diff --git a/sdk_container/src/third_party/coreos-overlay/PRESUBMIT.py b/sdk_container/src/third_party/coreos-overlay/PRESUBMIT.py new file mode 100644 index 0000000000..34810a98ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/PRESUBMIT.py @@ -0,0 +1,74 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +"""Top-level presubmit script for Chromium OS. + +See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts +for more details about the presubmit API built into gcl and git cl. +""" + +import difflib +import os +import re + +_EBUILD_FILES = ( + r".*\.ebuild", +) + +def _IsCrosWorkonEbuild(ebuild_contents): + pattern = re.compile('^ *inherit[-\._a-z0-9 ]*cros-workon') + for line in ebuild_contents: + if pattern.match(line): + return True + return False + +def Check9999Updated(input_api, output_api, source_file_filter=None): + """Checks that the 9999 ebuild was also modified.""" + output = [] + inconsistent = set() + missing_9999 = set() + for f in input_api.AffectedSourceFiles(source_file_filter): + ebuild_contents = f.NewContents() + # only look at non-9999 + if f.LocalPath().endswith('-9999.ebuild'): + continue + if _IsCrosWorkonEbuild(ebuild_contents): + dir = os.path.dirname(f.AbsoluteLocalPath()) + ebuild = os.path.basename(dir) + devebuild_path = os.path.join(dir, ebuild + '-9999.ebuild') + # check if 9999 ebuild exists + if not os.path.isfile(devebuild_path): + missing_9999.add(ebuild) + continue + diff = difflib.ndiff(ebuild_contents, + open(devebuild_path).read().splitlines()) + for line in diff: + if line.startswith('+') or line.startswith('-'): + # ignore empty-lines + if len(line) == 2: + continue + if not (line[2:].startswith('KEYWORDS=') or + line[2:].startswith('CROS_WORKON_COMMIT=')): + inconsistent.add(f.LocalPath()) + + if missing_9999: + output.append(output_api.PresubmitPromptWarning( + 'Missing 9999 for these cros-workon ebuilds:', items=missing_9999)) + if inconsistent: + output.append(output_api.PresubmitPromptWarning( + 'Following ebuilds are inconsistent with 9999:', items=inconsistent)) + return output + +def CheckChange(input_api, output_api, committing): + ebuilds = lambda x: input_api.FilterSourceFile(x, white_list=_EBUILD_FILES) + results = [] + results += Check9999Updated(input_api, output_api, + source_file_filter=ebuilds) + return results + +def CheckChangeOnUpload(input_api, output_api): + return CheckChange(input_api, output_api, False) + +def CheckChangeOnCommit(input_api, output_api): + return CheckChange(input_api, output_api, True) diff --git a/sdk_container/src/third_party/coreos-overlay/ROOT_PRESUBMIT.py b/sdk_container/src/third_party/coreos-overlay/ROOT_PRESUBMIT.py new file mode 100644 index 0000000000..a45c497d0f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/ROOT_PRESUBMIT.py @@ -0,0 +1,211 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +"""Top-level presubmit script for Chromium OS. + +See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts +for more details about the presubmit API built into gcl and git cl. +""" + +import re + +_EXCLUDED_PATHS = ( + r"^inherit-review-settings-ok$", + r".*[\\\/]debian[\\\/]rules$", +) + +# These match files that should contain tabs as indentation. +_TAB_OK_PATHS = ( + r"/src/third_party/kernel/", + r"/src/third_party/kernel-next/", + r"/src/third_party/u-boot/", + r"/src/third_party/u-boot-next/", + r".*\.ebuild$", + r".*\.eclass$", +) + +# These match files that are part of out "next" developemnt flow and as such +# do not require a valid BUG= field to commit, but it's still a good idea. +_NEXT_PATHS = ( + r"/src/third_party/kernel-next", + r"/src/third_party/u-boot-next", +) + +_LICENSE_HEADER = ( + r".*? Copyright \(c\) 20[-0-9]{2,7} The Chromium OS Authors\. All rights " + r"reserved\." "\n" + r".*? Use of this source code is governed by a BSD-style license that can " + "be\n" + r".*? found in the LICENSE file\." + "\n" +) + + +def CheckAndShowLicense(input_api, output_api, source_file_filter=None): + """Check that the source files have a valid License header. + + The license header must matches our template. If not also show the + header that should have been used. + + """ + results = [] + license_check = input_api.canned_checks.CheckLicense( + input_api, output_api, _LICENSE_HEADER, source_file_filter) + results.extend(license_check) + if license_check: + results.extend([output_api.PresubmitNotifyResult( + "License header should match the following:", + long_text=_LICENSE_HEADER)]) + return results + + +def CheckChangeHasMandatoryBugField(input_api, + output_api, + source_file_filter=None): + """Check that the commit contains a valid BUG= field.""" + msg = ('Changelist must reference a bug number using BUG=\n' + 'For example, BUG=chromium-os:8205\n' + 'BUG=none is allowed.') + + if (not input_api.AffectedSourceFiles(source_file_filter) or + input_api.change.BUG): + return [] + else: + return [output_api.PresubmitError(msg)] + + +def CheckChangeHasBugField(input_api, output_api, source_file_filter=None): + # This function is required because the canned BugField check doesn't + # take a source filter. + return input_api.canned_checks.CheckChangeHasBugField(input_api, + output_api) + + +def CheckChangeHasTestField(input_api, output_api, source_file_filter=None): + # This function is required because the canned TestField check doesn't + # take a source filter. + return input_api.canned_checks.CheckChangeHasTestField(input_api, + output_api) + + +def CheckTreeIsOpen(input_api, output_api, source_file_filter=None): + """Make sure the tree is 'open'. If not, don't submit.""" + return input_api.canned_checks.CheckTreeIsOpen( + input_api, + output_api, + json_url='http://chromiumos-status.appspot.com/current?format=json') + + +def CheckBuildbotPendingBuilds(input_api, output_api, source_file_filter=None): + """Check to see if there's a backlog on the pending CL queue""" + return input_api.canned_checks.CheckBuildbotPendingBuilds( + input_api, + output_api, + 'http://build.chromium.org/p/chromiumos/json/builders?filter=1', + 6, + []) + + +def FilterAbsoluteSourceFile(input_api, affected_file, white_list, black_list): + """Filters out files that aren't considered "source file". + + The lists will be compiled as regular expression and + AffectedFile.AbsoluteLocalPath() needs to pass both list. + + Note: This function was coppied from presubmit_support.py and modified to + check against (AbsoluteLocalPath - PresubmitLocalPath) instead of LocalPath + because LocalPath doesn't contain enough information to disambiguate kernel, + u-boot and -next files from the rest of ChromiumOS. + + """ + presubmit_local_path = input_api.PresubmitLocalPath() + + def RelativePath(affected_file): + absolute_local_path = affected_file.AbsoluteLocalPath() + + assert absolute_local_path.startswith(presubmit_local_path) + return absolute_local_path[len(presubmit_local_path):] + + def Find(relative_path, items): + for item in items: + if re.match(item, relative_path): + return True + + return False + + relative_path = RelativePath(affected_file) + + return (Find(relative_path, white_list) and + not Find(relative_path, black_list)) + +def RunChecklist(input_api, output_api, checklist): + """Run through a set of checks provided in a checklist. + + The checklist is a list of tuples, each of which contains the check to run + and a list of regular expressions of paths to ignore for this check + + """ + results = [] + + for check, paths in checklist: + white_list = input_api.DEFAULT_WHITE_LIST + + # Construct a black list from the DEFAULT_BLACK_LIST supplied by + # depot_tools and the paths that this check should not be applied to. + # + # We also remove the third_party rule here because our paterns are + # matching against the entire path from the root of the ChromiumOS + # project. We use the rooted paths because we want to be able to apply + # some of the presubmit checks to things like the kernel and u-boot that + # live in the third_party directory. + black_list = list(input_api.DEFAULT_BLACK_LIST) + black_list.remove(r".*\bthird_party[\\\/].*") + black_list.extend(paths) + sources = lambda path: FilterAbsoluteSourceFile(input_api, + path, + white_list, + black_list) + results.extend(check(input_api, output_api, source_file_filter=sources)) + + return results + + +def MakeCommonChecklist(input_api): + return [(input_api.canned_checks.CheckLongLines, _EXCLUDED_PATHS), + (input_api.canned_checks.CheckChangeHasNoStrayWhitespace, + _EXCLUDED_PATHS), + (CheckChangeHasTestField, _EXCLUDED_PATHS), + (CheckAndShowLicense, _EXCLUDED_PATHS), + (input_api.canned_checks.CheckChangeHasNoTabs, + _EXCLUDED_PATHS + _TAB_OK_PATHS)] + + +def MakeUploadChecklist(input_api): + return [(CheckChangeHasBugField, _EXCLUDED_PATHS)] + + +def MakeCommitChecklist(input_api): + return [(CheckChangeHasMandatoryBugField, _EXCLUDED_PATHS), + (CheckTreeIsOpen, _EXCLUDED_PATHS), + (CheckBuildbotPendingBuilds, _EXCLUDED_PATHS)] + + +def CheckChangeOnUpload(input_api, output_api): + """On upload we check against the common and upload lists.""" + return RunChecklist(input_api, + output_api, + MakeCommonChecklist(input_api) + + MakeUploadChecklist(input_api)) + + +def CheckChangeOnCommit(input_api, output_api): + """On commit we check against the common and commit lists.""" + return RunChecklist(input_api, + output_api, + MakeCommonChecklist(input_api) + + MakeCommitChecklist(input_api)) + + +def GetPreferredTrySlaves(): + return ['ChromiumOS x86'] diff --git a/sdk_container/src/third_party/coreos-overlay/WATCHLISTS b/sdk_container/src/third_party/coreos-overlay/WATCHLISTS new file mode 100644 index 0000000000..73fa35b37e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/WATCHLISTS @@ -0,0 +1,28 @@ +# See http://dev.chromium.org/developers/contributing-code/watchlists for +# a description of this file's format. +# Please keep these keys in alphabetical order. + +{ + 'WATCHLIST_DEFINITIONS': { + 'all': { + 'filepath': '.', + }, + 'fonts': { + 'filepath': 'media-fonts/|media-libs/(fontconfig|freetype)/', + }, + 'chromeos-image' : { + 'filepath': 'chromeos-base/chromeos(/|-dev|-test)', + }, + 'xorg' : { + 'filepath': 'chromeos-base/xorg-conf/|x11-(base|drivers|libs|misc)/', + }, + }, + 'WATCHLISTS': { + 'all': ['adlr+crosoverlay@chromium.org', + 'msb+crosoverlay@chromium.org', + 'anush@chromium.org'], + 'chromeos-image' : ['petkov@chromium.org', 'sosa@chromium.org'], + 'fonts' : ['derat@chromium.org'], + 'xorg' : ['derat@chromium.org', 'marcheu@chromium.org'], + }, +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/eselect-mesa/eselect-mesa-0.0.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/eselect-mesa/eselect-mesa-0.0.8.ebuild new file mode 100644 index 0000000000..fd9a1d8541 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/eselect-mesa/eselect-mesa-0.0.8.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mesa/eselect-mesa-0.0.8.ebuild,v 1.2 2010/11/28 15:37:34 chithanh Exp $ + +EAPI=3 + +DESCRIPTION="Utility to change the Mesa OpenGL driver being used" +HOMEPAGE="http://www.gentoo.org/" + +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd" +IUSE="" + +DEPEND="" +RDEPEND=">=app-admin/eselect-1.2.4" + +src_install() { + insinto /usr/share/eselect/modules + doins mesa.eselect || die +} + +pkg_postinst() { + if has_version ">=media-libs/mesa-7.9" && \ + ! [ -f "${EROOT}"/usr/share/mesa/eselect-mesa.conf ]; then + eerror "Rebuild media-libs/mesa for ${PN} to work." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/bootchart-0.9.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/bootchart-0.9.2-r1.ebuild new file mode 100644 index 0000000000..b6777ddace --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/bootchart-0.9.2-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# NOTE: This is based on the bootchart found in Ubuntu, which is a re-working +# of the bootchart project to use a C-based collector daemon. There wasn't a +# good link to a source tarball to use in the ebuild and all we need are the +# collector and gather files from it so they are inlined in the FILESDIR. + +inherit toolchain-funcs + +DESCRIPTION="Performance analysis and visualization of the system boot process" +HOMEPAGE="http://packages.ubuntu.com/lucid/bootchart" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_unpack() { + mkdir "${S}" + cp "${FILESDIR}/bootchart-collector.c" "${S}/collector.c" + cp "${FILESDIR}/bootchart-gather.sh" "${S}/gather" + cp "${FILESDIR}/bootchart.conf" "${S}" +} + +src_compile() { + $(tc-getCC) ${CFLAGS} -o collector collector.c || + die "Unable to compile bootchart collector." +} + +src_install() { + exeinto /lib/bootchart + doexe collector gather + + insinto /etc/init + doins bootchart.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-collector.c b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-collector.c new file mode 100644 index 0000000000..c40cebb3bf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-collector.c @@ -0,0 +1,438 @@ +/* bootchart-collector + * + * Copyright © 2009 Canonical Ltd. + * Author: Scott James Remnant . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define BUFSIZE 524288 + + +int append_buf (const char *str, size_t len, + int outfd, char *outbuf, size_t *outlen); +int copy_buf (int fd, int outfd, char *outbuf, size_t *outlen); +int flush_buf (int outfd, char *outbuf, size_t *outlen); + +int read_file (int fd, const char *uptime, size_t uptimelen, + int outfd, char *outbuf, size_t *outlen); +int read_proc (DIR *proc, const char *uptime, size_t uptimelen, + int outfd, char *outbuf, size_t *outlen); + +unsigned long get_uptime (int fd); +void sig_handler (int signum); + + +int +append_buf (const char *str, + size_t len, + int outfd, + char *outbuf, + size_t *outlen) +{ + assert (len <= BUFSIZE); + + if (*outlen + len > BUFSIZE) + if (flush_buf (outfd, outbuf, outlen) < 0) + return -1; + + memcpy (outbuf + *outlen, str, len); + *outlen += len; + + return 0; +} + +int +copy_buf (int fd, + int outfd, + char *outbuf, + size_t *outlen) +{ + for (;;) { + ssize_t len; + + if (*outlen == BUFSIZE) + if (flush_buf (outfd, outbuf, outlen) < 0) + return -1; + + len = read (fd, outbuf + *outlen, BUFSIZE - *outlen); + if (len < 0) { + perror ("read"); + return -1; + } else if (len == 0) + break; + + *outlen += len; + } + + return 0; +} + +int +flush_buf (int outfd, + char *outbuf, + size_t *outlen) +{ + size_t writelen = 0; + + while (writelen < *outlen) { + ssize_t len; + + len = write (outfd, outbuf + writelen, *outlen - writelen); + if (len < 0) { + perror ("write"); + exit (1); + } + + writelen += len; + } + + *outlen = 0; + + return 0; +} + + +int +read_file (int fd, + const char *uptime, + size_t uptimelen, + int outfd, + char *outbuf, + size_t *outlen) +{ + lseek (fd, SEEK_SET, 0); + + if (append_buf (uptime, uptimelen, outfd, outbuf, outlen) < 0) + return -1; + + if (copy_buf (fd, outfd, outbuf, outlen) < 0) + return -1; + + if (append_buf ("\n", 1, outfd, outbuf, outlen) < 0) + return -1; + + return 0; +} + +int +read_proc (DIR *proc, + const char *uptime, + size_t uptimelen, + int outfd, + char *outbuf, + size_t *outlen) +{ + struct dirent *ent; + + rewinddir (proc); + + if (append_buf (uptime, uptimelen, outfd, outbuf, outlen) < 0) + return -1; + + while ((ent = readdir (proc)) != NULL) { + char filename[PATH_MAX]; + int fd; + + if ((ent->d_name[0] < '0') || (ent->d_name[0] > '9')) + continue; + + sprintf (filename, "/proc/%s/stat", ent->d_name); + + fd = open (filename, O_RDONLY); + if (fd < 0) + continue; + + if (copy_buf (fd, outfd, outbuf, outlen) < 0) + ; + + if (close (fd) < 0) + continue; + } + + if (append_buf ("\n", 1, outfd, outbuf, outlen) < 0) + return -1; + + return 0; +} + + +unsigned long +get_uptime (int fd) +{ + char buf[80]; + ssize_t len; + unsigned long u1, u2; + + lseek (fd, SEEK_SET, 0); + + len = read (fd, buf, sizeof buf); + if (len < 0) { + perror ("read"); + return 0; + } + + buf[len] = '\0'; + + if (sscanf (buf, "%lu.%lu", &u1, &u2) != 2) { + perror ("sscanf"); + return 0; + } + + return u1 * 100 + u2; +} + + +void +sig_handler (int signum) +{ +} + +int +main (int argc, + char *argv[]) +{ + struct sigaction act; + sigset_t mask, oldmask; + struct rlimit rlim; + struct timespec timeout; + const char *output_dir = "."; + char filename[PATH_MAX]; + int sfd, dfd, ufd; + DIR *proc; + int statfd, diskfd, procfd; + char statbuf[BUFSIZE], diskbuf[BUFSIZE], procbuf[BUFSIZE]; + size_t statlen = 0, disklen = 0, proclen = 0; + unsigned long reltime = 0; + int arg = 1, rel = 0; + + if ((argc > arg) && (! strcmp (argv[arg], "-r"))) { + rel = 1; + arg++; + } + + if (argc <= arg) { + fprintf (stderr, "Usage: %s [-r] HZ [DIR]\n", argv[0]); + exit (1); + } + + if (argc > arg) { + unsigned long hz; + char *endptr; + + hz = strtoul (argv[arg], &endptr, 10); + if (*endptr) { + fprintf (stderr, "%s: HZ not an integer\n", argv[0]); + exit (1); + } + + if (hz > 1) { + timeout.tv_sec = 0; + timeout.tv_nsec = 1000000000 / hz; + } else { + timeout.tv_sec = 1; + timeout.tv_nsec = 0; + } + + arg++; + } + + if (argc > arg) { + output_dir = argv[arg]; + arg++; + } + + + sigemptyset (&mask); + sigaddset (&mask, SIGTERM); + sigaddset (&mask, SIGINT); + + if (sigprocmask (SIG_BLOCK, &mask, &oldmask) < 0) { + perror ("sigprocmask"); + exit (1); + } + + act.sa_handler = sig_handler; + act.sa_flags = 0; + sigemptyset (&act.sa_mask); + + if (sigaction (SIGTERM, &act, NULL) < 0) { + perror ("sigaction SIGTERM"); + exit (1); + } + + if (sigaction (SIGINT, &act, NULL) < 0) { + perror ("sigaction SIGINT"); + exit (1); + } + + /* Drop cores if we go wrong */ + if (chdir ("/")) + ; + + rlim.rlim_cur = RLIM_INFINITY; + rlim.rlim_max = RLIM_INFINITY; + + setrlimit (RLIMIT_CORE, &rlim); + + + proc = opendir ("/proc"); + if (! proc) { + perror ("opendir /proc"); + exit (1); + } + + sfd = open ("/proc/stat", O_RDONLY); + if (sfd < 0) { + perror ("open /proc/stat"); + exit (1); + } + + dfd = open ("/proc/diskstats", O_RDONLY); + if (dfd < 0) { + perror ("open /proc/diskstats"); + exit (1); + } + + ufd = open ("/proc/uptime", O_RDONLY); + if (ufd < 0) { + perror ("open /proc/uptime"); + exit (1); + } + + + sprintf (filename, "%s/proc_stat.log", output_dir); + statfd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (statfd < 0) { + perror ("open proc_stat.log"); + exit (1); + } + + sprintf (filename, "%s/proc_diskstats.log", output_dir); + diskfd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (diskfd < 0) { + perror ("open proc_diskstats.log"); + exit (1); + } + + sprintf (filename, "%s/proc_ps.log", output_dir); + procfd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (procfd < 0) { + perror ("open proc_ps.log"); + exit (1); + } + + + if (rel) { + reltime = get_uptime (ufd); + if (! reltime) + exit (1); + } + + for (;;) { + char uptime[80]; + size_t uptimelen; + unsigned long u; + + u = get_uptime (ufd); + if (! u) + exit (1); + + uptimelen = sprintf (uptime, "%lu\n", u - reltime); + + + if (read_file (sfd, uptime, uptimelen, + statfd, statbuf, &statlen) < 0) + exit (1); + + if (read_file (dfd, uptime, uptimelen, + diskfd, diskbuf, &disklen) < 0) + exit (1); + + if (read_proc (proc, uptime, uptimelen, + procfd, procbuf, &proclen) < 0) + exit (1); + + if (pselect (0, NULL, NULL, NULL, &timeout, &oldmask) < 0) { + if (errno == EINTR) { + break; + } else { + perror ("pselect"); + exit (1); + } + } + } + + + if (flush_buf (statfd, statbuf, &statlen) < 0) + exit (1); + if (close (statfd) < 0) { + perror ("close proc_stat.log"); + exit (1); + } + + if (flush_buf (diskfd, diskbuf, &disklen) < 0) + exit (1); + if (close (diskfd) < 0) { + perror ("close proc_diskstats.log"); + exit (1); + } + + if (flush_buf (procfd, procbuf, &proclen) < 0) + exit (1); + if (close (procfd) < 0) { + perror ("close proc_ps.log"); + exit (1); + } + + + if (close (ufd) < 0) { + perror ("close /proc/uptime"); + exit (1); + } + + if (close (dfd) < 0) { + perror ("close /proc/diskstats"); + exit (1); + } + + if (close (sfd) < 0) { + perror ("close /proc/stat"); + exit (1); + } + + if (closedir (proc) < 0) { + perror ("close /proc"); + exit (1); + } + + return 0; +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-gather.sh b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-gather.sh new file mode 100644 index 0000000000..9a7c6ccae9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-gather.sh @@ -0,0 +1,63 @@ +#!/bin/sh -e +# bootchart-gather +# +# Copyright © 2009 Canonical Ltd. +# Author: Scott James Remnant . +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Gather output of the bootchart collector into a tarball that bootchart +# can process itself. +TARBALL="$1" +if [ -z "$TARBALL" ]; then + echo "Usage: $0 TARBALL [DIR]" 1>&2 + exit 1 +fi + +if [ "${TARBALL#/}" = "$TARBALL" ]; then + TARBALL="$(pwd)/$TARBALL" +fi + +DIR="$2" +[ -n "$DIR" ] || DIR="." + + +cd $DIR + +# Output the header file with information about the system +{ + echo "version = $(dpkg-query -f'${Version}' -W bootchart)" + echo "title = Boot chart for $(hostname) ($(date))" + echo "system.uname = $(uname -srvm)" + echo "system.release = $(lsb_release -sd)" + case `uname -m` in + arm*) + echo -n "system.cpu = $(grep '^Processor' /proc/cpuinfo)" + if [ `grep -c '^processor' /proc/cpuinfo` -gt 0 ]; then + echo " ($(grep -c '^processor' /proc/cpuinfo))" + else + echo " (1)" + fi + ;; + *) + echo "system.cpu = $(grep '^model name' /proc/cpuinfo)"\ + "($(grep -c '^model name' /proc/cpuinfo))" + ;; + esac + echo "system.kernel.options = $(sed q /proc/cmdline)" +} > header + +# Create a tarball of the logs and header which can be parsed into the chart +tar czf $TARBALL header proc_stat.log proc_diskstats.log proc_ps.log + +exit 0 diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart.conf b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart.conf new file mode 100644 index 0000000000..3e34ebcae7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart.conf @@ -0,0 +1,27 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Collects boot data and optionally creates a chart" +author "chromium-os-dev@chromium.org" + +start on startup +stop on started system-services + +env BC_RUN=/dev/.bootchart +env BC_LOG=/var/log/bootchart + +pre-start exec mkdir -p "$BC_RUN" + +exec /lib/bootchart/collector 25 "$BC_RUN" + +pre-stop exec sleep 10 + +post-stop script + BC_DATA="${BC_LOG}/boot-$(date +%Y%m%d-%H%M%S).tgz" + + mkdir -p "$BC_LOG" + /lib/bootchart/gather "$BC_DATA" "$BC_RUN" + + rm -rf "$BC_RUN" +end script diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/metadata.xml new file mode 100644 index 0000000000..daf259dcca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/metadata.xml @@ -0,0 +1,14 @@ + + + + no-herd + + taysom@google.com + Paul Taysom + + + Punybench exercises the file system with a set of simple micro-benchmarks. + Each of the more than 60 benchmarks focus on just one aspect of the + file system. + + diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/punybench-0.0.1-r40.ebuild b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/punybench-0.0.1-r40.ebuild new file mode 100644 index 0000000000..81875cdbd0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/punybench-0.0.1-r40.ebuild @@ -0,0 +1,37 @@ +# +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header:$ +# + +EAPI=2 +CROS_WORKON_COMMIT="57224245adf877c44b884e1d38c5a5b1c7af554f" +CROS_WORKON_TREE="82e2c58d5dd033f61d396db341daca182448c8ad" +CROS_WORKON_PROJECT="chromiumos/platform/punybench" +CROS_WORKON_LOCALNAME="../platform/punybench" +inherit toolchain-funcs cros-workon + +DESCRIPTION="A set of file system microbenchmarks" +HOMEPAGE="http://git.chromium.org/gitweb/?s=punybench" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +##DEPEND="sys-libs/ncurses" + +src_compile() { + tc-export CC + if [ "${ARCH}" == "amd64" ]; then + PUNYARCH="x86_64" + else + PUNYARCH=${ARCH} + fi + emake BOARD="${PUNYARCH}" +} + +src_install() { + emake install BOARD="${PUNYARCH}" DESTDIR="${D}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/punybench-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/punybench-9999.ebuild new file mode 100644 index 0000000000..9141fbd396 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/punybench/punybench-9999.ebuild @@ -0,0 +1,35 @@ +# +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header:$ +# + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/punybench" +CROS_WORKON_LOCALNAME="../platform/punybench" +inherit toolchain-funcs cros-workon + +DESCRIPTION="A set of file system microbenchmarks" +HOMEPAGE="http://git.chromium.org/gitweb/?s=punybench" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +##DEPEND="sys-libs/ncurses" + +src_compile() { + tc-export CC + if [ "${ARCH}" == "amd64" ]; then + PUNYARCH="x86_64" + else + PUNYARCH=${ARCH} + fi + emake BOARD="${PUNYARCH}" +} + +src_install() { + emake install BOARD="${PUNYARCH}" DESTDIR="${D}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.4-solaris-gcc.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.4-solaris-gcc.patch new file mode 100644 index 0000000000..f0a3310c3c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.4-solaris-gcc.patch @@ -0,0 +1,33 @@ +--- mozilla/security/coreconf/SunOS5.mk.orig 2009-10-02 10:51:26.617090950 +0200 ++++ mozilla/security/coreconf/SunOS5.mk 2009-10-02 10:53:39.756260510 +0200 +@@ -37,6 +37,9 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + ++NS_USE_GCC = 1 ++GCC_USE_GNU_LD = 1 ++ + # + # Temporary define for the Client; to be removed when binary release is used + # +@@ -104,7 +107,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++#INCLUDES += -I/usr/dt/include -I/usr/openwin/include + + RANLIB = echo + CPU_ARCH = sparc +@@ -114,11 +117,6 @@ + NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) + + MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) +-ifdef NS_USE_GCC +-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1))) +- GCC_USE_GNU_LD = 1 +-endif +-endif + ifdef MAPFILE + ifdef NS_USE_GCC + ifdef GCC_USE_GNU_LD diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.5-gentoo-fixups.diff b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.5-gentoo-fixups.diff new file mode 100644 index 0000000000..79ac73cd8d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.5-gentoo-fixups.diff @@ -0,0 +1,245 @@ +diff -urN nss-3.12.5-orig/mozilla/security/nss/config/Makefile nss-3.12.5/mozilla/security/nss/config/Makefile +--- nss-3.12.5-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 +@@ -0,0 +1,40 @@ ++CORE_DEPTH = ../.. ++DEPTH = ../.. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` ++PREFIX = /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@exec_prefix@,\$${prefix}," \ ++ -e "s,@libdir@,\$${prefix}/gentoo/nss," \ ++ -e "s,@includedir@,\$${prefix}/include/nss," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in nss-3.12.5/mozilla/security/nss/config/nss-config.in +--- nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 +@@ -0,0 +1,145 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++ ++major_version=@NSS_MAJOR_VERSION@ ++minor_version=@NSS_MINOR_VERSION@ ++patch_version=@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_ssl=yes ++lib_smime=yes ++lib_nss=yes ++lib_nssutil=yes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac ++ ++ case $1 in ++ --prefix=*) ++ prefix=$optarg ++ ;; ++ --prefix) ++ echo_prefix=yes ++ ;; ++ --exec-prefix=*) ++ exec_prefix=$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=yes ++ ;; ++ --includedir=*) ++ includedir=$optarg ++ ;; ++ --includedir) ++ echo_includedir=yes ++ ;; ++ --libdir=*) ++ libdir=$optarg ++ ;; ++ --libdir) ++ echo_libdir=yes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ smime) ++ lib_smime=yes ++ ;; ++ nss) ++ lib_nss=yes ++ ;; ++ nssutil) ++ lib_nssutil=yes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=`pkg-config --variable=exec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=`pkg-config --variable=includedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=`pkg-config --variable=libdir nss` ++fi ++ ++if test "$echo_prefix" = "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" = "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" = "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" = "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" = "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" = "yes"; then ++ libdirs="-Wl,-R$libdir -L$libdir" ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs="$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" ++ fi ++ echo $libdirs ++fi ++ +diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.5/mozilla/security/nss/config/nss.pc.in +--- nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ ++Requires: nspr >= 4.8 ++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir} ++Cflags: -I${includedir} ++ +diff -urN nss-3.12.5-orig/mozilla/security/nss/Makefile nss-3.12.5/mozilla/security/nss/Makefile +--- nss-3.12.5-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 +@@ -78,7 +78,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_coreconf build_nspr build_dbm all ++nss_build_all: build_coreconf build_dbm all + + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + +@@ -140,12 +140,6 @@ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + +-build_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) +- +-clobber_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber +- + build_dbm: + ifndef NSS_DISABLE_DBM + cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs +diff -urN nss-3.12.5-orig/mozilla/security/nss/manifest.mn nss-3.12.5/mozilla/security/nss/manifest.mn +--- nss-3.12.5-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 ++++ nss-3.12.5/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 +@@ -42,6 +42,6 @@ + + RELEASE = nss + +-DIRS = lib cmd ++DIRS = lib cmd config + + diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch new file mode 100644 index 0000000000..bf2a865830 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch @@ -0,0 +1,10 @@ +--- nss-3.12.6b/mozilla/security/coreconf/Linux.mk-old 2010-02-11 12:43:26.000000000 -0600 ++++ nss-3.12.6b/mozilla/security/coreconf/Linux.mk 2010-02-14 09:13:53.962449644 -0600 +@@ -120,6 +120,7 @@ + ifdef MOZ_DEBUG_SYMBOLS + OPTIMIZER += -gstabs+ + endif ++OPTIMIZER += -fno-strict-aliasing + endif + + diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-cert-initlocks.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-cert-initlocks.patch new file mode 100644 index 0000000000..df8f7da78c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-cert-initlocks.patch @@ -0,0 +1,11 @@ +diff -rupN nss-3.12.8/mozilla/security/nss/lib/certdb/certdb.c nss-3.12.8_patched/mozilla/security/nss/lib/certdb/certdb.c +--- nss-3.12.8/mozilla/security/nss/lib/certdb/certdb.c 2010-09-02 00:52:02.000000000 +0000 ++++ nss-3.12.8_patched/mozilla/security/nss/lib/certdb/certdb.c 2012-04-02 20:58:31.821621891 +0000 +@@ -3030,6 +3030,7 @@ cert_InitLocks(void) + PORT_Assert(certTrustLock != NULL); + if (!certTrustLock) { + PZ_DestroyLock(certRefCountLock); ++ certRefCountLock = NULL; + return SECFailure; + } + } diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-chromeos-root-certs.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-chromeos-root-certs.patch new file mode 100644 index 0000000000..7b5f4bad30 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-chromeos-root-certs.patch @@ -0,0 +1,15046 @@ +diff -prauN nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.c +--- nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-30 18:02:26.450122000 +0000 ++++ nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-30 18:05:39.120122002 +0000 +@@ -35,7 +35,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + #ifdef DEBUG +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $"; + #endif /* DEBUG */ + + #ifndef BUILTINS_H +@@ -786,210 +786,6 @@ static const CK_ATTRIBUTE_TYPE nss_built + static const CK_ATTRIBUTE_TYPE nss_builtins_types_243 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_244 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_245 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_246 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_247 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_248 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_249 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_250 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_251 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_252 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_253 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_254 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_255 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_256 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_257 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_258 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_259 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_260 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_261 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_262 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_263 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_264 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_265 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_266 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_267 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_268 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_269 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_270 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_271 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_272 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_273 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_274 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_275 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_276 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_277 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_278 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_279 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_280 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_281 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_282 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_283 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_284 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_285 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_286 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_287 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_288 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_289 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_290 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_291 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_292 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_293 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_294 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_295 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_296 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_297 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_298 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_299 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_300 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_301 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_302 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_303 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_304 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_305 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_306 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_307 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_308 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_309 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_310 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; + #ifdef DEBUG + static const NSSItem nss_builtins_items_0 [] = { + { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -998,7 +794,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"CVS ID", (PRUint32)7 }, + { (void *)"NSS", (PRUint32)4 }, +- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $", (PRUint32)160 } ++ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $", (PRUint32)160 } + }; + #endif /* DEBUG */ + static const NSSItem nss_builtins_items_1 [] = { +@@ -1013,86 +809,6 @@ static const NSSItem nss_builtins_items_ + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GTE CyberTrust Root CA", (PRUint32)23 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\105\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\034\060\032\006\003\125" +-"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165" +-"\163\164\040\122\157\157\164" +-, (PRUint32)71 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\105\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\034\060\032\006\003\125" +-"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165" +-"\163\164\040\122\157\157\164" +-, (PRUint32)71 }, +- { (void *)"\002\002\001\243" +-, (PRUint32)4 }, +- { (void *)"\060\202\001\372\060\202\001\143\002\002\001\243\060\015\006\011" +-"\052\206\110\206\367\015\001\001\004\005\000\060\105\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\034\060\032\006\003\125\004\003\023\023\107" +-"\124\105\040\103\171\142\145\162\124\162\165\163\164\040\122\157" +-"\157\164\060\036\027\015\071\066\060\062\062\063\062\063\060\061" +-"\060\060\132\027\015\060\066\060\062\062\063\062\063\065\071\060" +-"\060\132\060\105\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\034\060\032\006" +-"\003\125\004\003\023\023\107\124\105\040\103\171\142\145\162\124" +-"\162\165\163\164\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\270\346\117\272\333\230\174\161\174\257" +-"\104\267\323\017\106\331\144\345\223\301\102\216\307\272\111\215" +-"\065\055\172\347\213\275\345\005\061\131\306\261\057\012\014\373" +-"\237\247\077\242\011\146\204\126\036\067\051\033\207\351\176\014" +-"\312\232\237\245\177\365\025\224\243\325\242\106\202\330\150\114" +-"\321\067\025\006\150\257\275\370\260\263\360\051\365\225\132\011" +-"\026\141\167\012\042\045\324\117\105\252\307\275\345\226\337\371" +-"\324\250\216\102\314\044\300\036\221\047\112\265\155\006\200\143" +-"\071\304\242\136\070\003\002\003\001\000\001\060\015\006\011\052" +-"\206\110\206\367\015\001\001\004\005\000\003\201\201\000\022\263" +-"\165\306\137\035\341\141\125\200\000\324\201\113\173\061\017\043" +-"\143\347\075\363\003\371\364\066\250\273\331\343\245\227\115\352" +-"\053\051\340\326\152\163\201\346\300\211\243\323\361\340\245\245" +-"\042\067\232\143\302\110\040\264\333\162\343\310\366\331\174\276" +-"\261\257\123\332\024\264\041\270\326\325\226\343\376\116\014\131" +-"\142\266\232\112\371\102\335\214\157\201\251\161\377\364\012\162" +-"\155\155\104\016\235\363\164\164\250\325\064\111\351\136\236\351" +-"\264\172\341\345\132\037\204\060\234\323\237\245\045\330" +-, (PRUint32)510 } +-}; +-static const NSSItem nss_builtins_items_3 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GTE CyberTrust Root CA", (PRUint32)23 }, +- { (void *)"\220\336\336\236\114\116\237\157\330\206\027\127\235\323\221\274" +-"\145\246\211\144" +-, (PRUint32)20 }, +- { (void *)"\304\327\360\262\243\305\175\141\147\360\004\315\103\323\272\130" +-, (PRUint32)16 }, +- { (void *)"\060\105\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\034\060\032\006\003\125" +-"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165" +-"\163\164\040\122\157\157\164" +-, (PRUint32)71 }, +- { (void *)"\002\002\001\243" +-, (PRUint32)4 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_4 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"GTE CyberTrust Global Root", (PRUint32)27 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +@@ -1156,7 +872,7 @@ static const NSSItem nss_builtins_items_ + "\037\042\265\315\225\255\272\247\314\371\253\013\172\177" + , (PRUint32)606 } + }; +-static const NSSItem nss_builtins_items_5 [] = { ++static const NSSItem nss_builtins_items_3 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1181,16 +897,16 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_6 [] = { ++static const NSSItem nss_builtins_items_4 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, ++ { (void *)"Thawte Personal Basic CA", (PRUint32)25 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101" ++ { (void *)"\060\201\313\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\032\060\030\006" +@@ -1198,15 +914,14 @@ static const NSSItem nss_builtins_items_ + "\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" +-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" +-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" +-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" +-"\056\143\157\155" +-, (PRUint32)212 }, ++"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" ++"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" ++"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" ++"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" ++, (PRUint32)206 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101" ++ { (void *)"\060\201\313\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\032\060\030\006" +@@ -1214,18 +929,17 @@ static const NSSItem nss_builtins_items_ + "\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" +-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" +-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" +-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" +-"\056\143\157\155" +-, (PRUint32)212 }, ++"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" ++"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" ++"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" ++"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" ++, (PRUint32)206 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000" ++ { (void *)"\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000" + "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" +-"\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061" ++"\201\313\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\032\060\030\006\003" +@@ -1233,62 +947,61 @@ static const NSSItem nss_builtins_items_ + "\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164" +-"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155" +-"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206" +-"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055" +-"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056" +-"\143\157\155\060\036\027\015\071\066\060\061\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\321\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\032" +-"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040" +-"\103\157\156\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124" +-"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106" +-"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011" +-"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157" +-"\156\141\154\055\146\162\145\145\155\141\151\154\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\324\151\327\324\260\224\144\133\161\351\107\330" +-"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337" +-"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176" +-"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104" +-"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170" +-"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156" +-"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152" +-"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345" +-"\132\304\034\271\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\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115" +-"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317" +-"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144" +-"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254" +-"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232" +-"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163" +-"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246" +-"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242" +-"\201" +-, (PRUint32)817 } ++"\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167\164" ++"\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151\143" ++"\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015\001" ++"\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141\163" ++"\151\143\100\164\150\141\167\164\145\056\143\157\155\060\036\027" ++"\015\071\066\060\061\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\313" ++"\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\032\060\030\006\003\125\004" ++"\012\023\021\124\150\141\167\164\145\040\103\157\156\163\165\154" ++"\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151\143\040\103" ++"\101\061\050\060\046\006\011\052\206\110\206\367\015\001\011\001" ++"\026\031\160\145\162\163\157\156\141\154\055\142\141\163\151\143" ++"\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\274\274\223\123\155\300\120\117" ++"\202\025\346\110\224\065\246\132\276\157\102\372\017\107\356\167" ++"\165\162\335\215\111\233\226\127\240\170\324\312\077\121\263\151" ++"\013\221\166\027\042\007\227\152\304\121\223\113\340\215\357\067" ++"\225\241\014\115\332\064\220\035\027\211\227\340\065\070\127\112" ++"\300\364\010\160\351\074\104\173\120\176\141\232\220\343\043\323" ++"\210\021\106\047\365\013\007\016\273\335\321\177\040\012\210\271" ++"\126\013\056\034\200\332\361\343\236\051\357\024\275\012\104\373" ++"\033\133\030\321\277\043\223\041\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\055\342\231\153\260\075\172\211\327\131\242" ++"\224\001\037\053\335\022\113\123\302\255\177\252\247\000\134\221" ++"\100\127\045\112\070\252\204\160\271\331\200\017\245\173\134\373" ++"\163\306\275\327\212\141\134\003\343\055\047\250\027\340\204\205" ++"\102\334\136\233\306\267\262\155\273\164\257\344\077\313\247\267" ++"\260\340\135\276\170\203\045\224\322\333\201\017\171\007\155\117" ++"\364\071\025\132\122\001\173\336\062\326\115\070\366\022\134\006" ++"\120\337\005\133\275\024\113\241\337\051\272\073\101\215\367\143" ++"\126\241\337\042\261" ++, (PRUint32)805 } + }; +-static const NSSItem nss_builtins_items_7 [] = { ++static const NSSItem nss_builtins_items_5 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, +- { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207" +-"\244\353\000\205" ++ { (void *)"Thawte Personal Basic CA", (PRUint32)25 }, ++ { (void *)"\100\347\214\035\122\075\034\331\225\117\254\032\032\263\275\074" ++"\272\241\133\374" + , (PRUint32)20 }, +- { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331" ++ { (void *)"\346\013\322\311\312\055\210\333\032\161\016\113\170\353\002\101" + , (PRUint32)16 }, +- { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101" ++ { (void *)"\060\201\313\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\032\060\030\006" +@@ -1296,11 +1009,263 @@ static const NSSItem nss_builtins_items_ + "\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" +-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" +-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" +-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" ++"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" ++"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" ++"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" ++"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" ++, (PRUint32)206 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_6 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Premium CA", (PRUint32)27 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\201\317\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" ++"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" ++"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" ++"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" ++"\157\155" ++, (PRUint32)210 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\317\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" ++"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" ++"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" ++"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" ++"\157\155" ++, (PRUint32)210 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\201\317\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\032\060\030\006\003" ++"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163" ++"\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167\164" ++"\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155\151" ++"\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206\367" ++"\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055\160" ++"\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143\157" ++"\155\060\036\027\015\071\066\060\061\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\317\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\032\060\030" ++"\006\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157" ++"\156\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141" ++"\167\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145" ++"\155\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110" ++"\206\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154" ++"\055\160\162\145\155\151\165\155\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" ++"\311\146\331\370\007\104\317\271\214\056\360\241\357\023\105\154" ++"\005\337\336\047\026\121\066\101\021\154\154\073\355\376\020\175" ++"\022\236\345\233\102\232\376\140\061\303\146\267\163\072\110\256" ++"\116\320\062\067\224\210\265\015\266\331\363\362\104\331\325\210" ++"\022\335\166\115\362\032\374\157\043\036\172\361\330\230\105\116" ++"\007\020\357\026\102\320\103\165\155\112\336\342\252\311\061\377" ++"\037\000\160\174\146\317\020\045\010\272\372\356\000\351\106\003" ++"\146\047\021\025\073\252\133\362\230\335\066\102\262\332\210\165" ++"\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\151\066\211" ++"\367\064\052\063\162\057\155\073\324\042\262\270\157\232\305\066" ++"\146\016\033\074\241\261\165\132\346\375\065\323\370\250\362\007" ++"\157\205\147\216\336\053\271\342\027\260\072\240\360\016\242\000" ++"\232\337\363\024\025\156\273\310\205\132\230\200\371\377\276\164" ++"\035\075\363\376\060\045\321\067\064\147\372\245\161\171\060\141" ++"\051\162\300\340\054\114\373\126\344\072\250\157\345\062\131\122" ++"\333\165\050\120\131\014\370\013\031\344\254\331\257\226\215\057" ++"\120\333\007\303\352\037\253\063\340\365\053\061\211" ++, (PRUint32)813 } ++}; ++static const NSSItem nss_builtins_items_7 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Premium CA", (PRUint32)27 }, ++ { (void *)"\066\206\065\143\375\121\050\307\276\246\360\005\317\351\264\066" ++"\150\010\154\316" ++, (PRUint32)20 }, ++ { (void *)"\072\262\336\042\232\040\223\111\371\355\310\322\212\347\150\015" ++, (PRUint32)16 }, ++ { (void *)"\060\201\317\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" ++"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" ++"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" ++"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" ++"\157\155" ++, (PRUint32)210 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_8 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\201\321\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" ++"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" ++"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" ++"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" ++"\056\143\157\155" ++, (PRUint32)212 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\321\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" ++"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" ++"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" ++"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" ++"\056\143\157\155" ++, (PRUint32)212 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\201\321\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\032\060\030\006\003" ++"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163" ++"\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164" ++"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155" ++"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206" ++"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055" ++"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056" ++"\143\157\155\060\036\027\015\071\066\060\061\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\321\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\032" ++"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040" ++"\103\157\156\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124" ++"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106" ++"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011" ++"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157" ++"\156\141\154\055\146\162\145\145\155\141\151\154\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\324\151\327\324\260\224\144\133\161\351\107\330" ++"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337" ++"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176" ++"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104" ++"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170" ++"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156" ++"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152" ++"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345" ++"\132\304\034\271\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\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115" ++"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317" ++"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144" ++"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254" ++"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232" ++"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163" ++"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246" ++"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242" ++"\201" ++, (PRUint32)817 } ++}; ++static const NSSItem nss_builtins_items_9 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, ++ { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207" ++"\244\353\000\205" ++, (PRUint32)20 }, ++ { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331" ++, (PRUint32)16 }, ++ { (void *)"\060\201\321\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" ++"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" ++"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" ++"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" + "\056\143\157\155" + , (PRUint32)212 }, + { (void *)"\002\001\000" +@@ -1310,7 +1275,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_8 [] = { ++static const NSSItem nss_builtins_items_10 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1400,7 +1365,7 @@ static const NSSItem nss_builtins_items_ + "\243\377\212\043\056\160\107" + , (PRUint32)791 } + }; +-static const NSSItem nss_builtins_items_9 [] = { ++static const NSSItem nss_builtins_items_11 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1430,147 +1395,21 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_10 [] = { ++static const NSSItem nss_builtins_items_12 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Premium Server CA", (PRUint32)25 }, ++ { (void *)"Equifax Secure CA", (PRUint32)18 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\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" +-, (PRUint32)209 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\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" +-, (PRUint32)209 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\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" +-, (PRUint32)811 } +-}; +-static const NSSItem nss_builtins_items_11 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Premium Server CA", (PRUint32)25 }, +- { (void *)"\142\177\215\170\047\145\143\231\322\175\177\220\104\311\376\263" +-"\363\076\372\232" +-, (PRUint32)20 }, +- { (void *)"\006\237\151\171\026\146\220\002\033\214\214\242\303\007\157\072" +-, (PRUint32)16 }, +- { (void *)"\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" +-, (PRUint32)209 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_12 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Equifax Secure CA", (PRUint32)18 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141" +-"\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151" +-"\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151" +-"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)80 }, ++ { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" ++"\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141" ++"\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151" ++"\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151" ++"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171" ++, (PRUint32)80 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" + "\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141" +@@ -1754,7 +1593,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; + static const NSSItem nss_builtins_items_16 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -1853,7 +1692,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; + static const NSSItem nss_builtins_items_18 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -2130,7 +1969,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; + static const NSSItem nss_builtins_items_24 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -2506,129 +2345,6 @@ static const NSSItem nss_builtins_items_ + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 4 Public Primary Certification Authority - G2", (PRUint32)61 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125" +-"\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154" +-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151" +-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" +-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013" +-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145" +-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" +-"\167\157\162\153" +-, (PRUint32)196 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125" +-"\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154" +-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151" +-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" +-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013" +-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145" +-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" +-"\167\157\162\153" +-, (PRUint32)196 }, +- { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067" +-"\045\370" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365" +-"\353\023\107\370\177\304\040\067\045\370\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125" +-"\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\061\074\060\072\006\003\125\004\013\023\063\103\154\141" +-"\163\163\040\064\040\120\165\142\154\151\143\040\120\162\151\155" +-"\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157" +-"\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107\062" +-"\061\072\060\070\006\003\125\004\013\023\061\050\143\051\040\061" +-"\071\071\070\040\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151" +-"\172\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035" +-"\006\003\125\004\013\023\026\126\145\162\151\123\151\147\156\040" +-"\124\162\165\163\164\040\116\145\164\167\157\162\153\060\036\027" +-"\015\071\070\060\065\061\070\060\060\060\060\060\060\132\027\015" +-"\062\070\060\070\060\061\062\063\065\071\065\071\132\060\201\301" +-"\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060" +-"\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147\156" +-"\054\040\111\156\143\056\061\074\060\072\006\003\125\004\013\023" +-"\063\103\154\141\163\163\040\064\040\120\165\142\154\151\143\040" +-"\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143" +-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040" +-"\055\040\107\062\061\072\060\070\006\003\125\004\013\023\061\050" +-"\143\051\040\061\071\071\070\040\126\145\162\151\123\151\147\156" +-"\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165\164" +-"\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171" +-"\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151\123" +-"\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157\162" +-"\153\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\272\360" +-"\344\317\371\304\256\205\124\271\007\127\371\217\305\177\150\021" +-"\370\304\027\260\104\334\343\060\163\325\052\142\052\270\320\314" +-"\034\355\050\133\176\275\152\334\263\221\044\312\101\142\074\374" +-"\002\001\277\034\026\061\224\005\227\166\156\242\255\275\141\027" +-"\154\116\060\206\360\121\067\052\120\307\250\142\201\334\133\112" +-"\252\301\240\264\156\353\057\345\127\305\261\053\100\160\333\132" +-"\115\241\216\037\275\003\037\330\003\324\217\114\231\161\274\342" +-"\202\314\130\350\230\072\206\323\206\070\363\000\051\037\002\003" +-"\001\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\003\201\201\000\205\214\022\301\247\271\120\025\172\313" +-"\076\254\270\103\212\334\252\335\024\272\211\201\176\001\074\043" +-"\161\041\210\057\202\334\143\372\002\105\254\105\131\327\052\130" +-"\104\133\267\237\201\073\222\150\075\342\067\044\365\173\154\217" +-"\166\065\226\011\250\131\235\271\316\043\253\164\326\203\375\062" +-"\163\047\330\151\076\103\164\366\256\305\211\232\347\123\174\351" +-"\173\366\113\363\301\145\203\336\215\212\234\074\210\215\071\131" +-"\374\252\077\042\215\241\301\146\120\201\162\114\355\042\144\117" +-"\117\312\200\221\266\051" +-, (PRUint32)774 } +-}; +-static const NSSItem nss_builtins_items_31 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 4 Public Primary Certification Authority - G2", (PRUint32)61 }, +- { (void *)"\013\167\276\273\313\172\242\107\005\336\314\017\275\152\002\374" +-"\172\275\233\122" +-, (PRUint32)20 }, +- { (void *)"\046\155\054\031\230\266\160\150\070\120\124\031\354\220\064\140" +-, (PRUint32)16 }, +- { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125" +-"\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154" +-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151" +-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" +-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013" +-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145" +-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" +-"\167\157\162\153" +-, (PRUint32)196 }, +- { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067" +-"\045\370" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_32 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"GlobalSign Root CA", (PRUint32)19 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\127\061\013\060\011\006\003\125\004\006\023\002\102\105\061" +@@ -2706,7 +2422,7 @@ static const NSSItem nss_builtins_items_ + "\125\342\374\110\311\051\046\151\340" + , (PRUint32)889 } + }; +-static const NSSItem nss_builtins_items_33 [] = { ++static const NSSItem nss_builtins_items_31 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2731,7 +2447,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_34 [] = { ++static const NSSItem nss_builtins_items_32 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2815,7 +2531,7 @@ static const NSSItem nss_builtins_items_ + "\152\374\176\102\070\100\144\022\367\236\201\341\223\056" + , (PRUint32)958 } + }; +-static const NSSItem nss_builtins_items_35 [] = { ++static const NSSItem nss_builtins_items_33 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2839,7 +2555,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_36 [] = { ++static const NSSItem nss_builtins_items_34 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2924,7 +2640,7 @@ static const NSSItem nss_builtins_items_ + "\161\202\053\231\317\072\267\365\055\162\310" + , (PRUint32)747 } + }; +-static const NSSItem nss_builtins_items_37 [] = { ++static const NSSItem nss_builtins_items_35 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2955,7 +2671,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_38 [] = { ++static const NSSItem nss_builtins_items_36 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3040,7 +2756,7 @@ static const NSSItem nss_builtins_items_ + "\276\355\164\114\274\133\325\142\037\103\335" + , (PRUint32)747 } + }; +-static const NSSItem nss_builtins_items_39 [] = { ++static const NSSItem nss_builtins_items_37 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3071,7 +2787,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_40 [] = { ++static const NSSItem nss_builtins_items_38 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3156,7 +2872,7 @@ static const NSSItem nss_builtins_items_ + "\040\017\105\176\153\242\177\243\214\025\356" + , (PRUint32)747 } + }; +-static const NSSItem nss_builtins_items_41 [] = { ++static const NSSItem nss_builtins_items_39 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3187,7 +2903,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_42 [] = { ++static const NSSItem nss_builtins_items_40 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3294,7 +3010,7 @@ static const NSSItem nss_builtins_items_ + "\113\336\006\226\161\054\362\333\266\037\244\357\077\356" + , (PRUint32)1054 } + }; +-static const NSSItem nss_builtins_items_43 [] = { ++static const NSSItem nss_builtins_items_41 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3327,7 +3043,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_44 [] = { ++static const NSSItem nss_builtins_items_42 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3434,7 +3150,7 @@ static const NSSItem nss_builtins_items_ + "\311\130\020\371\252\357\132\266\317\113\113\337\052" + , (PRUint32)1053 } + }; +-static const NSSItem nss_builtins_items_45 [] = { ++static const NSSItem nss_builtins_items_43 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3467,7 +3183,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_46 [] = { ++static const NSSItem nss_builtins_items_44 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3574,7 +3290,7 @@ static const NSSItem nss_builtins_items_ + "\153\271\012\172\116\117\113\204\356\113\361\175\335\021" + , (PRUint32)1054 } + }; +-static const NSSItem nss_builtins_items_47 [] = { ++static const NSSItem nss_builtins_items_45 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3607,7 +3323,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_48 [] = { ++static const NSSItem nss_builtins_items_46 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3714,7 +3430,7 @@ static const NSSItem nss_builtins_items_ + "\367\146\103\363\236\203\076\040\252\303\065\140\221\316" + , (PRUint32)1054 } + }; +-static const NSSItem nss_builtins_items_49 [] = { ++static const NSSItem nss_builtins_items_47 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3745,9 +3461,9 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_50 [] = { ++static const NSSItem nss_builtins_items_48 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3865,7 +3581,7 @@ static const NSSItem nss_builtins_items_ + "\155\055\105\013\367\012\223\352\355\006\371\262" + , (PRUint32)1244 } + }; +-static const NSSItem nss_builtins_items_51 [] = { ++static const NSSItem nss_builtins_items_49 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3897,159 +3613,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_52 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\311\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\110\060\106\006\003\125\004\013\024" +-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164" +-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057" +-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162" +-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056" +-"\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\063\060\061\006\003\125\004\003" +-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154" +-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)204 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\311\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\110\060\106\006\003\125\004\013\024" +-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164" +-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057" +-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162" +-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056" +-"\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\063\060\061\006\003\125\004\003" +-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154" +-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)204 }, +- { (void *)"\002\004\070\003\221\356" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070" +-"\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004" +-"\005\000\060\201\311\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\110\060\106\006\003\125\004" +-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156" +-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146" +-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171" +-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141" +-"\142\056\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\063\060\061\006\003\125" +-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040" +-"\103\154\151\145\156\164\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\061\060\061\062\061\071\062\064\063\060\132\027" +-"\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201" +-"\311\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\110\060\106\006\003\125\004\013\024\077\167" +-"\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103" +-"\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120" +-"\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146" +-"\056\040\154\151\155\151\164\163\040\154\151\141\142\056\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\063\060\061\006\003\125\004\003\023\052" +-"\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145" +-"\156\164\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\310\072\231\136\061\027\337\254\047" +-"\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150" +-"\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107" +-"\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226" +-"\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261" +-"\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164" +-"\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126" +-"\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346" +-"\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202" +-"\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004" +-"\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202" +-"\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244" +-"\201\333\060\201\330\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\110\060\106\006\003\125\004" +-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156" +-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146" +-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171" +-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141" +-"\142\056\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\063\060\061\006\003\125" +-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040" +-"\103\154\151\145\156\164\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\054\240" +-"\052\240\050\206\046\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" +-"\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125" +-"\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062" +-"\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061" +-"\062\061\071\062\064\063\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\304\373\234\051\173\227\315\114\226\374\356\133\263\312" +-"\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004" +-"\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231" +-"\164\213\225\352\114\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\004\005\000\003\201\201" +-"\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273" +-"\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002" +-"\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007" +-"\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363" +-"\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070" +-"\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003" +-"\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332" +-"\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134" +-"\354" +-, (PRUint32)1265 } +-}; +-static const NSSItem nss_builtins_items_53 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 }, +- { (void *)"\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125" +-"\262\371\365\200" +-, (PRUint32)20 }, +- { (void *)"\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364" +-, (PRUint32)16 }, +- { (void *)"\060\201\311\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\110\060\106\006\003\125\004\013\024" +-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164" +-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057" +-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162" +-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056" +-"\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\063\060\061\006\003\125\004\003" +-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154" +-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)204 }, +- { (void *)"\002\004\070\003\221\356" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_54 [] = { ++static const NSSItem nss_builtins_items_50 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4157,7 +3721,7 @@ static const NSSItem nss_builtins_items_ + "\275\114\105\236\141\272\277\204\201\222\003\321\322\151\174\305" + , (PRUint32)1120 } + }; +-static const NSSItem nss_builtins_items_55 [] = { ++static const NSSItem nss_builtins_items_51 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4188,7 +3752,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_56 [] = { ++static const NSSItem nss_builtins_items_52 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4270,7 +3834,7 @@ static const NSSItem nss_builtins_items_ + "\347\201\035\031\303\044\102\352\143\071\251" + , (PRUint32)891 } + }; +-static const NSSItem nss_builtins_items_57 [] = { ++static const NSSItem nss_builtins_items_53 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4295,7 +3859,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_58 [] = { ++static const NSSItem nss_builtins_items_54 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4363,7 +3927,7 @@ static const NSSItem nss_builtins_items_ + "\126\224\251\125" + , (PRUint32)660 } + }; +-static const NSSItem nss_builtins_items_59 [] = { ++static const NSSItem nss_builtins_items_55 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4388,7 +3952,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_60 [] = { ++static const NSSItem nss_builtins_items_56 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4455,7 +4019,7 @@ static const NSSItem nss_builtins_items_ + "\132\052\202\262\067\171" + , (PRUint32)646 } + }; +-static const NSSItem nss_builtins_items_61 [] = { ++static const NSSItem nss_builtins_items_57 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4480,254 +4044,21 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_62 [] = { ++static const NSSItem nss_builtins_items_58 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Equifax Secure eBusiness CA 2", (PRUint32)30 }, ++ { (void *)"AddTrust Low-Value Services Root", (PRUint32)33 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141" +-"\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004" +-"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162" +-"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062" +-, (PRUint32)80 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141" +-"\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004" +-"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162" +-"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062" +-, (PRUint32)80 }, +- { (void *)"\002\004\067\160\317\265" +-, (PRUint32)6 }, +- { (void *)"\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\067" +-"\160\317\265\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125" +-"\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151" +-"\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003" +-"\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143" +-"\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101" +-"\055\062\060\036\027\015\071\071\060\066\062\063\061\062\061\064" +-"\064\065\132\027\015\061\071\060\066\062\063\061\062\061\064\064" +-"\065\132\060\116\061\013\060\011\006\003\125\004\006\023\002\125" +-"\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151" +-"\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003" +-"\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143" +-"\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101" +-"\055\062\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\344" +-"\071\071\223\036\122\006\033\050\066\370\262\243\051\305\355\216" +-"\262\021\275\376\353\347\264\164\302\217\377\005\347\331\235\006" +-"\277\022\310\077\016\362\326\321\044\262\021\336\321\163\011\212" +-"\324\261\054\230\011\015\036\120\106\262\203\246\105\215\142\150" +-"\273\205\033\040\160\062\252\100\315\246\226\137\304\161\067\077" +-"\004\363\267\101\044\071\007\032\036\056\141\130\240\022\013\345" +-"\245\337\305\253\352\067\161\314\034\310\067\072\271\227\122\247" +-"\254\305\152\044\224\116\234\173\317\300\152\326\337\041\275\002" +-"\003\001\000\001\243\202\001\011\060\202\001\005\060\160\006\003" +-"\125\035\037\004\151\060\147\060\145\240\143\240\141\244\137\060" +-"\135\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027" +-"\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141\170" +-"\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004\013" +-"\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162\145" +-"\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062\061" +-"\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060\032" +-"\006\003\125\035\020\004\023\060\021\201\017\062\060\061\071\060" +-"\066\062\063\061\062\061\064\064\065\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\120\236\013\352\257\136\271\040\110\246\120\152" +-"\313\375\330\040\172\247\202\166\060\035\006\003\125\035\016\004" +-"\026\004\024\120\236\013\352\257\136\271\040\110\246\120\152\313" +-"\375\330\040\172\247\202\166\060\014\006\003\125\035\023\004\005" +-"\060\003\001\001\377\060\032\006\011\052\206\110\206\366\175\007" +-"\101\000\004\015\060\013\033\005\126\063\056\060\143\003\002\006" +-"\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000" +-"\003\201\201\000\014\206\202\255\350\116\032\365\216\211\047\342" +-"\065\130\075\051\264\007\217\066\120\225\277\156\301\236\353\304" +-"\220\262\205\250\273\267\102\340\017\007\071\337\373\236\220\262" +-"\321\301\076\123\237\003\104\260\176\113\364\157\344\174\037\347" +-"\342\261\344\270\232\357\303\275\316\336\013\062\064\331\336\050" +-"\355\063\153\304\324\327\075\022\130\253\175\011\055\313\160\365" +-"\023\212\224\241\047\244\326\160\305\155\224\265\311\175\235\240" +-"\322\306\010\111\331\146\233\246\323\364\013\334\305\046\127\341" +-"\221\060\352\315" +-, (PRUint32)804 } +-}; +-static const NSSItem nss_builtins_items_63 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Equifax Secure eBusiness CA 2", (PRUint32)30 }, +- { (void *)"\071\117\366\205\013\006\276\122\345\030\126\314\020\341\200\350" +-"\202\263\205\314" +-, (PRUint32)20 }, +- { (void *)"\252\277\277\144\227\332\230\035\157\306\010\072\225\160\063\312" +-, (PRUint32)16 }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141" +-"\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004" +-"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162" +-"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062" +-, (PRUint32)80 }, +- { (void *)"\002\004\067\160\317\265" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_64 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA", (PRUint32)18 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061" +-"\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123" +-"\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163" +-"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101" +-, (PRUint32)92 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061" +-"\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123" +-"\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163" +-"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101" +-, (PRUint32)92 }, +- { (void *)"\002\004\071\117\175\207" +-, (PRUint32)6 }, +- { (void *)"\060\202\005\054\060\202\004\024\240\003\002\001\002\002\004\071" +-"\117\175\207\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\127" +-"\127\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122" +-"\125\123\124\145\144\061\033\060\031\006\003\125\004\003\023\022" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\163\061\032\060\030\006\003\125\004\003\023\021\142\145\124" +-"\122\125\123\124\145\144\040\122\157\157\164\040\103\101\060\036" +-"\027\015\060\060\060\066\062\060\061\064\062\061\060\064\132\027" +-"\015\061\060\060\066\062\060\061\063\062\061\060\064\132\060\132" +-"\061\013\060\011\006\003\125\004\006\023\002\127\127\061\022\060" +-"\020\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145" +-"\144\061\033\060\031\006\003\125\004\003\023\022\142\145\124\122" +-"\125\123\124\145\144\040\122\157\157\164\040\103\101\163\061\032" +-"\060\030\006\003\125\004\003\023\021\142\145\124\122\125\123\124" +-"\145\144\040\122\157\157\164\040\103\101\060\202\001\042\060\015" +-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001" +-"\017\000\060\202\001\012\002\202\001\001\000\324\264\163\172\023" +-"\012\070\125\001\276\211\126\341\224\236\324\276\132\353\112\064" +-"\165\033\141\051\304\341\255\010\140\041\170\110\377\264\320\372" +-"\136\101\215\141\104\207\350\355\311\130\372\374\223\232\337\117" +-"\352\076\065\175\370\063\172\346\361\327\315\157\111\113\075\117" +-"\055\156\016\203\072\030\170\167\243\317\347\364\115\163\330\232" +-"\073\032\035\276\225\123\317\040\227\302\317\076\044\122\154\014" +-"\216\145\131\305\161\377\142\011\217\252\305\217\314\140\240\163" +-"\112\327\070\077\025\162\277\242\227\267\160\350\257\342\176\026" +-"\006\114\365\252\144\046\162\007\045\255\065\374\030\261\046\327" +-"\330\377\031\016\203\033\214\334\170\105\147\064\075\364\257\034" +-"\215\344\155\153\355\040\263\147\232\264\141\313\027\157\211\065" +-"\377\347\116\300\062\022\347\356\354\337\377\227\060\164\355\215" +-"\107\216\353\264\303\104\346\247\114\177\126\103\350\270\274\266" +-"\276\372\203\227\346\273\373\304\266\223\276\031\030\076\214\201" +-"\271\163\210\026\364\226\103\234\147\163\027\220\330\011\156\143" +-"\254\112\266\043\304\001\241\255\244\344\305\002\003\001\000\001" +-"\243\202\001\370\060\202\001\364\060\017\006\003\125\035\023\001" +-"\001\377\004\005\060\003\001\001\377\060\202\001\131\006\003\125" +-"\035\040\004\202\001\120\060\202\001\114\060\202\001\110\006\012" +-"\053\006\001\004\001\261\076\001\000\000\060\202\001\070\060\202" +-"\001\001\006\010\053\006\001\005\005\007\002\002\060\201\364\032" +-"\201\361\122\145\154\151\141\156\143\145\040\157\156\040\164\150" +-"\151\163\040\143\145\162\164\151\146\151\143\141\164\145\040\142" +-"\171\040\141\156\171\040\160\141\162\164\171\040\141\163\163\165" +-"\155\145\163\040\141\143\143\145\160\164\141\156\143\145\040\157" +-"\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154\151" +-"\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040\164" +-"\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164\151" +-"\157\156\163\040\157\146\040\165\163\145\054\040\141\156\144\040" +-"\143\145\162\164\151\146\151\143\141\164\151\157\156\040\160\162" +-"\141\143\164\151\143\145\040\163\164\141\164\145\155\145\156\164" +-"\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040\146" +-"\157\165\156\144\040\141\164\040\142\145\124\122\125\123\124\145" +-"\144\047\163\040\167\145\142\040\163\151\164\145\054\040\150\164" +-"\164\160\163\072\057\057\167\167\167\056\142\145\124\122\125\123" +-"\124\145\144\056\143\157\155\057\166\141\165\154\164\057\164\145" +-"\162\155\163\060\061\006\010\053\006\001\005\005\007\002\001\026" +-"\045\150\164\164\160\163\072\057\057\167\167\167\056\142\145\124" +-"\122\125\123\124\145\144\056\143\157\155\057\166\141\165\154\164" +-"\057\164\145\162\155\163\060\064\006\003\125\035\037\004\055\060" +-"\053\060\051\240\047\240\045\244\043\060\041\061\022\060\020\006" +-"\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144\061" +-"\013\060\011\006\003\125\004\006\023\002\127\127\060\035\006\003" +-"\125\035\016\004\026\004\024\052\271\233\151\056\073\233\330\315" +-"\336\052\061\004\064\153\312\007\030\253\147\060\037\006\003\125" +-"\035\043\004\030\060\026\200\024\052\271\233\151\056\073\233\330" +-"\315\336\052\061\004\064\153\312\007\030\253\147\060\016\006\003" +-"\125\035\017\001\001\377\004\004\003\002\001\376\060\015\006\011" +-"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000" +-"\171\141\333\243\136\156\026\261\352\166\121\371\313\025\233\313" +-"\151\276\346\201\153\237\050\037\145\076\335\021\205\222\324\350" +-"\101\277\176\063\275\043\347\361\040\277\244\264\246\031\001\306" +-"\214\215\065\174\145\244\117\011\244\326\330\043\025\005\023\247" +-"\103\171\257\333\243\016\233\173\170\032\363\004\206\132\306\366" +-"\214\040\107\070\111\120\006\235\162\147\072\360\230\003\255\226" +-"\147\104\374\077\020\015\206\115\344\000\073\051\173\316\073\073" +-"\231\206\141\045\100\204\334\023\142\267\372\312\131\326\003\036" +-"\326\123\001\315\155\114\150\125\100\341\356\153\307\052\000\000" +-"\110\202\263\012\001\303\140\052\014\367\202\065\356\110\206\226" +-"\344\164\324\075\352\001\161\272\004\165\100\247\251\177\071\071" +-"\232\125\227\051\145\256\031\125\045\005\162\107\323\350\030\334" +-"\270\351\257\103\163\001\022\164\243\341\134\137\025\135\044\363" +-"\371\344\364\266\147\147\022\347\144\042\212\366\245\101\246\034" +-"\266\140\143\105\212\020\264\272\106\020\256\101\127\145\154\077" +-"\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256" +-, (PRUint32)1328 } +-}; +-static const NSSItem nss_builtins_items_65 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA", (PRUint32)18 }, +- { (void *)"\133\315\315\314\146\366\334\344\104\037\343\175\134\303\023\114" +-"\106\364\160\070" +-, (PRUint32)20 }, +- { (void *)"\205\312\166\132\033\321\150\042\334\242\043\022\312\306\200\064" +-, (PRUint32)16 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061" +-"\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123" +-"\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163" +-"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101" +-, (PRUint32)92 }, +- { (void *)"\002\004\071\117\175\207" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_66 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"AddTrust Low-Value Services Root", (PRUint32)33 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061" +-"\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165" +-"\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024" +-"\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164" +-"\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101" +-"\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040" +-"\103\101\040\122\157\157\164" +-, (PRUint32)103 }, ++ { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061" ++"\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165" ++"\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024" ++"\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164" ++"\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101" ++"\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040" ++"\103\101\040\122\157\157\164" ++, (PRUint32)103 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061" + "\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165" +@@ -4807,7 +4138,7 @@ static const NSSItem nss_builtins_items_ + "\065\341\035\026\034\320\274\053\216\326\161\331" + , (PRUint32)1052 } + }; +-static const NSSItem nss_builtins_items_67 [] = { ++static const NSSItem nss_builtins_items_59 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4833,7 +4164,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_68 [] = { ++static const NSSItem nss_builtins_items_60 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4931,7 +4262,7 @@ static const NSSItem nss_builtins_items_ + "\027\132\173\320\274\307\217\116\206\004" + , (PRUint32)1082 } + }; +-static const NSSItem nss_builtins_items_69 [] = { ++static const NSSItem nss_builtins_items_61 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4958,7 +4289,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_70 [] = { ++static const NSSItem nss_builtins_items_62 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5052,7 +4383,7 @@ static const NSSItem nss_builtins_items_ + "\116\072\063\014\053\263\055\220\006" + , (PRUint32)1049 } + }; +-static const NSSItem nss_builtins_items_71 [] = { ++static const NSSItem nss_builtins_items_63 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5078,7 +4409,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_72 [] = { ++static const NSSItem nss_builtins_items_64 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5173,7 +4504,7 @@ static const NSSItem nss_builtins_items_ + "\306\241" + , (PRUint32)1058 } + }; +-static const NSSItem nss_builtins_items_73 [] = { ++static const NSSItem nss_builtins_items_65 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5199,395 +4530,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_74 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Time Stamping CA", (PRUint32)24 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\213\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\024\060\022\006\003\125\004\007" +-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060" +-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035" +-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060" +-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101" +-, (PRUint32)142 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\213\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\024\060\022\006\003\125\004\007" +-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060" +-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035" +-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060" +-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101" +-, (PRUint32)142 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)"\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000" +-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" +-"\201\213\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\024\060\022\006\003\125\004\007\023" +-"\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015" +-"\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060" +-"\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035" +-"\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027" +-"\015\071\067\060\061\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\213" +-"\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\024\060\022\006\003\125\004\007\023\013\104" +-"\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003" +-"\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006" +-"\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162" +-"\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003" +-"\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145" +-"\163\164\141\155\160\151\156\147\040\103\101\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\326\053\130\170\141\105\206\123" +-"\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047" +-"\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237" +-"\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032" +-"\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376" +-"\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235" +-"\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213" +-"\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137" +-"\355\372\267\056\212\370\210\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\147\333\342\302\346\207\075\100\203\206\067" +-"\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302" +-"\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357" +-"\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333" +-"\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220" +-"\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354" +-"\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003" +-"\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031" +-"\011\254\211\111\323" +-, (PRUint32)677 } +-}; +-static const NSSItem nss_builtins_items_75 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Time Stamping CA", (PRUint32)24 }, +- { (void *)"\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105" +-"\010\116\326\126" +-, (PRUint32)20 }, +- { (void *)"\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040" +-, (PRUint32)16 }, +- { (void *)"\060\201\213\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\024\060\022\006\003\125\004\007" +-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060" +-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035" +-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060" +-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101" +-, (PRUint32)142 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_76 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125" +-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\123\123\114\137\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\062\060\060\060\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" +-, (PRUint32)189 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125" +-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\123\123\114\137\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\062\060\060\060\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" +-, (PRUint32)189 }, +- { (void *)"\002\004\070\233\021\074" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070" +-"\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004" +-"\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013" +-"\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006" +-"\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163" +-"\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060\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\060\060\060\062\060\064\061\067\062\060\060\060\132" +-"\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060" +-"\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164" +-"\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004" +-"\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156" +-"\145\164\057\123\123\114\137\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\062\060\060\060\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\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\307\301\137\116\161\361\316" +-"\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265" +-"\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236" +-"\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201" +-"\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113" +-"\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002" +-"\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266" +-"\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332" +-"\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202" +-"\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370" +-"\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035" +-"\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317" +-"\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023" +-"\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075" +-"\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165" +-"\163\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060" +-"\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" +-"\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060" +-"\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062" +-"\060\060\062\060\064\061\067\065\060\060\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\313\154\300\153\343\273\076\313\374\042" +-"\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035" +-"\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234" +-"\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023" +-"\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366" +-"\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064" +-"\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015" +-"\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232" +-"\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251" +-"\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337" +-"\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205" +-"\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021" +-"\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154" +-"\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124" +-"\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274" +-"\005\377\154\211\063\360\354\025\017" +-, (PRUint32)1177 } +-}; +-static const NSSItem nss_builtins_items_77 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 }, +- { (void *)"\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366" +-"\045\072\110\223" +-, (PRUint32)20 }, +- { (void *)"\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231" +-, (PRUint32)16 }, +- { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125" +-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\123\123\114\137\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\062\060\060\060\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" +-, (PRUint32)189 }, +- { (void *)"\002\004\070\233\021\074" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_78 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" +-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105" +-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" +-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" +-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" +-"\164\150\157\162\151\164\171" +-, (PRUint32)183 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" +-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105" +-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" +-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" +-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" +-"\164\150\157\162\151\164\171" +-, (PRUint32)183 }, +- { (void *)"\002\004\070\236\366\344" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070" +-"\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004" +-"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013" +-"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006" +-"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163" +-"\164\056\156\145\164\057\107\103\103\101\137\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\062\060\060\060" +-"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155" +-"\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105" +-"\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156" +-"\164\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\060\060\060" +-"\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062" +-"\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022" +-"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156" +-"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167" +-"\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103" +-"\101\137\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\062\060\060\060\040\105\156\164\162\165\163\164\056" +-"\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006" +-"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145" +-"\164\040\103\154\151\145\156\164\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\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\223\164\264" +-"\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162" +-"\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255" +-"\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124" +-"\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064" +-"\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045" +-"\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374" +-"\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047" +-"\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001" +-"\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206" +-"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335" +-"\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201" +-"\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003" +-"\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164" +-"\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145" +-"\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137" +-"\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\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145" +-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125" +-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040" +-"\103\154\151\145\156\164\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\053\006" +-"\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062" +-"\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060" +-"\062\060\067\061\066\064\066\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\204\213\164\375\305\215\300\377\047\155\040\067" +-"\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004" +-"\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105" +-"\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005" +-"\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007" +-"\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060" +-"\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001" +-"\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016" +-"\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022" +-"\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024" +-"\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276" +-"\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277" +-"\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172" +-"\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103" +-"\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235" +-"\316\145\146\227\256\046\136" +-, (PRUint32)1159 } +-}; +-static const NSSItem nss_builtins_items_79 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 }, +- { (void *)"\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266" +-"\266\360\277\163" +-, (PRUint32)20 }, +- { (void *)"\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056" +-, (PRUint32)16 }, +- { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" +-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105" +-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" +-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" +-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" +-"\164\150\157\162\151\164\171" +-, (PRUint32)183 }, +- { (void *)"\002\004\070\236\366\344" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_80 [] = { ++static const NSSItem nss_builtins_items_66 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5699,7 +4642,7 @@ static const NSSItem nss_builtins_items_ + "\036\177\132\264\074" + , (PRUint32)1173 } + }; +-static const NSSItem nss_builtins_items_81 [] = { ++static const NSSItem nss_builtins_items_67 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5730,7 +4673,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_82 [] = { ++static const NSSItem nss_builtins_items_68 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5825,7 +4768,7 @@ static const NSSItem nss_builtins_items_ + "\071\050\150\016\163\335\045\232\336\022" + , (PRUint32)1002 } + }; +-static const NSSItem nss_builtins_items_83 [] = { ++static const NSSItem nss_builtins_items_69 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5853,7 +4796,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_84 [] = { ++static const NSSItem nss_builtins_items_70 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5980,7 +4923,7 @@ static const NSSItem nss_builtins_items_ + "\204\327\372\334\162\133\367\301\072\150" + , (PRUint32)1514 } + }; +-static const NSSItem nss_builtins_items_85 [] = { ++static const NSSItem nss_builtins_items_71 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6008,498 +4951,58 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_86 [] = { ++static const NSSItem nss_builtins_items_72 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA-Baltimore Implementation", (PRUint32)43 }, ++ { (void *)"RSA Security 2048 v3", (PRUint32)21 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055" +-"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055" +-"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\075\106" +-, (PRUint32)6 }, +- { (void *)"\060\202\005\152\060\202\004\122\240\003\002\001\002\002\004\074" +-"\265\075\106\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142" +-"\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004" +-"\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157" +-"\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\055\102\141\154\164\151\155\157\162\145\040\111\155\160\154" +-"\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062" +-"\060\064\061\061\060\067\063\070\065\061\132\027\015\062\062\060" +-"\064\061\061\060\067\063\070\065\061\132\060\146\061\022\060\020" +-"\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144" +-"\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060" +-"\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145" +-"\144\040\122\157\157\164\040\103\101\055\102\141\154\164\151\155" +-"\157\162\145\040\111\155\160\154\145\155\145\156\164\141\164\151" +-"\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\274\176\304\071\234\214\343\326\034\206\377\312\142" +-"\255\340\177\060\105\172\216\032\263\270\307\371\321\066\377\042" +-"\363\116\152\137\204\020\373\146\201\303\224\171\061\322\221\341" +-"\167\216\030\052\303\024\336\121\365\117\243\053\274\030\026\342" +-"\265\335\171\336\042\370\202\176\313\201\037\375\047\054\217\372" +-"\227\144\042\216\370\377\141\243\234\033\036\222\217\300\250\011" +-"\337\011\021\354\267\175\061\232\032\352\203\041\006\074\237\272" +-"\134\377\224\352\152\270\303\153\125\064\117\075\062\037\335\201" +-"\024\340\304\074\315\235\060\370\060\251\227\323\356\314\243\320" +-"\037\137\034\023\201\324\030\253\224\321\143\303\236\177\065\222" +-"\236\137\104\352\354\364\042\134\267\350\075\175\244\371\211\251" +-"\221\262\052\331\353\063\207\356\245\375\343\332\314\210\346\211" +-"\046\156\307\053\202\320\136\235\131\333\024\354\221\203\005\303" +-"\136\016\306\052\320\004\335\161\075\040\116\130\047\374\123\373" +-"\170\170\031\024\262\374\220\122\211\070\142\140\007\264\240\354" +-"\254\153\120\326\375\271\050\153\357\122\055\072\262\377\361\001" +-"\100\254\067\002\003\001\000\001\243\202\002\036\060\202\002\032" +-"\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001" +-"\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060\202" +-"\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076\000" +-"\000\001\011\050\203\221\061\060\202\001\217\060\202\001\110\006" +-"\010\053\006\001\005\005\007\002\002\060\202\001\072\032\202\001" +-"\066\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040" +-"\165\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164" +-"\151\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040" +-"\141\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156" +-"\164\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145" +-"\040\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160" +-"\154\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144" +-"\040\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151" +-"\164\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150" +-"\145\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\120\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145" +-"\156\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151" +-"\156\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145" +-"\156\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145" +-"\040\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145" +-"\124\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145" +-"\054\040\150\164\164\160\072\057\057\167\167\167\056\142\145\164" +-"\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165" +-"\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144" +-"\145\170\056\150\164\155\154\060\101\006\010\053\006\001\005\005" +-"\007\002\001\026\065\150\164\164\160\072\057\057\167\167\167\056" +-"\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160\162" +-"\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163\057" +-"\151\156\144\145\170\056\150\164\155\154\060\035\006\003\125\035" +-"\016\004\026\004\024\105\075\303\251\321\334\077\044\126\230\034" +-"\163\030\210\152\377\203\107\355\266\060\037\006\003\125\035\043" +-"\004\030\060\026\200\024\105\075\303\251\321\334\077\044\126\230" +-"\034\163\030\210\152\377\203\107\355\266\060\016\006\003\125\035" +-"\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\003\202\001\001\000\111\222" +-"\274\243\356\254\275\372\015\311\213\171\206\034\043\166\260\200" +-"\131\167\374\332\177\264\113\337\303\144\113\152\116\016\255\362" +-"\175\131\167\005\255\012\211\163\260\372\274\313\334\215\000\210" +-"\217\246\240\262\352\254\122\047\277\241\110\174\227\020\173\272" +-"\355\023\035\232\007\156\313\061\142\022\350\143\003\252\175\155" +-"\343\370\033\166\041\170\033\237\113\103\214\323\111\206\366\033" +-"\134\366\056\140\025\323\351\343\173\165\077\320\002\203\320\030" +-"\202\101\315\145\067\352\216\062\176\275\153\231\135\060\021\310" +-"\333\110\124\034\073\341\247\023\323\152\110\223\367\075\214\177" +-"\005\350\316\363\210\052\143\004\270\352\176\130\174\001\173\133" +-"\341\305\175\357\041\340\215\016\135\121\175\261\147\375\243\275" +-"\070\066\306\362\070\206\207\032\226\150\140\106\373\050\024\107" +-"\125\341\247\200\014\153\342\352\337\115\174\220\110\240\066\275" +-"\011\027\211\177\303\362\323\234\234\343\335\304\033\335\365\267" +-"\161\263\123\005\211\006\320\313\112\200\301\310\123\220\265\074" +-"\061\210\027\120\237\311\304\016\213\330\250\002\143\015" +-, (PRUint32)1390 } +-}; +-static const NSSItem nss_builtins_items_87 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA-Baltimore Implementation", (PRUint32)43 }, +- { (void *)"\334\273\236\267\031\113\304\162\005\301\021\165\051\206\203\133" +-"\123\312\344\370" +-, (PRUint32)20 }, +- { (void *)"\201\065\271\373\373\022\312\030\151\066\353\256\151\170\241\361" +-, (PRUint32)16 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055" +-"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\075\106" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_88 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - Entrust Implementation", (PRUint32)43 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\117\100" +-, (PRUint32)6 }, +- { (void *)"\060\202\006\121\060\202\005\071\240\003\002\001\002\002\004\074" +-"\265\117\100\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142" +-"\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004" +-"\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157" +-"\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160\154" +-"\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062" +-"\060\064\061\061\060\070\062\064\062\067\132\027\015\062\062\060" +-"\064\061\061\060\070\065\064\062\067\132\060\146\061\022\060\020" +-"\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144" +-"\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060" +-"\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145" +-"\144\040\122\157\157\164\040\103\101\040\055\040\105\156\164\162" +-"\165\163\164\040\111\155\160\154\145\155\145\156\164\141\164\151" +-"\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\272\364\104\003\252\022\152\265\103\354\125\222\266" +-"\060\175\065\127\014\333\363\015\047\156\114\367\120\250\233\116" +-"\053\157\333\365\255\034\113\135\263\251\301\376\173\104\353\133" +-"\243\005\015\037\305\064\053\060\000\051\361\170\100\262\244\377" +-"\072\364\001\210\027\176\346\324\046\323\272\114\352\062\373\103" +-"\167\227\207\043\305\333\103\243\365\052\243\121\136\341\073\322" +-"\145\151\176\125\025\233\172\347\151\367\104\340\127\265\025\350" +-"\146\140\017\015\003\373\202\216\243\350\021\173\154\276\307\143" +-"\016\027\223\337\317\113\256\156\163\165\340\363\252\271\244\300" +-"\011\033\205\352\161\051\210\101\062\371\360\052\016\154\011\362" +-"\164\153\146\154\122\023\037\030\274\324\076\367\330\156\040\236" +-"\312\376\374\041\224\356\023\050\113\327\134\136\014\146\356\351" +-"\273\017\301\064\261\177\010\166\363\075\046\160\311\213\045\035" +-"\142\044\014\352\034\165\116\300\022\344\272\023\035\060\051\055" +-"\126\063\005\273\227\131\176\306\111\117\211\327\057\044\250\266" +-"\210\100\265\144\222\123\126\044\344\242\240\205\263\136\220\264" +-"\022\063\315\002\003\001\000\001\243\202\003\005\060\202\003\001" +-"\060\202\001\267\006\003\125\035\040\004\202\001\256\060\202\001" +-"\252\060\202\001\246\006\017\053\006\001\004\001\261\076\000\000" +-"\002\011\050\203\221\061\060\202\001\221\060\202\001\111\006\010" +-"\053\006\001\005\005\007\002\002\060\202\001\073\032\202\001\067" +-"\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040\165" +-"\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164\151" +-"\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040\141" +-"\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156\164" +-"\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145\040" +-"\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154" +-"\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040" +-"\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164" +-"\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150\145" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\120" +-"\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145\156" +-"\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151\156" +-"\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145\156" +-"\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040" +-"\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145\124" +-"\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145\054" +-"\040\150\164\164\160\163\072\057\057\167\167\167\056\142\145\164" +-"\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165" +-"\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144" +-"\145\170\056\150\164\155\154\060\102\006\010\053\006\001\005\005" +-"\007\002\001\026\066\150\164\164\160\163\072\057\057\167\167\167" +-"\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160" +-"\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163" +-"\057\151\156\144\145\170\056\150\164\155\154\060\021\006\011\140" +-"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201" +-"\211\006\003\125\035\037\004\201\201\060\177\060\175\240\173\240" +-"\171\244\167\060\165\061\022\060\020\006\003\125\004\012\023\011" +-"\142\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125" +-"\004\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157" +-"\157\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023" +-"\052\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160" +-"\154\145\155\145\156\164\141\164\151\157\156\061\015\060\013\006" +-"\003\125\004\003\023\004\103\122\114\061\060\053\006\003\125\035" +-"\020\004\044\060\042\200\017\062\060\060\062\060\064\061\061\060" +-"\070\062\064\062\067\132\201\017\062\060\062\062\060\064\061\061" +-"\060\070\065\064\062\067\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\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044" +-"\060\252\204\204\026\060\035\006\003\125\035\016\004\026\004\024" +-"\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044\060" +-"\252\204\204\026\060\014\006\003\125\035\023\004\005\060\003\001" +-"\001\377\060\035\006\011\052\206\110\206\366\175\007\101\000\004" +-"\020\060\016\033\010\126\066\056\060\072\064\056\060\003\002\004" +-"\220\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000" +-"\003\202\001\001\000\052\270\027\316\037\020\224\353\270\232\267" +-"\271\137\354\332\367\222\044\254\334\222\073\307\040\215\362\231" +-"\345\135\070\241\302\064\355\305\023\131\134\005\265\053\117\141" +-"\233\221\373\101\374\374\325\074\115\230\166\006\365\201\175\353" +-"\335\220\346\321\126\124\332\343\055\014\237\021\062\224\042\001" +-"\172\366\154\054\164\147\004\314\245\217\216\054\263\103\265\224" +-"\242\320\175\351\142\177\006\276\047\001\203\236\072\375\212\356" +-"\230\103\112\153\327\265\227\073\072\277\117\155\264\143\372\063" +-"\000\064\056\055\155\226\311\173\312\231\143\272\276\364\366\060" +-"\240\055\230\226\351\126\104\005\251\104\243\141\020\353\202\241" +-"\147\135\274\135\047\165\252\212\050\066\052\070\222\331\335\244" +-"\136\000\245\314\314\174\051\052\336\050\220\253\267\341\266\377" +-"\175\045\013\100\330\252\064\243\055\336\007\353\137\316\012\335" +-"\312\176\072\175\046\301\142\150\072\346\057\067\363\201\206\041" +-"\304\251\144\252\357\105\066\321\032\146\174\370\351\067\326\326" +-"\141\276\242\255\110\347\337\346\164\376\323\155\175\322\045\334" +-"\254\142\127\251\367" +-, (PRUint32)1621 } +-}; +-static const NSSItem nss_builtins_items_89 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - Entrust Implementation", (PRUint32)43 }, +- { (void *)"\162\231\171\023\354\233\015\256\145\321\266\327\262\112\166\243" +-"\256\302\356\026" +-, (PRUint32)20 }, +- { (void *)"\175\206\220\217\133\361\362\100\300\367\075\142\265\244\251\073" +-, (PRUint32)16 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\117\100" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_90 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - RSA Implementation", (PRUint32)39 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141" +-"\164\151\157\156" +-, (PRUint32)100 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141" +-"\164\151\157\156" +-, (PRUint32)100 }, +- { (void *)"\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264" +-"\252\032" +-, (PRUint32)18 }, +- { (void *)"\060\202\005\150\060\202\004\120\240\003\002\001\002\002\020\073" +-"\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142" +-"\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125" +-"\123\124\145\144\061\033\060\031\006\003\125\004\013\023\022\142" +-"\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101" +-"\163\061\057\060\055\006\003\125\004\003\023\046\142\145\124\122" +-"\125\123\124\145\144\040\122\157\157\164\040\103\101\040\055\040" +-"\122\123\101\040\111\155\160\154\145\155\145\156\164\141\164\151" +-"\157\156\060\036\027\015\060\062\060\064\061\061\061\061\061\070" +-"\061\063\132\027\015\062\062\060\064\061\062\061\061\060\067\062" +-"\065\132\060\142\061\022\060\020\006\003\125\004\012\023\011\142" +-"\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004" +-"\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157" +-"\164\040\103\101\163\061\057\060\055\006\003\125\004\003\023\046" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\040\055\040\122\123\101\040\111\155\160\154\145\155\145\156" +-"\164\141\164\151\157\156\060\202\001\042\060\015\006\011\052\206" +-"\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202" +-"\001\012\002\202\001\001\000\344\272\064\060\011\216\127\320\271" +-"\006\054\157\156\044\200\042\277\135\103\246\372\117\254\202\347" +-"\034\150\160\205\033\243\156\265\252\170\331\156\007\113\077\351" +-"\337\365\352\350\124\241\141\212\016\057\151\165\030\267\014\345" +-"\024\215\161\156\230\270\125\374\014\225\320\233\156\341\055\210" +-"\324\072\100\153\222\361\231\226\144\336\333\377\170\364\356\226" +-"\035\107\211\174\324\276\271\210\167\043\072\011\346\004\236\155" +-"\252\136\322\310\275\232\116\031\337\211\352\133\016\176\303\344" +-"\264\360\340\151\073\210\017\101\220\370\324\161\103\044\301\217" +-"\046\113\073\126\351\377\214\154\067\351\105\255\205\214\123\303" +-"\140\206\220\112\226\311\263\124\260\273\027\360\034\105\331\324" +-"\033\031\144\126\012\031\367\314\341\377\206\257\176\130\136\254" +-"\172\220\037\311\050\071\105\173\242\266\307\234\037\332\205\324" +-"\041\206\131\060\223\276\123\063\067\366\357\101\317\063\307\253" +-"\162\153\045\365\363\123\033\014\114\056\361\165\113\357\240\207" +-"\367\376\212\025\320\154\325\313\371\150\123\271\160\025\023\302" +-"\365\056\373\103\065\165\055\002\003\001\000\001\243\202\002\030" +-"\060\202\002\024\060\014\006\003\125\035\023\004\005\060\003\001" +-"\001\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060" +-"\202\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076" +-"\000\000\003\011\050\203\221\061\060\202\001\217\060\101\006\010" +-"\053\006\001\005\005\007\002\001\026\065\150\164\164\160\072\057" +-"\057\167\167\167\056\142\145\164\162\165\163\164\145\144\056\143" +-"\157\155\057\160\162\157\144\165\143\164\163\137\163\145\162\166" +-"\151\143\145\163\057\151\156\144\145\170\056\150\164\155\154\060" +-"\202\001\110\006\010\053\006\001\005\005\007\002\002\060\202\001" +-"\072\032\202\001\066\122\145\154\151\141\156\143\145\040\157\156" +-"\040\157\162\040\165\163\145\040\157\146\040\164\150\151\163\040" +-"\103\145\162\164\151\146\151\143\141\164\145\040\143\162\145\141" +-"\164\145\163\040\141\156\040\141\143\153\156\157\167\154\145\144" +-"\147\155\145\156\164\040\141\156\144\040\141\143\143\145\160\164" +-"\141\156\143\145\040\157\146\040\164\150\145\040\164\150\145\156" +-"\040\141\160\160\154\151\143\141\142\154\145\040\163\164\141\156" +-"\144\141\162\144\040\164\145\162\155\163\040\141\156\144\040\143" +-"\157\156\144\151\164\151\157\156\163\040\157\146\040\165\163\145" +-"\054\040\164\150\145\040\103\145\162\164\151\146\151\143\141\164" +-"\151\157\156\040\120\162\141\143\164\151\143\145\040\123\164\141" +-"\164\145\155\145\156\164\040\141\156\144\040\164\150\145\040\122" +-"\145\154\171\151\156\147\040\120\141\162\164\171\040\101\147\162" +-"\145\145\155\145\156\164\054\040\167\150\151\143\150\040\143\141" +-"\156\040\142\145\040\146\157\165\156\144\040\141\164\040\164\150" +-"\145\040\142\145\124\122\125\123\124\145\144\040\167\145\142\040" +-"\163\151\164\145\054\040\150\164\164\160\072\057\057\167\167\167" +-"\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160" +-"\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163" +-"\057\151\156\144\145\170\056\150\164\155\154\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\251\354\024\176\371\331\103\314\123\053\024" +-"\255\317\367\360\131\211\101\315\031\060\035\006\003\125\035\016" +-"\004\026\004\024\251\354\024\176\371\331\103\314\123\053\024\255" +-"\317\367\360\131\211\101\315\031\060\015\006\011\052\206\110\206" +-"\367\015\001\001\005\005\000\003\202\001\001\000\333\227\260\165" +-"\352\014\304\301\230\312\126\005\300\250\255\046\110\257\055\040" +-"\350\201\307\266\337\103\301\054\035\165\113\324\102\215\347\172" +-"\250\164\334\146\102\131\207\263\365\151\155\331\251\236\263\175" +-"\034\061\301\365\124\342\131\044\111\345\356\275\071\246\153\212" +-"\230\104\373\233\327\052\203\227\064\055\307\175\065\114\055\064" +-"\270\076\015\304\354\210\047\257\236\222\375\120\141\202\250\140" +-"\007\024\123\314\145\023\301\366\107\104\151\322\061\310\246\335" +-"\056\263\013\336\112\215\133\075\253\015\302\065\122\242\126\067" +-"\314\062\213\050\205\102\234\221\100\172\160\053\070\066\325\341" +-"\163\032\037\345\372\176\137\334\326\234\073\060\352\333\300\133" +-"\047\134\323\163\007\301\302\363\114\233\157\237\033\312\036\252" +-"\250\070\063\011\130\262\256\374\007\350\066\334\125\272\057\117" +-"\100\376\172\275\006\246\201\301\223\042\174\206\021\012\006\167" +-"\110\256\065\267\057\062\232\141\136\213\276\051\237\051\044\210" +-"\126\071\054\250\322\253\226\003\132\324\110\237\271\100\204\013" +-"\230\150\373\001\103\326\033\342\011\261\227\034" +-, (PRUint32)1388 } +-}; +-static const NSSItem nss_builtins_items_91 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - RSA Implementation", (PRUint32)39 }, +- { (void *)"\035\202\131\312\041\047\303\313\301\154\331\062\366\054\145\051" +-"\214\250\207\022" +-, (PRUint32)20 }, +- { (void *)"\206\102\005\011\274\247\235\354\035\363\056\016\272\330\035\320" +-, (PRUint32)16 }, +- { (void *)"\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141" +-"\164\151\157\156" +-, (PRUint32)100 }, +- { (void *)"\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264" +-"\252\032" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_92 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"RSA Security 2048 v3", (PRUint32)21 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" +-"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" +-"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" +-"\162\151\164\171\040\062\060\064\070\040\126\063" +-, (PRUint32)60 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" +-"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" +-"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" +-"\162\151\164\171\040\062\060\064\070\040\126\063" +-, (PRUint32)60 }, +- { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000" +-"\000\002" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012" +-"\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\072" +-"\061\031\060\027\006\003\125\004\012\023\020\122\123\101\040\123" +-"\145\143\165\162\151\164\171\040\111\156\143\061\035\060\033\006" +-"\003\125\004\013\023\024\122\123\101\040\123\145\143\165\162\151" +-"\164\171\040\062\060\064\070\040\126\063\060\036\027\015\060\061" +-"\060\062\062\062\062\060\063\071\062\063\132\027\015\062\066\060" +-"\062\062\062\062\060\063\071\062\063\132\060\072\061\031\060\027" +-"\006\003\125\004\012\023\020\122\123\101\040\123\145\143\165\162" +-"\151\164\171\040\111\156\143\061\035\060\033\006\003\125\004\013" +-"\023\024\122\123\101\040\123\145\143\165\162\151\164\171\040\062" +-"\060\064\070\040\126\063\060\202\001\042\060\015\006\011\052\206" +-"\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202" +-"\001\012\002\202\001\001\000\267\217\125\161\322\200\335\173\151" +-"\171\247\360\030\120\062\074\142\147\366\012\225\007\335\346\033" +-"\363\236\331\322\101\124\153\255\237\174\276\031\315\373\106\253" +-"\101\150\036\030\352\125\310\057\221\170\211\050\373\047\051\140" +-"\377\337\217\214\073\311\111\233\265\244\224\316\001\352\076\265" +-"\143\173\177\046\375\031\335\300\041\275\204\321\055\117\106\303" +-"\116\334\330\067\071\073\050\257\313\235\032\352\053\257\041\245" +-"\301\043\042\270\270\033\132\023\207\127\203\321\360\040\347\350" +-"\117\043\102\260\000\245\175\211\351\351\141\163\224\230\161\046" +-"\274\055\152\340\367\115\360\361\266\052\070\061\201\015\051\341" +-"\000\301\121\017\114\122\370\004\132\252\175\162\323\270\207\052" +-"\273\143\020\003\052\263\241\117\015\132\136\106\267\075\016\365" +-"\164\354\231\237\371\075\044\201\210\246\335\140\124\350\225\066" +-"\075\306\011\223\232\243\022\200\000\125\231\031\107\275\320\245" +-"\174\303\272\373\037\367\365\017\370\254\271\265\364\067\230\023" +-"\030\336\205\133\267\014\202\073\207\157\225\071\130\060\332\156" +-"\001\150\027\042\314\300\013\002\003\001\000\001\243\143\060\141" ++ { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" ++"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" ++"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" ++"\162\151\164\171\040\062\060\064\070\040\126\063" ++, (PRUint32)60 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" ++"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" ++"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" ++"\162\151\164\171\040\062\060\064\070\040\126\063" ++, (PRUint32)60 }, ++ { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000" ++"\000\002" ++, (PRUint32)18 }, ++ { (void *)"\060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012" ++"\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002\060" ++"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\072" ++"\061\031\060\027\006\003\125\004\012\023\020\122\123\101\040\123" ++"\145\143\165\162\151\164\171\040\111\156\143\061\035\060\033\006" ++"\003\125\004\013\023\024\122\123\101\040\123\145\143\165\162\151" ++"\164\171\040\062\060\064\070\040\126\063\060\036\027\015\060\061" ++"\060\062\062\062\062\060\063\071\062\063\132\027\015\062\066\060" ++"\062\062\062\062\060\063\071\062\063\132\060\072\061\031\060\027" ++"\006\003\125\004\012\023\020\122\123\101\040\123\145\143\165\162" ++"\151\164\171\040\111\156\143\061\035\060\033\006\003\125\004\013" ++"\023\024\122\123\101\040\123\145\143\165\162\151\164\171\040\062" ++"\060\064\070\040\126\063\060\202\001\042\060\015\006\011\052\206" ++"\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202" ++"\001\012\002\202\001\001\000\267\217\125\161\322\200\335\173\151" ++"\171\247\360\030\120\062\074\142\147\366\012\225\007\335\346\033" ++"\363\236\331\322\101\124\153\255\237\174\276\031\315\373\106\253" ++"\101\150\036\030\352\125\310\057\221\170\211\050\373\047\051\140" ++"\377\337\217\214\073\311\111\233\265\244\224\316\001\352\076\265" ++"\143\173\177\046\375\031\335\300\041\275\204\321\055\117\106\303" ++"\116\334\330\067\071\073\050\257\313\235\032\352\053\257\041\245" ++"\301\043\042\270\270\033\132\023\207\127\203\321\360\040\347\350" ++"\117\043\102\260\000\245\175\211\351\351\141\163\224\230\161\046" ++"\274\055\152\340\367\115\360\361\266\052\070\061\201\015\051\341" ++"\000\301\121\017\114\122\370\004\132\252\175\162\323\270\207\052" ++"\273\143\020\003\052\263\241\117\015\132\136\106\267\075\016\365" ++"\164\354\231\237\371\075\044\201\210\246\335\140\124\350\225\066" ++"\075\306\011\223\232\243\022\200\000\125\231\031\107\275\320\245" ++"\174\303\272\373\037\367\365\017\370\254\271\265\364\067\230\023" ++"\030\336\205\133\267\014\202\073\207\157\225\071\130\060\332\156" ++"\001\150\027\042\314\300\013\002\003\001\000\001\243\143\060\141" + "\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001" + "\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001" + "\006\060\037\006\003\125\035\043\004\030\060\026\200\024\007\303" +@@ -6526,7 +5029,7 @@ static const NSSItem nss_builtins_items_ + "\354\040\005\141\336" + , (PRUint32)869 } + }; +-static const NSSItem nss_builtins_items_93 [] = { ++static const NSSItem nss_builtins_items_73 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6550,7 +5053,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_94 [] = { ++static const NSSItem nss_builtins_items_74 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6628,7 +5131,7 @@ static const NSSItem nss_builtins_items_ + "\302\005\146\200\241\313\346\063" + , (PRUint32)856 } + }; +-static const NSSItem nss_builtins_items_95 [] = { ++static const NSSItem nss_builtins_items_75 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6652,7 +5155,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_96 [] = { ++static const NSSItem nss_builtins_items_76 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6731,7 +5234,7 @@ static const NSSItem nss_builtins_items_ + "\342\042\051\256\175\203\100\250\272\154" + , (PRUint32)874 } + }; +-static const NSSItem nss_builtins_items_97 [] = { ++static const NSSItem nss_builtins_items_77 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6755,7 +5258,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_98 [] = { ++static const NSSItem nss_builtins_items_78 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6866,7 +5369,7 @@ static const NSSItem nss_builtins_items_ + "\244\346\216\330\371\051\110\212\316\163\376\054" + , (PRUint32)1388 } + }; +-static const NSSItem nss_builtins_items_99 [] = { ++static const NSSItem nss_builtins_items_79 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6890,7 +5393,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_100 [] = { ++static const NSSItem nss_builtins_items_80 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7001,7 +5504,7 @@ static const NSSItem nss_builtins_items_ + "\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222" + , (PRUint32)1392 } + }; +-static const NSSItem nss_builtins_items_101 [] = { ++static const NSSItem nss_builtins_items_81 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7025,7 +5528,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_102 [] = { ++static const NSSItem nss_builtins_items_82 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7133,7 +5636,7 @@ static const NSSItem nss_builtins_items_ + "\152\372\246\070\254\037\304\204" + , (PRUint32)1128 } + }; +-static const NSSItem nss_builtins_items_103 [] = { ++static const NSSItem nss_builtins_items_83 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7159,12 +5662,12 @@ static const NSSItem nss_builtins_items_ + { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300" + "\063\167" + , (PRUint32)18 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_104 [] = { ++static const NSSItem nss_builtins_items_84 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7251,7 +5754,7 @@ static const NSSItem nss_builtins_items_ + "\200\072\231\355\165\314\106\173" + , (PRUint32)936 } + }; +-static const NSSItem nss_builtins_items_105 [] = { ++static const NSSItem nss_builtins_items_85 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7277,7 +5780,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_106 [] = { ++static const NSSItem nss_builtins_items_86 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7396,7 +5899,7 @@ static const NSSItem nss_builtins_items_ + "\105\217\046\221\242\216\376\251" + , (PRUint32)1448 } + }; +-static const NSSItem nss_builtins_items_107 [] = { ++static const NSSItem nss_builtins_items_87 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7422,7 +5925,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_108 [] = { ++static const NSSItem nss_builtins_items_88 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7510,7 +6013,7 @@ static const NSSItem nss_builtins_items_ + "\222\340\134\366\007\017" + , (PRUint32)934 } + }; +-static const NSSItem nss_builtins_items_109 [] = { ++static const NSSItem nss_builtins_items_89 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7537,7 +6040,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_110 [] = { ++static const NSSItem nss_builtins_items_90 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7629,7 +6132,7 @@ static const NSSItem nss_builtins_items_ + "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144" + , (PRUint32)864 } + }; +-static const NSSItem nss_builtins_items_111 [] = { ++static const NSSItem nss_builtins_items_91 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7660,7 +6163,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_112 [] = { ++static const NSSItem nss_builtins_items_92 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7752,7 +6255,7 @@ static const NSSItem nss_builtins_items_ + "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064" + , (PRUint32)864 } + }; +-static const NSSItem nss_builtins_items_113 [] = { ++static const NSSItem nss_builtins_items_93 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7783,7 +6286,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_114 [] = { ++static const NSSItem nss_builtins_items_94 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7854,7 +6357,7 @@ static const NSSItem nss_builtins_items_ + "\350\140\052\233\205\112\100\363\153\212\044\354\006\026\054\163" + , (PRUint32)784 } + }; +-static const NSSItem nss_builtins_items_115 [] = { ++static const NSSItem nss_builtins_items_95 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7877,7 +6380,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_116 [] = { ++static const NSSItem nss_builtins_items_96 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7975,7 +6478,7 @@ static const NSSItem nss_builtins_items_ + "\225\351\066\226\230\156" + , (PRUint32)1078 } + }; +-static const NSSItem nss_builtins_items_117 [] = { ++static const NSSItem nss_builtins_items_97 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8002,7 +6505,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_118 [] = { ++static const NSSItem nss_builtins_items_98 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8101,7 +6604,7 @@ static const NSSItem nss_builtins_items_ + "\354\375\051" + , (PRUint32)1091 } + }; +-static const NSSItem nss_builtins_items_119 [] = { ++static const NSSItem nss_builtins_items_99 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8128,7 +6631,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_120 [] = { ++static const NSSItem nss_builtins_items_100 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8229,7 +6732,7 @@ static const NSSItem nss_builtins_items_ + "\160\136\310\304\170\260\142" + , (PRUint32)1095 } + }; +-static const NSSItem nss_builtins_items_121 [] = { ++static const NSSItem nss_builtins_items_101 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8257,7 +6760,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_122 [] = { ++static const NSSItem nss_builtins_items_102 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8435,7 +6938,7 @@ static const NSSItem nss_builtins_items_ + "\001\177\046\304\143\365\045\102\136\142\275" + , (PRUint32)2043 } + }; +-static const NSSItem nss_builtins_items_123 [] = { ++static const NSSItem nss_builtins_items_103 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8467,12 +6970,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)288 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_124 [] = { ++static const NSSItem nss_builtins_items_104 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8649,7 +7152,7 @@ static const NSSItem nss_builtins_items_ + "\206\063\076\346\057\110\156\257\124\220\116\255\261\045" + , (PRUint32)2030 } + }; +-static const NSSItem nss_builtins_items_125 [] = { ++static const NSSItem nss_builtins_items_105 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8681,12 +7184,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)278 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_126 [] = { ++static const NSSItem nss_builtins_items_106 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8863,7 +7366,7 @@ static const NSSItem nss_builtins_items_ + "\257\175\310\352\351\324\126\331\016\023\262\305\105\120" + , (PRUint32)2030 } + }; +-static const NSSItem nss_builtins_items_127 [] = { ++static const NSSItem nss_builtins_items_107 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8895,12 +7398,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)278 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_128 [] = { ++static const NSSItem nss_builtins_items_108 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9078,7 +7581,7 @@ static const NSSItem nss_builtins_items_ + "\336\007\043\162\346\275\040\024\113\264\206" + , (PRUint32)2043 } + }; +-static const NSSItem nss_builtins_items_129 [] = { ++static const NSSItem nss_builtins_items_109 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9110,12 +7613,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)280 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_130 [] = { ++static const NSSItem nss_builtins_items_110 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9293,7 +7796,7 @@ static const NSSItem nss_builtins_items_ + "\311\024\025\014\343\007\203\233\046\165\357" + , (PRUint32)2043 } + }; +-static const NSSItem nss_builtins_items_131 [] = { ++static const NSSItem nss_builtins_items_111 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9325,250 +7828,28 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)280 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_132 [] = { ++static const NSSItem nss_builtins_items_112 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"IPS Timestamping root", (PRUint32)22 }, ++ { (void *)"QuoVadis Root CA", (PRUint32)17 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105" +-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143" +-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011" +-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125" +-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164" +-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166" +-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125" +-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060" +-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023" +-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155" +-"\160\151\156\147\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\064\060\062" +-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011" +-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163" +-, (PRUint32)290 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105" +-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143" +-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011" +-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125" +-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164" +-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166" +-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125" +-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060" +-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023" +-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155" +-"\160\151\156\147\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\064\060\062" +-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011" +-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163" +-, (PRUint32)290 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)"\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123" +-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145" +-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102" +-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004" +-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040" +-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151" +-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004" +-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071" +-"\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053" +-"\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160" +-"\151\156\147\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\064\060\062\006" +-"\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155" +-"\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011\001" +-"\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145" +-"\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061" +-"\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070" +-"\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002" +-"\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162" +-"\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023" +-"\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003" +-"\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145" +-"\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162" +-"\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003" +-"\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160" +-"\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066" +-"\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013" +-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141" +-"\155\160\151\156\147\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\064\060" +-"\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001" +-"\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\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" +-"\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215" +-"\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257" +-"\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070" +-"\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161" +-"\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265" +-"\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130" +-"\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233" +-"\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243" +-"\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006" +-"\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235" +-"\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120" +-"\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213" +-"\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077" +-"\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061" +-"\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020" +-"\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141" +-"\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145" +-"\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111" +-"\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154" +-"\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040" +-"\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151" +-"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103" +-"\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065" +-"\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040" +-"\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\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\064\060\062\006\003\125\004\003" +-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141" +-"\155\160\151\156\147\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\036\060" +-"\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160" +-"\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000" +-"\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014" +-"\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003" +-"\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003" +-"\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001" +-"\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006" +-"\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001" +-"\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001" +-"\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053" +-"\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110" +-"\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003" +-"\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151" +-"\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004" +-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160" +-"\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001" +-"\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156" +-"\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145" +-"\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072" +-"\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006" +-"\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164" +-"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057" +-"\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001" +-"\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057" +-"\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060" +-"\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164" +-"\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206" +-"\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072" +-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163" +-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124" +-"\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154" +-"\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065" +-"\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163" +-"\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145" +-"\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056" +-"\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102" +-"\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167" +-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057" +-"\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151" +-"\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170" +-"\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057" +-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062" +-"\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163" +-"\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240" +-"\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143" +-"\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062" +-"\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155" +-"\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005" +-"\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005" +-"\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163" +-"\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110" +-"\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314" +-"\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203" +-"\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067" +-"\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077" +-"\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114" +-"\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210" +-"\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001" +-"\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324" +-"\207\112\137\334\357\351\126\360\012\014\350\165" +-, (PRUint32)2108 } +-}; +-static const NSSItem nss_builtins_items_133 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"IPS Timestamping root", (PRUint32)22 }, +- { (void *)"\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313" +-"\361\266\304\322" +-, (PRUint32)20 }, +- { (void *)"\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233" +-, (PRUint32)16 }, +- { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105" +-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143" +-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011" +-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125" +-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164" +-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166" +-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125" +-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060" +-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023" +-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155" +-"\160\151\156\147\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\064\060\062" +-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011" +-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163" +-, (PRUint32)290 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_134 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"QuoVadis Root CA", (PRUint32)17 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061" +-"\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144" +-"\151\163\040\114\151\155\151\164\145\144\061\045\060\043\006\003" +-"\125\004\013\023\034\122\157\157\164\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\056\060\054\006\003\125\004\003\023\045\121\165\157\126" +-"\141\144\151\163\040\122\157\157\164\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)129 }, ++ { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061" ++"\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144" ++"\151\163\040\114\151\155\151\164\145\144\061\045\060\043\006\003" ++"\125\004\013\023\034\122\157\157\164\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\056\060\054\006\003\125\004\003\023\045\121\165\157\126" ++"\141\144\151\163\040\122\157\157\164\040\103\145\162\164\151\146" ++"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" ++"\171" ++, (PRUint32)129 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061" + "\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144" +@@ -9678,7 +7959,7 @@ static const NSSItem nss_builtins_items_ + "\112\164\066\371" + , (PRUint32)1492 } + }; +-static const NSSItem nss_builtins_items_135 [] = { ++static const NSSItem nss_builtins_items_113 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9706,7 +7987,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_136 [] = { ++static const NSSItem nss_builtins_items_114 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9822,7 +8103,7 @@ static const NSSItem nss_builtins_items_ + "\020\005\145\325\202\020\352\302\061\315\056" + , (PRUint32)1467 } + }; +-static const NSSItem nss_builtins_items_137 [] = { ++static const NSSItem nss_builtins_items_115 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9846,7 +8127,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_138 [] = { ++static const NSSItem nss_builtins_items_116 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9977,7 +8258,7 @@ static const NSSItem nss_builtins_items_ + "\332" + , (PRUint32)1697 } + }; +-static const NSSItem nss_builtins_items_139 [] = { ++static const NSSItem nss_builtins_items_117 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10001,7 +8282,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_140 [] = { ++static const NSSItem nss_builtins_items_118 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10081,7 +8362,7 @@ static const NSSItem nss_builtins_items_ + "\057\317\246\356\311\160\042\024\275\375\276\154\013\003" + , (PRUint32)862 } + }; +-static const NSSItem nss_builtins_items_141 [] = { ++static const NSSItem nss_builtins_items_119 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10106,7 +8387,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_142 [] = { ++static const NSSItem nss_builtins_items_120 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10179,7 +8460,7 @@ static const NSSItem nss_builtins_items_ + "\127\275\125\232" + , (PRUint32)804 } + }; +-static const NSSItem nss_builtins_items_143 [] = { ++static const NSSItem nss_builtins_items_121 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10202,7 +8483,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_144 [] = { ++static const NSSItem nss_builtins_items_122 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10275,7 +8556,7 @@ static const NSSItem nss_builtins_items_ + "\160\254\337\114" + , (PRUint32)804 } + }; +-static const NSSItem nss_builtins_items_145 [] = { ++static const NSSItem nss_builtins_items_123 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10298,7 +8579,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_146 [] = { ++static const NSSItem nss_builtins_items_124 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10384,7 +8665,7 @@ static const NSSItem nss_builtins_items_ + "\025\301\044\174\062\174\003\035\073\241\130\105\062\223" + , (PRUint32)958 } + }; +-static const NSSItem nss_builtins_items_147 [] = { ++static const NSSItem nss_builtins_items_125 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10409,7 +8690,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_148 [] = { ++static const NSSItem nss_builtins_items_126 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10500,7 +8781,7 @@ static const NSSItem nss_builtins_items_ + "\151\003\142\270\231\005\005\075\153\170\022\275\260\157\145" + , (PRUint32)1071 } + }; +-static const NSSItem nss_builtins_items_149 [] = { ++static const NSSItem nss_builtins_items_127 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10524,7 +8805,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_150 [] = { ++static const NSSItem nss_builtins_items_128 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10628,7 +8909,7 @@ static const NSSItem nss_builtins_items_ + "\004\243\103\055\332\374\013\142\352\057\137\142\123" + , (PRUint32)1309 } + }; +-static const NSSItem nss_builtins_items_151 [] = { ++static const NSSItem nss_builtins_items_129 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10651,7 +8932,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_152 [] = { ++static const NSSItem nss_builtins_items_130 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10757,7 +9038,7 @@ static const NSSItem nss_builtins_items_ + "\364\010" + , (PRUint32)1122 } + }; +-static const NSSItem nss_builtins_items_153 [] = { ++static const NSSItem nss_builtins_items_131 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10787,7 +9068,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_154 [] = { ++static const NSSItem nss_builtins_items_132 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10901,7 +9182,7 @@ static const NSSItem nss_builtins_items_ + "\005\323\312\003\112\124" + , (PRUint32)1190 } + }; +-static const NSSItem nss_builtins_items_155 [] = { ++static const NSSItem nss_builtins_items_133 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10933,7 +9214,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_156 [] = { ++static const NSSItem nss_builtins_items_134 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11040,7 +9321,7 @@ static const NSSItem nss_builtins_items_ + "\062\234\036\273\235\370\146\250" + , (PRUint32)1144 } + }; +-static const NSSItem nss_builtins_items_157 [] = { ++static const NSSItem nss_builtins_items_135 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11070,7 +9351,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_158 [] = { ++static const NSSItem nss_builtins_items_136 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11176,7 +9457,7 @@ static const NSSItem nss_builtins_items_ + "\275\023\122\035\250\076\315\000\037\310" + , (PRUint32)1130 } + }; +-static const NSSItem nss_builtins_items_159 [] = { ++static const NSSItem nss_builtins_items_137 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11206,7 +9487,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_160 [] = { ++static const NSSItem nss_builtins_items_138 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11315,7 +9596,7 @@ static const NSSItem nss_builtins_items_ + "\334" + , (PRUint32)1217 } + }; +-static const NSSItem nss_builtins_items_161 [] = { ++static const NSSItem nss_builtins_items_139 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11343,7 +9624,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_162 [] = { ++static const NSSItem nss_builtins_items_140 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11450,7 +9731,7 @@ static const NSSItem nss_builtins_items_ + "\166\135\165\220\032\365\046\217\360" + , (PRUint32)1225 } + }; +-static const NSSItem nss_builtins_items_163 [] = { ++static const NSSItem nss_builtins_items_141 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11477,7 +9758,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_164 [] = { ++static const NSSItem nss_builtins_items_142 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11627,7 +9908,7 @@ static const NSSItem nss_builtins_items_ + "\306\224\107\351\050" + , (PRUint32)1749 } + }; +-static const NSSItem nss_builtins_items_165 [] = { ++static const NSSItem nss_builtins_items_143 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11659,7 +9940,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_166 [] = { ++static const NSSItem nss_builtins_items_144 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11802,7 +10083,7 @@ static const NSSItem nss_builtins_items_ + "\210" + , (PRUint32)1665 } + }; +-static const NSSItem nss_builtins_items_167 [] = { ++static const NSSItem nss_builtins_items_145 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11833,7 +10114,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_168 [] = { ++static const NSSItem nss_builtins_items_146 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11952,7 +10233,7 @@ static const NSSItem nss_builtins_items_ + "\066\053\143\254\130\001\153\063\051\120\206\203\361\001\110" + , (PRUint32)1359 } + }; +-static const NSSItem nss_builtins_items_169 [] = { ++static const NSSItem nss_builtins_items_147 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11981,7 +10262,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_170 [] = { ++static const NSSItem nss_builtins_items_148 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12101,7 +10382,7 @@ static const NSSItem nss_builtins_items_ + "\063\004\324" + , (PRUint32)1363 } + }; +-static const NSSItem nss_builtins_items_171 [] = { ++static const NSSItem nss_builtins_items_149 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12130,7 +10411,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_172 [] = { ++static const NSSItem nss_builtins_items_150 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12231,7 +10512,7 @@ static const NSSItem nss_builtins_items_ + "\264\003\045\274" + , (PRUint32)1076 } + }; +-static const NSSItem nss_builtins_items_173 [] = { ++static const NSSItem nss_builtins_items_151 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12260,7 +10541,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_174 [] = { ++static const NSSItem nss_builtins_items_152 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12353,7 +10634,7 @@ static const NSSItem nss_builtins_items_ + "\177\333\275\237" + , (PRUint32)1028 } + }; +-static const NSSItem nss_builtins_items_175 [] = { ++static const NSSItem nss_builtins_items_153 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12379,7 +10660,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_176 [] = { ++static const NSSItem nss_builtins_items_154 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12473,7 +10754,7 @@ static const NSSItem nss_builtins_items_ + "\037\027\224" + , (PRUint32)1043 } + }; +-static const NSSItem nss_builtins_items_177 [] = { ++static const NSSItem nss_builtins_items_155 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12499,7 +10780,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_178 [] = { ++static const NSSItem nss_builtins_items_156 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12654,7 +10935,7 @@ static const NSSItem nss_builtins_items_ + "\152\263\364\210\034\200\015\374\162\212\350\203\136" + , (PRUint32)1997 } + }; +-static const NSSItem nss_builtins_items_179 [] = { ++static const NSSItem nss_builtins_items_157 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12681,7 +10962,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_180 [] = { ++static const NSSItem nss_builtins_items_158 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12794,7 +11075,7 @@ static const NSSItem nss_builtins_items_ + "\245\206\054\174\364\022" + , (PRUint32)1398 } + }; +-static const NSSItem nss_builtins_items_181 [] = { ++static const NSSItem nss_builtins_items_159 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12819,7 +11100,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_182 [] = { ++static const NSSItem nss_builtins_items_160 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12923,7 +11204,7 @@ static const NSSItem nss_builtins_items_ + "\252\341\247\063\366\375\112\037\366\331\140" + , (PRUint32)1115 } + }; +-static const NSSItem nss_builtins_items_183 [] = { ++static const NSSItem nss_builtins_items_161 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12952,7 +11233,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_184 [] = { ++static const NSSItem nss_builtins_items_162 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13047,7 +11328,7 @@ static const NSSItem nss_builtins_items_ + "\117\041\145\073\112\177\107\243\373" + , (PRUint32)1001 } + }; +-static const NSSItem nss_builtins_items_185 [] = { ++static const NSSItem nss_builtins_items_163 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13075,7 +11356,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_186 [] = { ++static const NSSItem nss_builtins_items_164 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13198,7 +11479,7 @@ static const NSSItem nss_builtins_items_ + "\060\032\365\232\154\364\016\123\371\072\133\321\034" + , (PRUint32)1501 } + }; +-static const NSSItem nss_builtins_items_187 [] = { ++static const NSSItem nss_builtins_items_165 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13225,7 +11506,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_188 [] = { ++static const NSSItem nss_builtins_items_166 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13314,7 +11595,7 @@ static const NSSItem nss_builtins_items_ + "\346\120\262\247\372\012\105\057\242\360\362" + , (PRUint32)955 } + }; +-static const NSSItem nss_builtins_items_189 [] = { ++static const NSSItem nss_builtins_items_167 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13341,7 +11622,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_190 [] = { ++static const NSSItem nss_builtins_items_168 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13430,7 +11711,7 @@ static const NSSItem nss_builtins_items_ + "\225\155\336" + , (PRUint32)947 } + }; +-static const NSSItem nss_builtins_items_191 [] = { ++static const NSSItem nss_builtins_items_169 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13457,7 +11738,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_192 [] = { ++static const NSSItem nss_builtins_items_170 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13547,7 +11828,7 @@ static const NSSItem nss_builtins_items_ + "\370\351\056\023\243\167\350\037\112" + , (PRUint32)969 } + }; +-static const NSSItem nss_builtins_items_193 [] = { ++static const NSSItem nss_builtins_items_171 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13574,7 +11855,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_194 [] = { ++static const NSSItem nss_builtins_items_172 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13655,7 +11936,7 @@ static const NSSItem nss_builtins_items_ + "\227\277\242\216\264\124" + , (PRUint32)918 } + }; +-static const NSSItem nss_builtins_items_195 [] = { ++static const NSSItem nss_builtins_items_173 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13679,7 +11960,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_196 [] = { ++static const NSSItem nss_builtins_items_174 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13757,7 +12038,7 @@ static const NSSItem nss_builtins_items_ + "\013\004\216\007\333\051\266\012\356\235\202\065\065\020" + , (PRUint32)846 } + }; +-static const NSSItem nss_builtins_items_197 [] = { ++static const NSSItem nss_builtins_items_175 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13782,7 +12063,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_198 [] = { ++static const NSSItem nss_builtins_items_176 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13874,7 +12155,7 @@ static const NSSItem nss_builtins_items_ + "\363\267\240\247\315\345\172\063\066\152\372\232\053" + , (PRUint32)1037 } + }; +-static const NSSItem nss_builtins_items_199 [] = { ++static const NSSItem nss_builtins_items_177 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13900,7 +12181,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_200 [] = { ++static const NSSItem nss_builtins_items_178 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14002,7 +12283,7 @@ static const NSSItem nss_builtins_items_ + "\104\144\003\045\352\336\133\156\237\311\362\116\254\335\307" + , (PRUint32)1023 } + }; +-static const NSSItem nss_builtins_items_201 [] = { ++static const NSSItem nss_builtins_items_179 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14033,7 +12314,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_202 [] = { ++static const NSSItem nss_builtins_items_180 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14141,7 +12422,7 @@ static const NSSItem nss_builtins_items_ + "\167\161\307\372\221\372\057\121\236\351\071\122\266\347\004\102" + , (PRUint32)1088 } + }; +-static const NSSItem nss_builtins_items_203 [] = { ++static const NSSItem nss_builtins_items_181 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14173,7 +12454,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_204 [] = { ++static const NSSItem nss_builtins_items_182 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14290,7 +12571,7 @@ static const NSSItem nss_builtins_items_ + "\205\206\171\145\322" + , (PRUint32)1477 } + }; +-static const NSSItem nss_builtins_items_205 [] = { ++static const NSSItem nss_builtins_items_183 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14314,7 +12595,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_206 [] = { ++static const NSSItem nss_builtins_items_184 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14430,7 +12711,7 @@ static const NSSItem nss_builtins_items_ + "\111\044\133\311\260\320\127\301\372\076\172\341\227\311" + , (PRUint32)1470 } + }; +-static const NSSItem nss_builtins_items_207 [] = { ++static const NSSItem nss_builtins_items_185 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14454,7 +12735,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_208 [] = { ++static const NSSItem nss_builtins_items_186 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14571,7 +12852,7 @@ static const NSSItem nss_builtins_items_ + "\156" + , (PRUint32)1473 } + }; +-static const NSSItem nss_builtins_items_209 [] = { ++static const NSSItem nss_builtins_items_187 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14595,7 +12876,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_210 [] = { ++static const NSSItem nss_builtins_items_188 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14678,7 +12959,7 @@ static const NSSItem nss_builtins_items_ + "\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131" + , (PRUint32)896 } + }; +-static const NSSItem nss_builtins_items_211 [] = { ++static const NSSItem nss_builtins_items_189 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14704,7 +12985,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_212 [] = { ++static const NSSItem nss_builtins_items_190 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14808,7 +13089,7 @@ static const NSSItem nss_builtins_items_ + "\215\126\214\150" + , (PRUint32)1060 } + }; +-static const NSSItem nss_builtins_items_213 [] = { ++static const NSSItem nss_builtins_items_191 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14839,7 +13120,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_214 [] = { ++static const NSSItem nss_builtins_items_192 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14958,7 +13239,7 @@ static const NSSItem nss_builtins_items_ + "\254\021\326\250\355\143\152" + , (PRUint32)1239 } + }; +-static const NSSItem nss_builtins_items_215 [] = { ++static const NSSItem nss_builtins_items_193 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14991,7 +13272,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_216 [] = { ++static const NSSItem nss_builtins_items_194 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15076,7 +13357,7 @@ static const NSSItem nss_builtins_items_ + "\113\035\236\054\302\270\150\274\355\002\356\061" + , (PRUint32)956 } + }; +-static const NSSItem nss_builtins_items_217 [] = { ++static const NSSItem nss_builtins_items_195 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15101,7 +13382,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_218 [] = { ++static const NSSItem nss_builtins_items_196 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15186,7 +13467,7 @@ static const NSSItem nss_builtins_items_ + "\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026" + , (PRUint32)960 } + }; +-static const NSSItem nss_builtins_items_219 [] = { ++static const NSSItem nss_builtins_items_197 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15211,7 +13492,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_220 [] = { ++static const NSSItem nss_builtins_items_198 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15311,7 +13592,7 @@ static const NSSItem nss_builtins_items_ + "\145" + , (PRUint32)1057 } + }; +-static const NSSItem nss_builtins_items_221 [] = { ++static const NSSItem nss_builtins_items_199 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15340,166 +13621,21 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_222 [] = { ++static const NSSItem nss_builtins_items_200 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"DigiNotar Root CA", (PRUint32)18 }, ++ { (void *)"Network Solutions Certificate Authority", (PRUint32)40 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" +-"\074\114" +-, (PRUint32)18 }, +- { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014" +-"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" +-"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060" +-"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141" +-"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151" +-"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060" +-"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156" +-"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060" +-"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132" +-"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060" +-"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022" +-"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164" +-"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147" +-"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040" +-"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151" +-"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154" +-"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" +-"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" +-"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126" +-"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201" +-"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300" +-"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177" +-"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330" +-"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213" +-"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337" +-"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045" +-"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123" +-"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007" +-"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043" +-"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042" +-"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041" +-"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324" +-"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313" +-"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110" +-"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114" +-"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376" +-"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344" +-"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357" +-"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346" +-"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314" +-"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351" +-"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154" +-"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262" +-"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042" +-"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077" +-"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102" +-"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323" +-"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176" +-"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147" +-"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216" +-"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035" +-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" +-"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153" +-"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002" +-"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004" +-"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257" +-"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362" +-"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203" +-"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302" +-"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150" +-"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307" +-"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050" +-"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350" +-"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013" +-"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075" +-"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114" +-"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313" +-"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273" +-"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235" +-"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146" +-"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160" +-"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007" +-"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351" +-"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134" +-"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045" +-"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113" +-"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174" +-"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304" +-"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012" +-"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330" +-"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124" +-"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163" +-"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056" +-"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175" +-"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163" +-"\262\345\214\360\206\231\270\345\305\337\204\301\267\353" +-, (PRUint32)1422 } +-}; +-static const NSSItem nss_builtins_items_223 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"DigiNotar Root CA", (PRUint32)18 }, +- { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317" +-"\201\147\107\214" +-, (PRUint32)20 }, +- { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" +-"\074\114" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_224 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Network Solutions Certificate Authority", (PRUint32)40 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162" +-"\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056" +-"\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164" +-"\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103" +-"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" +-"\162\151\164\171" +-, (PRUint32)100 }, ++ { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" ++"\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162" ++"\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056" ++"\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164" ++"\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103" ++"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" ++"\162\151\164\171" ++, (PRUint32)100 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" + "\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162" +@@ -15577,7 +13713,7 @@ static const NSSItem nss_builtins_items_ + "\244\140\114\260\125\240\240\173\127\262" + , (PRUint32)1002 } + }; +-static const NSSItem nss_builtins_items_225 [] = { ++static const NSSItem nss_builtins_items_201 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15604,7 +13740,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_226 [] = { ++static const NSSItem nss_builtins_items_202 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15713,7 +13849,7 @@ static const NSSItem nss_builtins_items_ + "\333" + , (PRUint32)1217 } + }; +-static const NSSItem nss_builtins_items_227 [] = { ++static const NSSItem nss_builtins_items_203 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15741,7 +13877,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_228 [] = { ++static const NSSItem nss_builtins_items_204 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15815,7 +13951,7 @@ static const NSSItem nss_builtins_items_ + "\334\335\363\377\035\054\072\026\127\331\222\071\326" + , (PRUint32)653 } + }; +-static const NSSItem nss_builtins_items_229 [] = { ++static const NSSItem nss_builtins_items_205 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15844,7 +13980,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_230 [] = { ++static const NSSItem nss_builtins_items_206 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15936,7 +14072,7 @@ static const NSSItem nss_builtins_items_ + "\321\236\164\310\166\147" + , (PRUint32)1078 } + }; +-static const NSSItem nss_builtins_items_231 [] = { ++static const NSSItem nss_builtins_items_207 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15961,7 +14097,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_232 [] = { ++static const NSSItem nss_builtins_items_208 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16058,7 +14194,7 @@ static const NSSItem nss_builtins_items_ + "\253\205\322\140\126\132" + , (PRUint32)1030 } + }; +-static const NSSItem nss_builtins_items_233 [] = { ++static const NSSItem nss_builtins_items_209 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16086,7 +14222,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_234 [] = { ++static const NSSItem nss_builtins_items_210 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16171,7 +14307,7 @@ static const NSSItem nss_builtins_items_ + "\164" + , (PRUint32)897 } + }; +-static const NSSItem nss_builtins_items_235 [] = { ++static const NSSItem nss_builtins_items_211 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16197,7 +14333,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_236 [] = { ++static const NSSItem nss_builtins_items_212 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16294,7 +14430,7 @@ static const NSSItem nss_builtins_items_ + "\374\276\337\012\015" + , (PRUint32)1013 } + }; +-static const NSSItem nss_builtins_items_237 [] = { ++static const NSSItem nss_builtins_items_213 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16323,7 +14459,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_238 [] = { ++static const NSSItem nss_builtins_items_214 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16434,7 +14570,7 @@ static const NSSItem nss_builtins_items_ + "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224" + , (PRUint32)1151 } + }; +-static const NSSItem nss_builtins_items_239 [] = { ++static const NSSItem nss_builtins_items_215 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16466,7 +14602,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_240 [] = { ++static const NSSItem nss_builtins_items_216 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16620,7 +14756,7 @@ static const NSSItem nss_builtins_items_ + "\103\307\003\340\067\116\135\012\334\131\040\045" + , (PRUint32)1964 } + }; +-static const NSSItem nss_builtins_items_241 [] = { ++static const NSSItem nss_builtins_items_217 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16648,7 +14784,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_242 [] = { ++static const NSSItem nss_builtins_items_218 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16729,7 +14865,7 @@ static const NSSItem nss_builtins_items_ + "\300\226\130\057\352\273\106\327\273\344\331\056" + , (PRUint32)940 } + }; +-static const NSSItem nss_builtins_items_243 [] = { ++static const NSSItem nss_builtins_items_219 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16752,12 +14888,12 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_244 [] = { ++static const NSSItem nss_builtins_items_220 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.", (PRUint32)27 }, ++ { (void *)"AC Ra+z Certic+mara S.A.", (PRUint32)27 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\173\061\013\060\011\006\003\125\004\006\023\002\103\117\061" + "\107\060\105\006\003\125\004\012\014\076\123\157\143\151\145\144" +@@ -16886,12 +15022,12 @@ static const NSSItem nss_builtins_items_ + "\005\211\374\170\326\134\054\046\103\251" + , (PRUint32)1642 } + }; +-static const NSSItem nss_builtins_items_245 [] = { ++static const NSSItem nss_builtins_items_221 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.", (PRUint32)27 }, ++ { (void *)"AC Ra+z Certic+mara S.A.", (PRUint32)27 }, + { (void *)"\313\241\305\370\260\343\136\270\271\105\022\323\371\064\242\351" + "\006\020\323\066" + , (PRUint32)20 }, +@@ -16914,7 +15050,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_246 [] = { ++static const NSSItem nss_builtins_items_222 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17019,7 +15155,7 @@ static const NSSItem nss_builtins_items_ + "\334\144\047\027\214\132\267\332\164\050\315\227\344\275" + , (PRUint32)1198 } + }; +-static const NSSItem nss_builtins_items_247 [] = { ++static const NSSItem nss_builtins_items_223 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17046,7 +15182,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_248 [] = { ++static const NSSItem nss_builtins_items_224 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17151,7 +15287,7 @@ static const NSSItem nss_builtins_items_ + "\016\121\075\157\373\226\126\200\342\066\027\321\334\344" + , (PRUint32)1198 } + }; +-static const NSSItem nss_builtins_items_249 [] = { ++static const NSSItem nss_builtins_items_225 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17178,7 +15314,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_250 [] = { ++static const NSSItem nss_builtins_items_226 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17271,7 +15407,7 @@ static const NSSItem nss_builtins_items_ + "\230" + , (PRUint32)993 } + }; +-static const NSSItem nss_builtins_items_251 [] = { ++static const NSSItem nss_builtins_items_227 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17298,7 +15434,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_252 [] = { ++static const NSSItem nss_builtins_items_228 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17387,7 +15523,7 @@ static const NSSItem nss_builtins_items_ + "\126\144\127" + , (PRUint32)931 } + }; +-static const NSSItem nss_builtins_items_253 [] = { ++static const NSSItem nss_builtins_items_229 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17414,7 +15550,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_254 [] = { ++static const NSSItem nss_builtins_items_230 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17495,7 +15631,7 @@ static const NSSItem nss_builtins_items_ + "\000\147\240\161\000\202\110" + , (PRUint32)919 } + }; +-static const NSSItem nss_builtins_items_255 [] = { ++static const NSSItem nss_builtins_items_231 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17519,7 +15655,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_256 [] = { ++static const NSSItem nss_builtins_items_232 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17601,7 +15737,7 @@ static const NSSItem nss_builtins_items_ + "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217" + , (PRUint32)943 } + }; +-static const NSSItem nss_builtins_items_257 [] = { ++static const NSSItem nss_builtins_items_233 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17625,7 +15761,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_258 [] = { ++static const NSSItem nss_builtins_items_234 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17706,7 +15842,7 @@ static const NSSItem nss_builtins_items_ + "\246\210\070\316\125" + , (PRUint32)933 } + }; +-static const NSSItem nss_builtins_items_259 [] = { ++static const NSSItem nss_builtins_items_235 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17729,3139 +15865,576 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_260 [] = { ++static const NSSItem nss_builtins_items_236 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ePKI Root Certification Authority", (PRUint32)34 }, ++ { (void *)"Entrust.net 2048 2029", (PRUint32)22 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061" +-"\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150" +-"\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040" +-"\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145" +-"\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151" ++ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" ++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" ++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" ++"\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164" ++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" + "\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)96 }, ++"\040\050\062\060\064\070\051" ++, (PRUint32)183 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061" +-"\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150" +-"\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040" +-"\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145" +-"\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)96 }, +- { (void *)"\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322" +-"\274\235" +-, (PRUint32)18 }, +- { (void *)"\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025" +-"\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136" +-"\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060" +-"\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141" +-"\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164" +-"\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113" +-"\111\040\122\157\157\164\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\060\064\061\062\062\060\060\062\063\061\062\067\132\027" +-"\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136" +-"\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060" +-"\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141" +-"\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164" +-"\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113" +-"\111\040\122\157\157\164\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\202" +-"\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005" +-"\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341" +-"\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155" +-"\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007" +-"\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217" +-"\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376" +-"\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041" +-"\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225" +-"\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364" +-"\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327" +-"\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367" +-"\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020" +-"\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065" +-"\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047" +-"\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330" +-"\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111" +-"\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221" +-"\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162" +-"\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300" +-"\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243" +-"\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024" +-"\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224" +-"\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076" +-"\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101" +-"\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322" +-"\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172" +-"\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052" +-"\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107" +-"\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203" +-"\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215" +-"\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251" +-"\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132" +-"\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215" +-"\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002" +-"\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004" +-"\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125" +-"\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005" +-"\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060" +-"\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005" +-"\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307" +-"\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003" +-"\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201" +-"\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000" +-"\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022" +-"\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045" +-"\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312" +-"\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066" +-"\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017" +-"\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122" +-"\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227" +-"\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277" +-"\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322" +-"\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323" +-"\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066" +-"\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245" +-"\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355" +-"\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272" +-"\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224" +-"\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115" +-"\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001" +-"\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217" +-"\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341" +-"\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122" +-"\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200" +-"\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211" +-"\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263" +-"\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342" +-"\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374" +-"\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304" +-"\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156" +-"\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143" +-"\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203" +-"\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352" +-"\201\370\021\234" +-, (PRUint32)1460 } +-}; +-static const NSSItem nss_builtins_items_261 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ePKI Root Certification Authority", (PRUint32)34 }, +- { (void *)"\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342" +-"\075\151\306\360" +-, (PRUint32)20 }, +- { (void *)"\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263" +-, (PRUint32)16 }, +- { (void *)"\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061" +-"\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150" +-"\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040" +-"\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145" +-"\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151" ++ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" ++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" ++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" ++"\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164" ++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" + "\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)96 }, +- { (void *)"\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322" +-"\274\235" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_262 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3", (PRUint32)66 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172" +-"\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006" +-"\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102" +-"\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157" +-"\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155" +-"\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304" +-"\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125" +-"\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153" +-"\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101" +-"\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151" +-"\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043" +-"\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145" +-"\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153" +-"\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303" +-"\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303" +-"\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063" +-, (PRUint32)303 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172" +-"\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006" +-"\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102" +-"\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157" +-"\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155" +-"\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304" +-"\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125" +-"\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153" +-"\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101" +-"\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151" +-"\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043" +-"\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145" +-"\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153" +-"\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303" +-"\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303" +-"\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063" +-, (PRUint32)303 }, +- { (void *)"\002\001\021" +-, (PRUint32)3 }, +- { (void *)"\060\202\005\027\060\202\003\377\240\003\002\001\002\002\001\021" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122" +-"\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145" +-"\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003" +-"\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151" +-"\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154" +-"\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141" +-"\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260" +-"\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154" +-"\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040" +-"\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162" +-"\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164" +-"\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060" +-"\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162" +-"\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145" +-"\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234" +-"\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266" +-"\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155" +-"\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163" +-"\304\261\040\055\040\123\303\274\162\303\274\155\040\063\060\036" +-"\027\015\060\067\060\070\062\064\061\061\063\067\060\067\132\027" +-"\015\061\067\060\070\062\061\061\061\063\067\060\067\132\060\202" +-"\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145\040" +-"\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003\125" +-"\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151\154" +-"\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154\157" +-"\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141\040" +-"\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260\124" +-"\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154\165" +-"\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040\166" +-"\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162\141" +-"\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164\303" +-"\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060\041" +-"\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162\164" +-"\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145\172" +-"\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234\102" +-"\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266\153" +-"\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145" +-"\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304" +-"\261\040\055\040\123\303\274\162\303\274\155\040\063\060\202\001" +-"\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000" +-"\003\202\001\017\000\060\202\001\012\002\202\001\001\000\212\155" +-"\113\377\020\210\072\303\366\176\224\350\352\040\144\160\256\041" +-"\201\276\072\173\074\333\361\035\122\177\131\372\363\042\114\225" +-"\240\220\274\110\116\021\253\373\267\265\215\172\203\050\214\046" +-"\106\330\116\225\100\207\141\237\305\236\155\201\207\127\154\212" +-"\073\264\146\352\314\100\374\343\252\154\262\313\001\333\062\277" +-"\322\353\205\317\241\015\125\303\133\070\127\160\270\165\306\171" +-"\321\024\060\355\033\130\133\153\357\065\362\241\041\116\305\316" +-"\174\231\137\154\271\270\042\223\120\247\315\114\160\152\276\152" +-"\005\177\023\234\053\036\352\376\107\316\004\245\157\254\223\056" +-"\174\053\237\236\171\023\221\350\352\236\312\070\165\216\142\260" +-"\225\223\052\345\337\351\136\227\156\040\137\137\204\172\104\071" +-"\031\100\034\272\125\053\373\060\262\201\357\204\343\334\354\230" +-"\070\071\003\205\010\251\124\003\005\051\360\311\217\213\352\013" +-"\206\145\031\021\323\351\011\043\336\150\223\003\311\066\034\041" +-"\156\316\214\146\361\231\060\330\327\263\303\035\370\201\056\250" +-"\275\202\013\146\376\202\313\341\340\032\202\303\100\201\002\003" +-"\001\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026" +-"\004\024\275\210\207\311\217\366\244\012\013\252\353\305\376\221" +-"\043\235\253\112\212\062\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\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\005\005\000\003\202\001\001\000\035\174\372\111\217" +-"\064\351\267\046\222\026\232\005\164\347\113\320\155\071\154\303" +-"\046\366\316\270\061\274\304\337\274\052\370\067\221\030\334\004" +-"\310\144\231\053\030\155\200\003\131\311\256\370\130\320\076\355" +-"\303\043\237\151\074\206\070\034\236\357\332\047\170\321\204\067" +-"\161\212\074\113\071\317\176\105\006\326\055\330\212\115\170\022" +-"\326\255\302\323\313\322\320\101\363\046\066\112\233\225\154\014" +-"\356\345\321\103\047\146\301\210\367\172\263\040\154\352\260\151" +-"\053\307\040\350\014\003\304\101\005\231\342\077\344\153\370\240" +-"\206\201\307\204\306\037\325\113\201\022\262\026\041\054\023\241" +-"\200\262\136\014\112\023\236\040\330\142\100\253\220\352\144\112" +-"\057\254\015\001\022\171\105\250\057\207\031\150\310\342\205\307" +-"\060\262\165\371\070\077\262\300\223\264\153\342\003\104\316\147" +-"\240\337\211\326\255\214\166\243\023\303\224\141\053\153\331\154" +-"\301\007\012\042\007\205\154\205\044\106\251\276\077\213\170\204" +-"\202\176\044\014\235\375\201\067\343\045\250\355\066\116\225\054" +-"\311\234\220\332\354\251\102\074\255\266\002" +-, (PRUint32)1307 } +-}; +-static const NSSItem nss_builtins_items_263 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3", (PRUint32)66 }, +- { (void *)"\033\113\071\141\046\047\153\144\221\242\150\155\327\002\103\041" +-"\055\037\035\226" +-, (PRUint32)20 }, +- { (void *)"\355\101\365\214\120\305\053\234\163\346\356\154\353\302\250\046" +-, (PRUint32)16 }, +- { (void *)"\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172" +-"\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006" +-"\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102" +-"\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157" +-"\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155" +-"\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304" +-"\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125" +-"\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153" +-"\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101" +-"\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151" +-"\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043" +-"\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145" +-"\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153" +-"\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303" +-"\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303" +-"\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063" +-, (PRUint32)303 }, +- { (void *)"\002\001\021" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++"\040\050\062\060\064\070\051" ++, (PRUint32)183 }, ++ { (void *)"\002\004\070\143\336\370" ++, (PRUint32)6 }, ++ { (void *)"\060\202\004\052\060\202\003\022\240\003\002\001\002\002\004\070" ++"\143\336\370\060\015\006\011\052\206\110\206\367\015\001\001\005" ++"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013" ++"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006" ++"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163" ++"\164\056\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105" ++"\156\164\162\165\163\164\056\156\145\164\040\103\145\162\164\151" ++"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" ++"\164\171\040\050\062\060\064\070\051\060\036\027\015\071\071\061" ++"\062\062\064\061\067\065\060\065\061\132\027\015\062\071\060\067" ++"\062\064\061\064\061\065\061\062\132\060\201\264\061\024\060\022" ++"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156" ++"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167" ++"\056\145\156\164\162\165\163\164\056\156\145\164\057\103\120\123" ++"\137\062\060\064\070\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\063\060\061\006" ++"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145" ++"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040" ++"\101\165\164\150\157\162\151\164\171\040\050\062\060\064\070\051" ++"\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001" ++"\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001" ++"\000\255\115\113\251\022\206\262\352\243\040\007\025\026\144\052" ++"\053\113\321\277\013\112\115\216\355\200\166\245\147\267\170\100" ++"\300\163\102\310\150\300\333\123\053\335\136\270\166\230\065\223" ++"\213\032\235\174\023\072\016\037\133\267\036\317\345\044\024\036" ++"\261\201\251\215\175\270\314\153\113\003\361\002\014\334\253\245" ++"\100\044\000\177\164\224\241\235\010\051\263\210\013\365\207\167" ++"\235\125\315\344\303\176\327\152\144\253\205\024\206\225\133\227" ++"\062\120\157\075\310\272\146\014\343\374\275\270\111\301\166\211" ++"\111\031\375\300\250\275\211\243\147\057\306\237\274\161\031\140" ++"\270\055\351\054\311\220\166\146\173\224\342\257\170\326\145\123" ++"\135\074\326\234\262\317\051\003\371\057\244\120\262\324\110\316" ++"\005\062\125\212\375\262\144\114\016\344\230\007\165\333\177\337" ++"\271\010\125\140\205\060\051\371\173\110\244\151\206\343\065\077" ++"\036\206\135\172\172\025\275\357\000\216\025\042\124\027\000\220" ++"\046\223\274\016\111\150\221\277\370\107\323\235\225\102\301\016" ++"\115\337\157\046\317\303\030\041\142\146\103\160\326\325\300\007" ++"\341\002\003\001\000\001\243\102\060\100\060\016\006\003\125\035" ++"\017\001\001\377\004\004\003\002\001\006\060\017\006\003\125\035" ++"\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003\125" ++"\035\016\004\026\004\024\125\344\201\321\021\200\276\330\211\271" ++"\010\243\061\371\241\044\011\026\271\160\060\015\006\011\052\206" ++"\110\206\367\015\001\001\005\005\000\003\202\001\001\000\073\233" ++"\217\126\233\060\347\123\231\174\172\171\247\115\227\327\031\225" ++"\220\373\006\037\312\063\174\106\143\217\226\146\044\372\100\033" ++"\041\047\312\346\162\163\362\117\376\061\231\375\310\014\114\150" ++"\123\306\200\202\023\230\372\266\255\332\135\075\361\316\156\366" ++"\025\021\224\202\014\356\077\225\257\021\253\017\327\057\336\037" ++"\003\217\127\054\036\311\273\232\032\104\225\353\030\117\246\037" ++"\315\175\127\020\057\233\004\011\132\204\265\156\330\035\072\341" ++"\326\236\321\154\171\136\171\034\024\305\343\320\114\223\073\145" ++"\074\355\337\075\276\246\345\225\032\303\265\031\303\275\136\133" ++"\273\377\043\357\150\031\313\022\223\047\134\003\055\157\060\320" ++"\036\266\032\254\336\132\367\321\252\250\047\246\376\171\201\304" ++"\171\231\063\127\272\022\260\251\340\102\154\223\312\126\336\376" ++"\155\204\013\010\213\176\215\352\327\230\041\306\363\347\074\171" ++"\057\136\234\321\114\025\215\341\354\042\067\314\232\103\013\227" ++"\334\200\220\215\263\147\233\157\110\010\025\126\317\277\361\053" ++"\174\136\232\166\351\131\220\305\174\203\065\021\145\121" ++, (PRUint32)1070 } + }; +-static const NSSItem nss_builtins_items_264 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 2 CA 1", (PRUint32)21 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\062\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\062\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\001" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035" +-"\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163" +-"\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060" +-"\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040" +-"\103\154\141\163\163\040\062\040\103\101\040\061\060\036\027\015" +-"\060\066\061\060\061\063\061\060\062\065\060\071\132\027\015\061" +-"\066\061\060\061\063\061\060\062\065\060\071\132\060\113\061\013" +-"\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006" +-"\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123" +-"\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003" +-"\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141" +-"\163\163\040\062\040\103\101\040\061\060\202\001\042\060\015\006" +-"\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017" +-"\000\060\202\001\012\002\202\001\001\000\213\074\007\105\330\366" +-"\337\346\307\312\272\215\103\305\107\215\260\132\301\070\333\222" +-"\204\034\257\023\324\017\157\066\106\040\304\056\314\161\160\064" +-"\242\064\323\067\056\330\335\072\167\057\300\353\051\350\134\322" +-"\265\251\221\064\207\042\131\376\314\333\347\231\257\226\301\250" +-"\307\100\335\245\025\214\156\310\174\227\003\313\346\040\362\327" +-"\227\137\061\241\057\067\322\276\356\276\251\255\250\114\236\041" +-"\146\103\073\250\274\363\011\243\070\325\131\044\301\302\107\166" +-"\261\210\134\202\073\273\053\246\004\327\214\007\217\315\325\101" +-"\035\360\256\270\051\054\224\122\140\064\224\073\332\340\070\321" +-"\235\063\076\025\364\223\062\305\000\332\265\051\146\016\072\170" +-"\017\041\122\137\002\345\222\173\045\323\222\036\057\025\235\201" +-"\344\235\216\350\357\211\316\024\114\124\035\034\201\022\115\160" +-"\250\276\020\005\027\176\037\321\270\127\125\355\315\273\122\302" +-"\260\036\170\302\115\066\150\313\126\046\301\122\301\275\166\367" +-"\130\325\162\176\037\104\166\273\000\211\035\026\235\121\065\357" +-"\115\302\126\357\153\340\214\073\015\351\002\003\001\000\001\243" +-"\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\077" +-"\215\232\131\213\374\173\173\234\243\257\070\260\071\355\220\161" +-"\200\326\310\060\016\006\003\125\035\017\001\001\377\004\004\003" +-"\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\003\202\001\001\000\025\032\176\023\212\271\350\007\243" +-"\113\047\062\262\100\221\362\041\321\144\205\276\143\152\322\317" +-"\201\302\025\325\172\176\014\051\254\067\036\034\174\166\122\225" +-"\332\265\177\043\241\051\167\145\311\062\235\250\056\126\253\140" +-"\166\316\026\264\215\177\170\300\325\231\121\203\177\136\331\276" +-"\014\250\120\355\042\307\255\005\114\166\373\355\356\036\107\144" +-"\366\367\047\175\134\050\017\105\305\134\142\136\246\232\221\221" +-"\267\123\027\056\334\255\140\235\226\144\071\275\147\150\262\256" +-"\005\313\115\347\137\037\127\206\325\040\234\050\373\157\023\070" +-"\365\366\021\222\366\175\231\136\037\014\350\253\104\044\051\162" +-"\100\075\066\122\257\214\130\220\163\301\354\141\054\171\241\354" +-"\207\265\077\332\115\331\041\000\060\336\220\332\016\323\032\110" +-"\251\076\205\013\024\213\214\274\101\236\152\367\016\160\300\065" +-"\367\071\242\135\146\320\173\131\237\250\107\022\232\047\043\244" +-"\055\216\047\203\222\040\241\327\025\177\361\056\030\356\364\110" +-"\177\057\177\361\241\030\265\241\013\224\240\142\040\062\234\035" +-"\366\324\357\277\114\210\150" +-, (PRUint32)855 } +-}; +-static const NSSItem nss_builtins_items_265 [] = { ++static const NSSItem nss_builtins_items_237 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 2 CA 1", (PRUint32)21 }, +- { (void *)"\240\241\253\220\311\374\204\173\073\022\141\350\227\175\137\323" +-"\042\141\323\314" +-, (PRUint32)20 }, +- { (void *)"\270\010\232\360\003\314\033\015\310\154\013\166\241\165\144\043" +-, (PRUint32)16 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\062\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, ++ { (void *)"Entrust.net 2048 2029", (PRUint32)22 }, ++ { (void *)"\120\060\006\011\035\227\324\365\256\071\367\313\347\222\175\175" ++"\145\055\064\061" ++, (PRUint32)20 }, ++ { (void *)"\356\051\061\274\062\176\232\346\350\265\367\121\264\064\161\220" ++, (PRUint32)16 }, ++ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" ++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" ++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" ++"\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164" ++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" ++"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" ++"\040\050\062\060\064\070\051" ++, (PRUint32)183 }, ++ { (void *)"\002\004\070\143\336\370" ++, (PRUint32)6 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_266 [] = { ++static const NSSItem nss_builtins_items_238 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 3 CA 1", (PRUint32)21 }, ++ { (void *)"Entrust.net 2048 2030", (PRUint32)22 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\063\040\103\101\040\061" +-, (PRUint32)77 }, ++ { (void *)"\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165" ++"\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004" ++"\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165" ++"\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162" ++"\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051" ++"\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111" ++"\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162" ++"\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060" ++"\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040" ++"\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" ++"\062" ++, (PRUint32)193 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\063\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\002" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\002" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035" +-"\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163" +-"\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060" +-"\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040" +-"\103\154\141\163\163\040\063\040\103\101\040\061\060\036\027\015" +-"\060\065\060\065\060\071\061\064\061\063\060\063\132\027\015\061" +-"\065\060\065\060\071\061\064\061\063\060\063\132\060\113\061\013" +-"\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006" +-"\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123" +-"\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003" +-"\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141" +-"\163\163\040\063\040\103\101\040\061\060\202\001\042\060\015\006" +-"\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017" +-"\000\060\202\001\012\002\202\001\001\000\244\216\327\164\331\051" +-"\144\336\137\037\207\200\221\352\116\071\346\031\306\104\013\200" +-"\325\013\257\123\007\213\022\275\346\147\360\002\261\211\366\140" +-"\212\304\133\260\102\321\300\041\250\313\341\233\357\144\121\266" +-"\247\317\025\365\164\200\150\004\220\240\130\242\346\164\246\123" +-"\123\125\110\143\077\222\126\335\044\116\216\370\272\053\377\363" +-"\064\212\236\050\327\064\237\254\057\326\017\361\244\057\275\122" +-"\262\111\205\155\071\065\360\104\060\223\106\044\363\266\347\123" +-"\373\274\141\257\251\243\024\373\302\027\027\204\154\340\174\210" +-"\370\311\034\127\054\360\075\176\224\274\045\223\204\350\232\000" +-"\232\105\005\102\127\200\364\116\316\331\256\071\366\310\123\020" +-"\014\145\072\107\173\140\302\326\372\221\311\306\161\154\275\221" +-"\207\074\221\206\111\253\363\017\240\154\046\166\136\034\254\233" +-"\161\345\215\274\233\041\036\234\326\070\176\044\200\025\061\202" +-"\226\261\111\323\142\067\133\210\014\012\142\064\376\247\110\176" +-"\231\261\060\213\220\067\225\034\250\037\245\054\215\364\125\310" +-"\333\335\131\012\302\255\170\240\364\213\002\003\001\000\001\243" +-"\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\070" +-"\024\346\310\360\251\244\003\364\116\076\042\243\133\362\326\340" +-"\255\100\164\060\016\006\003\125\035\017\001\001\377\004\004\003" +-"\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\003\202\001\001\000\001\147\243\214\311\045\075\023\143" +-"\135\026\157\354\241\076\011\134\221\025\052\052\331\200\041\117" +-"\005\334\273\245\211\253\023\063\052\236\070\267\214\157\002\162" +-"\143\307\163\167\036\011\006\272\073\050\173\244\107\311\141\153" +-"\010\010\040\374\212\005\212\037\274\272\306\302\376\317\156\354" +-"\023\063\161\147\056\151\372\251\054\077\146\300\022\131\115\013" +-"\124\002\222\204\273\333\022\357\203\160\160\170\310\123\372\337" +-"\306\306\377\334\210\057\007\300\111\235\062\127\140\323\362\366" +-"\231\051\137\347\252\001\314\254\063\250\034\012\273\221\304\003" +-"\240\157\266\064\371\206\323\263\166\124\230\364\112\201\263\123" +-"\235\115\100\354\345\167\023\105\257\133\252\037\330\057\114\202" +-"\173\376\052\304\130\273\117\374\236\375\003\145\032\052\016\303" +-"\245\040\026\224\153\171\246\242\022\264\273\032\244\043\172\137" +-"\360\256\204\044\344\363\053\373\212\044\243\047\230\145\332\060" +-"\165\166\374\031\221\350\333\353\233\077\062\277\100\227\007\046" +-"\272\314\363\224\205\112\172\047\223\317\220\102\324\270\133\026" +-"\246\347\313\100\003\335\171" +-, (PRUint32)855 } +-}; +-static const NSSItem nss_builtins_items_267 [] = { ++ { (void *)"\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165" ++"\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004" ++"\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165" ++"\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162" ++"\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051" ++"\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111" ++"\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162" ++"\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060" ++"\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040" ++"\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" ++"\062" ++, (PRUint32)193 }, ++ { (void *)"\002\004\112\123\214\050" ++, (PRUint32)6 }, ++ { (void *)"\060\202\004\076\060\202\003\046\240\003\002\001\002\002\004\112" ++"\123\214\050\060\015\006\011\052\206\110\206\367\015\001\001\013" ++"\005\000\060\201\276\061\013\060\011\006\003\125\004\006\023\002" ++"\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156\164" ++"\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006\003" ++"\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156\164" ++"\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055\164" ++"\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060\050" ++"\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164\054" ++"\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164\150" ++"\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061" ++"\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165\163" ++"\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141" ++"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055" ++"\040\107\062\060\036\027\015\060\071\060\067\060\067\061\067\062" ++"\065\065\064\132\027\015\063\060\061\062\060\067\061\067\065\065" ++"\065\064\132\060\201\276\061\013\060\011\006\003\125\004\006\023" ++"\002\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156" ++"\164\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006" ++"\003\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156" ++"\164\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055" ++"\164\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060" ++"\050\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164" ++"\054\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164" ++"\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171" ++"\061\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165" ++"\163\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143" ++"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040" ++"\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206" ++"\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012" ++"\002\202\001\001\000\272\204\266\162\333\236\014\153\342\231\351" ++"\060\001\247\166\352\062\270\225\101\032\311\332\141\116\130\162" ++"\317\376\366\202\171\277\163\141\006\012\245\047\330\263\137\323" ++"\105\116\034\162\326\116\062\362\162\212\017\367\203\031\320\152" ++"\200\200\000\105\036\260\307\347\232\277\022\127\047\034\243\150" ++"\057\012\207\275\152\153\016\136\145\363\034\167\325\324\205\215" ++"\160\041\264\263\062\347\213\242\325\206\071\002\261\270\322\107" ++"\316\344\311\111\304\073\247\336\373\124\175\127\276\360\350\156" ++"\302\171\262\072\013\125\342\120\230\026\062\023\134\057\170\126" ++"\301\302\224\263\362\132\344\047\232\237\044\327\306\354\320\233" ++"\045\202\343\314\302\304\105\305\214\227\172\006\153\052\021\237" ++"\251\012\156\110\073\157\333\324\021\031\102\367\217\007\277\365" ++"\123\137\234\076\364\027\054\346\151\254\116\062\114\142\167\352" ++"\267\350\345\273\064\274\031\213\256\234\121\347\267\176\265\123" ++"\261\063\042\345\155\317\160\074\032\372\342\233\147\266\203\364" ++"\215\245\257\142\114\115\340\130\254\144\064\022\003\370\266\215" ++"\224\143\044\244\161\002\003\001\000\001\243\102\060\100\060\016" ++"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\017" ++"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" ++"\035\006\003\125\035\016\004\026\004\024\152\162\046\172\320\036" ++"\357\175\347\073\151\121\324\154\215\237\220\022\146\253\060\015" ++"\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001" ++"\001\000\171\237\035\226\306\266\171\077\042\215\207\323\207\003" ++"\004\140\152\153\232\056\131\211\163\021\254\103\321\365\023\377" ++"\215\071\053\300\362\275\117\160\214\251\057\352\027\304\013\124" ++"\236\324\033\226\230\063\074\250\255\142\242\000\166\253\131\151" ++"\156\006\035\176\304\271\104\215\230\257\022\324\141\333\012\031" ++"\106\107\363\353\367\143\301\100\005\100\245\322\267\364\265\232" ++"\066\277\251\210\166\210\004\125\004\053\234\207\177\032\067\074" ++"\176\055\245\032\330\324\211\136\312\275\254\075\154\330\155\257" ++"\325\363\166\017\315\073\210\070\042\235\154\223\232\304\075\277" ++"\202\033\145\077\246\017\135\252\374\345\262\025\312\265\255\306" ++"\274\075\320\204\350\352\006\162\260\115\071\062\170\277\076\021" ++"\234\013\244\235\232\041\363\360\233\013\060\170\333\301\334\207" ++"\103\376\274\143\232\312\305\302\034\311\307\215\377\073\022\130" ++"\010\346\266\075\354\172\054\116\373\203\226\316\014\074\151\207" ++"\124\163\244\163\302\223\377\121\020\254\025\124\001\330\374\005" ++"\261\211\241\177\164\203\232\111\327\334\116\173\212\110\157\213" ++"\105\366" ++, (PRUint32)1090 } ++}; ++static const NSSItem nss_builtins_items_239 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 3 CA 1", (PRUint32)21 }, +- { (void *)"\141\127\072\021\337\016\330\176\325\222\145\042\352\320\126\327" +-"\104\263\043\161" +-, (PRUint32)20 }, +- { (void *)"\337\074\163\131\201\347\071\120\201\004\114\064\242\313\263\173" +-, (PRUint32)16 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\063\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\002" +-, (PRUint32)3 }, ++ { (void *)"Entrust.net 2048 2030", (PRUint32)22 }, ++ { (void *)"\214\364\047\375\171\014\072\321\146\006\215\350\036\127\357\273" ++"\223\042\162\324" ++, (PRUint32)20 }, ++ { (void *)"\113\342\311\221\226\145\014\364\016\132\223\222\240\012\376\262" ++, (PRUint32)16 }, ++ { (void *)"\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165" ++"\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004" ++"\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165" ++"\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162" ++"\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051" ++"\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111" ++"\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162" ++"\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060" ++"\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040" ++"\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" ++"\062" ++, (PRUint32)193 }, ++ { (void *)"\002\004\112\123\214\050" ++, (PRUint32)6 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_268 [] = { ++static const NSSItem nss_builtins_items_240 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1", (PRUint32)48 }, ++ { (void *)"Thawte Premium Server primary 1024 2021", (PRUint32)40 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102" +-"\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162" +-"\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141" +-"\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060" +-"\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151" +-"\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145" +-"\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151" +-"\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023" +-"\002\124\122" +-, (PRUint32)131 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102" +-"\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162" +-"\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141" +-"\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060" +-"\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151" +-"\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145" +-"\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151" +-"\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023" +-"\002\124\122" +-, (PRUint32)131 }, +- { (void *)"\002\010\114\257\163\102\034\216\164\002" +-, (PRUint32)10 }, +- { (void *)"\060\202\005\347\060\202\003\317\240\003\002\001\002\002\010\114" +-"\257\163\102\034\216\164\002\060\015\006\011\052\206\110\206\367" +-"\015\001\001\005\005\000\060\201\200\061\070\060\066\006\003\125" +-"\004\003\014\057\105\102\107\040\105\154\145\153\164\162\157\156" +-"\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\061\067\060\065\006\003\125\004\012\014\056\105\102" +-"\107\040\102\151\154\151\305\237\151\155\040\124\145\153\156\157" +-"\154\157\152\151\154\145\162\151\040\166\145\040\110\151\172\155" +-"\145\164\154\145\162\151\040\101\056\305\236\056\061\013\060\011" +-"\006\003\125\004\006\023\002\124\122\060\036\027\015\060\066\060" +-"\070\061\067\060\060\062\061\060\071\132\027\015\061\066\060\070" +-"\061\064\060\060\063\061\060\071\132\060\201\200\061\070\060\066" +-"\006\003\125\004\003\014\057\105\102\107\040\105\154\145\153\164" +-"\162\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040" +-"\110\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261" +-"\143\304\261\163\304\261\061\067\060\065\006\003\125\004\012\014" +-"\056\105\102\107\040\102\151\154\151\305\237\151\155\040\124\145" +-"\153\156\157\154\157\152\151\154\145\162\151\040\166\145\040\110" +-"\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056\061" +-"\013\060\011\006\003\125\004\006\023\002\124\122\060\202\002\042" +-"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003" +-"\202\002\017\000\060\202\002\012\002\202\002\001\000\356\240\204" +-"\141\320\072\152\146\020\062\330\061\070\177\247\247\345\375\241" +-"\341\373\227\167\270\161\226\350\023\226\106\203\117\266\362\137" +-"\162\126\156\023\140\245\001\221\342\133\305\315\127\037\167\143" +-"\121\377\057\075\333\271\077\252\251\065\347\171\320\365\320\044" +-"\266\041\352\353\043\224\376\051\277\373\211\221\014\144\232\005" +-"\112\053\314\014\356\361\075\233\202\151\244\114\370\232\157\347" +-"\042\332\020\272\137\222\374\030\047\012\250\252\104\372\056\054" +-"\264\373\106\232\010\003\203\162\253\210\344\152\162\311\345\145" +-"\037\156\052\017\235\263\350\073\344\014\156\172\332\127\375\327" +-"\353\171\213\136\040\006\323\166\013\154\002\225\243\226\344\313" +-"\166\121\321\050\235\241\032\374\104\242\115\314\172\166\250\015" +-"\075\277\027\117\042\210\120\375\256\266\354\220\120\112\133\237" +-"\225\101\252\312\017\262\112\376\200\231\116\243\106\025\253\370" +-"\163\102\152\302\146\166\261\012\046\025\335\223\222\354\333\251" +-"\137\124\042\122\221\160\135\023\352\110\354\156\003\154\331\335" +-"\154\374\353\015\003\377\246\203\022\233\361\251\223\017\305\046" +-"\114\061\262\143\231\141\162\347\052\144\231\322\270\351\165\342" +-"\174\251\251\232\032\252\303\126\333\020\232\074\203\122\266\173" +-"\226\267\254\207\167\250\271\362\147\013\224\103\263\257\076\163" +-"\372\102\066\261\045\305\012\061\046\067\126\147\272\243\013\175" +-"\326\367\211\315\147\241\267\072\036\146\117\366\240\125\024\045" +-"\114\054\063\015\246\101\214\275\004\061\152\020\162\012\235\016" +-"\056\166\275\136\363\121\211\213\250\077\125\163\277\333\072\306" +-"\044\005\226\222\110\252\113\215\052\003\345\127\221\020\364\152" +-"\050\025\156\107\167\204\134\121\164\237\031\351\346\036\143\026" +-"\071\343\021\025\343\130\032\104\275\313\304\154\146\327\204\006" +-"\337\060\364\067\242\103\042\171\322\020\154\337\273\346\023\021" +-"\374\235\204\012\023\173\360\073\320\374\243\012\327\211\352\226" +-"\176\215\110\205\036\144\137\333\124\242\254\325\172\002\171\153" +-"\322\212\360\147\332\145\162\015\024\160\344\351\216\170\217\062" +-"\164\174\127\362\326\326\364\066\211\033\370\051\154\213\271\366" +-"\227\321\244\056\252\276\013\031\302\105\351\160\135\002\003\000" +-"\235\331\243\143\060\141\060\017\006\003\125\035\023\001\001\377" +-"\004\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001" +-"\377\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026" +-"\004\024\347\316\306\117\374\026\147\226\372\112\243\007\301\004" +-"\247\313\152\336\332\107\060\037\006\003\125\035\043\004\030\060" +-"\026\200\024\347\316\306\117\374\026\147\226\372\112\243\007\301" +-"\004\247\313\152\336\332\107\060\015\006\011\052\206\110\206\367" +-"\015\001\001\005\005\000\003\202\002\001\000\233\230\232\135\276" +-"\363\050\043\166\306\154\367\177\346\100\236\300\066\334\225\015" +-"\035\255\025\305\066\330\325\071\357\362\036\042\136\263\202\264" +-"\135\273\114\032\312\222\015\337\107\044\036\263\044\332\221\210" +-"\351\203\160\335\223\327\351\272\263\337\026\132\076\336\340\310" +-"\373\323\375\154\051\370\025\106\240\150\046\314\223\122\256\202" +-"\001\223\220\312\167\312\115\111\357\342\132\331\052\275\060\316" +-"\114\262\201\266\060\316\131\117\332\131\035\152\172\244\105\260" +-"\202\046\201\206\166\365\365\020\000\270\356\263\011\350\117\207" +-"\002\007\256\044\134\360\137\254\012\060\314\212\100\240\163\004" +-"\301\373\211\044\366\232\034\134\267\074\012\147\066\005\010\061" +-"\263\257\330\001\150\052\340\170\217\164\336\270\121\244\214\154" +-"\040\075\242\373\263\324\011\375\173\302\200\252\223\154\051\230" +-"\041\250\273\026\363\251\022\137\164\265\207\230\362\225\046\337" +-"\064\357\212\123\221\210\135\032\224\243\077\174\042\370\327\210" +-"\272\246\214\226\250\075\122\064\142\237\000\036\124\125\102\147" +-"\306\115\106\217\273\024\105\075\012\226\026\216\020\241\227\231" +-"\325\323\060\205\314\336\264\162\267\274\212\074\030\051\150\375" +-"\334\161\007\356\044\071\152\372\355\245\254\070\057\371\036\020" +-"\016\006\161\032\020\114\376\165\176\377\036\127\071\102\312\327" +-"\341\025\241\126\125\131\033\321\243\257\021\330\116\303\245\053" +-"\357\220\277\300\354\202\023\133\215\326\162\054\223\116\217\152" +-"\051\337\205\074\323\015\340\242\030\022\314\125\057\107\267\247" +-"\233\002\376\101\366\210\114\155\332\251\001\107\203\144\047\142" +-"\020\202\326\022\173\136\003\037\064\251\311\221\376\257\135\155" +-"\206\047\267\043\252\165\030\312\040\347\260\017\327\211\016\246" +-"\147\042\143\364\203\101\053\006\113\273\130\325\321\327\267\271" +-"\020\143\330\211\112\264\252\335\026\143\365\156\276\140\241\370" +-"\355\350\326\220\117\032\306\305\240\051\323\247\041\250\365\132" +-"\074\367\307\111\242\041\232\112\225\122\040\226\162\232\146\313" +-"\367\322\206\103\174\042\276\226\371\275\001\250\107\335\345\073" +-"\100\371\165\053\233\053\106\144\206\215\036\364\217\373\007\167" +-"\320\352\111\242\034\215\122\024\246\012\223" +-, (PRUint32)1515 } +-}; +-static const NSSItem nss_builtins_items_269 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1", (PRUint32)48 }, +- { (void *)"\214\226\272\353\335\053\007\007\110\356\060\062\146\240\363\230" +-"\156\174\256\130" +-, (PRUint32)20 }, +- { (void *)"\054\040\046\235\313\032\112\000\205\265\267\132\256\302\001\067" +-, (PRUint32)16 }, +- { (void *)"\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102" +-"\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162" +-"\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141" +-"\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060" +-"\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151" +-"\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145" +-"\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151" +-"\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023" +-"\002\124\122" +-, (PRUint32)131 }, +- { (void *)"\002\010\114\257\163\102\034\216\164\002" +-, (PRUint32)10 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_270 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"certSIGN ROOT CA", (PRUint32)17 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061" +-"\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111" +-"\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162" +-"\164\123\111\107\116\040\122\117\117\124\040\103\101" +-, (PRUint32)61 }, ++ { (void *)"\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" ++, (PRUint32)209 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061" +-"\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111" +-"\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162" +-"\164\123\111\107\116\040\122\117\117\124\040\103\101" +-, (PRUint32)61 }, +- { (void *)"\002\006\040\006\005\026\160\002" +-, (PRUint32)8 }, +- { (void *)"\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040" +-"\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001" +-"\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023" +-"\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145" +-"\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023" +-"\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103" +-"\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060" +-"\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064" +-"\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117" +-"\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123" +-"\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145" +-"\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202" +-"\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005" +-"\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267" +-"\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350" +-"\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127" +-"\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135" +-"\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020" +-"\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272" +-"\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263" +-"\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135" +-"\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001" +-"\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200" +-"\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020" +-"\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320" +-"\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045" +-"\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057" +-"\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020" +-"\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234" +-"\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002" +-"\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001" +-"\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017" +-"\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016" +-"\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262" +-"\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206" +-"\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211" +-"\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327" +-"\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044" +-"\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030" +-"\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124" +-"\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223" +-"\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031" +-"\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133" +-"\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367" +-"\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210" +-"\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240" +-"\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240" +-"\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160" +-"\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302" +-"\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210" +-"\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115" +-"\366\356\260\132\116\111\104\124\130\137\102\203" +-, (PRUint32)828 } +-}; +-static const NSSItem nss_builtins_items_271 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"certSIGN ROOT CA", (PRUint32)17 }, +- { (void *)"\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350" +-"\174\113\057\233" +-, (PRUint32)20 }, +- { (void *)"\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027" +-, (PRUint32)16 }, +- { (void *)"\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061" +-"\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111" +-"\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162" +-"\164\123\111\107\116\040\122\117\117\124\040\103\101" +-, (PRUint32)61 }, +- { (void *)"\002\006\040\006\005\026\160\002" +-, (PRUint32)8 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)"\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" ++, (PRUint32)209 }, ++ { (void *)"\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327" ++"\011\124" ++, (PRUint32)18 }, ++ { (void *)"\060\202\003\066\060\202\002\237\240\003\002\001\002\002\020\066" ++"\022\042\226\305\343\070\245\040\241\322\137\114\327\011\124\060" ++"\015\006\011\052\206\110\206\367\015\001\001\005\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\061\060\061\060\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\005\005\000\003\201\201\000\145\220\254\210\017\126" ++"\331\346\060\064\324\046\307\320\120\361\222\336\153\324\071\210" ++"\011\042\306\246\143\203\003\367\231\167\330\262\345\030\270\135" ++"\143\363\324\163\373\154\234\231\170\361\113\170\175\031\044\303" ++"\053\002\204\370\274\042\331\212\042\327\240\374\161\354\221\207" ++"\040\361\270\354\261\345\125\200\254\075\122\310\071\016\302\360" ++"\300\005\117\326\202\165\214\275\137\322\334\166\232\005\022\311" ++"\257\162\303\334\045\176\244\115\216\027\245\340\207\177\341\232" ++"\132\341\140\334\144\043\074\102\056\115" ++, (PRUint32)826 } + }; +-static const NSSItem nss_builtins_items_272 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CNNIC ROOT", (PRUint32)11 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061" +-"\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061" +-"\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040" +-"\122\117\117\124" +-, (PRUint32)52 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061" +-"\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061" +-"\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040" +-"\122\117\117\124" +-, (PRUint32)52 }, +- { (void *)"\002\004\111\063\000\001" +-, (PRUint32)6 }, +- { (void *)"\060\202\003\125\060\202\002\075\240\003\002\001\002\002\004\111" +-"\063\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\062\061\013\060\011\006\003\125\004\006\023\002\103" +-"\116\061\016\060\014\006\003\125\004\012\023\005\103\116\116\111" +-"\103\061\023\060\021\006\003\125\004\003\023\012\103\116\116\111" +-"\103\040\122\117\117\124\060\036\027\015\060\067\060\064\061\066" +-"\060\067\060\071\061\064\132\027\015\062\067\060\064\061\066\060" +-"\067\060\071\061\064\132\060\062\061\013\060\011\006\003\125\004" +-"\006\023\002\103\116\061\016\060\014\006\003\125\004\012\023\005" +-"\103\116\116\111\103\061\023\060\021\006\003\125\004\003\023\012" +-"\103\116\116\111\103\040\122\117\117\124\060\202\001\042\060\015" +-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001" +-"\017\000\060\202\001\012\002\202\001\001\000\323\065\367\077\163" +-"\167\255\350\133\163\027\302\321\157\355\125\274\156\352\350\244" +-"\171\262\154\303\243\357\341\237\261\073\110\205\365\232\134\041" +-"\042\020\054\305\202\316\332\343\232\156\067\341\207\054\334\271" +-"\014\132\272\210\125\337\375\252\333\037\061\352\001\361\337\071" +-"\001\301\023\375\110\122\041\304\125\337\332\330\263\124\166\272" +-"\164\261\267\175\327\300\350\366\131\305\115\310\275\255\037\024" +-"\332\337\130\104\045\062\031\052\307\176\176\216\256\070\260\060" +-"\173\107\162\011\061\360\060\333\303\033\166\051\273\151\166\116" +-"\127\371\033\144\242\223\126\267\157\231\156\333\012\004\234\021" +-"\343\200\037\313\143\224\020\012\251\341\144\202\061\371\214\047" +-"\355\246\231\000\366\160\223\030\370\241\064\206\243\335\172\302" +-"\030\171\366\172\145\065\317\220\353\275\063\223\237\123\253\163" +-"\073\346\233\064\040\057\035\357\251\035\143\032\240\200\333\003" +-"\057\371\046\032\206\322\215\273\251\276\122\072\207\147\110\015" +-"\277\264\240\330\046\276\043\137\163\067\177\046\346\222\004\243" +-"\177\317\040\247\267\363\072\312\313\231\313\002\003\001\000\001" +-"\243\163\060\161\060\021\006\011\140\206\110\001\206\370\102\001" +-"\001\004\004\003\002\000\007\060\037\006\003\125\035\043\004\030" +-"\060\026\200\024\145\362\061\255\052\367\367\335\122\226\012\307" +-"\002\301\016\357\246\325\073\021\060\017\006\003\125\035\023\001" +-"\001\377\004\005\060\003\001\001\377\060\013\006\003\125\035\017" +-"\004\004\003\002\001\376\060\035\006\003\125\035\016\004\026\004" +-"\024\145\362\061\255\052\367\367\335\122\226\012\307\002\301\016" +-"\357\246\325\073\021\060\015\006\011\052\206\110\206\367\015\001" +-"\001\005\005\000\003\202\001\001\000\113\065\356\314\344\256\277" +-"\303\156\255\237\225\073\113\077\133\036\337\127\051\242\131\312" +-"\070\342\271\032\377\236\346\156\062\335\036\256\352\065\267\365" +-"\223\221\116\332\102\341\303\027\140\120\362\321\134\046\271\202" +-"\267\352\155\344\234\204\347\003\171\027\257\230\075\224\333\307" +-"\272\000\347\270\277\001\127\301\167\105\062\014\073\361\264\034" +-"\010\260\375\121\240\241\335\232\035\023\066\232\155\267\307\074" +-"\271\341\305\331\027\372\203\325\075\025\240\074\273\036\013\342" +-"\310\220\077\250\206\014\374\371\213\136\205\313\117\133\113\142" +-"\021\107\305\105\174\005\057\101\261\236\020\151\033\231\226\340" +-"\125\171\373\116\206\231\270\224\332\206\070\152\223\243\347\313" +-"\156\345\337\352\041\125\211\234\175\175\177\230\365\000\211\356" +-"\343\204\300\134\226\265\305\106\352\106\340\205\125\266\033\311" +-"\022\326\301\315\315\200\363\002\001\074\310\151\313\105\110\143" +-"\330\224\320\354\205\016\073\116\021\145\364\202\214\246\075\256" +-"\056\042\224\011\310\134\352\074\201\135\026\052\003\227\026\125" +-"\011\333\212\101\202\236\146\233\021" +-, (PRUint32)857 } +-}; +-static const NSSItem nss_builtins_items_273 [] = { ++static const NSSItem nss_builtins_items_241 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CNNIC ROOT", (PRUint32)11 }, +- { (void *)"\213\257\114\233\035\360\052\222\367\332\022\216\271\033\254\364" +-"\230\140\113\157" +-, (PRUint32)20 }, +- { (void *)"\041\274\202\253\111\304\023\073\113\262\053\134\153\220\234\031" +-, (PRUint32)16 }, +- { (void *)"\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061" +-"\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061" +-"\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040" +-"\122\117\117\124" +-, (PRUint32)52 }, +- { (void *)"\002\004\111\063\000\001" +-, (PRUint32)6 }, ++ { (void *)"Thawte Premium Server primary 1024 2021", (PRUint32)40 }, ++ { (void *)"\340\253\005\224\040\162\124\223\005\140\142\002\066\160\367\315" ++"\056\374\146\146" ++, (PRUint32)20 }, ++ { (void *)"\246\153\140\220\043\233\077\055\273\230\157\326\247\031\015\106" ++, (PRUint32)16 }, ++ { (void *)"\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" ++, (PRUint32)209 }, ++ { (void *)"\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327" ++"\011\124" ++, (PRUint32)18 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_274 [] = { ++static const NSSItem nss_builtins_items_242 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ApplicationCA - Japanese Government", (PRUint32)36 }, ++ { (void *)"IPS Global CA Root 2048 2029", (PRUint32)29 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145" +-"\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060" +-"\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164" +-"\151\157\156\103\101" +-, (PRUint32)69 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145" +-"\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060" +-"\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164" +-"\151\157\156\103\101" +-, (PRUint32)69 }, +- { (void *)"\002\001\061" ++ { (void *)"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155" ++, (PRUint32)181 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155" ++, (PRUint32)181 }, ++ { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)"\060\202\003\240\060\202\002\210\240\003\002\001\002\002\001\061" ++ { (void *)"\060\202\006\007\060\202\004\357\240\003\002\001\002\002\001\000" + "\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061\034" +-"\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145\163" +-"\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060\024" +-"\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164\151" +-"\157\156\103\101\060\036\027\015\060\067\061\062\061\062\061\065" +-"\060\060\060\060\132\027\015\061\067\061\062\061\062\061\065\060" +-"\060\060\060\132\060\103\061\013\060\011\006\003\125\004\006\023" +-"\002\112\120\061\034\060\032\006\003\125\004\012\023\023\112\141" +-"\160\141\156\145\163\145\040\107\157\166\145\162\156\155\145\156" +-"\164\061\026\060\024\006\003\125\004\013\023\015\101\160\160\154" +-"\151\143\141\164\151\157\156\103\101\060\202\001\042\060\015\006" ++"\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123\061" ++"\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151\144" ++"\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162\151" ++"\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123\040" ++"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" ++"\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160\163" ++"\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160\163" ++"\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160\163" ++"\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157\157" ++"\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001" ++"\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143\141" ++"\056\143\157\155\060\036\027\015\060\071\060\071\060\067\061\064" ++"\063\070\064\064\132\027\015\062\071\061\062\062\065\061\064\063" ++"\070\064\064\132\060\201\262\061\013\060\011\006\003\125\004\006" ++"\023\002\105\123\061\017\060\015\006\003\125\004\010\023\006\115" ++"\141\144\162\151\144\061\017\060\015\006\003\125\004\007\023\006" ++"\115\141\144\162\151\144\061\057\060\055\006\003\125\004\012\023" ++"\046\111\120\123\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\163\056\154" ++"\056\040\151\160\163\103\101\061\016\060\014\006\003\125\004\013" ++"\023\005\151\160\163\103\101\061\035\060\033\006\003\125\004\003" ++"\023\024\151\160\163\103\101\040\107\154\157\142\141\154\040\103" ++"\101\040\122\157\157\164\061\041\060\037\006\011\052\206\110\206" ++"\367\015\001\011\001\026\022\147\154\157\142\141\154\060\061\100" ++"\151\160\163\143\141\056\143\157\155\060\202\001\042\060\015\006" + "\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017" +-"\000\060\202\001\012\002\202\001\001\000\247\155\340\164\116\207" +-"\217\245\006\336\150\242\333\206\231\113\144\015\161\360\012\005" +-"\233\216\252\341\314\056\322\152\073\301\172\264\227\141\215\212" +-"\276\306\232\234\006\264\206\121\344\067\016\164\170\176\137\212" +-"\177\224\244\327\107\010\375\120\132\126\344\150\254\050\163\240" +-"\173\351\177\030\222\100\117\055\235\365\256\104\110\163\066\006" +-"\236\144\054\073\064\043\333\134\046\344\161\171\217\324\156\171" +-"\042\271\223\301\312\315\301\126\355\210\152\327\240\071\041\004" +-"\127\054\242\365\274\107\101\117\136\064\042\225\265\037\051\155" +-"\136\112\363\115\162\276\101\126\040\207\374\351\120\107\327\060" +-"\024\356\134\214\125\272\131\215\207\374\043\336\223\320\004\214" +-"\375\357\155\275\320\172\311\245\072\152\162\063\306\112\015\005" +-"\027\052\055\173\261\247\330\326\360\276\364\077\352\016\050\155" +-"\101\141\043\166\170\303\270\145\244\363\132\256\314\302\252\331" +-"\347\130\336\266\176\235\205\156\237\052\012\157\237\003\051\060" +-"\227\050\035\274\267\317\124\051\116\121\061\371\047\266\050\046" +-"\376\242\143\346\101\026\360\063\230\107\002\003\001\000\001\243" +-"\201\236\060\201\233\060\035\006\003\125\035\016\004\026\004\024" +-"\124\132\313\046\077\161\314\224\106\015\226\123\352\153\110\320" +-"\223\376\102\165\060\016\006\003\125\035\017\001\001\377\004\004" +-"\003\002\001\006\060\131\006\003\125\035\021\004\122\060\120\244" +-"\116\060\114\061\013\060\011\006\003\125\004\006\023\002\112\120" +-"\061\030\060\026\006\003\125\004\012\014\017\346\227\245\346\234" +-"\254\345\233\275\346\224\277\345\272\234\061\043\060\041\006\003" +-"\125\004\013\014\032\343\202\242\343\203\227\343\203\252\343\202" +-"\261\343\203\274\343\202\267\343\203\247\343\203\263\103\101\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\005\005\000\003" +-"\202\001\001\000\071\152\104\166\167\070\072\354\243\147\106\017" +-"\371\213\006\250\373\152\220\061\316\176\354\332\321\211\174\172" +-"\353\056\014\275\231\062\347\260\044\326\303\377\365\262\210\011" +-"\207\054\343\124\341\243\246\262\010\013\300\205\250\310\322\234" +-"\161\366\035\237\140\374\070\063\023\341\236\334\013\137\332\026" +-"\120\051\173\057\160\221\017\231\272\064\064\215\225\164\305\176" +-"\170\251\146\135\275\312\041\167\102\020\254\146\046\075\336\221" +-"\253\375\025\360\157\355\154\137\020\370\363\026\366\003\212\217" +-"\247\022\021\014\313\375\077\171\301\234\375\142\356\243\317\124" +-"\014\321\053\137\027\076\343\076\277\300\053\076\011\233\376\210" +-"\246\176\264\222\027\374\043\224\201\275\156\247\305\214\302\353" +-"\021\105\333\370\101\311\226\166\352\160\137\171\022\153\344\243" +-"\007\132\005\357\047\111\317\041\237\212\114\011\160\146\251\046" +-"\301\053\021\116\063\322\016\374\326\154\322\016\062\144\150\377" +-"\255\005\170\137\003\035\250\343\220\254\044\340\017\100\247\113" +-"\256\213\050\267\202\312\030\007\346\267\133\164\351\040\031\177" +-"\262\033\211\124" +-, (PRUint32)932 } +-}; +-static const NSSItem nss_builtins_items_275 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ApplicationCA - Japanese Government", (PRUint32)36 }, +- { (void *)"\177\212\260\317\320\121\207\152\146\363\066\017\107\310\215\214" +-"\323\065\374\164" +-, (PRUint32)20 }, +- { (void *)"\176\043\116\133\247\245\264\045\351\000\007\164\021\142\256\326" +-, (PRUint32)16 }, +- { (void *)"\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145" +-"\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060" +-"\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164" +-"\151\157\156\103\101" +-, (PRUint32)69 }, +- { (void *)"\002\001\061" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_276 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G3", (PRUint32)46 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\063" +-, (PRUint32)155 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\063" +-, (PRUint32)155 }, +- { (void *)"\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030" +-"\017\037" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\376\060\202\002\346\240\003\002\001\002\002\020\025" +-"\254\156\224\031\262\171\113\101\366\047\251\303\030\017\037\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201" +-"\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026" +-"\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163" +-"\164\040\111\156\143\056\061\071\060\067\006\003\125\004\013\023" +-"\060\050\143\051\040\062\060\060\070\040\107\145\157\124\162\165" +-"\163\164\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\066\060\064\006\003\125\004\003\023\055\107\145\157\124" +-"\162\165\163\164\040\120\162\151\155\141\162\171\040\103\145\162" +-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157" +-"\162\151\164\171\040\055\040\107\063\060\036\027\015\060\070\060" +-"\064\060\062\060\060\060\060\060\060\132\027\015\063\067\061\062" +-"\060\061\062\063\065\071\065\071\132\060\201\230\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\026\060\024\006\003\125" +-"\004\012\023\015\107\145\157\124\162\165\163\164\040\111\156\143" +-"\056\061\071\060\067\006\003\125\004\013\023\060\050\143\051\040" +-"\062\060\060\070\040\107\145\157\124\162\165\163\164\040\111\156" +-"\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151" +-"\172\145\144\040\165\163\145\040\157\156\154\171\061\066\060\064" +-"\006\003\125\004\003\023\055\107\145\157\124\162\165\163\164\040" +-"\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143" +-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040" +-"\055\040\107\063\060\202\001\042\060\015\006\011\052\206\110\206" +-"\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012" +-"\002\202\001\001\000\334\342\136\142\130\035\063\127\071\062\063" +-"\372\353\313\207\214\247\324\112\335\006\210\352\144\216\061\230" +-"\245\070\220\036\230\317\056\143\053\360\106\274\104\262\211\241" +-"\300\050\014\111\160\041\225\237\144\300\246\223\022\002\145\046" +-"\206\306\245\211\360\372\327\204\240\160\257\117\032\227\077\006" +-"\104\325\311\353\162\020\175\344\061\050\373\034\141\346\050\007" +-"\104\163\222\042\151\247\003\210\154\235\143\310\122\332\230\047" +-"\347\010\114\160\076\264\311\022\301\305\147\203\135\063\363\003" +-"\021\354\152\320\123\342\321\272\066\140\224\200\273\141\143\154" +-"\133\027\176\337\100\224\036\253\015\302\041\050\160\210\377\326" +-"\046\154\154\140\004\045\116\125\176\175\357\277\224\110\336\267" +-"\035\335\160\215\005\137\210\245\233\362\302\356\352\321\100\101" +-"\155\142\070\035\126\006\305\003\107\121\040\031\374\173\020\013" +-"\016\142\256\166\125\277\137\167\276\076\111\001\123\075\230\045" +-"\003\166\044\132\035\264\333\211\352\171\345\266\263\073\077\272" +-"\114\050\101\177\006\254\152\216\301\320\366\005\035\175\346\102" +-"\206\343\245\325\107\002\003\001\000\001\243\102\060\100\060\017" +-"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" +-"\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060" +-"\035\006\003\125\035\016\004\026\004\024\304\171\312\216\241\116" +-"\003\035\034\334\153\333\061\133\224\076\077\060\177\055\060\015" +-"\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001" +-"\001\000\055\305\023\317\126\200\173\172\170\275\237\256\054\231" +-"\347\357\332\337\224\136\011\151\247\347\156\150\214\275\162\276" +-"\107\251\016\227\022\270\112\361\144\323\071\337\045\064\324\301" +-"\315\116\201\360\017\004\304\044\263\064\226\306\246\252\060\337" +-"\150\141\163\327\371\216\205\211\357\016\136\225\050\112\052\047" +-"\217\020\216\056\174\206\304\002\236\332\014\167\145\016\104\015" +-"\222\375\375\263\026\066\372\021\015\035\214\016\007\211\152\051" +-"\126\367\162\364\335\025\234\167\065\146\127\253\023\123\330\216" +-"\301\100\305\327\023\026\132\162\307\267\151\001\304\172\261\203" +-"\001\150\175\215\101\241\224\030\301\045\134\374\360\376\203\002" +-"\207\174\015\015\317\056\010\134\112\100\015\076\354\201\141\346" +-"\044\333\312\340\016\055\007\262\076\126\334\215\365\101\205\007" +-"\110\233\014\013\313\111\077\175\354\267\375\313\215\147\211\032" +-"\253\355\273\036\243\000\010\010\027\052\202\134\061\135\106\212" +-"\055\017\206\233\164\331\105\373\324\100\261\172\252\150\055\206" +-"\262\231\042\341\301\053\307\234\370\363\137\250\202\022\353\031" +-"\021\055" +-, (PRUint32)1026 } +-}; +-static const NSSItem nss_builtins_items_277 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G3", (PRUint32)46 }, +- { (void *)"\003\236\355\270\013\347\240\074\151\123\211\073\040\322\331\062" +-"\072\114\052\375" +-, (PRUint32)20 }, +- { (void *)"\265\350\064\066\311\020\104\130\110\160\155\056\203\324\270\005" +-, (PRUint32)16 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\063" +-, (PRUint32)155 }, +- { (void *)"\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030" +-"\017\037" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++"\000\060\202\001\012\002\202\001\001\000\247\357\314\200\060\260" ++"\221\044\117\260\150\370\303\312\055\025\070\125\130\202\342\070" ++"\143\260\367\243\222\157\203\270\260\136\260\214\254\124\261\167" ++"\320\120\340\227\263\220\255\212\263\037\071\053\105\126\367\252" ++"\342\337\174\262\354\157\123\057\232\313\320\346\146\313\311\023" ++"\350\162\342\264\315\061\127\207\022\265\223\350\372\162\316\352" ++"\107\362\214\264\260\143\327\004\000\267\144\066\071\227\350\225" ++"\361\210\371\161\015\003\047\214\141\317\010\203\226\117\203\305" ++"\116\350\134\370\006\160\361\002\252\034\036\251\310\252\176\347" ++"\135\315\215\074\024\157\147\320\033\251\043\110\213\041\050\072" ++"\212\114\346\021\061\371\041\056\262\147\146\306\051\156\224\223" ++"\317\100\226\374\260\075\277\262\264\223\277\126\161\266\245\101" ++"\207\260\130\265\131\043\050\111\270\230\371\120\036\055\025\050" ++"\013\114\254\111\321\204\251\233\232\347\162\124\267\070\320\333" ++"\311\376\251\163\325\155\020\315\216\165\353\376\227\375\200\074" ++"\374\264\330\110\364\231\106\013\210\024\244\266\056\333\114\140" ++"\364\041\301\154\200\225\024\325\257\325\002\003\001\000\001\243" ++"\202\002\044\060\202\002\040\060\035\006\003\125\035\016\004\026" ++"\004\024\025\246\226\200\261\025\113\061\303\302\234\366\347\023" ++"\013\113\363\030\315\206\060\201\337\006\003\125\035\043\004\201" ++"\327\060\201\324\200\024\025\246\226\200\261\025\113\061\303\302" ++"\234\366\347\023\013\113\363\030\315\206\241\201\270\244\201\265" ++"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155\202\001\000\060\014\006\003\125\035\023\004" ++"\005\060\003\001\001\377\060\013\006\003\125\035\017\004\004\003" ++"\002\001\006\060\107\006\003\125\035\045\004\100\060\076\006\010" ++"\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005\007" ++"\003\002\006\010\053\006\001\005\005\007\003\003\006\010\053\006" ++"\001\005\005\007\003\004\006\010\053\006\001\005\005\007\003\010" ++"\006\012\053\006\001\004\001\202\067\012\003\004\060\035\006\003" ++"\125\035\021\004\026\060\024\201\022\147\154\157\142\141\154\060" ++"\061\100\151\160\163\143\141\056\143\157\155\060\035\006\003\125" ++"\035\022\004\026\060\024\201\022\147\154\157\142\141\154\060\061" ++"\100\151\160\163\143\141\056\143\157\155\060\101\006\003\125\035" ++"\037\004\072\060\070\060\066\240\064\240\062\206\060\150\164\164" ++"\160\072\057\057\143\162\154\147\154\157\142\141\154\060\061\056" ++"\151\160\163\143\141\056\143\157\155\057\143\162\154\057\143\162" ++"\154\147\154\157\142\141\154\060\061\056\143\162\154\060\070\006" ++"\010\053\006\001\005\005\007\001\001\004\054\060\052\060\050\006" ++"\010\053\006\001\005\005\007\060\001\206\034\150\164\164\160\072" ++"\057\057\143\162\154\147\154\157\142\141\154\060\061\056\151\160" ++"\163\143\141\056\143\157\155\060\015\006\011\052\206\110\206\367" ++"\015\001\001\005\005\000\003\202\001\001\000\030\364\256\376\200" ++"\017\216\301\167\157\242\132\107\110\237\043\125\241\123\153\371" ++"\135\247\060\245\044\276\103\057\370\301\321\127\371\076\054\200" ++"\045\314\106\251\066\363\111\133\035\366\174\327\143\263\115\076" ++"\170\366\247\264\002\167\370\171\015\076\152\313\030\140\270\375" ++"\000\257\014\335\124\343\124\217\042\075\363\020\157\021\015\265" ++"\036\172\215\047\314\010\270\133\303\270\032\137\053\247\140\077" ++"\000\034\367\017\134\102\146\144\236\207\022\200\160\211\340\372" ++"\127\050\016\116\037\020\057\331\005\200\266\200\057\034\151\360" ++"\366\266\145\064\005\157\312\331\076\370\324\135\067\062\307\270" ++"\053\314\377\163\223\000\161\340\001\310\252\103\275\251\361\316" ++"\372\200\371\361\103\022\221\246\145\345\140\007\115\107\272\053" ++"\057\004\366\112\205\051\210\145\020\311\262\123\142\234\154\233" ++"\140\134\032\033\323\256\305\035\162\231\006\377\005\314\206\046" ++"\163\264\324\124\005\335\036\153\000\073\267\211\350\343\221\002" ++"\040\022\353\357\351\376\012\051\043\201\043\243\000\332\160\314" ++"\222\137\067\043\320\034\173\065\134\003\172" ++, (PRUint32)1547 } + }; +-static const NSSItem nss_builtins_items_278 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G2", (PRUint32)28 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013" +-"\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164" +-"\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167" +-"\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040" +-"\103\101\040\055\040\107\062" +-, (PRUint32)135 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013" +-"\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164" +-"\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167" +-"\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040" +-"\103\101\040\055\040\107\062" +-, (PRUint32)135 }, +- { (void *)"\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256" +-"\327\126" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\210\060\202\002\015\240\003\002\001\002\002\020\065" +-"\374\046\134\331\204\117\311\075\046\075\127\233\256\327\126\060" +-"\012\006\010\052\206\110\316\075\004\003\003\060\201\204\061\013" +-"\060\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006" +-"\003\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156" +-"\143\056\061\070\060\066\006\003\125\004\013\023\057\050\143\051" +-"\040\062\060\060\067\040\164\150\141\167\164\145\054\040\111\156" +-"\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151" +-"\172\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042" +-"\006\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162" +-"\151\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040" +-"\107\062\060\036\027\015\060\067\061\061\060\065\060\060\060\060" +-"\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071\065" +-"\071\132\060\201\204\061\013\060\011\006\003\125\004\006\023\002" +-"\125\123\061\025\060\023\006\003\125\004\012\023\014\164\150\141" +-"\167\164\145\054\040\111\156\143\056\061\070\060\066\006\003\125" +-"\004\013\023\057\050\143\051\040\062\060\060\067\040\164\150\141" +-"\167\164\145\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\044\060\042\006\003\125\004\003\023\033\164\150" +-"\141\167\164\145\040\120\162\151\155\141\162\171\040\122\157\157" +-"\164\040\103\101\040\055\040\107\062\060\166\060\020\006\007\052" +-"\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000" +-"\004\242\325\234\202\173\225\235\361\122\170\207\376\212\026\277" +-"\005\346\337\243\002\117\015\007\306\000\121\272\014\002\122\055" +-"\042\244\102\071\304\376\217\352\311\301\276\324\115\377\237\172" +-"\236\342\261\174\232\255\247\206\011\163\207\321\347\232\343\172" +-"\245\252\156\373\272\263\160\300\147\210\242\065\324\243\232\261" +-"\375\255\302\357\061\372\250\271\363\373\010\306\221\321\373\051" +-"\225\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004" +-"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004" +-"\024\232\330\000\060\000\347\153\177\205\030\356\213\266\316\212" +-"\014\370\021\341\273\060\012\006\010\052\206\110\316\075\004\003" +-"\003\003\151\000\060\146\002\061\000\335\370\340\127\107\133\247" +-"\346\012\303\275\365\200\212\227\065\015\033\211\074\124\206\167" +-"\050\312\241\364\171\336\265\346\070\260\360\145\160\214\177\002" +-"\124\302\277\377\330\241\076\331\317\002\061\000\304\215\224\374" +-"\334\123\322\334\235\170\026\037\025\063\043\123\122\343\132\061" +-"\135\235\312\256\275\023\051\104\015\047\133\250\347\150\234\022" +-"\367\130\077\056\162\002\127\243\217\241\024\056" +-, (PRUint32)652 } +-}; +-static const NSSItem nss_builtins_items_279 [] = { ++static const NSSItem nss_builtins_items_243 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G2", (PRUint32)28 }, +- { (void *)"\252\333\274\042\043\217\304\001\241\047\273\070\335\364\035\333" +-"\010\236\360\022" +-, (PRUint32)20 }, +- { (void *)"\164\235\352\140\044\304\375\042\123\076\314\072\162\331\051\117" +-, (PRUint32)16 }, +- { (void *)"\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013" +-"\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164" +-"\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167" +-"\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040" +-"\103\101\040\055\040\107\062" +-, (PRUint32)135 }, +- { (void *)"\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256" +-"\327\126" +-, (PRUint32)18 }, ++ { (void *)"IPS Global CA Root 2048 2029", (PRUint32)29 }, ++ { (void *)"\074\161\327\016\065\245\332\250\262\343\201\055\303\147\164\027" ++"\365\231\015\363" ++, (PRUint32)20 }, ++ { (void *)"\045\052\306\305\211\150\071\371\125\162\002\026\136\243\236\322" ++, (PRUint32)16 }, ++ { (void *)"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155" ++, (PRUint32)181 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_280 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G3", (PRUint32)28 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040" +-"\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143" +-"\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172" +-"\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006" +-"\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151" +-"\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107" +-"\063" +-, (PRUint32)177 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040" +-"\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143" +-"\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172" +-"\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006" +-"\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151" +-"\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107" +-"\063" +-, (PRUint32)177 }, +- { (void *)"\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367" +-"\220\373" +-, (PRUint32)18 }, +- { (void *)"\060\202\004\052\060\202\003\022\240\003\002\001\002\002\020\140" +-"\001\227\267\106\247\352\264\264\232\326\113\057\367\220\373\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201" +-"\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025" +-"\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054" +-"\040\111\156\143\056\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" +-"\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060" +-"\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056\040" +-"\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144" +-"\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003\125" +-"\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155\141" +-"\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063\060" +-"\036\027\015\060\070\060\064\060\062\060\060\060\060\060\060\132" +-"\027\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060" +-"\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145" +-"\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062" +-"\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056" +-"\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145" +-"\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003" +-"\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155" +-"\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063" +-"\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001" +-"\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001" +-"\000\262\277\047\054\373\333\330\133\335\170\173\033\236\167\146" +-"\201\313\076\274\174\256\363\246\047\232\064\243\150\061\161\070" +-"\063\142\344\363\161\146\171\261\251\145\243\245\213\325\217\140" +-"\055\077\102\314\252\153\062\300\043\313\054\101\335\344\337\374" +-"\141\234\342\163\262\042\225\021\103\030\137\304\266\037\127\154" +-"\012\005\130\042\310\066\114\072\174\245\321\317\206\257\210\247" +-"\104\002\023\164\161\163\012\102\131\002\370\033\024\153\102\337" +-"\157\137\272\153\202\242\235\133\347\112\275\036\001\162\333\113" +-"\164\350\073\177\177\175\037\004\264\046\233\340\264\132\254\107" +-"\075\125\270\327\260\046\122\050\001\061\100\146\330\331\044\275" +-"\366\052\330\354\041\111\134\233\366\172\351\177\125\065\176\226" +-"\153\215\223\223\047\313\222\273\352\254\100\300\237\302\370\200" +-"\317\135\364\132\334\316\164\206\246\076\154\013\123\312\275\222" +-"\316\031\006\162\346\014\134\070\151\307\004\326\274\154\316\133" +-"\366\367\150\234\334\045\025\110\210\241\351\251\370\230\234\340" +-"\363\325\061\050\141\021\154\147\226\215\071\231\313\302\105\044" +-"\071\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035" +-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" +-"\035\016\004\026\004\024\255\154\252\224\140\234\355\344\377\372" +-"\076\012\164\053\143\003\367\266\131\277\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\003\202\001\001\000\032\100" +-"\330\225\145\254\011\222\211\306\071\364\020\345\251\016\146\123" +-"\135\170\336\372\044\221\273\347\104\121\337\306\026\064\012\357" +-"\152\104\121\352\053\007\212\003\172\303\353\077\012\054\122\026" +-"\240\053\103\271\045\220\077\160\251\063\045\155\105\032\050\073" +-"\047\317\252\303\051\102\033\337\073\114\300\063\064\133\101\210" +-"\277\153\053\145\257\050\357\262\365\303\252\146\316\173\126\356" +-"\267\310\313\147\301\311\234\032\030\270\304\303\111\003\361\140" +-"\016\120\315\106\305\363\167\171\367\266\025\340\070\333\307\057" +-"\050\240\014\077\167\046\164\331\045\022\332\061\332\032\036\334" +-"\051\101\221\042\074\151\247\273\002\362\266\134\047\003\211\364" +-"\006\352\233\344\162\202\343\241\011\301\351\000\031\323\076\324" +-"\160\153\272\161\246\252\130\256\364\273\351\154\266\357\207\314" +-"\233\273\377\071\346\126\141\323\012\247\304\134\114\140\173\005" +-"\167\046\172\277\330\007\122\054\142\367\160\143\331\071\274\157" +-"\034\302\171\334\166\051\257\316\305\054\144\004\136\210\066\156" +-"\061\324\100\032\142\064\066\077\065\001\256\254\143\240" +-, (PRUint32)1070 } +-}; +-static const NSSItem nss_builtins_items_281 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G3", (PRUint32)28 }, +- { (void *)"\361\213\123\215\033\351\003\266\246\360\126\103\133\027\025\211" +-"\312\363\153\362" +-, (PRUint32)20 }, +- { (void *)"\373\033\135\103\212\224\315\104\306\166\362\103\113\107\347\061" +-, (PRUint32)16 }, +- { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040" +-"\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143" +-"\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172" +-"\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006" +-"\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151" +-"\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107" +-"\063" +-, (PRUint32)177 }, +- { (void *)"\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367" +-"\220\373" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_282 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G2", (PRUint32)46 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\062" +-, (PRUint32)155 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\062" +-, (PRUint32)155 }, +- { (void *)"\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076" +-"\303\153" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\256\060\202\002\065\240\003\002\001\002\002\020\074" +-"\262\364\110\012\000\342\376\353\044\073\136\140\076\303\153\060" +-"\012\006\010\052\206\110\316\075\004\003\003\060\201\230\061\013" +-"\060\011\006\003\125\004\006\023\002\125\123\061\026\060\024\006" +-"\003\125\004\012\023\015\107\145\157\124\162\165\163\164\040\111" +-"\156\143\056\061\071\060\067\006\003\125\004\013\023\060\050\143" +-"\051\040\062\060\060\067\040\107\145\157\124\162\165\163\164\040" +-"\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157" +-"\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\066" +-"\060\064\006\003\125\004\003\023\055\107\145\157\124\162\165\163" +-"\164\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171\040\055\040\107\062\060\036\027\015\060\067\061\061\060\065" +-"\060\060\060\060\060\060\132\027\015\063\070\060\061\061\070\062" +-"\063\065\071\065\071\132\060\201\230\061\013\060\011\006\003\125" +-"\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012\023" +-"\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061\071" +-"\060\067\006\003\125\004\013\023\060\050\143\051\040\062\060\060" +-"\067\040\107\145\157\124\162\165\163\164\040\111\156\143\056\040" +-"\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144" +-"\040\165\163\145\040\157\156\154\171\061\066\060\064\006\003\125" +-"\004\003\023\055\107\145\157\124\162\165\163\164\040\120\162\151" +-"\155\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" +-"\062\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005" +-"\053\201\004\000\042\003\142\000\004\025\261\350\375\003\025\103" +-"\345\254\353\207\067\021\142\357\322\203\066\122\175\105\127\013" +-"\112\215\173\124\073\072\156\137\025\002\300\120\246\317\045\057" +-"\175\312\110\270\307\120\143\034\052\041\010\174\232\066\330\013" +-"\376\321\046\305\130\061\060\050\045\363\135\135\243\270\266\245" +-"\264\222\355\154\054\237\353\335\103\211\242\074\113\110\221\035" +-"\120\354\046\337\326\140\056\275\041\243\102\060\100\060\017\006" +-"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016" +-"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035" +-"\006\003\125\035\016\004\026\004\024\025\137\065\127\121\125\373" +-"\045\262\255\003\151\374\001\243\372\276\021\125\325\060\012\006" +-"\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060" +-"\144\226\131\246\350\011\336\213\272\372\132\210\210\360\037\221" +-"\323\106\250\362\112\114\002\143\373\154\137\070\333\056\101\223" +-"\251\016\346\235\334\061\034\262\240\247\030\034\171\341\307\066" +-"\002\060\072\126\257\232\164\154\366\373\203\340\063\323\010\137" +-"\241\234\302\133\237\106\326\266\313\221\006\143\242\006\347\063" +-"\254\076\250\201\022\320\313\272\320\222\013\266\236\226\252\004" +-"\017\212" +-, (PRUint32)690 } +-}; +-static const NSSItem nss_builtins_items_283 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G2", (PRUint32)46 }, +- { (void *)"\215\027\204\325\067\363\003\175\354\160\376\127\213\121\232\231" +-"\346\020\327\260" +-, (PRUint32)20 }, +- { (void *)"\001\136\330\153\275\157\075\216\241\061\370\022\340\230\163\152" +-, (PRUint32)16 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\062" +-, (PRUint32)155 }, +- { (void *)"\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076" +-"\303\153" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_284 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Universal Root Certification Authority", (PRUint32)48 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023" +-"\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162" +-"\163\141\154\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)192 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023" +-"\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162" +-"\163\141\154\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)192 }, +- { (void *)"\002\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032" +-"\305\035" +-, (PRUint32)18 }, +- { (void *)"\060\202\004\271\060\202\003\241\240\003\002\001\002\002\020\100" +-"\032\304\144\041\263\023\041\003\016\273\344\022\032\305\035\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201" +-"\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027" +-"\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147" +-"\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013" +-"\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164" +-"\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004" +-"\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151" +-"\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162" +-"\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040" +-"\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126" +-"\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141" +-"\154\040\122\157\157\164\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\060\070\060\064\060\062\060\060\060\060\060\060\132\027" +-"\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060\201" +-"\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027" +-"\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147" +-"\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013" +-"\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164" +-"\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004" +-"\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151" +-"\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162" +-"\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040" +-"\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126" +-"\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141" +-"\154\040\122\157\157\164\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\202" +-"\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005" +-"\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\307" +-"\141\067\136\261\001\064\333\142\327\025\233\377\130\132\214\043" +-"\043\326\140\216\221\327\220\230\203\172\346\130\031\070\214\305" +-"\366\345\144\205\264\242\161\373\355\275\271\332\315\115\000\264" +-"\310\055\163\245\307\151\161\225\037\071\074\262\104\007\234\350" +-"\016\372\115\112\304\041\337\051\141\217\062\042\141\202\305\207" +-"\037\156\214\174\137\026\040\121\104\321\160\117\127\352\343\034" +-"\343\314\171\356\130\330\016\302\263\105\223\300\054\347\232\027" +-"\053\173\000\067\172\101\063\170\341\063\342\363\020\032\177\207" +-"\054\276\366\365\367\102\342\345\277\207\142\211\137\000\113\337" +-"\305\335\344\165\104\062\101\072\036\161\156\151\313\013\165\106" +-"\010\321\312\322\053\225\320\317\373\271\100\153\144\214\127\115" +-"\374\023\021\171\204\355\136\124\366\064\237\010\001\363\020\045" +-"\006\027\112\332\361\035\172\146\153\230\140\146\244\331\357\322" +-"\056\202\361\360\357\011\352\104\311\025\152\342\003\156\063\323" +-"\254\237\125\000\307\366\010\152\224\271\137\334\340\063\361\204" +-"\140\371\133\047\021\264\374\026\362\273\126\152\200\045\215\002" +-"\003\001\000\001\243\201\262\060\201\257\060\017\006\003\125\035" +-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\155\006\010\053" +-"\006\001\005\005\007\001\014\004\141\060\137\241\135\240\133\060" +-"\131\060\127\060\125\026\011\151\155\141\147\145\057\147\151\146" +-"\060\041\060\037\060\007\006\005\053\016\003\002\032\004\024\217" +-"\345\323\032\206\254\215\216\153\303\317\200\152\324\110\030\054" +-"\173\031\056\060\045\026\043\150\164\164\160\072\057\057\154\157" +-"\147\157\056\166\145\162\151\163\151\147\156\056\143\157\155\057" +-"\166\163\154\157\147\157\056\147\151\146\060\035\006\003\125\035" +-"\016\004\026\004\024\266\167\372\151\110\107\237\123\022\325\302" +-"\352\007\062\166\007\321\227\007\031\060\015\006\011\052\206\110" +-"\206\367\015\001\001\013\005\000\003\202\001\001\000\112\370\370" +-"\260\003\346\054\147\173\344\224\167\143\314\156\114\371\175\016" +-"\015\334\310\271\065\271\160\117\143\372\044\372\154\203\214\107" +-"\235\073\143\363\232\371\166\062\225\221\261\167\274\254\232\276" +-"\261\344\061\041\306\201\225\126\132\016\261\302\324\261\246\131" +-"\254\361\143\313\270\114\035\131\220\112\357\220\026\050\037\132" +-"\256\020\373\201\120\070\014\154\314\361\075\303\365\143\343\263" +-"\343\041\311\044\071\351\375\025\146\106\364\033\021\320\115\163" +-"\243\175\106\371\075\355\250\137\142\324\361\077\370\340\164\127" +-"\053\030\235\201\264\304\050\332\224\227\245\160\353\254\035\276" +-"\007\021\360\325\333\335\345\214\360\325\062\260\203\346\127\342" +-"\217\277\276\241\252\277\075\035\265\324\070\352\327\260\134\072" +-"\117\152\077\217\300\146\154\143\252\351\331\244\026\364\201\321" +-"\225\024\016\175\315\225\064\331\322\217\160\163\201\173\234\176" +-"\275\230\141\330\105\207\230\220\305\353\206\060\306\065\277\360" +-"\377\303\125\210\203\113\357\005\222\006\161\362\270\230\223\267" +-"\354\315\202\141\361\070\346\117\227\230\052\132\215" +-, (PRUint32)1213 } +-}; +-static const NSSItem nss_builtins_items_285 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Universal Root Certification Authority", (PRUint32)48 }, +- { (void *)"\066\171\312\065\146\207\162\060\115\060\245\373\207\073\017\247" +-"\173\267\015\124" +-, (PRUint32)20 }, +- { (void *)"\216\255\265\001\252\115\201\344\214\035\321\341\024\000\225\031" +-, (PRUint32)16 }, +- { (void *)"\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023" +-"\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162" +-"\163\141\154\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)192 }, +- { (void *)"\002\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032" +-"\305\035" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_286 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Class 3 Public Primary Certification Authority - G4", (PRUint32)61 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023" +-"\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040" +-"\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" +-"\165\164\150\157\162\151\164\171\040\055\040\107\064" +-, (PRUint32)205 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023" +-"\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040" +-"\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" +-"\165\164\150\157\162\151\164\171\040\055\040\107\064" +-, (PRUint32)205 }, +- { (void *)"\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207" +-"\254\263" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\204\060\202\003\012\240\003\002\001\002\002\020\057" +-"\200\376\043\214\016\042\017\110\147\022\050\221\207\254\263\060" +-"\012\006\010\052\206\110\316\075\004\003\003\060\201\312\061\013" +-"\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006" +-"\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040" +-"\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126" +-"\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145" +-"\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061" +-"\050\143\051\040\062\060\060\067\040\126\145\162\151\123\151\147" +-"\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151" +-"\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142" +-"\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162" +-"\151\164\171\040\055\040\107\064\060\036\027\015\060\067\061\061" +-"\060\065\060\060\060\060\060\060\132\027\015\063\070\060\061\061" +-"\070\062\063\065\071\065\071\132\060\201\312\061\013\060\011\006" +-"\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004" +-"\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143" +-"\056\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151" +-"\123\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157" +-"\162\153\061\072\060\070\006\003\125\004\013\023\061\050\143\051" +-"\040\062\060\060\067\040\126\145\162\151\123\151\147\156\054\040" +-"\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157" +-"\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\105" +-"\060\103\006\003\125\004\003\023\074\126\145\162\151\123\151\147" +-"\156\040\103\154\141\163\163\040\063\040\120\165\142\154\151\143" +-"\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-"\040\055\040\107\064\060\166\060\020\006\007\052\206\110\316\075" +-"\002\001\006\005\053\201\004\000\042\003\142\000\004\247\126\172" +-"\174\122\332\144\233\016\055\134\330\136\254\222\075\376\001\346" +-"\031\112\075\024\003\113\372\140\047\040\331\203\211\151\372\124" +-"\306\232\030\136\125\052\144\336\006\366\215\112\073\255\020\074" +-"\145\075\220\210\004\211\340\060\141\263\256\135\001\247\173\336" +-"\174\262\276\312\145\141\000\206\256\332\217\173\320\211\255\115" +-"\035\131\232\101\261\274\107\200\334\236\142\303\371\243\201\262" +-"\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004" +-"\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001\014" +-"\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026\011" +-"\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007\006" +-"\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215\216" +-"\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026\043" +-"\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162\151" +-"\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157\056" +-"\147\151\146\060\035\006\003\125\035\016\004\026\004\024\263\026" +-"\221\375\356\246\156\344\265\056\111\217\207\170\201\200\354\345" +-"\261\265\060\012\006\010\052\206\110\316\075\004\003\003\003\150" +-"\000\060\145\002\060\146\041\014\030\046\140\132\070\173\126\102" +-"\340\247\374\066\204\121\221\040\054\166\115\103\075\304\035\204" +-"\043\320\254\326\174\065\006\316\315\151\275\220\015\333\154\110" +-"\102\035\016\252\102\002\061\000\234\075\110\071\043\071\130\032" +-"\025\022\131\152\236\357\325\131\262\035\122\054\231\161\315\307" +-"\051\337\033\052\141\173\161\321\336\363\300\345\015\072\112\252" +-"\055\247\330\206\052\335\056\020" +-, (PRUint32)904 } +-}; +-static const NSSItem nss_builtins_items_287 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Class 3 Public Primary Certification Authority - G4", (PRUint32)61 }, +- { (void *)"\042\325\330\337\217\002\061\321\215\367\235\267\317\212\055\144" +-"\311\077\154\072" +-, (PRUint32)20 }, +- { (void *)"\072\122\341\347\375\157\072\343\157\363\157\231\033\371\042\101" +-, (PRUint32)16 }, +- { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023" +-"\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040" +-"\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" +-"\165\164\150\157\162\151\164\171\040\055\040\107\064" +-, (PRUint32)205 }, +- { (void *)"\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207" +-"\254\263" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_288 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"NetLock Arany (Class Gold) Főtanúsítvány", (PRUint32)45 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145" +-"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003" +-"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303" +-"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143" +-"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145" +-"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141" +-"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303" +-"\272\163\303\255\164\166\303\241\156\171" +-, (PRUint32)170 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145" +-"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003" +-"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303" +-"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143" +-"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145" +-"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141" +-"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303" +-"\272\163\303\255\164\166\303\241\156\171" +-, (PRUint32)170 }, +- { (void *)"\002\006\111\101\054\344\000\020" +-, (PRUint32)8 }, +- { (void *)"\060\202\004\025\060\202\002\375\240\003\002\001\002\002\006\111" +-"\101\054\344\000\020\060\015\006\011\052\206\110\206\367\015\001" +-"\001\013\005\000\060\201\247\061\013\060\011\006\003\125\004\006" +-"\023\002\110\125\061\021\060\017\006\003\125\004\007\014\010\102" +-"\165\144\141\160\145\163\164\061\025\060\023\006\003\125\004\012" +-"\014\014\116\145\164\114\157\143\153\040\113\146\164\056\061\067" +-"\060\065\006\003\125\004\013\014\056\124\141\156\303\272\163\303" +-"\255\164\166\303\241\156\171\153\151\141\144\303\263\153\040\050" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\051\061\065\060\063\006\003\125\004\003" +-"\014\054\116\145\164\114\157\143\153\040\101\162\141\156\171\040" +-"\050\103\154\141\163\163\040\107\157\154\144\051\040\106\305\221" +-"\164\141\156\303\272\163\303\255\164\166\303\241\156\171\060\036" +-"\027\015\060\070\061\062\061\061\061\065\060\070\062\061\132\027" +-"\015\062\070\061\062\060\066\061\065\060\070\062\061\132\060\201" +-"\247\061\013\060\011\006\003\125\004\006\023\002\110\125\061\021" +-"\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145\163" +-"\164\061\025\060\023\006\003\125\004\012\014\014\116\145\164\114" +-"\157\143\153\040\113\146\164\056\061\067\060\065\006\003\125\004" +-"\013\014\056\124\141\156\303\272\163\303\255\164\166\303\241\156" +-"\171\153\151\141\144\303\263\153\040\050\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163" +-"\051\061\065\060\063\006\003\125\004\003\014\054\116\145\164\114" +-"\157\143\153\040\101\162\141\156\171\040\050\103\154\141\163\163" +-"\040\107\157\154\144\051\040\106\305\221\164\141\156\303\272\163" +-"\303\255\164\166\303\241\156\171\060\202\001\042\060\015\006\011" +-"\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000" +-"\060\202\001\012\002\202\001\001\000\304\044\136\163\276\113\155" +-"\024\303\241\364\343\227\220\156\322\060\105\036\074\356\147\331" +-"\144\340\032\212\177\312\060\312\203\343\040\301\343\364\072\323" +-"\224\137\032\174\133\155\277\060\117\204\047\366\237\037\111\274" +-"\306\231\012\220\362\017\365\177\103\204\067\143\121\213\172\245" +-"\160\374\172\130\315\216\233\355\303\106\154\204\160\135\332\363" +-"\001\220\043\374\116\060\251\176\341\047\143\347\355\144\074\240" +-"\270\311\063\143\376\026\220\377\260\270\375\327\250\300\300\224" +-"\103\013\266\325\131\246\236\126\320\044\037\160\171\257\333\071" +-"\124\015\145\165\331\025\101\224\001\257\136\354\366\215\361\377" +-"\255\144\376\040\232\327\134\353\376\246\037\010\144\243\213\166" +-"\125\255\036\073\050\140\056\207\045\350\252\257\037\306\144\106" +-"\040\267\160\177\074\336\110\333\226\123\267\071\167\344\032\342" +-"\307\026\204\166\227\133\057\273\031\025\205\370\151\205\365\231" +-"\247\251\362\064\247\251\266\246\003\374\157\206\075\124\174\166" +-"\004\233\153\371\100\135\000\064\307\056\231\165\235\345\210\003" +-"\252\115\370\003\322\102\166\300\033\002\003\000\250\213\243\105" +-"\060\103\060\022\006\003\125\035\023\001\001\377\004\010\060\006" +-"\001\001\377\002\001\004\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004" +-"\024\314\372\147\223\360\266\270\320\245\300\036\363\123\375\214" +-"\123\337\203\327\226\060\015\006\011\052\206\110\206\367\015\001" +-"\001\013\005\000\003\202\001\001\000\253\177\356\034\026\251\234" +-"\074\121\000\240\300\021\010\005\247\231\346\157\001\210\124\141" +-"\156\361\271\030\255\112\255\376\201\100\043\224\057\373\165\174" +-"\057\050\113\142\044\201\202\013\365\141\361\034\156\270\141\070" +-"\353\201\372\142\241\073\132\142\323\224\145\304\341\346\155\202" +-"\370\057\045\160\262\041\046\301\162\121\037\214\054\303\204\220" +-"\303\132\217\272\317\364\247\145\245\353\230\321\373\005\262\106" +-"\165\025\043\152\157\205\143\060\200\360\325\236\037\051\034\302" +-"\154\260\120\131\135\220\133\073\250\015\060\317\277\175\177\316" +-"\361\235\203\275\311\106\156\040\246\371\141\121\272\041\057\173" +-"\276\245\025\143\241\324\225\207\361\236\271\363\211\363\075\205" +-"\270\270\333\276\265\271\051\371\332\067\005\000\111\224\003\204" +-"\104\347\277\103\061\317\165\213\045\321\364\246\144\365\222\366" +-"\253\005\353\075\351\245\013\066\142\332\314\006\137\066\213\266" +-"\136\061\270\052\373\136\366\161\337\104\046\236\304\346\015\221" +-"\264\056\165\225\200\121\152\113\060\246\260\142\241\223\361\233" +-"\330\316\304\143\165\077\131\107\261" +-, (PRUint32)1049 } +-}; +-static const NSSItem nss_builtins_items_289 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"NetLock Arany (Class Gold) Főtanúsítvány", (PRUint32)45 }, +- { (void *)"\006\010\077\131\077\025\241\004\240\151\244\153\251\003\320\006" +-"\267\227\011\221" +-, (PRUint32)20 }, +- { (void *)"\305\241\267\377\163\335\326\327\064\062\030\337\374\074\255\210" +-, (PRUint32)16 }, +- { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145" +-"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003" +-"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303" +-"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143" +-"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145" +-"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141" +-"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303" +-"\272\163\303\255\164\166\303\241\156\171" +-, (PRUint32)170 }, +- { (void *)"\002\006\111\101\054\344\000\020" +-, (PRUint32)8 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_290 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Staat der Nederlanden Root CA - G2", (PRUint32)35 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061" +-"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040" +-"\122\157\157\164\040\103\101\040\055\040\107\062" +-, (PRUint32)92 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061" +-"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040" +-"\122\157\157\164\040\103\101\040\055\040\107\062" +-, (PRUint32)92 }, +- { (void *)"\002\004\000\230\226\214" +-, (PRUint32)6 }, +- { (void *)"\060\202\005\312\060\202\003\262\240\003\002\001\002\002\004\000" +-"\230\226\214\060\015\006\011\052\206\110\206\367\015\001\001\013" +-"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116" +-"\114\061\036\060\034\006\003\125\004\012\014\025\123\164\141\141" +-"\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145" +-"\156\061\053\060\051\006\003\125\004\003\014\042\123\164\141\141" +-"\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145" +-"\156\040\122\157\157\164\040\103\101\040\055\040\107\062\060\036" +-"\027\015\060\070\060\063\062\066\061\061\061\070\061\067\132\027" +-"\015\062\060\060\063\062\065\061\061\060\063\061\060\132\060\132" +-"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\036\060" +-"\034\006\003\125\004\012\014\025\123\164\141\141\164\040\144\145" +-"\162\040\116\145\144\145\162\154\141\156\144\145\156\061\053\060" +-"\051\006\003\125\004\003\014\042\123\164\141\141\164\040\144\145" +-"\162\040\116\145\144\145\162\154\141\156\144\145\156\040\122\157" +-"\157\164\040\103\101\040\055\040\107\062\060\202\002\042\060\015" +-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002" +-"\017\000\060\202\002\012\002\202\002\001\000\305\131\347\157\165" +-"\252\076\113\234\265\270\254\236\013\344\371\331\312\253\135\217" +-"\265\071\020\202\327\257\121\340\073\341\000\110\152\317\332\341" +-"\006\103\021\231\252\024\045\022\255\042\350\000\155\103\304\251" +-"\270\345\037\211\113\147\275\141\110\357\375\322\340\140\210\345" +-"\271\030\140\050\303\167\053\255\260\067\252\067\336\144\131\052" +-"\106\127\344\113\271\370\067\174\325\066\347\200\301\266\363\324" +-"\147\233\226\350\316\327\306\012\123\320\153\111\226\363\243\013" +-"\005\167\110\367\045\345\160\254\060\024\040\045\343\177\165\132" +-"\345\110\370\116\173\003\007\004\372\202\141\207\156\360\073\304" +-"\244\307\320\365\164\076\245\135\032\010\362\233\045\322\366\254" +-"\004\046\076\125\072\142\050\245\173\262\060\257\370\067\302\321" +-"\272\326\070\375\364\357\111\060\067\231\046\041\110\205\001\251" +-"\345\026\347\334\220\125\337\017\350\070\315\231\067\041\117\135" +-"\365\042\157\152\305\022\026\140\027\125\362\145\146\246\247\060" +-"\221\070\301\070\035\206\004\204\272\032\045\170\136\235\257\314" +-"\120\140\326\023\207\122\355\143\037\155\145\175\302\025\030\164" +-"\312\341\176\144\051\214\162\330\026\023\175\013\111\112\361\050" +-"\033\040\164\153\305\075\335\260\252\110\011\075\056\202\224\315" +-"\032\145\331\053\210\232\231\274\030\176\237\356\175\146\174\076" +-"\275\224\270\201\316\315\230\060\170\301\157\147\320\276\137\340" +-"\150\355\336\342\261\311\054\131\170\222\252\337\053\140\143\362" +-"\345\136\271\343\312\372\177\120\206\076\242\064\030\014\011\150" +-"\050\021\034\344\341\271\134\076\107\272\062\077\030\314\133\204" +-"\365\363\153\164\304\162\164\341\343\213\240\112\275\215\146\057" +-"\352\255\065\332\040\323\210\202\141\360\022\042\266\274\320\325" +-"\244\354\257\124\210\045\044\074\247\155\261\162\051\077\076\127" +-"\246\177\125\257\156\046\306\376\347\314\100\134\121\104\201\012" +-"\170\336\112\316\125\277\035\325\331\267\126\357\360\166\377\013" +-"\171\265\257\275\373\251\151\221\106\227\150\200\024\066\035\263" +-"\177\273\051\230\066\245\040\372\202\140\142\063\244\354\326\272" +-"\007\247\156\305\317\024\246\347\326\222\064\330\201\365\374\035" +-"\135\252\134\036\366\243\115\073\270\367\071\002\003\001\000\001" +-"\243\201\227\060\201\224\060\017\006\003\125\035\023\001\001\377" +-"\004\005\060\003\001\001\377\060\122\006\003\125\035\040\004\113" +-"\060\111\060\107\006\004\125\035\040\000\060\077\060\075\006\010" +-"\053\006\001\005\005\007\002\001\026\061\150\164\164\160\072\057" +-"\057\167\167\167\056\160\153\151\157\166\145\162\150\145\151\144" +-"\056\156\154\057\160\157\154\151\143\151\145\163\057\162\157\157" +-"\164\055\160\157\154\151\143\171\055\107\062\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" +-"\035\016\004\026\004\024\221\150\062\207\025\035\211\342\265\361" +-"\254\066\050\064\215\013\174\142\210\353\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\003\202\002\001\000\250\101" +-"\112\147\052\222\201\202\120\156\341\327\330\263\071\073\363\002" +-"\025\011\120\121\357\055\275\044\173\210\206\073\371\264\274\222" +-"\011\226\271\366\300\253\043\140\006\171\214\021\116\121\322\171" +-"\200\063\373\235\110\276\354\101\103\201\037\176\107\100\034\345" +-"\172\010\312\252\213\165\255\024\304\302\350\146\074\202\007\247" +-"\346\047\202\133\030\346\017\156\331\120\076\212\102\030\051\306" +-"\264\126\374\126\020\240\005\027\275\014\043\177\364\223\355\234" +-"\032\121\276\335\105\101\277\221\044\264\037\214\351\137\317\173" +-"\041\231\237\225\237\071\072\106\034\154\371\315\173\234\220\315" +-"\050\251\307\251\125\273\254\142\064\142\065\023\113\024\072\125" +-"\203\271\206\215\222\246\306\364\007\045\124\314\026\127\022\112" +-"\202\170\310\024\331\027\202\046\055\135\040\037\171\256\376\324" +-"\160\026\026\225\203\330\065\071\377\122\135\165\034\026\305\023" +-"\125\317\107\314\165\145\122\112\336\360\260\247\344\012\226\013" +-"\373\255\302\342\045\204\262\335\344\275\176\131\154\233\360\360" +-"\330\347\312\362\351\227\070\176\211\276\314\373\071\027\141\077" +-"\162\333\072\221\330\145\001\031\035\255\120\244\127\012\174\113" +-"\274\234\161\163\052\105\121\031\205\314\216\375\107\247\164\225" +-"\035\250\321\257\116\027\261\151\046\302\252\170\127\133\305\115" +-"\247\345\236\005\027\224\312\262\137\240\111\030\215\064\351\046" +-"\154\110\036\252\150\222\005\341\202\163\132\233\334\007\133\010" +-"\155\175\235\327\215\041\331\374\024\040\252\302\105\337\077\347" +-"\000\262\121\344\302\370\005\271\171\032\214\064\363\236\133\344" +-"\067\133\153\112\337\054\127\212\100\132\066\272\335\165\104\010" +-"\067\102\160\014\376\334\136\041\240\243\212\300\220\234\150\332" +-"\120\346\105\020\107\170\266\116\322\145\311\303\067\337\341\102" +-"\143\260\127\067\105\055\173\212\234\277\005\352\145\125\063\367" +-"\071\020\305\050\052\041\172\033\212\304\044\371\077\025\310\232" +-"\025\040\365\125\142\226\355\155\223\120\274\344\252\170\255\331" +-"\313\012\145\207\246\146\301\304\201\243\167\072\130\036\013\356" +-"\203\213\235\036\322\122\244\314\035\157\260\230\155\224\061\265" +-"\370\161\012\334\271\374\175\062\140\346\353\257\212\001" +-, (PRUint32)1486 } +-}; +-static const NSSItem nss_builtins_items_291 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Staat der Nederlanden Root CA - G2", (PRUint32)35 }, +- { (void *)"\131\257\202\171\221\206\307\264\165\007\313\317\003\127\106\353" +-"\004\335\267\026" +-, (PRUint32)20 }, +- { (void *)"\174\245\017\370\133\232\175\155\060\256\124\132\343\102\242\212" +-, (PRUint32)16 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061" +-"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040" +-"\122\157\157\164\040\103\101\040\055\040\107\062" +-, (PRUint32)92 }, +- { (void *)"\002\004\000\230\226\214" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_292 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CA Disig", (PRUint32)9 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061" +-"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163" +-"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104" +-"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125" +-"\004\003\023\010\103\101\040\104\151\163\151\147" +-, (PRUint32)76 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061" +-"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163" +-"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104" +-"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125" +-"\004\003\023\010\103\101\040\104\151\163\151\147" +-, (PRUint32)76 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\001" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061\023" +-"\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163\154" +-"\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104\151" +-"\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125\004" +-"\003\023\010\103\101\040\104\151\163\151\147\060\036\027\015\060" +-"\066\060\063\062\062\060\061\063\071\063\064\132\027\015\061\066" +-"\060\063\062\062\060\061\063\071\063\064\132\060\112\061\013\060" +-"\011\006\003\125\004\006\023\002\123\113\061\023\060\021\006\003" +-"\125\004\007\023\012\102\162\141\164\151\163\154\141\166\141\061" +-"\023\060\021\006\003\125\004\012\023\012\104\151\163\151\147\040" +-"\141\056\163\056\061\021\060\017\006\003\125\004\003\023\010\103" +-"\101\040\104\151\163\151\147\060\202\001\042\060\015\006\011\052" +-"\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060" +-"\202\001\012\002\202\001\001\000\222\366\061\301\175\210\375\231" +-"\001\251\330\173\362\161\165\361\061\306\363\165\146\372\121\050" +-"\106\204\227\170\064\274\154\374\274\105\131\210\046\030\112\304" +-"\067\037\241\112\104\275\343\161\004\365\104\027\342\077\374\110" +-"\130\157\134\236\172\011\272\121\067\042\043\146\103\041\260\074" +-"\144\242\370\152\025\016\077\353\121\341\124\251\335\006\231\327" +-"\232\074\124\213\071\003\077\017\305\316\306\353\203\162\002\250" +-"\037\161\363\055\370\165\010\333\142\114\350\372\316\371\347\152" +-"\037\266\153\065\202\272\342\217\026\222\175\005\014\154\106\003" +-"\135\300\355\151\277\072\301\212\240\350\216\331\271\105\050\207" +-"\010\354\264\312\025\276\202\335\265\104\213\055\255\206\014\150" +-"\142\155\205\126\362\254\024\143\072\306\321\231\254\064\170\126" +-"\113\317\266\255\077\214\212\327\004\345\343\170\114\365\206\252" +-"\365\217\372\075\154\161\243\055\312\147\353\150\173\156\063\251" +-"\014\202\050\250\114\152\041\100\025\040\014\046\133\203\302\251" +-"\026\025\300\044\202\135\053\026\255\312\143\366\164\000\260\337" +-"\103\304\020\140\126\147\143\105\002\003\001\000\001\243\201\377" +-"\060\201\374\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\215" +-"\262\111\150\235\162\010\045\271\300\047\365\120\223\126\110\106" +-"\161\371\217\060\016\006\003\125\035\017\001\001\377\004\004\003" +-"\002\001\006\060\066\006\003\125\035\021\004\057\060\055\201\023" +-"\143\141\157\160\145\162\141\164\157\162\100\144\151\163\151\147" +-"\056\163\153\206\026\150\164\164\160\072\057\057\167\167\167\056" +-"\144\151\163\151\147\056\163\153\057\143\141\060\146\006\003\125" +-"\035\037\004\137\060\135\060\055\240\053\240\051\206\047\150\164" +-"\164\160\072\057\057\167\167\167\056\144\151\163\151\147\056\163" +-"\153\057\143\141\057\143\162\154\057\143\141\137\144\151\163\151" +-"\147\056\143\162\154\060\054\240\052\240\050\206\046\150\164\164" +-"\160\072\057\057\143\141\056\144\151\163\151\147\056\163\153\057" +-"\143\141\057\143\162\154\057\143\141\137\144\151\163\151\147\056" +-"\143\162\154\060\032\006\003\125\035\040\004\023\060\021\060\017" +-"\006\015\053\201\036\221\223\346\012\000\000\000\001\001\001\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202" +-"\001\001\000\135\064\164\141\114\257\073\330\377\237\155\130\066" +-"\034\075\013\201\015\022\053\106\020\200\375\347\074\047\320\172" +-"\310\251\266\176\164\060\063\243\072\212\173\164\300\171\171\102" +-"\223\155\377\261\051\024\202\253\041\214\057\027\371\077\046\057" +-"\365\131\306\357\200\006\267\232\111\051\354\316\176\161\074\152" +-"\020\101\300\366\323\232\262\174\132\221\234\300\254\133\310\115" +-"\136\367\341\123\377\103\167\374\236\113\147\154\327\363\203\321" +-"\240\340\177\045\337\270\230\013\232\062\070\154\060\240\363\377" +-"\010\025\063\367\120\112\173\076\243\076\040\251\334\057\126\200" +-"\012\355\101\120\260\311\364\354\262\343\046\104\000\016\157\236" +-"\006\274\042\226\123\160\145\304\120\012\106\153\244\057\047\201" +-"\022\047\023\137\020\241\166\316\212\173\067\352\303\071\141\003" +-"\225\230\072\347\154\210\045\010\374\171\150\015\207\175\142\370" +-"\264\137\373\305\330\114\275\130\274\077\103\133\324\036\001\115" +-"\074\143\276\043\357\214\315\132\120\270\150\124\371\012\231\063" +-"\021\000\341\236\302\106\167\202\365\131\006\214\041\114\207\011" +-"\315\345\250" +-, (PRUint32)1043 } +-}; +-static const NSSItem nss_builtins_items_293 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CA Disig", (PRUint32)9 }, +- { (void *)"\052\310\325\213\127\316\277\057\111\257\362\374\166\217\121\024" +-"\142\220\172\101" +-, (PRUint32)20 }, +- { (void *)"\077\105\226\071\342\120\207\367\273\376\230\014\074\040\230\346" +-, (PRUint32)16 }, +- { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061" +-"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163" +-"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104" +-"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125" +-"\004\003\023\010\103\101\040\104\151\163\151\147" +-, (PRUint32)76 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_294 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Juur-SK", (PRUint32)8 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011" +-"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011" +-"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125" +-"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163" +-"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060" +-"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-, (PRUint32)95 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011" +-"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011" +-"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125" +-"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163" +-"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060" +-"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-, (PRUint32)95 }, +- { (void *)"\002\004\073\216\113\374" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\346\060\202\003\316\240\003\002\001\002\002\004\073" +-"\216\113\374\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\135\061\030\060\026\006\011\052\206\110\206\367\015" +-"\001\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013" +-"\060\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006" +-"\003\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151" +-"\164\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061" +-"\020\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123" +-"\113\060\036\027\015\060\061\060\070\063\060\061\064\062\063\060" +-"\061\132\027\015\061\066\060\070\062\066\061\064\062\063\060\061" +-"\132\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001" +-"\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060" +-"\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003" +-"\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164" +-"\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020" +-"\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-"\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001" +-"\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001" +-"\000\201\161\066\076\063\007\326\343\060\215\023\176\167\062\106" +-"\313\317\031\262\140\061\106\227\206\364\230\106\244\302\145\105" +-"\317\323\100\174\343\132\042\250\020\170\063\314\210\261\323\201" +-"\112\366\142\027\173\137\115\012\056\320\317\213\043\356\117\002" +-"\116\273\353\016\312\275\030\143\350\200\034\215\341\034\215\075" +-"\340\377\133\137\352\144\345\227\350\077\231\177\014\012\011\063" +-"\000\032\123\247\041\341\070\113\326\203\033\255\257\144\302\371" +-"\034\172\214\146\110\115\146\037\030\012\342\076\273\037\007\145" +-"\223\205\271\032\260\271\304\373\015\021\366\365\326\371\033\307" +-"\054\053\267\030\121\376\340\173\366\250\110\257\154\073\117\057" +-"\357\370\321\107\036\046\127\360\121\035\063\226\377\357\131\075" +-"\332\115\321\025\064\307\352\077\026\110\173\221\034\200\103\017" +-"\075\270\005\076\321\263\225\315\330\312\017\302\103\147\333\267" +-"\223\340\042\202\056\276\365\150\050\203\271\301\073\151\173\040" +-"\332\116\234\155\341\272\315\217\172\154\260\011\042\327\213\013" +-"\333\034\325\132\046\133\015\300\352\345\140\320\237\376\065\337" +-"\077\002\003\001\000\001\243\202\001\254\060\202\001\250\060\017" +-"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" +-"\202\001\026\006\003\125\035\040\004\202\001\015\060\202\001\011" +-"\060\202\001\005\006\012\053\006\001\004\001\316\037\001\001\001" +-"\060\201\366\060\201\320\006\010\053\006\001\005\005\007\002\002" +-"\060\201\303\036\201\300\000\123\000\145\000\145\000\040\000\163" +-"\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141" +-"\000\141\000\164\000\040\000\157\000\156\000\040\000\166\000\344" +-"\000\154\000\152\000\141\000\163\000\164\000\141\000\164\000\165" +-"\000\144\000\040\000\101\000\123\000\055\000\151\000\163\000\040" +-"\000\123\000\145\000\162\000\164\000\151\000\146\000\151\000\164" +-"\000\163\000\145\000\145\000\162\000\151\000\155\000\151\000\163" +-"\000\153\000\145\000\163\000\153\000\165\000\163\000\040\000\141" +-"\000\154\000\141\000\155\000\055\000\123\000\113\000\040\000\163" +-"\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141" +-"\000\141\000\164\000\151\000\144\000\145\000\040\000\153\000\151" +-"\000\156\000\156\000\151\000\164\000\141\000\155\000\151\000\163" +-"\000\145\000\153\000\163\060\041\006\010\053\006\001\005\005\007" +-"\002\001\026\025\150\164\164\160\072\057\057\167\167\167\056\163" +-"\153\056\145\145\057\143\160\163\057\060\053\006\003\125\035\037" +-"\004\044\060\042\060\040\240\036\240\034\206\032\150\164\164\160" +-"\072\057\057\167\167\167\056\163\153\056\145\145\057\152\165\165" +-"\162\057\143\162\154\057\060\035\006\003\125\035\016\004\026\004" +-"\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030\077" +-"\157\357\351\175\276\060\037\006\003\125\035\043\004\030\060\026" +-"\200\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030" +-"\077\157\357\351\175\276\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\346\060\015\006\011\052\206\110\206\367\015" +-"\001\001\005\005\000\003\202\001\001\000\173\301\030\224\123\242" +-"\011\363\376\046\147\232\120\344\303\005\057\053\065\170\221\114" +-"\174\250\021\021\171\114\111\131\254\310\367\205\145\134\106\273" +-"\073\020\240\002\257\315\117\265\314\066\052\354\135\376\357\240" +-"\221\311\266\223\157\174\200\124\354\307\010\160\015\216\373\202" +-"\354\052\140\170\151\066\066\321\305\234\213\151\265\100\310\224" +-"\145\167\362\127\041\146\073\316\205\100\266\063\143\032\277\171" +-"\036\374\134\035\323\035\223\033\213\014\135\205\275\231\060\062" +-"\030\011\221\122\351\174\241\272\377\144\222\232\354\376\065\356" +-"\214\057\256\374\040\206\354\112\336\033\170\062\067\246\201\322" +-"\235\257\132\022\026\312\231\133\374\157\155\016\305\240\036\206" +-"\311\221\320\134\230\202\137\143\014\212\132\253\330\225\246\314" +-"\313\212\326\277\144\113\216\312\212\262\260\351\041\062\236\252" +-"\250\205\230\064\201\071\041\073\250\072\122\062\075\366\153\067" +-"\206\006\132\025\230\334\360\021\146\376\064\040\267\003\364\101" +-"\020\175\071\204\171\226\162\143\266\226\002\345\153\271\255\031" +-"\115\273\306\104\333\066\313\052\234\216" +-, (PRUint32)1258 } +-}; +-static const NSSItem nss_builtins_items_295 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Juur-SK", (PRUint32)8 }, +- { (void *)"\100\235\113\331\027\265\134\047\266\233\144\313\230\042\104\015" +-"\315\011\270\211" +-, (PRUint32)20 }, +- { (void *)"\252\216\135\331\370\333\012\130\267\215\046\207\154\202\065\125" +-, (PRUint32)16 }, +- { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011" +-"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011" +-"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125" +-"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163" +-"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060" +-"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-, (PRUint32)95 }, +- { (void *)"\002\004\073\216\113\374" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_296 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Hongkong Post Root CA 1", (PRUint32)24 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061" +-, (PRUint32)73 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061" +-, (PRUint32)73 }, +- { (void *)"\002\002\003\350" +-, (PRUint32)4 }, +- { (void *)"\060\202\003\060\060\202\002\030\240\003\002\001\002\002\002\003" +-"\350\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000" +-"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061\060\036\027\015\060\063\060" +-"\065\061\065\060\065\061\063\061\064\132\027\015\062\063\060\065" +-"\061\065\060\064\065\062\062\071\132\060\107\061\013\060\011\006" +-"\003\125\004\006\023\002\110\113\061\026\060\024\006\003\125\004" +-"\012\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164" +-"\061\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153" +-"\157\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101" +-"\040\061\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\254\377\070\266\351\146\002\111\343\242\264\341\220" +-"\371\100\217\171\371\342\275\171\376\002\275\356\044\222\035\042" +-"\366\332\205\162\151\376\327\077\011\324\335\221\265\002\234\320" +-"\215\132\341\125\303\120\206\271\051\046\302\343\331\240\361\151" +-"\003\050\040\200\105\042\055\126\247\073\124\225\126\042\131\037" +-"\050\337\037\040\075\155\242\066\276\043\240\261\156\265\261\047" +-"\077\071\123\011\352\253\152\350\164\262\302\145\134\216\277\174" +-"\303\170\204\315\236\026\374\365\056\117\040\052\010\237\167\363" +-"\305\036\304\232\122\146\036\110\136\343\020\006\217\042\230\341" +-"\145\216\033\135\043\146\073\270\245\062\121\310\206\252\241\251" +-"\236\177\166\224\302\246\154\267\101\360\325\310\006\070\346\324" +-"\014\342\363\073\114\155\120\214\304\203\047\301\023\204\131\075" +-"\236\165\164\266\330\002\136\072\220\172\300\102\066\162\354\152" +-"\115\334\357\304\000\337\023\030\127\137\046\170\310\326\012\171" +-"\167\277\367\257\267\166\271\245\013\204\027\135\020\352\157\341" +-"\253\225\021\137\155\074\243\134\115\203\133\362\263\031\212\200" +-"\213\013\207\002\003\001\000\001\243\046\060\044\060\022\006\003" +-"\125\035\023\001\001\377\004\010\060\006\001\001\377\002\001\003" +-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\306" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003" +-"\202\001\001\000\016\106\325\074\256\342\207\331\136\201\213\002" +-"\230\101\010\214\114\274\332\333\356\047\033\202\347\152\105\354" +-"\026\213\117\205\240\363\262\160\275\132\226\272\312\156\155\356" +-"\106\213\156\347\052\056\226\263\031\063\353\264\237\250\262\067" +-"\356\230\250\227\266\056\266\147\047\324\246\111\375\034\223\145" +-"\166\236\102\057\334\042\154\232\117\362\132\025\071\261\161\327" +-"\053\121\350\155\034\230\300\331\052\364\241\202\173\325\311\101" +-"\242\043\001\164\070\125\213\017\271\056\147\242\040\004\067\332" +-"\234\013\323\027\041\340\217\227\171\064\157\204\110\002\040\063" +-"\033\346\064\104\237\221\160\364\200\136\204\103\302\051\322\154" +-"\022\024\344\141\215\254\020\220\236\204\120\273\360\226\157\105" +-"\237\212\363\312\154\117\372\021\072\025\025\106\303\315\037\203" +-"\133\055\101\022\355\120\147\101\023\075\041\253\224\212\252\116" +-"\174\301\261\373\247\326\265\047\057\227\253\156\340\035\342\321" +-"\034\054\037\104\342\374\276\221\241\234\373\326\051\123\163\206" +-"\237\123\330\103\016\135\326\143\202\161\035\200\164\312\366\342" +-"\002\153\331\132" +-, (PRUint32)820 } +-}; +-static const NSSItem nss_builtins_items_297 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Hongkong Post Root CA 1", (PRUint32)24 }, +- { (void *)"\326\332\250\040\215\011\322\025\115\044\265\057\313\064\156\262" +-"\130\262\212\130" +-, (PRUint32)20 }, +- { (void *)"\250\015\157\071\170\271\103\155\167\102\155\230\132\314\043\312" +-, (PRUint32)16 }, +- { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061" +-, (PRUint32)73 }, +- { (void *)"\002\002\003\350" +-, (PRUint32)4 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_298 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"SecureSign RootCA11", (PRUint32)20 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032" +-"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147" +-"\156\040\122\157\157\164\103\101\061\061" +-, (PRUint32)90 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032" +-"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147" +-"\156\040\122\157\157\164\103\101\061\061" +-, (PRUint32)90 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\155\060\202\002\125\240\003\002\001\002\002\001\001" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061\053" +-"\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162" +-"\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032\006" +-"\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147\156" +-"\040\122\157\157\164\103\101\061\061\060\036\027\015\060\071\060" +-"\064\060\070\060\064\065\066\064\067\132\027\015\062\071\060\064" +-"\060\070\060\064\065\066\064\067\132\060\130\061\013\060\011\006" +-"\003\125\004\006\023\002\112\120\061\053\060\051\006\003\125\004" +-"\012\023\042\112\141\160\141\156\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163\054" +-"\040\111\156\143\056\061\034\060\032\006\003\125\004\003\023\023" +-"\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164\103" +-"\101\061\061\060\202\001\042\060\015\006\011\052\206\110\206\367" +-"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002" +-"\202\001\001\000\375\167\252\245\034\220\005\073\313\114\233\063" +-"\213\132\024\105\244\347\220\026\321\337\127\322\041\020\244\027" +-"\375\337\254\326\037\247\344\333\174\367\354\337\270\003\332\224" +-"\130\375\135\162\174\214\077\137\001\147\164\025\226\343\002\074" +-"\207\333\256\313\001\216\302\363\146\306\205\105\364\002\306\072" +-"\265\142\262\257\372\234\277\244\346\324\200\060\230\363\015\266" +-"\223\217\251\324\330\066\362\260\374\212\312\054\241\025\063\225" +-"\061\332\300\033\362\356\142\231\206\143\077\277\335\223\052\203" +-"\250\166\271\023\037\267\316\116\102\205\217\042\347\056\032\362" +-"\225\011\262\005\265\104\116\167\241\040\275\251\362\116\012\175" +-"\120\255\365\005\015\105\117\106\161\375\050\076\123\373\004\330" +-"\055\327\145\035\112\033\372\317\073\260\061\232\065\156\310\213" +-"\006\323\000\221\362\224\010\145\114\261\064\006\000\172\211\342" +-"\360\307\003\131\317\325\326\350\247\062\263\346\230\100\206\305" +-"\315\047\022\213\314\173\316\267\021\074\142\140\007\043\076\053" +-"\100\156\224\200\011\155\266\263\157\167\157\065\010\120\373\002" +-"\207\305\076\211\002\003\001\000\001\243\102\060\100\060\035\006" +-"\003\125\035\016\004\026\004\024\133\370\115\117\262\245\206\324" +-"\072\322\361\143\232\240\276\011\366\127\267\336\060\016\006\003" +-"\125\035\017\001\001\377\004\004\003\002\001\006\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\005\005\000\003\202\001\001" +-"\000\240\241\070\026\146\056\247\126\037\041\234\006\372\035\355" +-"\271\042\305\070\046\330\116\117\354\243\177\171\336\106\041\241" +-"\207\167\217\007\010\232\262\244\305\257\017\062\230\013\174\146" +-"\051\266\233\175\045\122\111\103\253\114\056\053\156\172\160\257" +-"\026\016\343\002\154\373\102\346\030\235\105\330\125\310\350\073" +-"\335\347\341\364\056\013\034\064\134\154\130\112\373\214\210\120" +-"\137\225\034\277\355\253\042\265\145\263\205\272\236\017\270\255" +-"\345\172\033\212\120\072\035\275\015\274\173\124\120\013\271\102" +-"\257\125\240\030\201\255\145\231\357\276\344\234\277\304\205\253" +-"\101\262\124\157\334\045\315\355\170\342\216\014\215\011\111\335" +-"\143\173\132\151\226\002\041\250\275\122\131\351\175\065\313\310" +-"\122\312\177\201\376\331\153\323\367\021\355\045\337\370\347\371" +-"\244\372\162\227\204\123\015\245\320\062\030\121\166\131\024\154" +-"\017\353\354\137\200\214\165\103\203\303\205\230\377\114\236\055" +-"\015\344\167\203\223\116\265\226\007\213\050\023\233\214\031\215" +-"\101\047\111\100\356\336\346\043\104\071\334\241\042\326\272\003" +-"\362" +-, (PRUint32)881 } +-}; +-static const NSSItem nss_builtins_items_299 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"SecureSign RootCA11", (PRUint32)20 }, +- { (void *)"\073\304\237\110\370\363\163\240\234\036\275\370\133\261\303\145" +-"\307\330\021\263" +-, (PRUint32)20 }, +- { (void *)"\267\122\164\342\222\264\200\223\362\165\344\314\327\362\352\046" +-, (PRUint32)16 }, +- { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032" +-"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147" +-"\156\040\122\157\157\164\103\101\061\061" +-, (PRUint32)90 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_300 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ACEDICOM Root", (PRUint32)14 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105" +-"\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003" +-"\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004" +-"\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125" +-"\004\006\023\002\105\123" +-, (PRUint32)70 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105" +-"\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003" +-"\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004" +-"\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125" +-"\004\006\023\002\105\123" +-, (PRUint32)70 }, +- { (void *)"\002\010\141\215\307\206\073\001\202\005" +-, (PRUint32)10 }, +- { (void *)"\060\202\005\265\060\202\003\235\240\003\002\001\002\002\010\141" +-"\215\307\206\073\001\202\005\060\015\006\011\052\206\110\206\367" +-"\015\001\001\005\005\000\060\104\061\026\060\024\006\003\125\004" +-"\003\014\015\101\103\105\104\111\103\117\115\040\122\157\157\164" +-"\061\014\060\012\006\003\125\004\013\014\003\120\113\111\061\017" +-"\060\015\006\003\125\004\012\014\006\105\104\111\103\117\115\061" +-"\013\060\011\006\003\125\004\006\023\002\105\123\060\036\027\015" +-"\060\070\060\064\061\070\061\066\062\064\062\062\132\027\015\062" +-"\070\060\064\061\063\061\066\062\064\062\062\132\060\104\061\026" +-"\060\024\006\003\125\004\003\014\015\101\103\105\104\111\103\117" +-"\115\040\122\157\157\164\061\014\060\012\006\003\125\004\013\014" +-"\003\120\113\111\061\017\060\015\006\003\125\004\012\014\006\105" +-"\104\111\103\117\115\061\013\060\011\006\003\125\004\006\023\002" +-"\105\123\060\202\002\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202" +-"\002\001\000\377\222\225\341\150\006\166\264\054\310\130\110\312" +-"\375\200\124\051\125\143\044\377\220\145\233\020\165\173\303\152" +-"\333\142\002\001\362\030\206\265\174\132\070\261\344\130\271\373" +-"\323\330\055\237\275\062\067\277\054\025\155\276\265\364\041\322" +-"\023\221\331\007\255\001\005\326\363\275\167\316\137\102\201\012" +-"\371\152\343\203\000\250\053\056\125\023\143\201\312\107\034\173" +-"\134\026\127\172\033\203\140\004\072\076\145\303\315\001\336\336" +-"\244\326\014\272\216\336\331\004\356\027\126\042\233\217\143\375" +-"\115\026\013\267\173\167\214\371\045\265\321\155\231\022\056\117" +-"\032\270\346\352\004\222\256\075\021\271\121\102\075\207\260\061" +-"\205\257\171\132\234\376\347\116\136\222\117\103\374\253\072\255" +-"\245\022\046\146\271\342\014\327\230\316\324\130\245\225\100\012" +-"\267\104\235\023\164\053\302\245\353\042\025\230\020\330\213\305" +-"\004\237\035\217\140\345\006\033\233\317\271\171\240\075\242\043" +-"\077\102\077\153\372\034\003\173\060\215\316\154\300\277\346\033" +-"\137\277\147\270\204\031\325\025\357\173\313\220\066\061\142\311" +-"\274\002\253\106\137\233\376\032\150\224\064\075\220\216\255\366" +-"\344\035\011\177\112\210\070\077\276\147\375\064\226\365\035\274" +-"\060\164\313\070\356\325\154\253\324\374\364\000\267\000\133\205" +-"\062\026\166\063\351\330\243\231\235\005\000\252\026\346\363\201" +-"\175\157\175\252\206\155\255\025\164\323\304\242\161\252\364\024" +-"\175\347\062\270\037\274\325\361\116\275\157\027\002\071\327\016" +-"\225\102\072\307\000\076\351\046\143\021\352\013\321\112\377\030" +-"\235\262\327\173\057\072\331\226\373\350\036\222\256\023\125\310" +-"\331\047\366\334\110\033\260\044\301\205\343\167\235\232\244\363" +-"\014\021\035\015\310\264\024\356\265\202\127\011\277\040\130\177" +-"\057\042\043\330\160\313\171\154\311\113\362\251\052\310\374\207" +-"\053\327\032\120\370\047\350\057\103\343\072\275\330\127\161\375" +-"\316\246\122\133\371\335\115\355\345\366\157\211\355\273\223\234" +-"\166\041\165\360\222\114\051\367\057\234\001\056\376\120\106\236" +-"\144\014\024\263\007\133\305\302\163\154\361\007\134\105\044\024" +-"\065\256\203\361\152\115\211\172\372\263\330\055\146\360\066\207" +-"\365\053\123\002\003\001\000\001\243\201\252\060\201\247\060\017" +-"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" +-"\037\006\003\125\035\043\004\030\060\026\200\024\246\263\341\053" +-"\053\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120" +-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\206" +-"\060\035\006\003\125\035\016\004\026\004\024\246\263\341\053\053" +-"\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120\060" +-"\104\006\003\125\035\040\004\075\060\073\060\071\006\004\125\035" +-"\040\000\060\061\060\057\006\010\053\006\001\005\005\007\002\001" +-"\026\043\150\164\164\160\072\057\057\141\143\145\144\151\143\157" +-"\155\056\145\144\151\143\157\155\147\162\157\165\160\056\143\157" +-"\155\057\144\157\143\060\015\006\011\052\206\110\206\367\015\001" +-"\001\005\005\000\003\202\002\001\000\316\054\013\122\121\142\046" +-"\175\014\047\203\217\305\366\332\240\150\173\117\222\136\352\244" +-"\163\062\021\123\104\262\104\313\235\354\017\171\102\263\020\246" +-"\307\015\235\313\266\372\077\072\174\352\277\210\123\033\074\367" +-"\202\372\005\065\063\341\065\250\127\300\347\375\215\117\077\223" +-"\062\117\170\146\003\167\007\130\351\225\310\176\076\320\171\000" +-"\214\362\033\121\063\233\274\224\351\072\173\156\122\055\062\236" +-"\043\244\105\373\266\056\023\260\213\030\261\335\316\325\035\247" +-"\102\177\125\276\373\133\273\107\324\374\044\315\004\256\226\005" +-"\025\326\254\316\060\363\312\013\305\272\342\042\340\246\255\042" +-"\344\002\356\164\021\177\114\377\170\035\065\332\346\002\064\353" +-"\030\022\141\167\006\011\026\143\352\030\255\242\207\037\362\307" +-"\200\011\011\165\116\020\250\217\075\206\270\165\021\300\044\142" +-"\212\226\173\112\105\351\354\131\305\276\153\203\346\341\350\254" +-"\265\060\036\376\005\007\200\371\341\043\015\120\217\005\230\377" +-"\054\137\350\073\266\255\317\201\265\041\207\312\010\052\043\047" +-"\060\040\053\317\355\224\133\254\262\172\322\307\050\241\212\013" +-"\233\115\112\054\155\205\077\011\162\074\147\342\331\334\007\272" +-"\353\145\173\132\001\143\326\220\133\117\027\146\075\177\013\031" +-"\243\223\143\020\122\052\237\024\026\130\342\334\245\364\241\026" +-"\213\016\221\213\201\312\233\131\372\330\153\221\007\145\125\137" +-"\122\037\257\072\373\220\335\151\245\133\234\155\016\054\266\372" +-"\316\254\245\174\062\112\147\100\334\060\064\043\335\327\004\043" +-"\146\360\374\125\200\247\373\146\031\202\065\147\142\160\071\136" +-"\157\307\352\220\100\104\010\036\270\262\326\333\356\131\247\015" +-"\030\171\064\274\124\030\136\123\312\064\121\355\105\012\346\216" +-"\307\202\066\076\247\070\143\251\060\054\027\020\140\222\237\125" +-"\207\022\131\020\302\017\147\151\021\314\116\036\176\112\232\255" +-"\257\100\250\165\254\126\220\164\270\240\234\245\171\157\334\351" +-"\032\310\151\005\351\272\372\003\263\174\344\340\116\302\316\235" +-"\350\266\106\015\156\176\127\072\147\224\302\313\037\234\167\112" +-"\147\116\151\206\103\223\070\373\266\333\117\203\221\324\140\176" +-"\113\076\053\070\007\125\230\136\244" +-, (PRUint32)1465 } +-}; +-static const NSSItem nss_builtins_items_301 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ACEDICOM Root", (PRUint32)14 }, +- { (void *)"\340\264\062\056\262\366\245\150\266\124\123\204\110\030\112\120" +-"\066\207\103\204" +-, (PRUint32)20 }, +- { (void *)"\102\201\240\342\034\343\125\020\336\125\211\102\145\226\042\346" +-, (PRUint32)16 }, +- { (void *)"\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105" +-"\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003" +-"\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004" +-"\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125" +-"\004\006\023\002\105\123" +-, (PRUint32)70 }, +- { (void *)"\002\010\141\215\307\206\073\001\202\005" +-, (PRUint32)10 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_302 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 1 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242" +-"\344\335" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\074\060\202\001\245\002\020\077\151\036\201\234\360" +-"\232\112\363\163\377\271\110\242\344\335\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006" +-"\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004" +-"\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143" +-"\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163" +-"\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155\141" +-"\162\171\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\066" +-"\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060" +-"\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125" +-"\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141" +-"\163\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155" +-"\141\162\171\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\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\345\031\277\155\243\126\141\055" +-"\231\110\161\366\147\336\271\215\353\267\236\206\200\012\221\016" +-"\372\070\045\257\106\210\202\345\163\250\240\233\044\135\015\037" +-"\314\145\156\014\260\320\126\204\030\207\232\006\233\020\241\163" +-"\337\264\130\071\153\156\301\366\025\325\250\250\077\252\022\006" +-"\215\061\254\177\260\064\327\217\064\147\210\011\315\024\021\342" +-"\116\105\126\151\037\170\002\200\332\334\107\221\051\273\066\311" +-"\143\134\305\340\327\055\207\173\241\267\062\260\173\060\272\052" +-"\057\061\252\356\243\147\332\333\002\003\001\000\001\060\015\006" +-"\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000" +-"\130\025\051\071\074\167\243\332\134\045\003\174\140\372\356\011" +-"\231\074\047\020\160\310\014\011\346\263\207\317\012\342\030\226" +-"\065\142\314\277\233\047\171\211\137\311\304\011\364\316\265\035" +-"\337\052\275\345\333\206\234\150\045\345\060\174\266\211\025\376" +-"\147\321\255\341\120\254\074\174\142\113\217\272\204\327\022\025" +-"\033\037\312\135\017\301\122\224\052\021\231\332\173\317\014\066" +-"\023\325\065\334\020\031\131\352\224\301\000\277\165\217\331\372" +-"\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133" +-, (PRUint32)576 } +-}; +-static const NSSItem nss_builtins_items_303 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 1 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)"\316\152\144\243\011\344\057\273\331\205\034\105\076\144\011\352" +-"\350\175\140\361" +-, (PRUint32)20 }, +- { (void *)"\206\254\336\053\305\155\303\331\214\050\210\323\215\026\023\036" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242" +-"\344\335" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_304 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 3 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277" +-"\022\276" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\074\060\202\001\245\002\020\074\221\061\313\037\366" +-"\320\033\016\232\270\320\104\277\022\276\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006" +-"\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004" +-"\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143" +-"\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163" +-"\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155\141" +-"\162\171\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\066" +-"\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060" +-"\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125" +-"\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141" +-"\163\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155" +-"\141\162\171\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\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\311\134\131\236\362\033\212\001" +-"\024\264\020\337\004\100\333\343\127\257\152\105\100\217\204\014" +-"\013\321\063\331\331\021\317\356\002\130\037\045\367\052\250\104" +-"\005\252\354\003\037\170\177\236\223\271\232\000\252\043\175\326" +-"\254\205\242\143\105\307\162\047\314\364\114\306\165\161\322\071" +-"\357\117\102\360\165\337\012\220\306\216\040\157\230\017\370\254" +-"\043\137\160\051\066\244\311\206\347\261\232\040\313\123\245\205" +-"\347\075\276\175\232\376\044\105\063\334\166\025\355\017\242\161" +-"\144\114\145\056\201\150\105\247\002\003\001\000\001\060\015\006" +-"\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000" +-"\020\162\122\251\005\024\031\062\010\101\360\305\153\012\314\176" +-"\017\041\031\315\344\147\334\137\251\033\346\312\350\163\235\042" +-"\330\230\156\163\003\141\221\305\174\260\105\100\156\104\235\215" +-"\260\261\226\164\141\055\015\251\105\322\244\222\052\326\232\165" +-"\227\156\077\123\375\105\231\140\035\250\053\114\371\136\247\011" +-"\330\165\060\327\322\145\140\075\147\326\110\125\165\151\077\221" +-"\365\110\013\107\151\042\151\202\226\276\311\310\070\206\112\172" +-"\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220" +-, (PRUint32)576 } +-}; +-static const NSSItem nss_builtins_items_305 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 3 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)"\241\333\143\223\221\157\027\344\030\125\011\100\004\025\307\002" +-"\100\260\256\153" +-, (PRUint32)20 }, +- { (void *)"\357\132\361\063\357\361\315\273\121\002\356\022\024\113\226\304" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277" +-"\022\276" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_306 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Microsec e-Szigno Root CA 2009", (PRUint32)31 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151" +-"\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006" +-"\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145" +-"\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040" +-"\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015" +-"\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147" +-"\156\157\056\150\165" +-, (PRUint32)133 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151" +-"\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006" +-"\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145" +-"\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040" +-"\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015" +-"\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147" +-"\156\157\056\150\165" +-, (PRUint32)133 }, +- { (void *)"\002\011\000\302\176\103\004\116\107\077\031" +-, (PRUint32)11 }, +- { (void *)"\060\202\004\012\060\202\002\362\240\003\002\001\002\002\011\000" +-"\302\176\103\004\116\107\077\031\060\015\006\011\052\206\110\206" +-"\367\015\001\001\013\005\000\060\201\202\061\013\060\011\006\003" +-"\125\004\006\023\002\110\125\061\021\060\017\006\003\125\004\007" +-"\014\010\102\165\144\141\160\145\163\164\061\026\060\024\006\003" +-"\125\004\012\014\015\115\151\143\162\157\163\145\143\040\114\164" +-"\144\056\061\047\060\045\006\003\125\004\003\014\036\115\151\143" +-"\162\157\163\145\143\040\145\055\123\172\151\147\156\157\040\122" +-"\157\157\164\040\103\101\040\062\060\060\071\061\037\060\035\006" +-"\011\052\206\110\206\367\015\001\011\001\026\020\151\156\146\157" +-"\100\145\055\163\172\151\147\156\157\056\150\165\060\036\027\015" +-"\060\071\060\066\061\066\061\061\063\060\061\070\132\027\015\062" +-"\071\061\062\063\060\061\061\063\060\061\070\132\060\201\202\061" +-"\013\060\011\006\003\125\004\006\023\002\110\125\061\021\060\017" +-"\006\003\125\004\007\014\010\102\165\144\141\160\145\163\164\061" +-"\026\060\024\006\003\125\004\012\014\015\115\151\143\162\157\163" +-"\145\143\040\114\164\144\056\061\047\060\045\006\003\125\004\003" +-"\014\036\115\151\143\162\157\163\145\143\040\145\055\123\172\151" +-"\147\156\157\040\122\157\157\164\040\103\101\040\062\060\060\071" +-"\061\037\060\035\006\011\052\206\110\206\367\015\001\011\001\026" +-"\020\151\156\146\157\100\145\055\163\172\151\147\156\157\056\150" +-"\165\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001" +-"\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001" +-"\001\000\351\370\217\363\143\255\332\206\330\247\340\102\373\317" +-"\221\336\246\046\370\231\245\143\160\255\233\256\312\063\100\175" +-"\155\226\156\241\016\104\356\341\023\235\224\102\122\232\275\165" +-"\205\164\054\250\016\035\223\266\030\267\214\054\250\317\373\134" +-"\161\271\332\354\376\350\176\217\344\057\035\262\250\165\207\330" +-"\267\241\345\073\317\231\112\106\320\203\031\175\300\241\022\034" +-"\225\155\112\364\330\307\245\115\063\056\205\071\100\165\176\024" +-"\174\200\022\230\120\307\101\147\270\240\200\141\124\246\154\116" +-"\037\340\235\016\007\351\311\272\063\347\376\300\125\050\054\002" +-"\200\247\031\365\236\334\125\123\003\227\173\007\110\377\231\373" +-"\067\212\044\304\131\314\120\020\143\216\252\251\032\260\204\032" +-"\206\371\137\273\261\120\156\244\321\012\314\325\161\176\037\247" +-"\033\174\365\123\156\042\137\313\053\346\324\174\135\256\326\302" +-"\306\114\345\005\001\331\355\127\374\301\043\171\374\372\310\044" +-"\203\225\363\265\152\121\001\320\167\326\351\022\241\371\032\203" +-"\373\202\033\271\260\227\364\166\006\063\103\111\240\377\013\265" +-"\372\265\002\003\001\000\001\243\201\200\060\176\060\017\006\003" +-"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006" +-"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006" +-"\003\125\035\016\004\026\004\024\313\017\306\337\102\103\314\075" +-"\313\265\110\043\241\032\172\246\052\273\064\150\060\037\006\003" +-"\125\035\043\004\030\060\026\200\024\313\017\306\337\102\103\314" +-"\075\313\265\110\043\241\032\172\246\052\273\064\150\060\033\006" +-"\003\125\035\021\004\024\060\022\201\020\151\156\146\157\100\145" +-"\055\163\172\151\147\156\157\056\150\165\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\003\202\001\001\000\311\321" +-"\016\136\056\325\314\263\174\076\313\374\075\377\015\050\225\223" +-"\004\310\277\332\315\171\270\103\220\360\244\276\357\362\357\041" +-"\230\274\324\324\135\006\366\356\102\354\060\154\240\252\251\312" +-"\361\257\212\372\077\013\163\152\076\352\056\100\176\037\256\124" +-"\141\171\353\056\010\067\327\043\363\214\237\276\035\261\341\244" +-"\165\333\240\342\124\024\261\272\034\051\244\030\366\022\272\242" +-"\024\024\343\061\065\310\100\377\267\340\005\166\127\301\034\131" +-"\362\370\277\344\355\045\142\134\204\360\176\176\037\263\276\371" +-"\267\041\021\314\003\001\126\160\247\020\222\036\033\064\201\036" +-"\255\234\032\303\004\074\355\002\141\326\036\006\363\137\072\207" +-"\362\053\361\105\207\345\075\254\321\307\127\204\275\153\256\334" +-"\330\371\266\033\142\160\013\075\066\311\102\362\062\327\172\141" +-"\346\322\333\075\317\310\251\311\233\334\333\130\104\327\157\070" +-"\257\177\170\323\243\255\032\165\272\034\301\066\174\217\036\155" +-"\034\303\165\106\256\065\005\246\366\134\075\041\356\126\360\311" +-"\202\042\055\172\124\253\160\303\175\042\145\202\160\226" +-, (PRUint32)1038 } +-}; +-static const NSSItem nss_builtins_items_307 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Microsec e-Szigno Root CA 2009", (PRUint32)31 }, +- { (void *)"\211\337\164\376\134\364\017\112\200\371\343\067\175\124\332\221" +-"\341\001\061\216" +-, (PRUint32)20 }, +- { (void *)"\370\111\364\003\274\104\055\203\276\110\151\175\051\144\374\261" +-, (PRUint32)16 }, +- { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151" +-"\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006" +-"\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145" +-"\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040" +-"\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015" +-"\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147" +-"\156\157\056\150\165" +-, (PRUint32)133 }, +- { (void *)"\002\011\000\302\176\103\004\116\107\077\031" +-, (PRUint32)11 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_308 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi", (PRUint32)52 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162" +-"\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156" +-"\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125" +-"\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040" +-"\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151" +-"\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154" +-"\141\171\151\143\151\163\151" +-, (PRUint32)119 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162" +-"\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156" +-"\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125" +-"\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040" +-"\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151" +-"\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154" +-"\141\171\151\143\151\163\151" +-, (PRUint32)119 }, +- { (void *)"\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333" +-"\254\265" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\266\060\202\002\236\240\003\002\001\002\002\020\104" +-"\231\215\074\300\003\047\275\234\166\225\271\352\333\254\265\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\165" +-"\061\013\060\011\006\003\125\004\006\023\002\124\122\061\050\060" +-"\046\006\003\125\004\012\023\037\105\154\145\153\164\162\157\156" +-"\151\153\040\102\151\154\147\151\040\107\165\166\145\156\154\151" +-"\147\151\040\101\056\123\056\061\074\060\072\006\003\125\004\003" +-"\023\063\145\055\107\165\166\145\156\040\113\157\153\040\105\154" +-"\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146\151" +-"\153\141\040\110\151\172\155\145\164\040\123\141\147\154\141\171" +-"\151\143\151\163\151\060\036\027\015\060\067\060\061\060\064\061" +-"\061\063\062\064\070\132\027\015\061\067\060\061\060\064\061\061" +-"\063\062\064\070\132\060\165\061\013\060\011\006\003\125\004\006" +-"\023\002\124\122\061\050\060\046\006\003\125\004\012\023\037\105" +-"\154\145\153\164\162\157\156\151\153\040\102\151\154\147\151\040" +-"\107\165\166\145\156\154\151\147\151\040\101\056\123\056\061\074" +-"\060\072\006\003\125\004\003\023\063\145\055\107\165\166\145\156" +-"\040\113\157\153\040\105\154\145\153\164\162\157\156\151\153\040" +-"\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145\164" +-"\040\123\141\147\154\141\171\151\143\151\163\151\060\202\001\042" +-"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003" +-"\202\001\017\000\060\202\001\012\002\202\001\001\000\303\022\040" +-"\236\260\136\000\145\215\116\106\273\200\134\351\054\006\227\325" +-"\363\162\311\160\271\347\113\145\200\301\113\276\176\074\327\124" +-"\061\224\336\325\022\272\123\026\002\352\130\143\357\133\330\363" +-"\355\052\032\252\161\110\243\334\020\055\137\137\353\134\113\234" +-"\226\010\102\045\050\021\314\212\132\142\001\120\325\353\011\123" +-"\057\370\303\217\376\263\374\375\235\242\343\137\175\276\355\013" +-"\340\140\353\151\354\063\355\330\215\373\022\111\203\000\311\213" +-"\227\214\073\163\052\062\263\022\367\271\115\362\364\115\155\307" +-"\346\326\046\067\010\362\331\375\153\134\243\345\110\134\130\274" +-"\102\276\003\132\201\272\034\065\014\000\323\365\043\176\161\060" +-"\010\046\070\334\045\021\107\055\363\272\043\020\245\277\274\002" +-"\367\103\136\307\376\260\067\120\231\173\017\223\316\346\103\054" +-"\303\176\015\362\034\103\146\140\313\141\061\107\207\243\117\256" +-"\275\126\154\114\274\274\370\005\312\144\364\351\064\241\054\265" +-"\163\341\302\076\350\310\311\064\045\010\134\363\355\246\307\224" +-"\237\255\210\103\045\327\341\071\140\376\254\071\131\002\003\001" +-"\000\001\243\102\060\100\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377" +-"\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026" +-"\004\024\237\356\104\263\224\325\372\221\117\056\331\125\232\004" +-"\126\333\055\304\333\245\060\015\006\011\052\206\110\206\367\015" +-"\001\001\005\005\000\003\202\001\001\000\177\137\271\123\133\143" +-"\075\165\062\347\372\304\164\032\313\106\337\106\151\034\122\317" +-"\252\117\302\150\353\377\200\251\121\350\075\142\167\211\075\012" +-"\165\071\361\156\135\027\207\157\150\005\301\224\154\331\135\337" +-"\332\262\131\313\245\020\212\312\314\071\315\237\353\116\336\122" +-"\377\014\360\364\222\251\362\154\123\253\233\322\107\240\037\164" +-"\367\233\232\361\057\025\237\172\144\060\030\007\074\052\017\147" +-"\312\374\017\211\141\235\145\245\074\345\274\023\133\010\333\343" +-"\377\355\273\006\273\152\006\261\172\117\145\306\202\375\036\234" +-"\213\265\015\356\110\273\270\275\252\010\264\373\243\174\313\237" +-"\315\220\166\134\206\226\170\127\012\146\371\130\032\235\375\227" +-"\051\140\336\021\246\220\034\031\034\356\001\226\042\064\064\056" +-"\221\371\267\304\047\321\173\346\277\373\200\104\132\026\345\353" +-"\340\324\012\070\274\344\221\343\325\353\134\301\254\337\033\152" +-"\174\236\345\165\322\266\227\207\333\314\207\053\103\072\204\010" +-"\257\253\074\333\367\074\146\061\206\260\235\123\171\355\370\043" +-"\336\102\343\055\202\361\017\345\372\227" +-, (PRUint32)954 } +-}; +-static const NSSItem nss_builtins_items_309 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi", (PRUint32)52 }, +- { (void *)"\335\341\322\251\001\200\056\035\207\136\204\263\200\176\113\261" +-"\375\231\101\064" +-, (PRUint32)20 }, +- { (void *)"\075\101\051\313\036\252\021\164\315\135\260\142\257\260\103\133" +-, (PRUint32)16 }, +- { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162" +-"\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156" +-"\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125" +-"\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040" +-"\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151" +-"\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154" +-"\141\171\151\143\151\163\151" +-, (PRUint32)119 }, +- { (void *)"\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333" +-"\254\265" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_310 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GlobalSign Root CA - R3", (PRUint32)24 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157" +-"\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040" +-"\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107" +-"\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125" +-"\004\003\023\012\107\154\157\142\141\154\123\151\147\156" +-, (PRUint32)78 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157" +-"\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040" +-"\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107" +-"\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125" +-"\004\003\023\012\107\154\157\142\141\154\123\151\147\156" +-, (PRUint32)78 }, +- { (void *)"\002\013\004\000\000\000\000\001\041\130\123\010\242" +-, (PRUint32)13 }, +- { (void *)"\060\202\003\137\060\202\002\107\240\003\002\001\002\002\013\004" +-"\000\000\000\000\001\041\130\123\010\242\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\060\114\061\040\060\036\006" +-"\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147\156" +-"\040\122\157\157\164\040\103\101\040\055\040\122\063\061\023\060" +-"\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123\151" +-"\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154\157" +-"\142\141\154\123\151\147\156\060\036\027\015\060\071\060\063\061" +-"\070\061\060\060\060\060\060\132\027\015\062\071\060\063\061\070" +-"\061\060\060\060\060\060\132\060\114\061\040\060\036\006\003\125" +-"\004\013\023\027\107\154\157\142\141\154\123\151\147\156\040\122" +-"\157\157\164\040\103\101\040\055\040\122\063\061\023\060\021\006" +-"\003\125\004\012\023\012\107\154\157\142\141\154\123\151\147\156" +-"\061\023\060\021\006\003\125\004\003\023\012\107\154\157\142\141" +-"\154\123\151\147\156\060\202\001\042\060\015\006\011\052\206\110" +-"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001" +-"\012\002\202\001\001\000\314\045\166\220\171\006\170\042\026\365" +-"\300\203\266\204\312\050\236\375\005\166\021\305\255\210\162\374" +-"\106\002\103\307\262\212\235\004\137\044\313\056\113\341\140\202" +-"\106\341\122\253\014\201\107\160\154\335\144\321\353\365\054\243" +-"\017\202\075\014\053\256\227\327\266\024\206\020\171\273\073\023" +-"\200\167\214\010\341\111\322\152\142\057\037\136\372\226\150\337" +-"\211\047\225\070\237\006\327\076\311\313\046\131\015\163\336\260" +-"\310\351\046\016\203\025\306\357\133\213\322\004\140\312\111\246" +-"\050\366\151\073\366\313\310\050\221\345\235\212\141\127\067\254" +-"\164\024\334\164\340\072\356\162\057\056\234\373\320\273\277\365" +-"\075\000\341\006\063\350\202\053\256\123\246\072\026\163\214\335" +-"\101\016\040\072\300\264\247\241\351\262\117\220\056\062\140\351" +-"\127\313\271\004\222\150\150\345\070\046\140\165\262\237\167\377" +-"\221\024\357\256\040\111\374\255\100\025\110\321\002\061\141\031" +-"\136\270\227\357\255\167\267\144\232\172\277\137\301\023\357\233" +-"\142\373\015\154\340\124\151\026\251\003\332\156\351\203\223\161" +-"\166\306\151\205\202\027\002\003\001\000\001\243\102\060\100\060" +-"\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060" +-"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377" +-"\060\035\006\003\125\035\016\004\026\004\024\217\360\113\177\250" +-"\056\105\044\256\115\120\372\143\232\213\336\342\335\033\274\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202" +-"\001\001\000\113\100\333\300\120\252\376\310\014\357\367\226\124" +-"\105\111\273\226\000\011\101\254\263\023\206\206\050\007\063\312" +-"\153\346\164\271\272\000\055\256\244\012\323\365\361\361\017\212" +-"\277\163\147\112\203\307\104\173\170\340\257\156\154\157\003\051" +-"\216\063\071\105\303\216\344\271\127\154\252\374\022\226\354\123" +-"\306\055\344\044\154\271\224\143\373\334\123\150\147\126\076\203" +-"\270\317\065\041\303\311\150\376\316\332\302\123\252\314\220\212" +-"\351\360\135\106\214\225\335\172\130\050\032\057\035\336\315\000" +-"\067\101\217\355\104\155\327\123\050\227\176\363\147\004\036\025" +-"\327\212\226\264\323\336\114\047\244\114\033\163\163\166\364\027" +-"\231\302\037\172\016\343\055\010\255\012\034\054\377\074\253\125" +-"\016\017\221\176\066\353\303\127\111\276\341\056\055\174\140\213" +-"\303\101\121\023\043\235\316\367\062\153\224\001\250\231\347\054" +-"\063\037\072\073\045\322\206\100\316\073\054\206\170\311\141\057" +-"\024\272\356\333\125\157\337\204\356\005\011\115\275\050\330\162" +-"\316\323\142\120\145\036\353\222\227\203\061\331\263\265\312\107" +-"\130\077\137" +-, (PRUint32)867 } +-}; +-static const NSSItem nss_builtins_items_311 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GlobalSign Root CA - R3", (PRUint32)24 }, +- { (void *)"\326\233\126\021\110\360\034\167\305\105\170\301\011\046\337\133" +-"\205\151\166\255" +-, (PRUint32)20 }, +- { (void *)"\305\337\270\111\312\005\023\125\356\055\272\032\303\076\260\050" +-, (PRUint32)16 }, +- { (void *)"\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157" +-"\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040" +-"\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107" +-"\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125" +-"\004\003\023\012\107\154\157\142\141\154\123\151\147\156" +-, (PRUint32)78 }, +- { (void *)"\002\013\004\000\000\000\000\001\041\130\123\010\242" +-, (PRUint32)13 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; + +@@ -21112,79 +16685,11 @@ nss_builtins_data[] = { + { 11, nss_builtins_types_240, nss_builtins_items_240, {NULL} }, + { 13, nss_builtins_types_241, nss_builtins_items_241, {NULL} }, + { 11, nss_builtins_types_242, nss_builtins_items_242, {NULL} }, +- { 13, nss_builtins_types_243, nss_builtins_items_243, {NULL} }, +- { 11, nss_builtins_types_244, nss_builtins_items_244, {NULL} }, +- { 13, nss_builtins_types_245, nss_builtins_items_245, {NULL} }, +- { 11, nss_builtins_types_246, nss_builtins_items_246, {NULL} }, +- { 13, nss_builtins_types_247, nss_builtins_items_247, {NULL} }, +- { 11, nss_builtins_types_248, nss_builtins_items_248, {NULL} }, +- { 13, nss_builtins_types_249, nss_builtins_items_249, {NULL} }, +- { 11, nss_builtins_types_250, nss_builtins_items_250, {NULL} }, +- { 13, nss_builtins_types_251, nss_builtins_items_251, {NULL} }, +- { 11, nss_builtins_types_252, nss_builtins_items_252, {NULL} }, +- { 13, nss_builtins_types_253, nss_builtins_items_253, {NULL} }, +- { 11, nss_builtins_types_254, nss_builtins_items_254, {NULL} }, +- { 13, nss_builtins_types_255, nss_builtins_items_255, {NULL} }, +- { 11, nss_builtins_types_256, nss_builtins_items_256, {NULL} }, +- { 13, nss_builtins_types_257, nss_builtins_items_257, {NULL} }, +- { 11, nss_builtins_types_258, nss_builtins_items_258, {NULL} }, +- { 13, nss_builtins_types_259, nss_builtins_items_259, {NULL} }, +- { 11, nss_builtins_types_260, nss_builtins_items_260, {NULL} }, +- { 13, nss_builtins_types_261, nss_builtins_items_261, {NULL} }, +- { 11, nss_builtins_types_262, nss_builtins_items_262, {NULL} }, +- { 13, nss_builtins_types_263, nss_builtins_items_263, {NULL} }, +- { 11, nss_builtins_types_264, nss_builtins_items_264, {NULL} }, +- { 13, nss_builtins_types_265, nss_builtins_items_265, {NULL} }, +- { 11, nss_builtins_types_266, nss_builtins_items_266, {NULL} }, +- { 13, nss_builtins_types_267, nss_builtins_items_267, {NULL} }, +- { 11, nss_builtins_types_268, nss_builtins_items_268, {NULL} }, +- { 13, nss_builtins_types_269, nss_builtins_items_269, {NULL} }, +- { 11, nss_builtins_types_270, nss_builtins_items_270, {NULL} }, +- { 13, nss_builtins_types_271, nss_builtins_items_271, {NULL} }, +- { 11, nss_builtins_types_272, nss_builtins_items_272, {NULL} }, +- { 13, nss_builtins_types_273, nss_builtins_items_273, {NULL} }, +- { 11, nss_builtins_types_274, nss_builtins_items_274, {NULL} }, +- { 13, nss_builtins_types_275, nss_builtins_items_275, {NULL} }, +- { 11, nss_builtins_types_276, nss_builtins_items_276, {NULL} }, +- { 13, nss_builtins_types_277, nss_builtins_items_277, {NULL} }, +- { 11, nss_builtins_types_278, nss_builtins_items_278, {NULL} }, +- { 13, nss_builtins_types_279, nss_builtins_items_279, {NULL} }, +- { 11, nss_builtins_types_280, nss_builtins_items_280, {NULL} }, +- { 13, nss_builtins_types_281, nss_builtins_items_281, {NULL} }, +- { 11, nss_builtins_types_282, nss_builtins_items_282, {NULL} }, +- { 13, nss_builtins_types_283, nss_builtins_items_283, {NULL} }, +- { 11, nss_builtins_types_284, nss_builtins_items_284, {NULL} }, +- { 13, nss_builtins_types_285, nss_builtins_items_285, {NULL} }, +- { 11, nss_builtins_types_286, nss_builtins_items_286, {NULL} }, +- { 13, nss_builtins_types_287, nss_builtins_items_287, {NULL} }, +- { 11, nss_builtins_types_288, nss_builtins_items_288, {NULL} }, +- { 13, nss_builtins_types_289, nss_builtins_items_289, {NULL} }, +- { 11, nss_builtins_types_290, nss_builtins_items_290, {NULL} }, +- { 13, nss_builtins_types_291, nss_builtins_items_291, {NULL} }, +- { 11, nss_builtins_types_292, nss_builtins_items_292, {NULL} }, +- { 13, nss_builtins_types_293, nss_builtins_items_293, {NULL} }, +- { 11, nss_builtins_types_294, nss_builtins_items_294, {NULL} }, +- { 13, nss_builtins_types_295, nss_builtins_items_295, {NULL} }, +- { 11, nss_builtins_types_296, nss_builtins_items_296, {NULL} }, +- { 13, nss_builtins_types_297, nss_builtins_items_297, {NULL} }, +- { 11, nss_builtins_types_298, nss_builtins_items_298, {NULL} }, +- { 13, nss_builtins_types_299, nss_builtins_items_299, {NULL} }, +- { 11, nss_builtins_types_300, nss_builtins_items_300, {NULL} }, +- { 13, nss_builtins_types_301, nss_builtins_items_301, {NULL} }, +- { 11, nss_builtins_types_302, nss_builtins_items_302, {NULL} }, +- { 13, nss_builtins_types_303, nss_builtins_items_303, {NULL} }, +- { 11, nss_builtins_types_304, nss_builtins_items_304, {NULL} }, +- { 13, nss_builtins_types_305, nss_builtins_items_305, {NULL} }, +- { 11, nss_builtins_types_306, nss_builtins_items_306, {NULL} }, +- { 13, nss_builtins_types_307, nss_builtins_items_307, {NULL} }, +- { 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} }, +- { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} }, +- { 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} }, +- { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} } ++ { 13, nss_builtins_types_243, nss_builtins_items_243, {NULL} } + }; + const PRUint32 + #ifdef DEBUG +- nss_builtins_nObjects = 311+1; ++ nss_builtins_nObjects = 243+1; + #else +- nss_builtins_nObjects = 311; ++ nss_builtins_nObjects = 243; + #endif /* DEBUG */ +diff -prauN nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.txt nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +--- nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-30 18:02:26.450122000 +0000 ++++ nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-30 18:03:33.620122001 +0000 +@@ -34,7 +34,7 @@ + # the terms of any one of the MPL, the GPL or the LGPL. + # + # ***** END LICENSE BLOCK ***** +-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.1 $ $Date: 2010/08/27 15:46:44 $" ++CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $" + + # + # certdata.txt +@@ -103,96 +103,6 @@ CKA_MODIFIABLE CK_BBOOL CK_FALSE + CKA_LABEL UTF8 "Mozilla Builtin Roots" + + # +-# Certificate "GTE CyberTrust Root CA" +-# +-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 Root CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\105\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\034\060\032\006\003\125 +-\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165 +-\163\164\040\122\157\157\164 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\105\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\034\060\032\006\003\125 +-\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165 +-\163\164\040\122\157\157\164 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\001\243 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\001\372\060\202\001\143\002\002\001\243\060\015\006\011 +-\052\206\110\206\367\015\001\001\004\005\000\060\105\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\034\060\032\006\003\125\004\003\023\023\107 +-\124\105\040\103\171\142\145\162\124\162\165\163\164\040\122\157 +-\157\164\060\036\027\015\071\066\060\062\062\063\062\063\060\061 +-\060\060\132\027\015\060\066\060\062\062\063\062\063\065\071\060 +-\060\132\060\105\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\034\060\032\006 +-\003\125\004\003\023\023\107\124\105\040\103\171\142\145\162\124 +-\162\165\163\164\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\270\346\117\272\333\230\174\161\174\257 +-\104\267\323\017\106\331\144\345\223\301\102\216\307\272\111\215 +-\065\055\172\347\213\275\345\005\061\131\306\261\057\012\014\373 +-\237\247\077\242\011\146\204\126\036\067\051\033\207\351\176\014 +-\312\232\237\245\177\365\025\224\243\325\242\106\202\330\150\114 +-\321\067\025\006\150\257\275\370\260\263\360\051\365\225\132\011 +-\026\141\167\012\042\045\324\117\105\252\307\275\345\226\337\371 +-\324\250\216\102\314\044\300\036\221\047\112\265\155\006\200\143 +-\071\304\242\136\070\003\002\003\001\000\001\060\015\006\011\052 +-\206\110\206\367\015\001\001\004\005\000\003\201\201\000\022\263 +-\165\306\137\035\341\141\125\200\000\324\201\113\173\061\017\043 +-\143\347\075\363\003\371\364\066\250\273\331\343\245\227\115\352 +-\053\051\340\326\152\163\201\346\300\211\243\323\361\340\245\245 +-\042\067\232\143\302\110\040\264\333\162\343\310\366\331\174\276 +-\261\257\123\332\024\264\041\270\326\325\226\343\376\116\014\131 +-\142\266\232\112\371\102\335\214\157\201\251\161\377\364\012\162 +-\155\155\104\016\235\363\164\164\250\325\064\111\351\136\236\351 +-\264\172\341\345\132\037\204\060\234\323\237\245\045\330 +-END +- +-# Trust for Certificate "GTE CyberTrust Root CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GTE CyberTrust Root CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\220\336\336\236\114\116\237\157\330\206\027\127\235\323\221\274 +-\145\246\211\144 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\304\327\360\262\243\305\175\141\147\360\004\315\103\323\272\130 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\105\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\034\060\032\006\003\125 +-\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165 +-\163\164\040\122\157\157\164 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\001\243 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "GTE CyberTrust Global Root" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -295,6 +205,275 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE ++ ++# ++# Certificate "Thawte Personal Basic CA" ++# ++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 Personal Basic CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\201\313\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151 ++\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015 ++\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141 ++\163\151\143\100\164\150\141\167\164\145\056\143\157\155 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\313\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151 ++\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015 ++\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141 ++\163\151\143\100\164\150\141\167\164\145\056\143\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\201\313\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\032\060\030\006\003 ++\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163 ++\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151\143 ++\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015\001 ++\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141\163 ++\151\143\100\164\150\141\167\164\145\056\143\157\155\060\036\027 ++\015\071\066\060\061\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\313 ++\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\032\060\030\006\003\125\004 ++\012\023\021\124\150\141\167\164\145\040\103\157\156\163\165\154 ++\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151\143\040\103 ++\101\061\050\060\046\006\011\052\206\110\206\367\015\001\011\001 ++\026\031\160\145\162\163\157\156\141\154\055\142\141\163\151\143 ++\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\274\274\223\123\155\300\120\117 ++\202\025\346\110\224\065\246\132\276\157\102\372\017\107\356\167 ++\165\162\335\215\111\233\226\127\240\170\324\312\077\121\263\151 ++\013\221\166\027\042\007\227\152\304\121\223\113\340\215\357\067 ++\225\241\014\115\332\064\220\035\027\211\227\340\065\070\127\112 ++\300\364\010\160\351\074\104\173\120\176\141\232\220\343\043\323 ++\210\021\106\047\365\013\007\016\273\335\321\177\040\012\210\271 ++\126\013\056\034\200\332\361\343\236\051\357\024\275\012\104\373 ++\033\133\030\321\277\043\223\041\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\055\342\231\153\260\075\172\211\327\131\242 ++\224\001\037\053\335\022\113\123\302\255\177\252\247\000\134\221 ++\100\127\045\112\070\252\204\160\271\331\200\017\245\173\134\373 ++\163\306\275\327\212\141\134\003\343\055\047\250\027\340\204\205 ++\102\334\136\233\306\267\262\155\273\164\257\344\077\313\247\267 ++\260\340\135\276\170\203\045\224\322\333\201\017\171\007\155\117 ++\364\071\025\132\122\001\173\336\062\326\115\070\366\022\134\006 ++\120\337\005\133\275\024\113\241\337\051\272\073\101\215\367\143 ++\126\241\337\042\261 ++END ++ ++# Trust for Certificate "Thawte Personal Basic CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Thawte Personal Basic CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\100\347\214\035\122\075\034\331\225\117\254\032\032\263\275\074 ++\272\241\133\374 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\346\013\322\311\312\055\210\333\032\161\016\113\170\353\002\101 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\313\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151 ++\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015 ++\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141 ++\163\151\143\100\164\150\141\167\164\145\056\143\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Thawte Personal Premium CA" ++# ++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 Personal Premium CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\201\317\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167 ++\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155 ++\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206 ++\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055 ++\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143 ++\157\155 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\317\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167 ++\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155 ++\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206 ++\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055 ++\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143 ++\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\201\317\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\032\060\030\006\003 ++\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163 ++\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167\164 ++\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155\151 ++\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206\367 ++\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055\160 ++\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143\157 ++\155\060\036\027\015\071\066\060\061\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\317\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\032\060\030 ++\006\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157 ++\156\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141 ++\167\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145 ++\155\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110 ++\206\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154 ++\055\160\162\145\155\151\165\155\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 ++\311\146\331\370\007\104\317\271\214\056\360\241\357\023\105\154 ++\005\337\336\047\026\121\066\101\021\154\154\073\355\376\020\175 ++\022\236\345\233\102\232\376\140\061\303\146\267\163\072\110\256 ++\116\320\062\067\224\210\265\015\266\331\363\362\104\331\325\210 ++\022\335\166\115\362\032\374\157\043\036\172\361\330\230\105\116 ++\007\020\357\026\102\320\103\165\155\112\336\342\252\311\061\377 ++\037\000\160\174\146\317\020\045\010\272\372\356\000\351\106\003 ++\146\047\021\025\073\252\133\362\230\335\066\102\262\332\210\165 ++\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\151\066\211 ++\367\064\052\063\162\057\155\073\324\042\262\270\157\232\305\066 ++\146\016\033\074\241\261\165\132\346\375\065\323\370\250\362\007 ++\157\205\147\216\336\053\271\342\027\260\072\240\360\016\242\000 ++\232\337\363\024\025\156\273\310\205\132\230\200\371\377\276\164 ++\035\075\363\376\060\045\321\067\064\147\372\245\161\171\060\141 ++\051\162\300\340\054\114\373\126\344\072\250\157\345\062\131\122 ++\333\165\050\120\131\014\370\013\031\344\254\331\257\226\215\057 ++\120\333\007\303\352\037\253\063\340\365\053\061\211 ++END ++ ++# Trust for Certificate "Thawte Personal Premium CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Thawte Personal Premium CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\066\206\065\143\375\121\050\307\276\246\360\005\317\351\264\066 ++\150\010\154\316 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\072\262\336\042\232\040\223\111\371\355\310\322\212\347\150\015 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\317\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167 ++\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155 ++\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206 ++\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055 ++\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143 ++\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -564,170 +743,34 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # +-# Certificate "Thawte Premium Server CA" ++# Certificate "Equifax Secure CA" + # + 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_LABEL UTF8 "Equifax Secure 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 ++\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 ++\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 ++\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 ++\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 ++\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 + 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 ++\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 ++\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 ++\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 ++\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 ++\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 + 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" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_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_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Equifax Secure CA" +-# +-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 "Equifax Secure CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 +-\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 +-\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 +-\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 +-\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\065\336\364\317 ++\002\004\065\336\364\317 + END + CKA_VALUE MULTILINE_OCTAL + \060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\065 +@@ -918,7 +961,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Digital Signature Trust Co. Global CA 3" +@@ -1027,7 +1070,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Verisign Class 1 Public Primary Certification Authority" +@@ -1334,7 +1377,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Verisign Class 1 Public Primary Certification Authority - G2" +@@ -1736,139 +1779,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Verisign Class 4 Public Primary Certification Authority - G2" +-# +-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 "Verisign Class 4 Public Primary Certification Authority - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125 +-\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154 +-\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151 +-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +-\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013 +-\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145 +-\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164 +-\167\157\162\153 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125 +-\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154 +-\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151 +-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +-\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013 +-\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145 +-\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164 +-\167\157\162\153 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067 +-\045\370 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365 +-\353\023\107\370\177\304\040\067\045\370\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +-\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\061\074\060\072\006\003\125\004\013\023\063\103\154\141 +-\163\163\040\064\040\120\165\142\154\151\143\040\120\162\151\155 +-\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157 +-\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107\062 +-\061\072\060\070\006\003\125\004\013\023\061\050\143\051\040\061 +-\071\071\070\040\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 +-\172\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035 +-\006\003\125\004\013\023\026\126\145\162\151\123\151\147\156\040 +-\124\162\165\163\164\040\116\145\164\167\157\162\153\060\036\027 +-\015\071\070\060\065\061\070\060\060\060\060\060\060\132\027\015 +-\062\070\060\070\060\061\062\063\065\071\065\071\132\060\201\301 +-\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060 +-\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147\156 +-\054\040\111\156\143\056\061\074\060\072\006\003\125\004\013\023 +-\063\103\154\141\163\163\040\064\040\120\165\142\154\151\143\040 +-\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143 +-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040 +-\055\040\107\062\061\072\060\070\006\003\125\004\013\023\061\050 +-\143\051\040\061\071\071\070\040\126\145\162\151\123\151\147\156 +-\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165\164 +-\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171 +-\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151\123 +-\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157\162 +-\153\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\272\360 +-\344\317\371\304\256\205\124\271\007\127\371\217\305\177\150\021 +-\370\304\027\260\104\334\343\060\163\325\052\142\052\270\320\314 +-\034\355\050\133\176\275\152\334\263\221\044\312\101\142\074\374 +-\002\001\277\034\026\061\224\005\227\166\156\242\255\275\141\027 +-\154\116\060\206\360\121\067\052\120\307\250\142\201\334\133\112 +-\252\301\240\264\156\353\057\345\127\305\261\053\100\160\333\132 +-\115\241\216\037\275\003\037\330\003\324\217\114\231\161\274\342 +-\202\314\130\350\230\072\206\323\206\070\363\000\051\037\002\003 +-\001\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\003\201\201\000\205\214\022\301\247\271\120\025\172\313 +-\076\254\270\103\212\334\252\335\024\272\211\201\176\001\074\043 +-\161\041\210\057\202\334\143\372\002\105\254\105\131\327\052\130 +-\104\133\267\237\201\073\222\150\075\342\067\044\365\173\154\217 +-\166\065\226\011\250\131\235\271\316\043\253\164\326\203\375\062 +-\163\047\330\151\076\103\164\366\256\305\211\232\347\123\174\351 +-\173\366\113\363\301\145\203\336\215\212\234\074\210\215\071\131 +-\374\252\077\042\215\241\301\146\120\201\162\114\355\042\144\117 +-\117\312\200\221\266\051 +-END +- +-# Trust for Certificate "Verisign Class 4 Public Primary Certification Authority - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Verisign Class 4 Public Primary Certification Authority - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\013\167\276\273\313\172\242\107\005\336\314\017\275\152\002\374 +-\172\275\233\122 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\046\155\054\031\230\266\160\150\070\120\124\031\354\220\064\140 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125 +-\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154 +-\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151 +-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +-\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013 +-\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145 +-\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164 +-\167\157\162\153 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067 +-\045\370 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "GlobalSign Root CA" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -3079,7 +2989,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Entrust.net Secure Server CA" +@@ -3242,168 +3152,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Entrust.net Secure Personal CA" +-# +-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 Personal CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\311\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\110\060\106\006\003\125\004\013\024 +-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164 +-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057 +-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162 +-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056 +-\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\063\060\061\006\003\125\004\003 +-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154 +-\151\145\156\164\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\311\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\110\060\106\006\003\125\004\013\024 +-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164 +-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057 +-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162 +-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056 +-\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\063\060\061\006\003\125\004\003 +-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154 +-\151\145\156\164\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\070\003\221\356 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070 +-\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004 +-\005\000\060\201\311\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\110\060\106\006\003\125\004 +-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156 +-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146 +-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171 +-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141 +-\142\056\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\063\060\061\006\003\125 +-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040 +-\103\154\151\145\156\164\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\061\060\061\062\061\071\062\064\063\060\132\027 +-\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201 +-\311\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\110\060\106\006\003\125\004\013\024\077\167 +-\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103 +-\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120 +-\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146 +-\056\040\154\151\155\151\164\163\040\154\151\141\142\056\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\063\060\061\006\003\125\004\003\023\052 +-\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145 +-\156\164\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\310\072\231\136\061\027\337\254\047 +-\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150 +-\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107 +-\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226 +-\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261 +-\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164 +-\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126 +-\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346 +-\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202 +-\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004 +-\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202 +-\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244 +-\201\333\060\201\330\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\110\060\106\006\003\125\004 +-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156 +-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146 +-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171 +-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141 +-\142\056\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\063\060\061\006\003\125 +-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040 +-\103\154\151\145\156\164\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\054\240 +-\052\240\050\206\046\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 +-\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125 +-\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062 +-\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061 +-\062\061\071\062\064\063\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\304\373\234\051\173\227\315\114\226\374\356\133\263\312 +-\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004 +-\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231 +-\164\213\225\352\114\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\004\005\000\003\201\201 +-\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273 +-\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002 +-\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007 +-\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363 +-\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070 +-\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003 +-\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332 +-\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134 +-\354 +-END +- +-# Trust for Certificate "Entrust.net Secure Personal CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_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 Personal CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125 +-\262\371\365\200 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\311\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\110\060\106\006\003\125\004\013\024 +-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164 +-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057 +-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162 +-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056 +-\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\063\060\061\006\003\125\004\003 +-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154 +-\151\145\156\164\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\070\003\221\356 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "Entrust.net Premium 2048 Secure Server CA" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -3875,288 +3623,35 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Equifax Secure eBusiness CA 2" ++# Certificate "AddTrust Low-Value Services Root" + # + 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 "Equifax Secure eBusiness CA 2" ++CKA_LABEL UTF8 "AddTrust Low-Value Services Root" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141 +-\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004 +-\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162 +-\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062 ++\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 ++\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 ++\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 ++\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 ++\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 ++\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 ++\103\101\040\122\157\157\164 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141 +-\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004 +-\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162 +-\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062 ++\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 ++\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 ++\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 ++\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 ++\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 ++\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 ++\103\101\040\122\157\157\164 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\067\160\317\265 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\067 +-\160\317\265\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125 +-\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003 +-\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143 +-\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101 +-\055\062\060\036\027\015\071\071\060\066\062\063\061\062\061\064 +-\064\065\132\027\015\061\071\060\066\062\063\061\062\061\064\064 +-\065\132\060\116\061\013\060\011\006\003\125\004\006\023\002\125 +-\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003 +-\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143 +-\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101 +-\055\062\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\344 +-\071\071\223\036\122\006\033\050\066\370\262\243\051\305\355\216 +-\262\021\275\376\353\347\264\164\302\217\377\005\347\331\235\006 +-\277\022\310\077\016\362\326\321\044\262\021\336\321\163\011\212 +-\324\261\054\230\011\015\036\120\106\262\203\246\105\215\142\150 +-\273\205\033\040\160\062\252\100\315\246\226\137\304\161\067\077 +-\004\363\267\101\044\071\007\032\036\056\141\130\240\022\013\345 +-\245\337\305\253\352\067\161\314\034\310\067\072\271\227\122\247 +-\254\305\152\044\224\116\234\173\317\300\152\326\337\041\275\002 +-\003\001\000\001\243\202\001\011\060\202\001\005\060\160\006\003 +-\125\035\037\004\151\060\147\060\145\240\143\240\141\244\137\060 +-\135\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027 +-\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141\170 +-\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004\013 +-\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162\145 +-\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062\061 +-\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060\032 +-\006\003\125\035\020\004\023\060\021\201\017\062\060\061\071\060 +-\066\062\063\061\062\061\064\064\065\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\120\236\013\352\257\136\271\040\110\246\120\152 +-\313\375\330\040\172\247\202\166\060\035\006\003\125\035\016\004 +-\026\004\024\120\236\013\352\257\136\271\040\110\246\120\152\313 +-\375\330\040\172\247\202\166\060\014\006\003\125\035\023\004\005 +-\060\003\001\001\377\060\032\006\011\052\206\110\206\366\175\007 +-\101\000\004\015\060\013\033\005\126\063\056\060\143\003\002\006 +-\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +-\003\201\201\000\014\206\202\255\350\116\032\365\216\211\047\342 +-\065\130\075\051\264\007\217\066\120\225\277\156\301\236\353\304 +-\220\262\205\250\273\267\102\340\017\007\071\337\373\236\220\262 +-\321\301\076\123\237\003\104\260\176\113\364\157\344\174\037\347 +-\342\261\344\270\232\357\303\275\316\336\013\062\064\331\336\050 +-\355\063\153\304\324\327\075\022\130\253\175\011\055\313\160\365 +-\023\212\224\241\047\244\326\160\305\155\224\265\311\175\235\240 +-\322\306\010\111\331\146\233\246\323\364\013\334\305\046\127\341 +-\221\060\352\315 +-END +- +-# Trust for Certificate "Equifax Secure eBusiness CA 2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Equifax Secure eBusiness CA 2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\071\117\366\205\013\006\276\122\345\030\126\314\020\341\200\350 +-\202\263\205\314 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\252\277\277\144\227\332\230\035\157\306\010\072\225\160\063\312 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141 +-\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004 +-\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162 +-\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\067\160\317\265 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "beTRUSTed Root CA" +-# +-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 "beTRUSTed Root CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061 +-\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123 +-\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163 +-\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061 +-\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123 +-\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163 +-\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\071\117\175\207 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\054\060\202\004\024\240\003\002\001\002\002\004\071 +-\117\175\207\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\127 +-\127\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122 +-\125\123\124\145\144\061\033\060\031\006\003\125\004\003\023\022 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\163\061\032\060\030\006\003\125\004\003\023\021\142\145\124 +-\122\125\123\124\145\144\040\122\157\157\164\040\103\101\060\036 +-\027\015\060\060\060\066\062\060\061\064\062\061\060\064\132\027 +-\015\061\060\060\066\062\060\061\063\062\061\060\064\132\060\132 +-\061\013\060\011\006\003\125\004\006\023\002\127\127\061\022\060 +-\020\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145 +-\144\061\033\060\031\006\003\125\004\003\023\022\142\145\124\122 +-\125\123\124\145\144\040\122\157\157\164\040\103\101\163\061\032 +-\060\030\006\003\125\004\003\023\021\142\145\124\122\125\123\124 +-\145\144\040\122\157\157\164\040\103\101\060\202\001\042\060\015 +-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 +-\017\000\060\202\001\012\002\202\001\001\000\324\264\163\172\023 +-\012\070\125\001\276\211\126\341\224\236\324\276\132\353\112\064 +-\165\033\141\051\304\341\255\010\140\041\170\110\377\264\320\372 +-\136\101\215\141\104\207\350\355\311\130\372\374\223\232\337\117 +-\352\076\065\175\370\063\172\346\361\327\315\157\111\113\075\117 +-\055\156\016\203\072\030\170\167\243\317\347\364\115\163\330\232 +-\073\032\035\276\225\123\317\040\227\302\317\076\044\122\154\014 +-\216\145\131\305\161\377\142\011\217\252\305\217\314\140\240\163 +-\112\327\070\077\025\162\277\242\227\267\160\350\257\342\176\026 +-\006\114\365\252\144\046\162\007\045\255\065\374\030\261\046\327 +-\330\377\031\016\203\033\214\334\170\105\147\064\075\364\257\034 +-\215\344\155\153\355\040\263\147\232\264\141\313\027\157\211\065 +-\377\347\116\300\062\022\347\356\354\337\377\227\060\164\355\215 +-\107\216\353\264\303\104\346\247\114\177\126\103\350\270\274\266 +-\276\372\203\227\346\273\373\304\266\223\276\031\030\076\214\201 +-\271\163\210\026\364\226\103\234\147\163\027\220\330\011\156\143 +-\254\112\266\043\304\001\241\255\244\344\305\002\003\001\000\001 +-\243\202\001\370\060\202\001\364\060\017\006\003\125\035\023\001 +-\001\377\004\005\060\003\001\001\377\060\202\001\131\006\003\125 +-\035\040\004\202\001\120\060\202\001\114\060\202\001\110\006\012 +-\053\006\001\004\001\261\076\001\000\000\060\202\001\070\060\202 +-\001\001\006\010\053\006\001\005\005\007\002\002\060\201\364\032 +-\201\361\122\145\154\151\141\156\143\145\040\157\156\040\164\150 +-\151\163\040\143\145\162\164\151\146\151\143\141\164\145\040\142 +-\171\040\141\156\171\040\160\141\162\164\171\040\141\163\163\165 +-\155\145\163\040\141\143\143\145\160\164\141\156\143\145\040\157 +-\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154\151 +-\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040\164 +-\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164\151 +-\157\156\163\040\157\146\040\165\163\145\054\040\141\156\144\040 +-\143\145\162\164\151\146\151\143\141\164\151\157\156\040\160\162 +-\141\143\164\151\143\145\040\163\164\141\164\145\155\145\156\164 +-\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040\146 +-\157\165\156\144\040\141\164\040\142\145\124\122\125\123\124\145 +-\144\047\163\040\167\145\142\040\163\151\164\145\054\040\150\164 +-\164\160\163\072\057\057\167\167\167\056\142\145\124\122\125\123 +-\124\145\144\056\143\157\155\057\166\141\165\154\164\057\164\145 +-\162\155\163\060\061\006\010\053\006\001\005\005\007\002\001\026 +-\045\150\164\164\160\163\072\057\057\167\167\167\056\142\145\124 +-\122\125\123\124\145\144\056\143\157\155\057\166\141\165\154\164 +-\057\164\145\162\155\163\060\064\006\003\125\035\037\004\055\060 +-\053\060\051\240\047\240\045\244\043\060\041\061\022\060\020\006 +-\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144\061 +-\013\060\011\006\003\125\004\006\023\002\127\127\060\035\006\003 +-\125\035\016\004\026\004\024\052\271\233\151\056\073\233\330\315 +-\336\052\061\004\064\153\312\007\030\253\147\060\037\006\003\125 +-\035\043\004\030\060\026\200\024\052\271\233\151\056\073\233\330 +-\315\336\052\061\004\064\153\312\007\030\253\147\060\016\006\003 +-\125\035\017\001\001\377\004\004\003\002\001\376\060\015\006\011 +-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000 +-\171\141\333\243\136\156\026\261\352\166\121\371\313\025\233\313 +-\151\276\346\201\153\237\050\037\145\076\335\021\205\222\324\350 +-\101\277\176\063\275\043\347\361\040\277\244\264\246\031\001\306 +-\214\215\065\174\145\244\117\011\244\326\330\043\025\005\023\247 +-\103\171\257\333\243\016\233\173\170\032\363\004\206\132\306\366 +-\214\040\107\070\111\120\006\235\162\147\072\360\230\003\255\226 +-\147\104\374\077\020\015\206\115\344\000\073\051\173\316\073\073 +-\231\206\141\045\100\204\334\023\142\267\372\312\131\326\003\036 +-\326\123\001\315\155\114\150\125\100\341\356\153\307\052\000\000 +-\110\202\263\012\001\303\140\052\014\367\202\065\356\110\206\226 +-\344\164\324\075\352\001\161\272\004\165\100\247\251\177\071\071 +-\232\125\227\051\145\256\031\125\045\005\162\107\323\350\030\334 +-\270\351\257\103\163\001\022\164\243\341\134\137\025\135\044\363 +-\371\344\364\266\147\147\022\347\144\042\212\366\245\101\246\034 +-\266\140\143\105\212\020\264\272\106\020\256\101\127\145\154\077 +-\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256 +-END +- +-# Trust for Certificate "beTRUSTed Root CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\133\315\315\314\146\366\334\344\104\037\343\175\134\303\023\114 +-\106\364\160\070 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\205\312\166\132\033\321\150\042\334\242\043\022\312\306\200\064 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061 +-\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123 +-\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163 +-\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\071\117\175\207 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "AddTrust Low-Value Services Root" +-# +-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 "AddTrust Low-Value Services Root" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 +-\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 +-\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 +-\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 +-\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 +-\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 +-\103\101\040\122\157\157\164 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 +-\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 +-\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 +-\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 +-\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 +-\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 +-\103\101\040\122\157\157\164 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 ++\002\001\001 + END + CKA_VALUE MULTILINE_OCTAL + \060\202\004\030\060\202\003\000\240\003\002\001\002\002\001\001 +@@ -4654,424 +4149,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Thawte Time Stamping CA" +-# +-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 Time Stamping CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\213\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\024\060\022\006\003\125\004\007 +-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060 +-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035 +-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060 +-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\040\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\213\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\024\060\022\006\003\125\004\007 +-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060 +-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035 +-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060 +-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000 +-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 +-\201\213\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\024\060\022\006\003\125\004\007\023 +-\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015 +-\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060 +-\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035 +-\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027 +-\015\071\067\060\061\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\213 +-\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\024\060\022\006\003\125\004\007\023\013\104 +-\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003 +-\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006 +-\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162 +-\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003 +-\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145 +-\163\164\141\155\160\151\156\147\040\103\101\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\326\053\130\170\141\105\206\123 +-\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047 +-\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237 +-\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032 +-\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376 +-\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235 +-\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213 +-\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137 +-\355\372\267\056\212\370\210\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\147\333\342\302\346\207\075\100\203\206\067 +-\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302 +-\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357 +-\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333 +-\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220 +-\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354 +-\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003 +-\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031 +-\011\254\211\111\323 +-END +- +-# Trust for Certificate "Thawte Time Stamping CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Thawte Time Stamping CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105 +-\010\116\326\126 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\213\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\024\060\022\006\003\125\004\007 +-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060 +-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035 +-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060 +-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Entrust.net Global Secure Server CA" +-# +-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 Global Secure Server CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125 +-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\123\123\114\137\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\062\060\060\060\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\272\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125 +-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\123\123\114\137\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\062\060\060\060\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\070\233\021\074 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070 +-\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004 +-\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013 +-\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006 +-\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163 +-\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060\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\060\060\060\062\060\064\061\067\062\060\060\060\132 +-\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060 +-\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164 +-\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004 +-\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156 +-\145\164\057\123\123\114\137\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\062\060\060\060\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\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\307\301\137\116\161\361\316 +-\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265 +-\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236 +-\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201 +-\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113 +-\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002 +-\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266 +-\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332 +-\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202 +-\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370 +-\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035 +-\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317 +-\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023 +-\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075 +-\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165 +-\163\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060 +-\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 +-\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060 +-\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062 +-\060\060\062\060\064\061\067\065\060\060\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\313\154\300\153\343\273\076\313\374\042 +-\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035 +-\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234 +-\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023 +-\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366 +-\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064 +-\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015 +-\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232 +-\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251 +-\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337 +-\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205 +-\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021 +-\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154 +-\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124 +-\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274 +-\005\377\154\211\063\360\354\025\017 +-END +- +-# Trust for Certificate "Entrust.net Global Secure Server CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Entrust.net Global Secure Server CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366 +-\045\072\110\223 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125 +-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\123\123\114\137\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\062\060\060\060\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\070\233\021\074 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Entrust.net Global Secure Personal CA" +-# +-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 Global Secure Personal CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 +-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105 +-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 +-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 +-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\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\264\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 +-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105 +-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 +-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 +-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\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\070\236\366\344 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070 +-\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004 +-\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013 +-\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006 +-\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163 +-\164\056\156\145\164\057\107\103\103\101\137\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\062\060\060\060 +-\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155 +-\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105 +-\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156 +-\164\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\060\060\060 +-\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062 +-\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022 +-\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156 +-\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167 +-\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103 +-\101\137\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\062\060\060\060\040\105\156\164\162\165\163\164\056 +-\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006 +-\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145 +-\164\040\103\154\151\145\156\164\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\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\223\164\264 +-\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162 +-\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255 +-\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124 +-\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064 +-\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045 +-\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374 +-\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047 +-\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001 +-\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206 +-\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335 +-\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201 +-\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003 +-\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164 +-\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145 +-\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137 +-\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\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145 +-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125 +-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040 +-\103\154\151\145\156\164\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\053\006 +-\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062 +-\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060 +-\062\060\067\061\066\064\066\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\204\213\164\375\305\215\300\377\047\155\040\067 +-\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004 +-\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105 +-\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005 +-\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007 +-\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060 +-\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001 +-\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016 +-\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022 +-\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024 +-\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276 +-\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277 +-\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172 +-\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103 +-\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235 +-\316\145\146\227\256\046\136 +-END +- +-# Trust for Certificate "Entrust.net Global Secure Personal CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266 +-\266\360\277\163 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 +-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105 +-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 +-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 +-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\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\070\236\366\344 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "Entrust Root Certification Authority" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -5523,500 +4600,30 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "beTRUSTed Root CA-Baltimore Implementation" ++# Certificate "RSA Security 2048 v3" + # + 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 "beTRUSTed Root CA-Baltimore Implementation" ++CKA_LABEL UTF8 "RSA Security 2048 v3" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055 +-\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 ++\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 ++\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 ++\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 ++\162\151\164\171\040\062\060\064\070\040\126\063 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055 +-\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 ++\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 ++\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 ++\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 ++\162\151\164\171\040\062\060\064\070\040\126\063 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\075\106 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\152\060\202\004\122\240\003\002\001\002\002\004\074 +-\265\075\106\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142 +-\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004 +-\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157 +-\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\055\102\141\154\164\151\155\157\162\145\040\111\155\160\154 +-\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062 +-\060\064\061\061\060\067\063\070\065\061\132\027\015\062\062\060 +-\064\061\061\060\067\063\070\065\061\132\060\146\061\022\060\020 +-\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144 +-\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060 +-\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145 +-\144\040\122\157\157\164\040\103\101\055\102\141\154\164\151\155 +-\157\162\145\040\111\155\160\154\145\155\145\156\164\141\164\151 +-\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 +-\001\001\000\274\176\304\071\234\214\343\326\034\206\377\312\142 +-\255\340\177\060\105\172\216\032\263\270\307\371\321\066\377\042 +-\363\116\152\137\204\020\373\146\201\303\224\171\061\322\221\341 +-\167\216\030\052\303\024\336\121\365\117\243\053\274\030\026\342 +-\265\335\171\336\042\370\202\176\313\201\037\375\047\054\217\372 +-\227\144\042\216\370\377\141\243\234\033\036\222\217\300\250\011 +-\337\011\021\354\267\175\061\232\032\352\203\041\006\074\237\272 +-\134\377\224\352\152\270\303\153\125\064\117\075\062\037\335\201 +-\024\340\304\074\315\235\060\370\060\251\227\323\356\314\243\320 +-\037\137\034\023\201\324\030\253\224\321\143\303\236\177\065\222 +-\236\137\104\352\354\364\042\134\267\350\075\175\244\371\211\251 +-\221\262\052\331\353\063\207\356\245\375\343\332\314\210\346\211 +-\046\156\307\053\202\320\136\235\131\333\024\354\221\203\005\303 +-\136\016\306\052\320\004\335\161\075\040\116\130\047\374\123\373 +-\170\170\031\024\262\374\220\122\211\070\142\140\007\264\240\354 +-\254\153\120\326\375\271\050\153\357\122\055\072\262\377\361\001 +-\100\254\067\002\003\001\000\001\243\202\002\036\060\202\002\032 +-\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 +-\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060\202 +-\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076\000 +-\000\001\011\050\203\221\061\060\202\001\217\060\202\001\110\006 +-\010\053\006\001\005\005\007\002\002\060\202\001\072\032\202\001 +-\066\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040 +-\165\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164 +-\151\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040 +-\141\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156 +-\164\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145 +-\040\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160 +-\154\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144 +-\040\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151 +-\164\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150 +-\145\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040 +-\120\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145 +-\156\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151 +-\156\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145 +-\156\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145 +-\040\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145 +-\124\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145 +-\054\040\150\164\164\160\072\057\057\167\167\167\056\142\145\164 +-\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165 +-\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144 +-\145\170\056\150\164\155\154\060\101\006\010\053\006\001\005\005 +-\007\002\001\026\065\150\164\164\160\072\057\057\167\167\167\056 +-\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160\162 +-\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163\057 +-\151\156\144\145\170\056\150\164\155\154\060\035\006\003\125\035 +-\016\004\026\004\024\105\075\303\251\321\334\077\044\126\230\034 +-\163\030\210\152\377\203\107\355\266\060\037\006\003\125\035\043 +-\004\030\060\026\200\024\105\075\303\251\321\334\077\044\126\230 +-\034\163\030\210\152\377\203\107\355\266\060\016\006\003\125\035 +-\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\003\202\001\001\000\111\222 +-\274\243\356\254\275\372\015\311\213\171\206\034\043\166\260\200 +-\131\167\374\332\177\264\113\337\303\144\113\152\116\016\255\362 +-\175\131\167\005\255\012\211\163\260\372\274\313\334\215\000\210 +-\217\246\240\262\352\254\122\047\277\241\110\174\227\020\173\272 +-\355\023\035\232\007\156\313\061\142\022\350\143\003\252\175\155 +-\343\370\033\166\041\170\033\237\113\103\214\323\111\206\366\033 +-\134\366\056\140\025\323\351\343\173\165\077\320\002\203\320\030 +-\202\101\315\145\067\352\216\062\176\275\153\231\135\060\021\310 +-\333\110\124\034\073\341\247\023\323\152\110\223\367\075\214\177 +-\005\350\316\363\210\052\143\004\270\352\176\130\174\001\173\133 +-\341\305\175\357\041\340\215\016\135\121\175\261\147\375\243\275 +-\070\066\306\362\070\206\207\032\226\150\140\106\373\050\024\107 +-\125\341\247\200\014\153\342\352\337\115\174\220\110\240\066\275 +-\011\027\211\177\303\362\323\234\234\343\335\304\033\335\365\267 +-\161\263\123\005\211\006\320\313\112\200\301\310\123\220\265\074 +-\061\210\027\120\237\311\304\016\213\330\250\002\143\015 +-END +- +-# Trust for Certificate "beTRUSTed Root CA-Baltimore Implementation" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA-Baltimore Implementation" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\334\273\236\267\031\113\304\162\005\301\021\165\051\206\203\133 +-\123\312\344\370 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\201\065\271\373\373\022\312\030\151\066\353\256\151\170\241\361 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055 +-\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\075\106 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "beTRUSTed Root CA - Entrust Implementation" +-# +-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 "beTRUSTed Root CA - Entrust Implementation" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\117\100 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\006\121\060\202\005\071\240\003\002\001\002\002\004\074 +-\265\117\100\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142 +-\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004 +-\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157 +-\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160\154 +-\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062 +-\060\064\061\061\060\070\062\064\062\067\132\027\015\062\062\060 +-\064\061\061\060\070\065\064\062\067\132\060\146\061\022\060\020 +-\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144 +-\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060 +-\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145 +-\144\040\122\157\157\164\040\103\101\040\055\040\105\156\164\162 +-\165\163\164\040\111\155\160\154\145\155\145\156\164\141\164\151 +-\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 +-\001\001\000\272\364\104\003\252\022\152\265\103\354\125\222\266 +-\060\175\065\127\014\333\363\015\047\156\114\367\120\250\233\116 +-\053\157\333\365\255\034\113\135\263\251\301\376\173\104\353\133 +-\243\005\015\037\305\064\053\060\000\051\361\170\100\262\244\377 +-\072\364\001\210\027\176\346\324\046\323\272\114\352\062\373\103 +-\167\227\207\043\305\333\103\243\365\052\243\121\136\341\073\322 +-\145\151\176\125\025\233\172\347\151\367\104\340\127\265\025\350 +-\146\140\017\015\003\373\202\216\243\350\021\173\154\276\307\143 +-\016\027\223\337\317\113\256\156\163\165\340\363\252\271\244\300 +-\011\033\205\352\161\051\210\101\062\371\360\052\016\154\011\362 +-\164\153\146\154\122\023\037\030\274\324\076\367\330\156\040\236 +-\312\376\374\041\224\356\023\050\113\327\134\136\014\146\356\351 +-\273\017\301\064\261\177\010\166\363\075\046\160\311\213\045\035 +-\142\044\014\352\034\165\116\300\022\344\272\023\035\060\051\055 +-\126\063\005\273\227\131\176\306\111\117\211\327\057\044\250\266 +-\210\100\265\144\222\123\126\044\344\242\240\205\263\136\220\264 +-\022\063\315\002\003\001\000\001\243\202\003\005\060\202\003\001 +-\060\202\001\267\006\003\125\035\040\004\202\001\256\060\202\001 +-\252\060\202\001\246\006\017\053\006\001\004\001\261\076\000\000 +-\002\011\050\203\221\061\060\202\001\221\060\202\001\111\006\010 +-\053\006\001\005\005\007\002\002\060\202\001\073\032\202\001\067 +-\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040\165 +-\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164\151 +-\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040\141 +-\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156\164 +-\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145\040 +-\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154 +-\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040 +-\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164 +-\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150\145 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\120 +-\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145\156 +-\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151\156 +-\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145\156 +-\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040 +-\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145\124 +-\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145\054 +-\040\150\164\164\160\163\072\057\057\167\167\167\056\142\145\164 +-\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165 +-\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144 +-\145\170\056\150\164\155\154\060\102\006\010\053\006\001\005\005 +-\007\002\001\026\066\150\164\164\160\163\072\057\057\167\167\167 +-\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160 +-\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163 +-\057\151\156\144\145\170\056\150\164\155\154\060\021\006\011\140 +-\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201 +-\211\006\003\125\035\037\004\201\201\060\177\060\175\240\173\240 +-\171\244\167\060\165\061\022\060\020\006\003\125\004\012\023\011 +-\142\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125 +-\004\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157 +-\157\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023 +-\052\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160 +-\154\145\155\145\156\164\141\164\151\157\156\061\015\060\013\006 +-\003\125\004\003\023\004\103\122\114\061\060\053\006\003\125\035 +-\020\004\044\060\042\200\017\062\060\060\062\060\064\061\061\060 +-\070\062\064\062\067\132\201\017\062\060\062\062\060\064\061\061 +-\060\070\065\064\062\067\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\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044 +-\060\252\204\204\026\060\035\006\003\125\035\016\004\026\004\024 +-\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044\060 +-\252\204\204\026\060\014\006\003\125\035\023\004\005\060\003\001 +-\001\377\060\035\006\011\052\206\110\206\366\175\007\101\000\004 +-\020\060\016\033\010\126\066\056\060\072\064\056\060\003\002\004 +-\220\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +-\003\202\001\001\000\052\270\027\316\037\020\224\353\270\232\267 +-\271\137\354\332\367\222\044\254\334\222\073\307\040\215\362\231 +-\345\135\070\241\302\064\355\305\023\131\134\005\265\053\117\141 +-\233\221\373\101\374\374\325\074\115\230\166\006\365\201\175\353 +-\335\220\346\321\126\124\332\343\055\014\237\021\062\224\042\001 +-\172\366\154\054\164\147\004\314\245\217\216\054\263\103\265\224 +-\242\320\175\351\142\177\006\276\047\001\203\236\072\375\212\356 +-\230\103\112\153\327\265\227\073\072\277\117\155\264\143\372\063 +-\000\064\056\055\155\226\311\173\312\231\143\272\276\364\366\060 +-\240\055\230\226\351\126\104\005\251\104\243\141\020\353\202\241 +-\147\135\274\135\047\165\252\212\050\066\052\070\222\331\335\244 +-\136\000\245\314\314\174\051\052\336\050\220\253\267\341\266\377 +-\175\045\013\100\330\252\064\243\055\336\007\353\137\316\012\335 +-\312\176\072\175\046\301\142\150\072\346\057\067\363\201\206\041 +-\304\251\144\252\357\105\066\321\032\146\174\370\351\067\326\326 +-\141\276\242\255\110\347\337\346\164\376\323\155\175\322\045\334 +-\254\142\127\251\367 +-END +- +-# Trust for Certificate "beTRUSTed Root CA - Entrust Implementation" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA - Entrust Implementation" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\162\231\171\023\354\233\015\256\145\321\266\327\262\112\166\243 +-\256\302\356\026 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\175\206\220\217\133\361\362\100\300\367\075\142\265\244\251\073 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\117\100 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "beTRUSTed Root CA - RSA Implementation" +-# +-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 "beTRUSTed Root CA - RSA Implementation" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141 +-\164\151\157\156 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141 +-\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264 +-\252\032 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\150\060\202\004\120\240\003\002\001\002\002\020\073 +-\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142 +-\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125 +-\123\124\145\144\061\033\060\031\006\003\125\004\013\023\022\142 +-\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101 +-\163\061\057\060\055\006\003\125\004\003\023\046\142\145\124\122 +-\125\123\124\145\144\040\122\157\157\164\040\103\101\040\055\040 +-\122\123\101\040\111\155\160\154\145\155\145\156\164\141\164\151 +-\157\156\060\036\027\015\060\062\060\064\061\061\061\061\061\070 +-\061\063\132\027\015\062\062\060\064\061\062\061\061\060\067\062 +-\065\132\060\142\061\022\060\020\006\003\125\004\012\023\011\142 +-\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004 +-\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157 +-\164\040\103\101\163\061\057\060\055\006\003\125\004\003\023\046 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\040\055\040\122\123\101\040\111\155\160\154\145\155\145\156 +-\164\141\164\151\157\156\060\202\001\042\060\015\006\011\052\206 +-\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 +-\001\012\002\202\001\001\000\344\272\064\060\011\216\127\320\271 +-\006\054\157\156\044\200\042\277\135\103\246\372\117\254\202\347 +-\034\150\160\205\033\243\156\265\252\170\331\156\007\113\077\351 +-\337\365\352\350\124\241\141\212\016\057\151\165\030\267\014\345 +-\024\215\161\156\230\270\125\374\014\225\320\233\156\341\055\210 +-\324\072\100\153\222\361\231\226\144\336\333\377\170\364\356\226 +-\035\107\211\174\324\276\271\210\167\043\072\011\346\004\236\155 +-\252\136\322\310\275\232\116\031\337\211\352\133\016\176\303\344 +-\264\360\340\151\073\210\017\101\220\370\324\161\103\044\301\217 +-\046\113\073\126\351\377\214\154\067\351\105\255\205\214\123\303 +-\140\206\220\112\226\311\263\124\260\273\027\360\034\105\331\324 +-\033\031\144\126\012\031\367\314\341\377\206\257\176\130\136\254 +-\172\220\037\311\050\071\105\173\242\266\307\234\037\332\205\324 +-\041\206\131\060\223\276\123\063\067\366\357\101\317\063\307\253 +-\162\153\045\365\363\123\033\014\114\056\361\165\113\357\240\207 +-\367\376\212\025\320\154\325\313\371\150\123\271\160\025\023\302 +-\365\056\373\103\065\165\055\002\003\001\000\001\243\202\002\030 +-\060\202\002\024\060\014\006\003\125\035\023\004\005\060\003\001 +-\001\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060 +-\202\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076 +-\000\000\003\011\050\203\221\061\060\202\001\217\060\101\006\010 +-\053\006\001\005\005\007\002\001\026\065\150\164\164\160\072\057 +-\057\167\167\167\056\142\145\164\162\165\163\164\145\144\056\143 +-\157\155\057\160\162\157\144\165\143\164\163\137\163\145\162\166 +-\151\143\145\163\057\151\156\144\145\170\056\150\164\155\154\060 +-\202\001\110\006\010\053\006\001\005\005\007\002\002\060\202\001 +-\072\032\202\001\066\122\145\154\151\141\156\143\145\040\157\156 +-\040\157\162\040\165\163\145\040\157\146\040\164\150\151\163\040 +-\103\145\162\164\151\146\151\143\141\164\145\040\143\162\145\141 +-\164\145\163\040\141\156\040\141\143\153\156\157\167\154\145\144 +-\147\155\145\156\164\040\141\156\144\040\141\143\143\145\160\164 +-\141\156\143\145\040\157\146\040\164\150\145\040\164\150\145\156 +-\040\141\160\160\154\151\143\141\142\154\145\040\163\164\141\156 +-\144\141\162\144\040\164\145\162\155\163\040\141\156\144\040\143 +-\157\156\144\151\164\151\157\156\163\040\157\146\040\165\163\145 +-\054\040\164\150\145\040\103\145\162\164\151\146\151\143\141\164 +-\151\157\156\040\120\162\141\143\164\151\143\145\040\123\164\141 +-\164\145\155\145\156\164\040\141\156\144\040\164\150\145\040\122 +-\145\154\171\151\156\147\040\120\141\162\164\171\040\101\147\162 +-\145\145\155\145\156\164\054\040\167\150\151\143\150\040\143\141 +-\156\040\142\145\040\146\157\165\156\144\040\141\164\040\164\150 +-\145\040\142\145\124\122\125\123\124\145\144\040\167\145\142\040 +-\163\151\164\145\054\040\150\164\164\160\072\057\057\167\167\167 +-\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160 +-\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163 +-\057\151\156\144\145\170\056\150\164\155\154\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\251\354\024\176\371\331\103\314\123\053\024 +-\255\317\367\360\131\211\101\315\031\060\035\006\003\125\035\016 +-\004\026\004\024\251\354\024\176\371\331\103\314\123\053\024\255 +-\317\367\360\131\211\101\315\031\060\015\006\011\052\206\110\206 +-\367\015\001\001\005\005\000\003\202\001\001\000\333\227\260\165 +-\352\014\304\301\230\312\126\005\300\250\255\046\110\257\055\040 +-\350\201\307\266\337\103\301\054\035\165\113\324\102\215\347\172 +-\250\164\334\146\102\131\207\263\365\151\155\331\251\236\263\175 +-\034\061\301\365\124\342\131\044\111\345\356\275\071\246\153\212 +-\230\104\373\233\327\052\203\227\064\055\307\175\065\114\055\064 +-\270\076\015\304\354\210\047\257\236\222\375\120\141\202\250\140 +-\007\024\123\314\145\023\301\366\107\104\151\322\061\310\246\335 +-\056\263\013\336\112\215\133\075\253\015\302\065\122\242\126\067 +-\314\062\213\050\205\102\234\221\100\172\160\053\070\066\325\341 +-\163\032\037\345\372\176\137\334\326\234\073\060\352\333\300\133 +-\047\134\323\163\007\301\302\363\114\233\157\237\033\312\036\252 +-\250\070\063\011\130\262\256\374\007\350\066\334\125\272\057\117 +-\100\376\172\275\006\246\201\301\223\042\174\206\021\012\006\167 +-\110\256\065\267\057\062\232\141\136\213\276\051\237\051\044\210 +-\126\071\054\250\322\253\226\003\132\324\110\237\271\100\204\013 +-\230\150\373\001\103\326\033\342\011\261\227\034 +-END +- +-# Trust for Certificate "beTRUSTed Root CA - RSA Implementation" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA - RSA Implementation" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\035\202\131\312\041\047\303\313\301\154\331\062\366\054\145\051 +-\214\250\207\022 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\206\102\005\011\274\247\235\354\035\363\056\016\272\330\035\320 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141 +-\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264 +-\252\032 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "RSA Security 2048 v3" +-# +-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 Security 2048 v3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 +-\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 +-\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 +-\162\151\164\171\040\062\060\064\070\040\126\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 +-\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 +-\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 +-\162\151\164\171\040\062\060\064\070\040\126\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000 +-\000\002 ++\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000 ++\000\002 + END + CKA_VALUE MULTILINE_OCTAL + \060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012 +@@ -6763,9 +5370,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300 + \063\167 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8171,9 +6778,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8395,9 +7002,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8619,9 +7226,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8844,9 +7451,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -9069,241 +7676,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "IPS Timestamping root" +-# +-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 "IPS Timestamping root" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105 +-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143 +-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011 +-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125 +-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164 +-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166 +-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125 +-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060 +-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023 +-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155 +-\160\151\156\147\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\064\060\062 +-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011 +-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105 +-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143 +-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011 +-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125 +-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164 +-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166 +-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125 +-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060 +-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023 +-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155 +-\160\151\156\147\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\064\060\062 +-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011 +-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123 +-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145 +-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102 +-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004 +-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040 +-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151 +-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004 +-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071 +-\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053 +-\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160 +-\151\156\147\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\064\060\062\006 +-\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155 +-\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011\001 +-\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145 +-\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061 +-\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070 +-\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002 +-\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162 +-\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023 +-\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003 +-\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145 +-\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162 +-\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003 +-\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160 +-\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066 +-\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013 +-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141 +-\155\160\151\156\147\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\064\060 +-\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001 +-\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\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 +-\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215 +-\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257 +-\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070 +-\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161 +-\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265 +-\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130 +-\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233 +-\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243 +-\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006 +-\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235 +-\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120 +-\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213 +-\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077 +-\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061 +-\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020 +-\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141 +-\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145 +-\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111 +-\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154 +-\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040 +-\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151 +-\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103 +-\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065 +-\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040 +-\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\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\064\060\062\006\003\125\004\003 +-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141 +-\155\160\151\156\147\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\036\060 +-\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160 +-\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000 +-\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014 +-\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003 +-\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003 +-\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001 +-\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006 +-\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001 +-\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001 +-\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053 +-\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110 +-\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003 +-\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151 +-\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004 +-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160 +-\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001 +-\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156 +-\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145 +-\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072 +-\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006 +-\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164 +-\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057 +-\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001 +-\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057 +-\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060 +-\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164 +-\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206 +-\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072 +-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163 +-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124 +-\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154 +-\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065 +-\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163 +-\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145 +-\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056 +-\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102 +-\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167 +-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057 +-\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151 +-\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170 +-\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057 +-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062 +-\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163 +-\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240 +-\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143 +-\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062 +-\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155 +-\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005 +-\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005 +-\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163 +-\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110 +-\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314 +-\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203 +-\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067 +-\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077 +-\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114 +-\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210 +-\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001 +-\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324 +-\207\112\137\334\357\351\126\360\012\014\350\165 +-END +- +-# Trust for Certificate "IPS Timestamping root" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "IPS Timestamping root" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313 +-\361\266\304\322 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105 +-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143 +-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011 +-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125 +-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164 +-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166 +-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125 +-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060 +-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023 +-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155 +-\160\151\156\147\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\064\060\062 +-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011 +-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -15535,161 +13910,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "DigiNotar Root CA" +-# +-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 "DigiNotar Root CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 +-\074\114 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014 +-\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137 +-\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060 +-\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141 +-\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151 +-\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060 +-\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156 +-\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060 +-\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132 +-\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060 +-\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022 +-\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164 +-\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147 +-\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040 +-\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151 +-\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154 +-\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 +-\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 +-\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126 +-\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201 +-\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300 +-\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177 +-\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330 +-\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213 +-\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337 +-\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045 +-\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123 +-\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007 +-\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043 +-\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042 +-\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041 +-\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324 +-\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313 +-\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110 +-\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114 +-\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376 +-\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344 +-\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357 +-\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346 +-\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314 +-\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351 +-\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154 +-\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262 +-\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042 +-\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077 +-\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102 +-\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323 +-\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176 +-\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147 +-\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216 +-\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 +-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 +-\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153 +-\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002 +-\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004 +-\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257 +-\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362 +-\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203 +-\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302 +-\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150 +-\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307 +-\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050 +-\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350 +-\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013 +-\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075 +-\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114 +-\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313 +-\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273 +-\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235 +-\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146 +-\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160 +-\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007 +-\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351 +-\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134 +-\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045 +-\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113 +-\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174 +-\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304 +-\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012 +-\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330 +-\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124 +-\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163 +-\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056 +-\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175 +-\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163 +-\262\345\214\360\206\231\270\345\305\337\204\301\267\353 +-END +- +-# Trust for Certificate "DigiNotar Root CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "DigiNotar Root CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317 +-\201\147\107\214 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 +-\074\114 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "Network Solutions Certificate Authority" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -17057,13 +15277,13 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "AC Raiz Certicamara S.A." ++# Certificate "AC Ra+z Certic+mara S.A." + # + 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 "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A." ++CKA_LABEL UTF8 "AC Ra+z Certic+mara S.A." + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL + \060\173\061\013\060\011\006\003\125\004\006\023\002\103\117\061 +@@ -17196,12 +15416,12 @@ CKA_VALUE MULTILINE_OCTAL + \005\211\374\170\326\134\054\046\103\251 + END + +-# Trust for Certificate "AC Raiz Certicamara S.A." ++# Trust for Certificate "AC Ra+z Certic+mara S.A." + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A." ++CKA_LABEL UTF8 "AC Ra+z Certic+mara S.A." + CKA_CERT_SHA1_HASH MULTILINE_OCTAL + \313\241\305\370\260\343\136\270\271\105\022\323\371\064\242\351 + \006\020\323\066 +@@ -18114,3397 +16334,613 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "ePKI Root Certification Authority" ++# Certificate "Entrust.net 2048 2029" + # + 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 "ePKI Root Certification Authority" ++CKA_LABEL UTF8 "Entrust.net 2048 2029" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +-\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 ++\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 ++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 ++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 ++\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164 ++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 + \143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 ++\040\050\062\060\064\070\051 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +-\120\113\111\040\122\157\157\164\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\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 +-\274\235 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025 +-\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136 +-\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 +-\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 +-\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 +-\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 +-\111\040\122\157\157\164\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\060\064\061\062\062\060\060\062\063\061\062\067\132\027 +-\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136 +-\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 +-\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 +-\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 +-\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 +-\111\040\122\157\157\164\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\202 +-\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +-\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341 +-\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155 +-\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007 +-\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217 +-\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376 +-\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041 +-\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225 +-\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364 +-\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327 +-\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367 +-\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020 +-\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065 +-\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047 +-\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330 +-\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111 +-\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221 +-\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162 +-\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300 +-\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243 +-\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024 +-\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224 +-\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076 +-\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101 +-\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322 +-\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172 +-\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052 +-\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107 +-\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203 +-\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215 +-\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251 +-\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132 +-\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215 +-\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002 +-\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004 +-\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125 +-\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005 +-\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060 +-\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005 +-\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307 +-\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 +-\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201 +-\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000 +-\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022 +-\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045 +-\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312 +-\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066 +-\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017 +-\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122 +-\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227 +-\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277 +-\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322 +-\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323 +-\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066 +-\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245 +-\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355 +-\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272 +-\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224 +-\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115 +-\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001 +-\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217 +-\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341 +-\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122 +-\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200 +-\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211 +-\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263 +-\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342 +-\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374 +-\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304 +-\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156 +-\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143 +-\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203 +-\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352 +-\201\370\021\234 +-END +- +-# Trust for Certificate "ePKI Root Certification Authority" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "ePKI Root Certification Authority" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342 +-\075\151\306\360 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +-\120\113\111\040\122\157\157\164\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\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 +-\274\235 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3" +-# +-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 "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172 +-\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006 +-\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102 +-\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157 +-\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155 +-\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304 +-\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125 +-\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153 +-\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101 +-\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151 +-\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043 +-\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145 +-\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153 +-\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303 +-\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303 +-\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172 +-\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006 +-\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102 +-\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157 +-\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155 +-\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304 +-\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125 +-\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153 +-\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101 +-\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151 +-\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043 +-\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145 +-\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153 +-\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303 +-\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303 +-\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\021 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\027\060\202\003\377\240\003\002\001\002\002\001\021 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122 +-\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145 +-\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003 +-\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151 +-\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154 +-\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141 +-\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260 +-\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154 +-\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040 +-\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162 +-\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164 +-\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060 +-\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162 +-\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145 +-\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234 +-\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266 +-\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155 +-\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163 +-\304\261\040\055\040\123\303\274\162\303\274\155\040\063\060\036 +-\027\015\060\067\060\070\062\064\061\061\063\067\060\067\132\027 +-\015\061\067\060\070\062\061\061\061\063\067\060\067\132\060\202 +-\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +-\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145\040 +-\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003\125 +-\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151\154 +-\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154\157 +-\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141\040 +-\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260\124 +-\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154\165 +-\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040\166 +-\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162\141 +-\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164\303 +-\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060\041 +-\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162\164 +-\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145\172 +-\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234\102 +-\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266\153 +-\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145 +-\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304 +-\261\040\055\040\123\303\274\162\303\274\155\040\063\060\202\001 +-\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000 +-\003\202\001\017\000\060\202\001\012\002\202\001\001\000\212\155 +-\113\377\020\210\072\303\366\176\224\350\352\040\144\160\256\041 +-\201\276\072\173\074\333\361\035\122\177\131\372\363\042\114\225 +-\240\220\274\110\116\021\253\373\267\265\215\172\203\050\214\046 +-\106\330\116\225\100\207\141\237\305\236\155\201\207\127\154\212 +-\073\264\146\352\314\100\374\343\252\154\262\313\001\333\062\277 +-\322\353\205\317\241\015\125\303\133\070\127\160\270\165\306\171 +-\321\024\060\355\033\130\133\153\357\065\362\241\041\116\305\316 +-\174\231\137\154\271\270\042\223\120\247\315\114\160\152\276\152 +-\005\177\023\234\053\036\352\376\107\316\004\245\157\254\223\056 +-\174\053\237\236\171\023\221\350\352\236\312\070\165\216\142\260 +-\225\223\052\345\337\351\136\227\156\040\137\137\204\172\104\071 +-\031\100\034\272\125\053\373\060\262\201\357\204\343\334\354\230 +-\070\071\003\205\010\251\124\003\005\051\360\311\217\213\352\013 +-\206\145\031\021\323\351\011\043\336\150\223\003\311\066\034\041 +-\156\316\214\146\361\231\060\330\327\263\303\035\370\201\056\250 +-\275\202\013\146\376\202\313\341\340\032\202\303\100\201\002\003 +-\001\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026 +-\004\024\275\210\207\311\217\366\244\012\013\252\353\305\376\221 +-\043\235\253\112\212\062\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\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\005\005\000\003\202\001\001\000\035\174\372\111\217 +-\064\351\267\046\222\026\232\005\164\347\113\320\155\071\154\303 +-\046\366\316\270\061\274\304\337\274\052\370\067\221\030\334\004 +-\310\144\231\053\030\155\200\003\131\311\256\370\130\320\076\355 +-\303\043\237\151\074\206\070\034\236\357\332\047\170\321\204\067 +-\161\212\074\113\071\317\176\105\006\326\055\330\212\115\170\022 +-\326\255\302\323\313\322\320\101\363\046\066\112\233\225\154\014 +-\356\345\321\103\047\146\301\210\367\172\263\040\154\352\260\151 +-\053\307\040\350\014\003\304\101\005\231\342\077\344\153\370\240 +-\206\201\307\204\306\037\325\113\201\022\262\026\041\054\023\241 +-\200\262\136\014\112\023\236\040\330\142\100\253\220\352\144\112 +-\057\254\015\001\022\171\105\250\057\207\031\150\310\342\205\307 +-\060\262\165\371\070\077\262\300\223\264\153\342\003\104\316\147 +-\240\337\211\326\255\214\166\243\023\303\224\141\053\153\331\154 +-\301\007\012\042\007\205\154\205\044\106\251\276\077\213\170\204 +-\202\176\044\014\235\375\201\067\343\045\250\355\066\116\225\054 +-\311\234\220\332\354\251\102\074\255\266\002 +-END +- +-# Trust for Certificate "TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\033\113\071\141\046\047\153\144\221\242\150\155\327\002\103\041 +-\055\037\035\226 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\355\101\365\214\120\305\053\234\163\346\356\154\353\302\250\046 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172 +-\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006 +-\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102 +-\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157 +-\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155 +-\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304 +-\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125 +-\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153 +-\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101 +-\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151 +-\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043 +-\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145 +-\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153 +-\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303 +-\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303 +-\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\021 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Buypass Class 2 CA 1" +-# +-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 "Buypass Class 2 CA 1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\062\040\103\101\040\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\062\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\001 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035 +-\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163 +-\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060 +-\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040 +-\103\154\141\163\163\040\062\040\103\101\040\061\060\036\027\015 +-\060\066\061\060\061\063\061\060\062\065\060\071\132\027\015\061 +-\066\061\060\061\063\061\060\062\065\060\071\132\060\113\061\013 +-\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006 +-\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123 +-\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003 +-\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141 +-\163\163\040\062\040\103\101\040\061\060\202\001\042\060\015\006 +-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 +-\000\060\202\001\012\002\202\001\001\000\213\074\007\105\330\366 +-\337\346\307\312\272\215\103\305\107\215\260\132\301\070\333\222 +-\204\034\257\023\324\017\157\066\106\040\304\056\314\161\160\064 +-\242\064\323\067\056\330\335\072\167\057\300\353\051\350\134\322 +-\265\251\221\064\207\042\131\376\314\333\347\231\257\226\301\250 +-\307\100\335\245\025\214\156\310\174\227\003\313\346\040\362\327 +-\227\137\061\241\057\067\322\276\356\276\251\255\250\114\236\041 +-\146\103\073\250\274\363\011\243\070\325\131\044\301\302\107\166 +-\261\210\134\202\073\273\053\246\004\327\214\007\217\315\325\101 +-\035\360\256\270\051\054\224\122\140\064\224\073\332\340\070\321 +-\235\063\076\025\364\223\062\305\000\332\265\051\146\016\072\170 +-\017\041\122\137\002\345\222\173\045\323\222\036\057\025\235\201 +-\344\235\216\350\357\211\316\024\114\124\035\034\201\022\115\160 +-\250\276\020\005\027\176\037\321\270\127\125\355\315\273\122\302 +-\260\036\170\302\115\066\150\313\126\046\301\122\301\275\166\367 +-\130\325\162\176\037\104\166\273\000\211\035\026\235\121\065\357 +-\115\302\126\357\153\340\214\073\015\351\002\003\001\000\001\243 +-\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\077 +-\215\232\131\213\374\173\173\234\243\257\070\260\071\355\220\161 +-\200\326\310\060\016\006\003\125\035\017\001\001\377\004\004\003 +-\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\003\202\001\001\000\025\032\176\023\212\271\350\007\243 +-\113\047\062\262\100\221\362\041\321\144\205\276\143\152\322\317 +-\201\302\025\325\172\176\014\051\254\067\036\034\174\166\122\225 +-\332\265\177\043\241\051\167\145\311\062\235\250\056\126\253\140 +-\166\316\026\264\215\177\170\300\325\231\121\203\177\136\331\276 +-\014\250\120\355\042\307\255\005\114\166\373\355\356\036\107\144 +-\366\367\047\175\134\050\017\105\305\134\142\136\246\232\221\221 +-\267\123\027\056\334\255\140\235\226\144\071\275\147\150\262\256 +-\005\313\115\347\137\037\127\206\325\040\234\050\373\157\023\070 +-\365\366\021\222\366\175\231\136\037\014\350\253\104\044\051\162 +-\100\075\066\122\257\214\130\220\163\301\354\141\054\171\241\354 +-\207\265\077\332\115\331\041\000\060\336\220\332\016\323\032\110 +-\251\076\205\013\024\213\214\274\101\236\152\367\016\160\300\065 +-\367\071\242\135\146\320\173\131\237\250\107\022\232\047\043\244 +-\055\216\047\203\222\040\241\327\025\177\361\056\030\356\364\110 +-\177\057\177\361\241\030\265\241\013\224\240\142\040\062\234\035 +-\366\324\357\277\114\210\150 +-END +- +-# Trust for Certificate "Buypass Class 2 CA 1" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Buypass Class 2 CA 1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\240\241\253\220\311\374\204\173\073\022\141\350\227\175\137\323 +-\042\141\323\314 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\270\010\232\360\003\314\033\015\310\154\013\166\241\165\144\043 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\062\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Buypass Class 3 CA 1" +-# +-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 "Buypass Class 3 CA 1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\063\040\103\101\040\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\063\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\002 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\002 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035 +-\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163 +-\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060 +-\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040 +-\103\154\141\163\163\040\063\040\103\101\040\061\060\036\027\015 +-\060\065\060\065\060\071\061\064\061\063\060\063\132\027\015\061 +-\065\060\065\060\071\061\064\061\063\060\063\132\060\113\061\013 +-\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006 +-\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123 +-\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003 +-\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141 +-\163\163\040\063\040\103\101\040\061\060\202\001\042\060\015\006 +-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 +-\000\060\202\001\012\002\202\001\001\000\244\216\327\164\331\051 +-\144\336\137\037\207\200\221\352\116\071\346\031\306\104\013\200 +-\325\013\257\123\007\213\022\275\346\147\360\002\261\211\366\140 +-\212\304\133\260\102\321\300\041\250\313\341\233\357\144\121\266 +-\247\317\025\365\164\200\150\004\220\240\130\242\346\164\246\123 +-\123\125\110\143\077\222\126\335\044\116\216\370\272\053\377\363 +-\064\212\236\050\327\064\237\254\057\326\017\361\244\057\275\122 +-\262\111\205\155\071\065\360\104\060\223\106\044\363\266\347\123 +-\373\274\141\257\251\243\024\373\302\027\027\204\154\340\174\210 +-\370\311\034\127\054\360\075\176\224\274\045\223\204\350\232\000 +-\232\105\005\102\127\200\364\116\316\331\256\071\366\310\123\020 +-\014\145\072\107\173\140\302\326\372\221\311\306\161\154\275\221 +-\207\074\221\206\111\253\363\017\240\154\046\166\136\034\254\233 +-\161\345\215\274\233\041\036\234\326\070\176\044\200\025\061\202 +-\226\261\111\323\142\067\133\210\014\012\142\064\376\247\110\176 +-\231\261\060\213\220\067\225\034\250\037\245\054\215\364\125\310 +-\333\335\131\012\302\255\170\240\364\213\002\003\001\000\001\243 +-\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\070 +-\024\346\310\360\251\244\003\364\116\076\042\243\133\362\326\340 +-\255\100\164\060\016\006\003\125\035\017\001\001\377\004\004\003 +-\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\003\202\001\001\000\001\147\243\214\311\045\075\023\143 +-\135\026\157\354\241\076\011\134\221\025\052\052\331\200\041\117 +-\005\334\273\245\211\253\023\063\052\236\070\267\214\157\002\162 +-\143\307\163\167\036\011\006\272\073\050\173\244\107\311\141\153 +-\010\010\040\374\212\005\212\037\274\272\306\302\376\317\156\354 +-\023\063\161\147\056\151\372\251\054\077\146\300\022\131\115\013 +-\124\002\222\204\273\333\022\357\203\160\160\170\310\123\372\337 +-\306\306\377\334\210\057\007\300\111\235\062\127\140\323\362\366 +-\231\051\137\347\252\001\314\254\063\250\034\012\273\221\304\003 +-\240\157\266\064\371\206\323\263\166\124\230\364\112\201\263\123 +-\235\115\100\354\345\167\023\105\257\133\252\037\330\057\114\202 +-\173\376\052\304\130\273\117\374\236\375\003\145\032\052\016\303 +-\245\040\026\224\153\171\246\242\022\264\273\032\244\043\172\137 +-\360\256\204\044\344\363\053\373\212\044\243\047\230\145\332\060 +-\165\166\374\031\221\350\333\353\233\077\062\277\100\227\007\046 +-\272\314\363\224\205\112\172\047\223\317\220\102\324\270\133\026 +-\246\347\313\100\003\335\171 +-END +- +-# Trust for Certificate "Buypass Class 3 CA 1" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Buypass Class 3 CA 1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\141\127\072\021\337\016\330\176\325\222\145\042\352\320\126\327 +-\104\263\043\161 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\337\074\163\131\201\347\071\120\201\004\114\064\242\313\263\173 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\063\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\002 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "EBG Elektronik Sertifika Hizmet Saglayicisi" +-# +-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 "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102 +-\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162 +-\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141 +-\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060 +-\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151 +-\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145 +-\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151 +-\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023 +-\002\124\122 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102 +-\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162 +-\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141 +-\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060 +-\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151 +-\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145 +-\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151 +-\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023 +-\002\124\122 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\114\257\163\102\034\216\164\002 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\347\060\202\003\317\240\003\002\001\002\002\010\114 +-\257\163\102\034\216\164\002\060\015\006\011\052\206\110\206\367 +-\015\001\001\005\005\000\060\201\200\061\070\060\066\006\003\125 +-\004\003\014\057\105\102\107\040\105\154\145\153\164\162\157\156 +-\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\061\067\060\065\006\003\125\004\012\014\056\105\102 +-\107\040\102\151\154\151\305\237\151\155\040\124\145\153\156\157 +-\154\157\152\151\154\145\162\151\040\166\145\040\110\151\172\155 +-\145\164\154\145\162\151\040\101\056\305\236\056\061\013\060\011 +-\006\003\125\004\006\023\002\124\122\060\036\027\015\060\066\060 +-\070\061\067\060\060\062\061\060\071\132\027\015\061\066\060\070 +-\061\064\060\060\063\061\060\071\132\060\201\200\061\070\060\066 +-\006\003\125\004\003\014\057\105\102\107\040\105\154\145\153\164 +-\162\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040 +-\110\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261 +-\143\304\261\163\304\261\061\067\060\065\006\003\125\004\012\014 +-\056\105\102\107\040\102\151\154\151\305\237\151\155\040\124\145 +-\153\156\157\154\157\152\151\154\145\162\151\040\166\145\040\110 +-\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056\061 +-\013\060\011\006\003\125\004\006\023\002\124\122\060\202\002\042 +-\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +-\202\002\017\000\060\202\002\012\002\202\002\001\000\356\240\204 +-\141\320\072\152\146\020\062\330\061\070\177\247\247\345\375\241 +-\341\373\227\167\270\161\226\350\023\226\106\203\117\266\362\137 +-\162\126\156\023\140\245\001\221\342\133\305\315\127\037\167\143 +-\121\377\057\075\333\271\077\252\251\065\347\171\320\365\320\044 +-\266\041\352\353\043\224\376\051\277\373\211\221\014\144\232\005 +-\112\053\314\014\356\361\075\233\202\151\244\114\370\232\157\347 +-\042\332\020\272\137\222\374\030\047\012\250\252\104\372\056\054 +-\264\373\106\232\010\003\203\162\253\210\344\152\162\311\345\145 +-\037\156\052\017\235\263\350\073\344\014\156\172\332\127\375\327 +-\353\171\213\136\040\006\323\166\013\154\002\225\243\226\344\313 +-\166\121\321\050\235\241\032\374\104\242\115\314\172\166\250\015 +-\075\277\027\117\042\210\120\375\256\266\354\220\120\112\133\237 +-\225\101\252\312\017\262\112\376\200\231\116\243\106\025\253\370 +-\163\102\152\302\146\166\261\012\046\025\335\223\222\354\333\251 +-\137\124\042\122\221\160\135\023\352\110\354\156\003\154\331\335 +-\154\374\353\015\003\377\246\203\022\233\361\251\223\017\305\046 +-\114\061\262\143\231\141\162\347\052\144\231\322\270\351\165\342 +-\174\251\251\232\032\252\303\126\333\020\232\074\203\122\266\173 +-\226\267\254\207\167\250\271\362\147\013\224\103\263\257\076\163 +-\372\102\066\261\045\305\012\061\046\067\126\147\272\243\013\175 +-\326\367\211\315\147\241\267\072\036\146\117\366\240\125\024\045 +-\114\054\063\015\246\101\214\275\004\061\152\020\162\012\235\016 +-\056\166\275\136\363\121\211\213\250\077\125\163\277\333\072\306 +-\044\005\226\222\110\252\113\215\052\003\345\127\221\020\364\152 +-\050\025\156\107\167\204\134\121\164\237\031\351\346\036\143\026 +-\071\343\021\025\343\130\032\104\275\313\304\154\146\327\204\006 +-\337\060\364\067\242\103\042\171\322\020\154\337\273\346\023\021 +-\374\235\204\012\023\173\360\073\320\374\243\012\327\211\352\226 +-\176\215\110\205\036\144\137\333\124\242\254\325\172\002\171\153 +-\322\212\360\147\332\145\162\015\024\160\344\351\216\170\217\062 +-\164\174\127\362\326\326\364\066\211\033\370\051\154\213\271\366 +-\227\321\244\056\252\276\013\031\302\105\351\160\135\002\003\000 +-\235\331\243\143\060\141\060\017\006\003\125\035\023\001\001\377 +-\004\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001 +-\377\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026 +-\004\024\347\316\306\117\374\026\147\226\372\112\243\007\301\004 +-\247\313\152\336\332\107\060\037\006\003\125\035\043\004\030\060 +-\026\200\024\347\316\306\117\374\026\147\226\372\112\243\007\301 +-\004\247\313\152\336\332\107\060\015\006\011\052\206\110\206\367 +-\015\001\001\005\005\000\003\202\002\001\000\233\230\232\135\276 +-\363\050\043\166\306\154\367\177\346\100\236\300\066\334\225\015 +-\035\255\025\305\066\330\325\071\357\362\036\042\136\263\202\264 +-\135\273\114\032\312\222\015\337\107\044\036\263\044\332\221\210 +-\351\203\160\335\223\327\351\272\263\337\026\132\076\336\340\310 +-\373\323\375\154\051\370\025\106\240\150\046\314\223\122\256\202 +-\001\223\220\312\167\312\115\111\357\342\132\331\052\275\060\316 +-\114\262\201\266\060\316\131\117\332\131\035\152\172\244\105\260 +-\202\046\201\206\166\365\365\020\000\270\356\263\011\350\117\207 +-\002\007\256\044\134\360\137\254\012\060\314\212\100\240\163\004 +-\301\373\211\044\366\232\034\134\267\074\012\147\066\005\010\061 +-\263\257\330\001\150\052\340\170\217\164\336\270\121\244\214\154 +-\040\075\242\373\263\324\011\375\173\302\200\252\223\154\051\230 +-\041\250\273\026\363\251\022\137\164\265\207\230\362\225\046\337 +-\064\357\212\123\221\210\135\032\224\243\077\174\042\370\327\210 +-\272\246\214\226\250\075\122\064\142\237\000\036\124\125\102\147 +-\306\115\106\217\273\024\105\075\012\226\026\216\020\241\227\231 +-\325\323\060\205\314\336\264\162\267\274\212\074\030\051\150\375 +-\334\161\007\356\044\071\152\372\355\245\254\070\057\371\036\020 +-\016\006\161\032\020\114\376\165\176\377\036\127\071\102\312\327 +-\341\025\241\126\125\131\033\321\243\257\021\330\116\303\245\053 +-\357\220\277\300\354\202\023\133\215\326\162\054\223\116\217\152 +-\051\337\205\074\323\015\340\242\030\022\314\125\057\107\267\247 +-\233\002\376\101\366\210\114\155\332\251\001\107\203\144\047\142 +-\020\202\326\022\173\136\003\037\064\251\311\221\376\257\135\155 +-\206\047\267\043\252\165\030\312\040\347\260\017\327\211\016\246 +-\147\042\143\364\203\101\053\006\113\273\130\325\321\327\267\271 +-\020\143\330\211\112\264\252\335\026\143\365\156\276\140\241\370 +-\355\350\326\220\117\032\306\305\240\051\323\247\041\250\365\132 +-\074\367\307\111\242\041\232\112\225\122\040\226\162\232\146\313 +-\367\322\206\103\174\042\276\226\371\275\001\250\107\335\345\073 +-\100\371\165\053\233\053\106\144\206\215\036\364\217\373\007\167 +-\320\352\111\242\034\215\122\024\246\012\223 +-END +- +-# Trust for Certificate "EBG Elektronik Sertifika Hizmet Saglayicisi" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\214\226\272\353\335\053\007\007\110\356\060\062\146\240\363\230 +-\156\174\256\130 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\054\040\046\235\313\032\112\000\205\265\267\132\256\302\001\067 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102 +-\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162 +-\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141 +-\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060 +-\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151 +-\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145 +-\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151 +-\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023 +-\002\124\122 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\114\257\163\102\034\216\164\002 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "certSIGN ROOT CA" +-# +-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 "certSIGN ROOT CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +-\164\123\111\107\116\040\122\117\117\124\040\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +-\164\123\111\107\116\040\122\117\117\124\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\040\006\005\026\160\002 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040 +-\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001 +-\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023 +-\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145 +-\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023 +-\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103 +-\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060 +-\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064 +-\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117 +-\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123 +-\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145 +-\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202 +-\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +-\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267 +-\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350 +-\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127 +-\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135 +-\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020 +-\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272 +-\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263 +-\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135 +-\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001 +-\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200 +-\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020 +-\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320 +-\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045 +-\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057 +-\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020 +-\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234 +-\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002 +-\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001 +-\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017 +-\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016 +-\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262 +-\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206 +-\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211 +-\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327 +-\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044 +-\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030 +-\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124 +-\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223 +-\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031 +-\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133 +-\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367 +-\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210 +-\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240 +-\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240 +-\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160 +-\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302 +-\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210 +-\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115 +-\366\356\260\132\116\111\104\124\130\137\102\203 +-END +- +-# Trust for Certificate "certSIGN ROOT CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "certSIGN ROOT CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350 +-\174\113\057\233 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +-\164\123\111\107\116\040\122\117\117\124\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\040\006\005\026\160\002 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "CNNIC ROOT" +-# +-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 "CNNIC ROOT" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061 +-\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061 +-\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040 +-\122\117\117\124 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061 +-\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061 +-\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040 +-\122\117\117\124 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\111\063\000\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\125\060\202\002\075\240\003\002\001\002\002\004\111 +-\063\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\062\061\013\060\011\006\003\125\004\006\023\002\103 +-\116\061\016\060\014\006\003\125\004\012\023\005\103\116\116\111 +-\103\061\023\060\021\006\003\125\004\003\023\012\103\116\116\111 +-\103\040\122\117\117\124\060\036\027\015\060\067\060\064\061\066 +-\060\067\060\071\061\064\132\027\015\062\067\060\064\061\066\060 +-\067\060\071\061\064\132\060\062\061\013\060\011\006\003\125\004 +-\006\023\002\103\116\061\016\060\014\006\003\125\004\012\023\005 +-\103\116\116\111\103\061\023\060\021\006\003\125\004\003\023\012 +-\103\116\116\111\103\040\122\117\117\124\060\202\001\042\060\015 +-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 +-\017\000\060\202\001\012\002\202\001\001\000\323\065\367\077\163 +-\167\255\350\133\163\027\302\321\157\355\125\274\156\352\350\244 +-\171\262\154\303\243\357\341\237\261\073\110\205\365\232\134\041 +-\042\020\054\305\202\316\332\343\232\156\067\341\207\054\334\271 +-\014\132\272\210\125\337\375\252\333\037\061\352\001\361\337\071 +-\001\301\023\375\110\122\041\304\125\337\332\330\263\124\166\272 +-\164\261\267\175\327\300\350\366\131\305\115\310\275\255\037\024 +-\332\337\130\104\045\062\031\052\307\176\176\216\256\070\260\060 +-\173\107\162\011\061\360\060\333\303\033\166\051\273\151\166\116 +-\127\371\033\144\242\223\126\267\157\231\156\333\012\004\234\021 +-\343\200\037\313\143\224\020\012\251\341\144\202\061\371\214\047 +-\355\246\231\000\366\160\223\030\370\241\064\206\243\335\172\302 +-\030\171\366\172\145\065\317\220\353\275\063\223\237\123\253\163 +-\073\346\233\064\040\057\035\357\251\035\143\032\240\200\333\003 +-\057\371\046\032\206\322\215\273\251\276\122\072\207\147\110\015 +-\277\264\240\330\046\276\043\137\163\067\177\046\346\222\004\243 +-\177\317\040\247\267\363\072\312\313\231\313\002\003\001\000\001 +-\243\163\060\161\060\021\006\011\140\206\110\001\206\370\102\001 +-\001\004\004\003\002\000\007\060\037\006\003\125\035\043\004\030 +-\060\026\200\024\145\362\061\255\052\367\367\335\122\226\012\307 +-\002\301\016\357\246\325\073\021\060\017\006\003\125\035\023\001 +-\001\377\004\005\060\003\001\001\377\060\013\006\003\125\035\017 +-\004\004\003\002\001\376\060\035\006\003\125\035\016\004\026\004 +-\024\145\362\061\255\052\367\367\335\122\226\012\307\002\301\016 +-\357\246\325\073\021\060\015\006\011\052\206\110\206\367\015\001 +-\001\005\005\000\003\202\001\001\000\113\065\356\314\344\256\277 +-\303\156\255\237\225\073\113\077\133\036\337\127\051\242\131\312 +-\070\342\271\032\377\236\346\156\062\335\036\256\352\065\267\365 +-\223\221\116\332\102\341\303\027\140\120\362\321\134\046\271\202 +-\267\352\155\344\234\204\347\003\171\027\257\230\075\224\333\307 +-\272\000\347\270\277\001\127\301\167\105\062\014\073\361\264\034 +-\010\260\375\121\240\241\335\232\035\023\066\232\155\267\307\074 +-\271\341\305\331\027\372\203\325\075\025\240\074\273\036\013\342 +-\310\220\077\250\206\014\374\371\213\136\205\313\117\133\113\142 +-\021\107\305\105\174\005\057\101\261\236\020\151\033\231\226\340 +-\125\171\373\116\206\231\270\224\332\206\070\152\223\243\347\313 +-\156\345\337\352\041\125\211\234\175\175\177\230\365\000\211\356 +-\343\204\300\134\226\265\305\106\352\106\340\205\125\266\033\311 +-\022\326\301\315\315\200\363\002\001\074\310\151\313\105\110\143 +-\330\224\320\354\205\016\073\116\021\145\364\202\214\246\075\256 +-\056\042\224\011\310\134\352\074\201\135\026\052\003\227\026\125 +-\011\333\212\101\202\236\146\233\021 +-END +- +-# Trust for Certificate "CNNIC ROOT" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "CNNIC ROOT" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\213\257\114\233\035\360\052\222\367\332\022\216\271\033\254\364 +-\230\140\113\157 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\041\274\202\253\111\304\023\073\113\262\053\134\153\220\234\031 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061 +-\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061 +-\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040 +-\122\117\117\124 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\111\063\000\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "ApplicationCA - Japanese Government" +-# +-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 "ApplicationCA - Japanese Government" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145 +-\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060 +-\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164 +-\151\157\156\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145 +-\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060 +-\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164 +-\151\157\156\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\061 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\240\060\202\002\210\240\003\002\001\002\002\001\061 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061\034 +-\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145\163 +-\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060\024 +-\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164\151 +-\157\156\103\101\060\036\027\015\060\067\061\062\061\062\061\065 +-\060\060\060\060\132\027\015\061\067\061\062\061\062\061\065\060 +-\060\060\060\132\060\103\061\013\060\011\006\003\125\004\006\023 +-\002\112\120\061\034\060\032\006\003\125\004\012\023\023\112\141 +-\160\141\156\145\163\145\040\107\157\166\145\162\156\155\145\156 +-\164\061\026\060\024\006\003\125\004\013\023\015\101\160\160\154 +-\151\143\141\164\151\157\156\103\101\060\202\001\042\060\015\006 +-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 +-\000\060\202\001\012\002\202\001\001\000\247\155\340\164\116\207 +-\217\245\006\336\150\242\333\206\231\113\144\015\161\360\012\005 +-\233\216\252\341\314\056\322\152\073\301\172\264\227\141\215\212 +-\276\306\232\234\006\264\206\121\344\067\016\164\170\176\137\212 +-\177\224\244\327\107\010\375\120\132\126\344\150\254\050\163\240 +-\173\351\177\030\222\100\117\055\235\365\256\104\110\163\066\006 +-\236\144\054\073\064\043\333\134\046\344\161\171\217\324\156\171 +-\042\271\223\301\312\315\301\126\355\210\152\327\240\071\041\004 +-\127\054\242\365\274\107\101\117\136\064\042\225\265\037\051\155 +-\136\112\363\115\162\276\101\126\040\207\374\351\120\107\327\060 +-\024\356\134\214\125\272\131\215\207\374\043\336\223\320\004\214 +-\375\357\155\275\320\172\311\245\072\152\162\063\306\112\015\005 +-\027\052\055\173\261\247\330\326\360\276\364\077\352\016\050\155 +-\101\141\043\166\170\303\270\145\244\363\132\256\314\302\252\331 +-\347\130\336\266\176\235\205\156\237\052\012\157\237\003\051\060 +-\227\050\035\274\267\317\124\051\116\121\061\371\047\266\050\046 +-\376\242\143\346\101\026\360\063\230\107\002\003\001\000\001\243 +-\201\236\060\201\233\060\035\006\003\125\035\016\004\026\004\024 +-\124\132\313\046\077\161\314\224\106\015\226\123\352\153\110\320 +-\223\376\102\165\060\016\006\003\125\035\017\001\001\377\004\004 +-\003\002\001\006\060\131\006\003\125\035\021\004\122\060\120\244 +-\116\060\114\061\013\060\011\006\003\125\004\006\023\002\112\120 +-\061\030\060\026\006\003\125\004\012\014\017\346\227\245\346\234 +-\254\345\233\275\346\224\277\345\272\234\061\043\060\041\006\003 +-\125\004\013\014\032\343\202\242\343\203\227\343\203\252\343\202 +-\261\343\203\274\343\202\267\343\203\247\343\203\263\103\101\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\005\005\000\003 +-\202\001\001\000\071\152\104\166\167\070\072\354\243\147\106\017 +-\371\213\006\250\373\152\220\061\316\176\354\332\321\211\174\172 +-\353\056\014\275\231\062\347\260\044\326\303\377\365\262\210\011 +-\207\054\343\124\341\243\246\262\010\013\300\205\250\310\322\234 +-\161\366\035\237\140\374\070\063\023\341\236\334\013\137\332\026 +-\120\051\173\057\160\221\017\231\272\064\064\215\225\164\305\176 +-\170\251\146\135\275\312\041\167\102\020\254\146\046\075\336\221 +-\253\375\025\360\157\355\154\137\020\370\363\026\366\003\212\217 +-\247\022\021\014\313\375\077\171\301\234\375\142\356\243\317\124 +-\014\321\053\137\027\076\343\076\277\300\053\076\011\233\376\210 +-\246\176\264\222\027\374\043\224\201\275\156\247\305\214\302\353 +-\021\105\333\370\101\311\226\166\352\160\137\171\022\153\344\243 +-\007\132\005\357\047\111\317\041\237\212\114\011\160\146\251\046 +-\301\053\021\116\063\322\016\374\326\154\322\016\062\144\150\377 +-\255\005\170\137\003\035\250\343\220\254\044\340\017\100\247\113 +-\256\213\050\267\202\312\030\007\346\267\133\164\351\040\031\177 +-\262\033\211\124 +-END +- +-# Trust for Certificate "ApplicationCA - Japanese Government" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "ApplicationCA - Japanese Government" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\177\212\260\317\320\121\207\152\146\363\066\017\107\310\215\214 +-\323\065\374\164 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\176\043\116\133\247\245\264\045\351\000\007\164\021\142\256\326 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145 +-\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060 +-\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164 +-\151\157\156\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\061 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "GeoTrust Primary Certification Authority - G3" +-# +-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 "GeoTrust Primary Certification Authority - G3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030 +-\017\037 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\376\060\202\002\346\240\003\002\001\002\002\020\025 +-\254\156\224\031\262\171\113\101\366\047\251\303\030\017\037\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 +-\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026 +-\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163 +-\164\040\111\156\143\056\061\071\060\067\006\003\125\004\013\023 +-\060\050\143\051\040\062\060\060\070\040\107\145\157\124\162\165 +-\163\164\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\066\060\064\006\003\125\004\003\023\055\107\145\157\124 +-\162\165\163\164\040\120\162\151\155\141\162\171\040\103\145\162 +-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 +-\162\151\164\171\040\055\040\107\063\060\036\027\015\060\070\060 +-\064\060\062\060\060\060\060\060\060\132\027\015\063\067\061\062 +-\060\061\062\063\065\071\065\071\132\060\201\230\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\026\060\024\006\003\125 +-\004\012\023\015\107\145\157\124\162\165\163\164\040\111\156\143 +-\056\061\071\060\067\006\003\125\004\013\023\060\050\143\051\040 +-\062\060\060\070\040\107\145\157\124\162\165\163\164\040\111\156 +-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 +-\172\145\144\040\165\163\145\040\157\156\154\171\061\066\060\064 +-\006\003\125\004\003\023\055\107\145\157\124\162\165\163\164\040 +-\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143 +-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040 +-\055\040\107\063\060\202\001\042\060\015\006\011\052\206\110\206 +-\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012 +-\002\202\001\001\000\334\342\136\142\130\035\063\127\071\062\063 +-\372\353\313\207\214\247\324\112\335\006\210\352\144\216\061\230 +-\245\070\220\036\230\317\056\143\053\360\106\274\104\262\211\241 +-\300\050\014\111\160\041\225\237\144\300\246\223\022\002\145\046 +-\206\306\245\211\360\372\327\204\240\160\257\117\032\227\077\006 +-\104\325\311\353\162\020\175\344\061\050\373\034\141\346\050\007 +-\104\163\222\042\151\247\003\210\154\235\143\310\122\332\230\047 +-\347\010\114\160\076\264\311\022\301\305\147\203\135\063\363\003 +-\021\354\152\320\123\342\321\272\066\140\224\200\273\141\143\154 +-\133\027\176\337\100\224\036\253\015\302\041\050\160\210\377\326 +-\046\154\154\140\004\045\116\125\176\175\357\277\224\110\336\267 +-\035\335\160\215\005\137\210\245\233\362\302\356\352\321\100\101 +-\155\142\070\035\126\006\305\003\107\121\040\031\374\173\020\013 +-\016\142\256\166\125\277\137\167\276\076\111\001\123\075\230\045 +-\003\166\044\132\035\264\333\211\352\171\345\266\263\073\077\272 +-\114\050\101\177\006\254\152\216\301\320\366\005\035\175\346\102 +-\206\343\245\325\107\002\003\001\000\001\243\102\060\100\060\017 +-\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +-\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +-\035\006\003\125\035\016\004\026\004\024\304\171\312\216\241\116 +-\003\035\034\334\153\333\061\133\224\076\077\060\177\055\060\015 +-\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001 +-\001\000\055\305\023\317\126\200\173\172\170\275\237\256\054\231 +-\347\357\332\337\224\136\011\151\247\347\156\150\214\275\162\276 +-\107\251\016\227\022\270\112\361\144\323\071\337\045\064\324\301 +-\315\116\201\360\017\004\304\044\263\064\226\306\246\252\060\337 +-\150\141\163\327\371\216\205\211\357\016\136\225\050\112\052\047 +-\217\020\216\056\174\206\304\002\236\332\014\167\145\016\104\015 +-\222\375\375\263\026\066\372\021\015\035\214\016\007\211\152\051 +-\126\367\162\364\335\025\234\167\065\146\127\253\023\123\330\216 +-\301\100\305\327\023\026\132\162\307\267\151\001\304\172\261\203 +-\001\150\175\215\101\241\224\030\301\045\134\374\360\376\203\002 +-\207\174\015\015\317\056\010\134\112\100\015\076\354\201\141\346 +-\044\333\312\340\016\055\007\262\076\126\334\215\365\101\205\007 +-\110\233\014\013\313\111\077\175\354\267\375\313\215\147\211\032 +-\253\355\273\036\243\000\010\010\027\052\202\134\061\135\106\212 +-\055\017\206\233\164\331\105\373\324\100\261\172\252\150\055\206 +-\262\231\042\341\301\053\307\234\370\363\137\250\202\022\353\031 +-\021\055 +-END +- +-# Trust for Certificate "GeoTrust Primary Certification Authority - G3" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\003\236\355\270\013\347\240\074\151\123\211\073\040\322\331\062 +-\072\114\052\375 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\265\350\064\066\311\020\104\130\110\160\155\056\203\324\270\005 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030 +-\017\037 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "thawte Primary Root CA - G2" +-# +-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 Primary Root CA - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 +-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 +-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 +-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 +-\103\101\040\055\040\107\062 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 +-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 +-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 +-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 +-\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256 +-\327\126 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\210\060\202\002\015\240\003\002\001\002\002\020\065 +-\374\046\134\331\204\117\311\075\046\075\127\233\256\327\126\060 +-\012\006\010\052\206\110\316\075\004\003\003\060\201\204\061\013 +-\060\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006 +-\003\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156 +-\143\056\061\070\060\066\006\003\125\004\013\023\057\050\143\051 +-\040\062\060\060\067\040\164\150\141\167\164\145\054\040\111\156 +-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 +-\172\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042 +-\006\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162 +-\151\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040 +-\107\062\060\036\027\015\060\067\061\061\060\065\060\060\060\060 +-\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071\065 +-\071\132\060\201\204\061\013\060\011\006\003\125\004\006\023\002 +-\125\123\061\025\060\023\006\003\125\004\012\023\014\164\150\141 +-\167\164\145\054\040\111\156\143\056\061\070\060\066\006\003\125 +-\004\013\023\057\050\143\051\040\062\060\060\067\040\164\150\141 +-\167\164\145\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\044\060\042\006\003\125\004\003\023\033\164\150 +-\141\167\164\145\040\120\162\151\155\141\162\171\040\122\157\157 +-\164\040\103\101\040\055\040\107\062\060\166\060\020\006\007\052 +-\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000 +-\004\242\325\234\202\173\225\235\361\122\170\207\376\212\026\277 +-\005\346\337\243\002\117\015\007\306\000\121\272\014\002\122\055 +-\042\244\102\071\304\376\217\352\311\301\276\324\115\377\237\172 +-\236\342\261\174\232\255\247\206\011\163\207\321\347\232\343\172 +-\245\252\156\373\272\263\160\300\147\210\242\065\324\243\232\261 +-\375\255\302\357\061\372\250\271\363\373\010\306\221\321\373\051 +-\225\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004 +-\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004 +-\024\232\330\000\060\000\347\153\177\205\030\356\213\266\316\212 +-\014\370\021\341\273\060\012\006\010\052\206\110\316\075\004\003 +-\003\003\151\000\060\146\002\061\000\335\370\340\127\107\133\247 +-\346\012\303\275\365\200\212\227\065\015\033\211\074\124\206\167 +-\050\312\241\364\171\336\265\346\070\260\360\145\160\214\177\002 +-\124\302\277\377\330\241\076\331\317\002\061\000\304\215\224\374 +-\334\123\322\334\235\170\026\037\025\063\043\123\122\343\132\061 +-\135\235\312\256\275\023\051\104\015\047\133\250\347\150\234\022 +-\367\130\077\056\162\002\127\243\217\241\024\056 +-END +- +-# Trust for Certificate "thawte Primary Root CA - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "thawte Primary Root CA - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\252\333\274\042\043\217\304\001\241\047\273\070\335\364\035\333 +-\010\236\360\022 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\164\235\352\140\044\304\375\042\123\076\314\072\162\331\051\117 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 +-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 +-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 +-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 +-\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256 +-\327\126 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "thawte Primary Root CA - G3" +-# +-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 Primary Root CA - G3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040 +-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 +-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 +-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 +-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 +-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 +-\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040 +-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 +-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 +-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 +-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 +-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 +-\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367 +-\220\373 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\052\060\202\003\022\240\003\002\001\002\002\020\140 +-\001\227\267\106\247\352\264\264\232\326\113\057\367\220\373\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 +-\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025 +-\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054 +-\040\111\156\143\056\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 +-\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060 +-\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056\040 +-\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144 +-\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003\125 +-\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155\141 +-\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063\060 +-\036\027\015\060\070\060\064\060\062\060\060\060\060\060\060\132 +-\027\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060 +-\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145 +-\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062 +-\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056 +-\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145 +-\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003 +-\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155 +-\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063 +-\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001 +-\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001 +-\000\262\277\047\054\373\333\330\133\335\170\173\033\236\167\146 +-\201\313\076\274\174\256\363\246\047\232\064\243\150\061\161\070 +-\063\142\344\363\161\146\171\261\251\145\243\245\213\325\217\140 +-\055\077\102\314\252\153\062\300\043\313\054\101\335\344\337\374 +-\141\234\342\163\262\042\225\021\103\030\137\304\266\037\127\154 +-\012\005\130\042\310\066\114\072\174\245\321\317\206\257\210\247 +-\104\002\023\164\161\163\012\102\131\002\370\033\024\153\102\337 +-\157\137\272\153\202\242\235\133\347\112\275\036\001\162\333\113 +-\164\350\073\177\177\175\037\004\264\046\233\340\264\132\254\107 +-\075\125\270\327\260\046\122\050\001\061\100\146\330\331\044\275 +-\366\052\330\354\041\111\134\233\366\172\351\177\125\065\176\226 +-\153\215\223\223\047\313\222\273\352\254\100\300\237\302\370\200 +-\317\135\364\132\334\316\164\206\246\076\154\013\123\312\275\222 +-\316\031\006\162\346\014\134\070\151\307\004\326\274\154\316\133 +-\366\367\150\234\334\045\025\110\210\241\351\251\370\230\234\340 +-\363\325\061\050\141\021\154\147\226\215\071\231\313\302\105\044 +-\071\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 +-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 +-\035\016\004\026\004\024\255\154\252\224\140\234\355\344\377\372 +-\076\012\164\053\143\003\367\266\131\277\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\003\202\001\001\000\032\100 +-\330\225\145\254\011\222\211\306\071\364\020\345\251\016\146\123 +-\135\170\336\372\044\221\273\347\104\121\337\306\026\064\012\357 +-\152\104\121\352\053\007\212\003\172\303\353\077\012\054\122\026 +-\240\053\103\271\045\220\077\160\251\063\045\155\105\032\050\073 +-\047\317\252\303\051\102\033\337\073\114\300\063\064\133\101\210 +-\277\153\053\145\257\050\357\262\365\303\252\146\316\173\126\356 +-\267\310\313\147\301\311\234\032\030\270\304\303\111\003\361\140 +-\016\120\315\106\305\363\167\171\367\266\025\340\070\333\307\057 +-\050\240\014\077\167\046\164\331\045\022\332\061\332\032\036\334 +-\051\101\221\042\074\151\247\273\002\362\266\134\047\003\211\364 +-\006\352\233\344\162\202\343\241\011\301\351\000\031\323\076\324 +-\160\153\272\161\246\252\130\256\364\273\351\154\266\357\207\314 +-\233\273\377\071\346\126\141\323\012\247\304\134\114\140\173\005 +-\167\046\172\277\330\007\122\054\142\367\160\143\331\071\274\157 +-\034\302\171\334\166\051\257\316\305\054\144\004\136\210\066\156 +-\061\324\100\032\142\064\066\077\065\001\256\254\143\240 +-END +- +-# Trust for Certificate "thawte Primary Root CA - G3" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "thawte Primary Root CA - G3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\361\213\123\215\033\351\003\266\246\360\126\103\133\027\025\211 +-\312\363\153\362 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\373\033\135\103\212\224\315\104\306\166\362\103\113\107\347\061 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040 +-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 +-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 +-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 +-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 +-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 +-\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367 +-\220\373 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "GeoTrust Primary Certification Authority - G2" +-# +-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 "GeoTrust Primary Certification Authority - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\062 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076 +-\303\153 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\256\060\202\002\065\240\003\002\001\002\002\020\074 +-\262\364\110\012\000\342\376\353\044\073\136\140\076\303\153\060 +-\012\006\010\052\206\110\316\075\004\003\003\060\201\230\061\013 +-\060\011\006\003\125\004\006\023\002\125\123\061\026\060\024\006 +-\003\125\004\012\023\015\107\145\157\124\162\165\163\164\040\111 +-\156\143\056\061\071\060\067\006\003\125\004\013\023\060\050\143 +-\051\040\062\060\060\067\040\107\145\157\124\162\165\163\164\040 +-\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157 +-\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\066 +-\060\064\006\003\125\004\003\023\055\107\145\157\124\162\165\163 +-\164\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +-\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +-\171\040\055\040\107\062\060\036\027\015\060\067\061\061\060\065 +-\060\060\060\060\060\060\132\027\015\063\070\060\061\061\070\062 +-\063\065\071\065\071\132\060\201\230\061\013\060\011\006\003\125 +-\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012\023 +-\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061\071 +-\060\067\006\003\125\004\013\023\060\050\143\051\040\062\060\060 +-\067\040\107\145\157\124\162\165\163\164\040\111\156\143\056\040 +-\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144 +-\040\165\163\145\040\157\156\154\171\061\066\060\064\006\003\125 +-\004\003\023\055\107\145\157\124\162\165\163\164\040\120\162\151 +-\155\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151 +-\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 +-\062\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005 +-\053\201\004\000\042\003\142\000\004\025\261\350\375\003\025\103 +-\345\254\353\207\067\021\142\357\322\203\066\122\175\105\127\013 +-\112\215\173\124\073\072\156\137\025\002\300\120\246\317\045\057 +-\175\312\110\270\307\120\143\034\052\041\010\174\232\066\330\013 +-\376\321\046\305\130\061\060\050\045\363\135\135\243\270\266\245 +-\264\222\355\154\054\237\353\335\103\211\242\074\113\110\221\035 +-\120\354\046\337\326\140\056\275\041\243\102\060\100\060\017\006 +-\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016 +-\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035 +-\006\003\125\035\016\004\026\004\024\025\137\065\127\121\125\373 +-\045\262\255\003\151\374\001\243\372\276\021\125\325\060\012\006 +-\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060 +-\144\226\131\246\350\011\336\213\272\372\132\210\210\360\037\221 +-\323\106\250\362\112\114\002\143\373\154\137\070\333\056\101\223 +-\251\016\346\235\334\061\034\262\240\247\030\034\171\341\307\066 +-\002\060\072\126\257\232\164\154\366\373\203\340\063\323\010\137 +-\241\234\302\133\237\106\326\266\313\221\006\143\242\006\347\063 +-\254\076\250\201\022\320\313\272\320\222\013\266\236\226\252\004 +-\017\212 +-END +- +-# Trust for Certificate "GeoTrust Primary Certification Authority - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\215\027\204\325\067\363\003\175\354\160\376\127\213\121\232\231 +-\346\020\327\260 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\001\136\330\153\275\157\075\216\241\061\370\022\340\230\163\152 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076 +-\303\153 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "VeriSign Universal Root Certification Authority" +-# +-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 "VeriSign Universal Root Certification Authority" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023 +-\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162 +-\163\141\154\040\122\157\157\164\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\275\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023 +-\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162 +-\163\141\154\040\122\157\157\164\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\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032 +-\305\035 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\271\060\202\003\241\240\003\002\001\002\002\020\100 +-\032\304\144\041\263\023\041\003\016\273\344\022\032\305\035\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 +-\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027 +-\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147 +-\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013 +-\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164 +-\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004 +-\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151 +-\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162 +-\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040 +-\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126 +-\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141 +-\154\040\122\157\157\164\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\060\070\060\064\060\062\060\060\060\060\060\060\132\027 +-\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060\201 +-\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027 +-\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147 +-\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013 +-\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164 +-\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004 +-\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151 +-\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162 +-\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040 +-\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126 +-\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141 +-\154\040\122\157\157\164\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\202 +-\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +-\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\307 +-\141\067\136\261\001\064\333\142\327\025\233\377\130\132\214\043 +-\043\326\140\216\221\327\220\230\203\172\346\130\031\070\214\305 +-\366\345\144\205\264\242\161\373\355\275\271\332\315\115\000\264 +-\310\055\163\245\307\151\161\225\037\071\074\262\104\007\234\350 +-\016\372\115\112\304\041\337\051\141\217\062\042\141\202\305\207 +-\037\156\214\174\137\026\040\121\104\321\160\117\127\352\343\034 +-\343\314\171\356\130\330\016\302\263\105\223\300\054\347\232\027 +-\053\173\000\067\172\101\063\170\341\063\342\363\020\032\177\207 +-\054\276\366\365\367\102\342\345\277\207\142\211\137\000\113\337 +-\305\335\344\165\104\062\101\072\036\161\156\151\313\013\165\106 +-\010\321\312\322\053\225\320\317\373\271\100\153\144\214\127\115 +-\374\023\021\171\204\355\136\124\366\064\237\010\001\363\020\045 +-\006\027\112\332\361\035\172\146\153\230\140\146\244\331\357\322 +-\056\202\361\360\357\011\352\104\311\025\152\342\003\156\063\323 +-\254\237\125\000\307\366\010\152\224\271\137\334\340\063\361\204 +-\140\371\133\047\021\264\374\026\362\273\126\152\200\045\215\002 +-\003\001\000\001\243\201\262\060\201\257\060\017\006\003\125\035 +-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\155\006\010\053 +-\006\001\005\005\007\001\014\004\141\060\137\241\135\240\133\060 +-\131\060\127\060\125\026\011\151\155\141\147\145\057\147\151\146 +-\060\041\060\037\060\007\006\005\053\016\003\002\032\004\024\217 +-\345\323\032\206\254\215\216\153\303\317\200\152\324\110\030\054 +-\173\031\056\060\045\026\043\150\164\164\160\072\057\057\154\157 +-\147\157\056\166\145\162\151\163\151\147\156\056\143\157\155\057 +-\166\163\154\157\147\157\056\147\151\146\060\035\006\003\125\035 +-\016\004\026\004\024\266\167\372\151\110\107\237\123\022\325\302 +-\352\007\062\166\007\321\227\007\031\060\015\006\011\052\206\110 +-\206\367\015\001\001\013\005\000\003\202\001\001\000\112\370\370 +-\260\003\346\054\147\173\344\224\167\143\314\156\114\371\175\016 +-\015\334\310\271\065\271\160\117\143\372\044\372\154\203\214\107 +-\235\073\143\363\232\371\166\062\225\221\261\167\274\254\232\276 +-\261\344\061\041\306\201\225\126\132\016\261\302\324\261\246\131 +-\254\361\143\313\270\114\035\131\220\112\357\220\026\050\037\132 +-\256\020\373\201\120\070\014\154\314\361\075\303\365\143\343\263 +-\343\041\311\044\071\351\375\025\146\106\364\033\021\320\115\163 +-\243\175\106\371\075\355\250\137\142\324\361\077\370\340\164\127 +-\053\030\235\201\264\304\050\332\224\227\245\160\353\254\035\276 +-\007\021\360\325\333\335\345\214\360\325\062\260\203\346\127\342 +-\217\277\276\241\252\277\075\035\265\324\070\352\327\260\134\072 +-\117\152\077\217\300\146\154\143\252\351\331\244\026\364\201\321 +-\225\024\016\175\315\225\064\331\322\217\160\163\201\173\234\176 +-\275\230\141\330\105\207\230\220\305\353\206\060\306\065\277\360 +-\377\303\125\210\203\113\357\005\222\006\161\362\270\230\223\267 +-\354\315\202\141\361\070\346\117\227\230\052\132\215 +-END +- +-# Trust for Certificate "VeriSign Universal Root Certification Authority" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "VeriSign Universal Root Certification Authority" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\066\171\312\065\146\207\162\060\115\060\245\373\207\073\017\247 +-\173\267\015\124 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\216\255\265\001\252\115\201\344\214\035\321\341\024\000\225\031 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023 +-\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162 +-\163\141\154\040\122\157\157\164\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\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032 +-\305\035 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" +-# +-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 "VeriSign Class 3 Public Primary Certification Authority - G4" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 +-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 +-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +-\165\164\150\157\162\151\164\171\040\055\040\107\064 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 +-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 +-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +-\165\164\150\157\162\151\164\171\040\055\040\107\064 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207 +-\254\263 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\204\060\202\003\012\240\003\002\001\002\002\020\057 +-\200\376\043\214\016\042\017\110\147\022\050\221\207\254\263\060 +-\012\006\010\052\206\110\316\075\004\003\003\060\201\312\061\013 +-\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006 +-\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040 +-\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126 +-\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145 +-\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061 +-\050\143\051\040\062\060\060\067\040\126\145\162\151\123\151\147 +-\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151 +-\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142 +-\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162 +-\151\164\171\040\055\040\107\064\060\036\027\015\060\067\061\061 +-\060\065\060\060\060\060\060\060\132\027\015\063\070\060\061\061 +-\070\062\063\065\071\065\071\132\060\201\312\061\013\060\011\006 +-\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +-\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +-\056\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151 +-\123\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157 +-\162\153\061\072\060\070\006\003\125\004\013\023\061\050\143\051 +-\040\062\060\060\067\040\126\145\162\151\123\151\147\156\054\040 +-\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157 +-\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\105 +-\060\103\006\003\125\004\003\023\074\126\145\162\151\123\151\147 +-\156\040\103\154\141\163\163\040\063\040\120\165\142\154\151\143 +-\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151 +-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 +-\040\055\040\107\064\060\166\060\020\006\007\052\206\110\316\075 +-\002\001\006\005\053\201\004\000\042\003\142\000\004\247\126\172 +-\174\122\332\144\233\016\055\134\330\136\254\222\075\376\001\346 +-\031\112\075\024\003\113\372\140\047\040\331\203\211\151\372\124 +-\306\232\030\136\125\052\144\336\006\366\215\112\073\255\020\074 +-\145\075\220\210\004\211\340\060\141\263\256\135\001\247\173\336 +-\174\262\276\312\145\141\000\206\256\332\217\173\320\211\255\115 +-\035\131\232\101\261\274\107\200\334\236\142\303\371\243\201\262 +-\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004 +-\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001\014 +-\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026\011 +-\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007\006 +-\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215\216 +-\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026\043 +-\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162\151 +-\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157\056 +-\147\151\146\060\035\006\003\125\035\016\004\026\004\024\263\026 +-\221\375\356\246\156\344\265\056\111\217\207\170\201\200\354\345 +-\261\265\060\012\006\010\052\206\110\316\075\004\003\003\003\150 +-\000\060\145\002\060\146\041\014\030\046\140\132\070\173\126\102 +-\340\247\374\066\204\121\221\040\054\166\115\103\075\304\035\204 +-\043\320\254\326\174\065\006\316\315\151\275\220\015\333\154\110 +-\102\035\016\252\102\002\061\000\234\075\110\071\043\071\130\032 +-\025\022\131\152\236\357\325\131\262\035\122\054\231\161\315\307 +-\051\337\033\052\141\173\161\321\336\363\300\345\015\072\112\252 +-\055\247\330\206\052\335\056\020 +-END +- +-# Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\042\325\330\337\217\002\061\321\215\367\235\267\317\212\055\144 +-\311\077\154\072 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\072\122\341\347\375\157\072\343\157\363\157\231\033\371\042\101 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 +-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 +-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +-\165\164\150\157\162\151\164\171\040\055\040\107\064 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207 +-\254\263 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "NetLock Arany (Class Gold) Főtanúsítvány" +-# +-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 "NetLock Arany (Class Gold) Főtanúsítvány" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145 +-\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003 +-\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303 +-\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143 +-\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145 +-\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141 +-\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303 +-\272\163\303\255\164\166\303\241\156\171 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145 +-\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003 +-\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303 +-\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143 +-\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145 +-\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141 +-\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303 +-\272\163\303\255\164\166\303\241\156\171 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\111\101\054\344\000\020 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\025\060\202\002\375\240\003\002\001\002\002\006\111 +-\101\054\344\000\020\060\015\006\011\052\206\110\206\367\015\001 +-\001\013\005\000\060\201\247\061\013\060\011\006\003\125\004\006 +-\023\002\110\125\061\021\060\017\006\003\125\004\007\014\010\102 +-\165\144\141\160\145\163\164\061\025\060\023\006\003\125\004\012 +-\014\014\116\145\164\114\157\143\153\040\113\146\164\056\061\067 +-\060\065\006\003\125\004\013\014\056\124\141\156\303\272\163\303 +-\255\164\166\303\241\156\171\153\151\141\144\303\263\153\040\050 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\051\061\065\060\063\006\003\125\004\003 +-\014\054\116\145\164\114\157\143\153\040\101\162\141\156\171\040 +-\050\103\154\141\163\163\040\107\157\154\144\051\040\106\305\221 +-\164\141\156\303\272\163\303\255\164\166\303\241\156\171\060\036 +-\027\015\060\070\061\062\061\061\061\065\060\070\062\061\132\027 +-\015\062\070\061\062\060\066\061\065\060\070\062\061\132\060\201 +-\247\061\013\060\011\006\003\125\004\006\023\002\110\125\061\021 +-\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145\163 +-\164\061\025\060\023\006\003\125\004\012\014\014\116\145\164\114 +-\157\143\153\040\113\146\164\056\061\067\060\065\006\003\125\004 +-\013\014\056\124\141\156\303\272\163\303\255\164\166\303\241\156 +-\171\153\151\141\144\303\263\153\040\050\103\145\162\164\151\146 +-\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163 +-\051\061\065\060\063\006\003\125\004\003\014\054\116\145\164\114 +-\157\143\153\040\101\162\141\156\171\040\050\103\154\141\163\163 +-\040\107\157\154\144\051\040\106\305\221\164\141\156\303\272\163 +-\303\255\164\166\303\241\156\171\060\202\001\042\060\015\006\011 +-\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000 +-\060\202\001\012\002\202\001\001\000\304\044\136\163\276\113\155 +-\024\303\241\364\343\227\220\156\322\060\105\036\074\356\147\331 +-\144\340\032\212\177\312\060\312\203\343\040\301\343\364\072\323 +-\224\137\032\174\133\155\277\060\117\204\047\366\237\037\111\274 +-\306\231\012\220\362\017\365\177\103\204\067\143\121\213\172\245 +-\160\374\172\130\315\216\233\355\303\106\154\204\160\135\332\363 +-\001\220\043\374\116\060\251\176\341\047\143\347\355\144\074\240 +-\270\311\063\143\376\026\220\377\260\270\375\327\250\300\300\224 +-\103\013\266\325\131\246\236\126\320\044\037\160\171\257\333\071 +-\124\015\145\165\331\025\101\224\001\257\136\354\366\215\361\377 +-\255\144\376\040\232\327\134\353\376\246\037\010\144\243\213\166 +-\125\255\036\073\050\140\056\207\045\350\252\257\037\306\144\106 +-\040\267\160\177\074\336\110\333\226\123\267\071\167\344\032\342 +-\307\026\204\166\227\133\057\273\031\025\205\370\151\205\365\231 +-\247\251\362\064\247\251\266\246\003\374\157\206\075\124\174\166 +-\004\233\153\371\100\135\000\064\307\056\231\165\235\345\210\003 +-\252\115\370\003\322\102\166\300\033\002\003\000\250\213\243\105 +-\060\103\060\022\006\003\125\035\023\001\001\377\004\010\060\006 +-\001\001\377\002\001\004\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004 +-\024\314\372\147\223\360\266\270\320\245\300\036\363\123\375\214 +-\123\337\203\327\226\060\015\006\011\052\206\110\206\367\015\001 +-\001\013\005\000\003\202\001\001\000\253\177\356\034\026\251\234 +-\074\121\000\240\300\021\010\005\247\231\346\157\001\210\124\141 +-\156\361\271\030\255\112\255\376\201\100\043\224\057\373\165\174 +-\057\050\113\142\044\201\202\013\365\141\361\034\156\270\141\070 +-\353\201\372\142\241\073\132\142\323\224\145\304\341\346\155\202 +-\370\057\045\160\262\041\046\301\162\121\037\214\054\303\204\220 +-\303\132\217\272\317\364\247\145\245\353\230\321\373\005\262\106 +-\165\025\043\152\157\205\143\060\200\360\325\236\037\051\034\302 +-\154\260\120\131\135\220\133\073\250\015\060\317\277\175\177\316 +-\361\235\203\275\311\106\156\040\246\371\141\121\272\041\057\173 +-\276\245\025\143\241\324\225\207\361\236\271\363\211\363\075\205 +-\270\270\333\276\265\271\051\371\332\067\005\000\111\224\003\204 +-\104\347\277\103\061\317\165\213\045\321\364\246\144\365\222\366 +-\253\005\353\075\351\245\013\066\142\332\314\006\137\066\213\266 +-\136\061\270\052\373\136\366\161\337\104\046\236\304\346\015\221 +-\264\056\165\225\200\121\152\113\060\246\260\142\241\223\361\233 +-\330\316\304\143\165\077\131\107\261 +-END +- +-# Trust for Certificate "NetLock Arany (Class Gold) Főtanúsítvány" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "NetLock Arany (Class Gold) Főtanúsítvány" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\006\010\077\131\077\025\241\004\240\151\244\153\251\003\320\006 +-\267\227\011\221 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\305\241\267\377\163\335\326\327\064\062\030\337\374\074\255\210 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145 +-\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003 +-\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303 +-\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143 +-\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145 +-\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141 +-\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303 +-\272\163\303\255\164\166\303\241\156\171 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\111\101\054\344\000\020 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Staat der Nederlanden Root CA - G2" +-# +-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 "Staat der Nederlanden Root CA - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 +-\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 +-\122\157\157\164\040\103\101\040\055\040\107\062 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 +-\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 +-\122\157\157\164\040\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\000\230\226\214 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\312\060\202\003\262\240\003\002\001\002\002\004\000 +-\230\226\214\060\015\006\011\052\206\110\206\367\015\001\001\013 +-\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116 +-\114\061\036\060\034\006\003\125\004\012\014\025\123\164\141\141 +-\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145 +-\156\061\053\060\051\006\003\125\004\003\014\042\123\164\141\141 +-\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145 +-\156\040\122\157\157\164\040\103\101\040\055\040\107\062\060\036 +-\027\015\060\070\060\063\062\066\061\061\061\070\061\067\132\027 +-\015\062\060\060\063\062\065\061\061\060\063\061\060\132\060\132 +-\061\013\060\011\006\003\125\004\006\023\002\116\114\061\036\060 +-\034\006\003\125\004\012\014\025\123\164\141\141\164\040\144\145 +-\162\040\116\145\144\145\162\154\141\156\144\145\156\061\053\060 +-\051\006\003\125\004\003\014\042\123\164\141\141\164\040\144\145 +-\162\040\116\145\144\145\162\154\141\156\144\145\156\040\122\157 +-\157\164\040\103\101\040\055\040\107\062\060\202\002\042\060\015 +-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002 +-\017\000\060\202\002\012\002\202\002\001\000\305\131\347\157\165 +-\252\076\113\234\265\270\254\236\013\344\371\331\312\253\135\217 +-\265\071\020\202\327\257\121\340\073\341\000\110\152\317\332\341 +-\006\103\021\231\252\024\045\022\255\042\350\000\155\103\304\251 +-\270\345\037\211\113\147\275\141\110\357\375\322\340\140\210\345 +-\271\030\140\050\303\167\053\255\260\067\252\067\336\144\131\052 +-\106\127\344\113\271\370\067\174\325\066\347\200\301\266\363\324 +-\147\233\226\350\316\327\306\012\123\320\153\111\226\363\243\013 +-\005\167\110\367\045\345\160\254\060\024\040\045\343\177\165\132 +-\345\110\370\116\173\003\007\004\372\202\141\207\156\360\073\304 +-\244\307\320\365\164\076\245\135\032\010\362\233\045\322\366\254 +-\004\046\076\125\072\142\050\245\173\262\060\257\370\067\302\321 +-\272\326\070\375\364\357\111\060\067\231\046\041\110\205\001\251 +-\345\026\347\334\220\125\337\017\350\070\315\231\067\041\117\135 +-\365\042\157\152\305\022\026\140\027\125\362\145\146\246\247\060 +-\221\070\301\070\035\206\004\204\272\032\045\170\136\235\257\314 +-\120\140\326\023\207\122\355\143\037\155\145\175\302\025\030\164 +-\312\341\176\144\051\214\162\330\026\023\175\013\111\112\361\050 +-\033\040\164\153\305\075\335\260\252\110\011\075\056\202\224\315 +-\032\145\331\053\210\232\231\274\030\176\237\356\175\146\174\076 +-\275\224\270\201\316\315\230\060\170\301\157\147\320\276\137\340 +-\150\355\336\342\261\311\054\131\170\222\252\337\053\140\143\362 +-\345\136\271\343\312\372\177\120\206\076\242\064\030\014\011\150 +-\050\021\034\344\341\271\134\076\107\272\062\077\030\314\133\204 +-\365\363\153\164\304\162\164\341\343\213\240\112\275\215\146\057 +-\352\255\065\332\040\323\210\202\141\360\022\042\266\274\320\325 +-\244\354\257\124\210\045\044\074\247\155\261\162\051\077\076\127 +-\246\177\125\257\156\046\306\376\347\314\100\134\121\104\201\012 +-\170\336\112\316\125\277\035\325\331\267\126\357\360\166\377\013 +-\171\265\257\275\373\251\151\221\106\227\150\200\024\066\035\263 +-\177\273\051\230\066\245\040\372\202\140\142\063\244\354\326\272 +-\007\247\156\305\317\024\246\347\326\222\064\330\201\365\374\035 +-\135\252\134\036\366\243\115\073\270\367\071\002\003\001\000\001 +-\243\201\227\060\201\224\060\017\006\003\125\035\023\001\001\377 +-\004\005\060\003\001\001\377\060\122\006\003\125\035\040\004\113 +-\060\111\060\107\006\004\125\035\040\000\060\077\060\075\006\010 +-\053\006\001\005\005\007\002\001\026\061\150\164\164\160\072\057 +-\057\167\167\167\056\160\153\151\157\166\145\162\150\145\151\144 +-\056\156\154\057\160\157\154\151\143\151\145\163\057\162\157\157 +-\164\055\160\157\154\151\143\171\055\107\062\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 +-\035\016\004\026\004\024\221\150\062\207\025\035\211\342\265\361 +-\254\066\050\064\215\013\174\142\210\353\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\003\202\002\001\000\250\101 +-\112\147\052\222\201\202\120\156\341\327\330\263\071\073\363\002 +-\025\011\120\121\357\055\275\044\173\210\206\073\371\264\274\222 +-\011\226\271\366\300\253\043\140\006\171\214\021\116\121\322\171 +-\200\063\373\235\110\276\354\101\103\201\037\176\107\100\034\345 +-\172\010\312\252\213\165\255\024\304\302\350\146\074\202\007\247 +-\346\047\202\133\030\346\017\156\331\120\076\212\102\030\051\306 +-\264\126\374\126\020\240\005\027\275\014\043\177\364\223\355\234 +-\032\121\276\335\105\101\277\221\044\264\037\214\351\137\317\173 +-\041\231\237\225\237\071\072\106\034\154\371\315\173\234\220\315 +-\050\251\307\251\125\273\254\142\064\142\065\023\113\024\072\125 +-\203\271\206\215\222\246\306\364\007\045\124\314\026\127\022\112 +-\202\170\310\024\331\027\202\046\055\135\040\037\171\256\376\324 +-\160\026\026\225\203\330\065\071\377\122\135\165\034\026\305\023 +-\125\317\107\314\165\145\122\112\336\360\260\247\344\012\226\013 +-\373\255\302\342\045\204\262\335\344\275\176\131\154\233\360\360 +-\330\347\312\362\351\227\070\176\211\276\314\373\071\027\141\077 +-\162\333\072\221\330\145\001\031\035\255\120\244\127\012\174\113 +-\274\234\161\163\052\105\121\031\205\314\216\375\107\247\164\225 +-\035\250\321\257\116\027\261\151\046\302\252\170\127\133\305\115 +-\247\345\236\005\027\224\312\262\137\240\111\030\215\064\351\046 +-\154\110\036\252\150\222\005\341\202\163\132\233\334\007\133\010 +-\155\175\235\327\215\041\331\374\024\040\252\302\105\337\077\347 +-\000\262\121\344\302\370\005\271\171\032\214\064\363\236\133\344 +-\067\133\153\112\337\054\127\212\100\132\066\272\335\165\104\010 +-\067\102\160\014\376\334\136\041\240\243\212\300\220\234\150\332 +-\120\346\105\020\107\170\266\116\322\145\311\303\067\337\341\102 +-\143\260\127\067\105\055\173\212\234\277\005\352\145\125\063\367 +-\071\020\305\050\052\041\172\033\212\304\044\371\077\025\310\232 +-\025\040\365\125\142\226\355\155\223\120\274\344\252\170\255\331 +-\313\012\145\207\246\146\301\304\201\243\167\072\130\036\013\356 +-\203\213\235\036\322\122\244\314\035\157\260\230\155\224\061\265 +-\370\161\012\334\271\374\175\062\140\346\353\257\212\001 +-END +- +-# Trust for Certificate "Staat der Nederlanden Root CA - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Staat der Nederlanden Root CA - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\131\257\202\171\221\206\307\264\165\007\313\317\003\127\106\353 +-\004\335\267\026 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\174\245\017\370\133\232\175\155\060\256\124\132\343\102\242\212 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 +-\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 +-\122\157\157\164\040\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\000\230\226\214 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "CA Disig" +-# +-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 "CA Disig" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061 +-\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163 +-\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104 +-\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125 +-\004\003\023\010\103\101\040\104\151\163\151\147 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061 +-\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163 +-\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104 +-\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125 +-\004\003\023\010\103\101\040\104\151\163\151\147 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\001 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061\023 +-\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163\154 +-\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104\151 +-\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125\004 +-\003\023\010\103\101\040\104\151\163\151\147\060\036\027\015\060 +-\066\060\063\062\062\060\061\063\071\063\064\132\027\015\061\066 +-\060\063\062\062\060\061\063\071\063\064\132\060\112\061\013\060 +-\011\006\003\125\004\006\023\002\123\113\061\023\060\021\006\003 +-\125\004\007\023\012\102\162\141\164\151\163\154\141\166\141\061 +-\023\060\021\006\003\125\004\012\023\012\104\151\163\151\147\040 +-\141\056\163\056\061\021\060\017\006\003\125\004\003\023\010\103 +-\101\040\104\151\163\151\147\060\202\001\042\060\015\006\011\052 +-\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060 +-\202\001\012\002\202\001\001\000\222\366\061\301\175\210\375\231 +-\001\251\330\173\362\161\165\361\061\306\363\165\146\372\121\050 +-\106\204\227\170\064\274\154\374\274\105\131\210\046\030\112\304 +-\067\037\241\112\104\275\343\161\004\365\104\027\342\077\374\110 +-\130\157\134\236\172\011\272\121\067\042\043\146\103\041\260\074 +-\144\242\370\152\025\016\077\353\121\341\124\251\335\006\231\327 +-\232\074\124\213\071\003\077\017\305\316\306\353\203\162\002\250 +-\037\161\363\055\370\165\010\333\142\114\350\372\316\371\347\152 +-\037\266\153\065\202\272\342\217\026\222\175\005\014\154\106\003 +-\135\300\355\151\277\072\301\212\240\350\216\331\271\105\050\207 +-\010\354\264\312\025\276\202\335\265\104\213\055\255\206\014\150 +-\142\155\205\126\362\254\024\143\072\306\321\231\254\064\170\126 +-\113\317\266\255\077\214\212\327\004\345\343\170\114\365\206\252 +-\365\217\372\075\154\161\243\055\312\147\353\150\173\156\063\251 +-\014\202\050\250\114\152\041\100\025\040\014\046\133\203\302\251 +-\026\025\300\044\202\135\053\026\255\312\143\366\164\000\260\337 +-\103\304\020\140\126\147\143\105\002\003\001\000\001\243\201\377 +-\060\201\374\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\215 +-\262\111\150\235\162\010\045\271\300\047\365\120\223\126\110\106 +-\161\371\217\060\016\006\003\125\035\017\001\001\377\004\004\003 +-\002\001\006\060\066\006\003\125\035\021\004\057\060\055\201\023 +-\143\141\157\160\145\162\141\164\157\162\100\144\151\163\151\147 +-\056\163\153\206\026\150\164\164\160\072\057\057\167\167\167\056 +-\144\151\163\151\147\056\163\153\057\143\141\060\146\006\003\125 +-\035\037\004\137\060\135\060\055\240\053\240\051\206\047\150\164 +-\164\160\072\057\057\167\167\167\056\144\151\163\151\147\056\163 +-\153\057\143\141\057\143\162\154\057\143\141\137\144\151\163\151 +-\147\056\143\162\154\060\054\240\052\240\050\206\046\150\164\164 +-\160\072\057\057\143\141\056\144\151\163\151\147\056\163\153\057 +-\143\141\057\143\162\154\057\143\141\137\144\151\163\151\147\056 +-\143\162\154\060\032\006\003\125\035\040\004\023\060\021\060\017 +-\006\015\053\201\036\221\223\346\012\000\000\000\001\001\001\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202 +-\001\001\000\135\064\164\141\114\257\073\330\377\237\155\130\066 +-\034\075\013\201\015\022\053\106\020\200\375\347\074\047\320\172 +-\310\251\266\176\164\060\063\243\072\212\173\164\300\171\171\102 +-\223\155\377\261\051\024\202\253\041\214\057\027\371\077\046\057 +-\365\131\306\357\200\006\267\232\111\051\354\316\176\161\074\152 +-\020\101\300\366\323\232\262\174\132\221\234\300\254\133\310\115 +-\136\367\341\123\377\103\167\374\236\113\147\154\327\363\203\321 +-\240\340\177\045\337\270\230\013\232\062\070\154\060\240\363\377 +-\010\025\063\367\120\112\173\076\243\076\040\251\334\057\126\200 +-\012\355\101\120\260\311\364\354\262\343\046\104\000\016\157\236 +-\006\274\042\226\123\160\145\304\120\012\106\153\244\057\047\201 +-\022\047\023\137\020\241\166\316\212\173\067\352\303\071\141\003 +-\225\230\072\347\154\210\045\010\374\171\150\015\207\175\142\370 +-\264\137\373\305\330\114\275\130\274\077\103\133\324\036\001\115 +-\074\143\276\043\357\214\315\132\120\270\150\124\371\012\231\063 +-\021\000\341\236\302\106\167\202\365\131\006\214\041\114\207\011 +-\315\345\250 +-END +- +-# Trust for Certificate "CA Disig" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "CA Disig" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\052\310\325\213\127\316\277\057\111\257\362\374\166\217\121\024 +-\142\220\172\101 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\077\105\226\071\342\120\207\367\273\376\230\014\074\040\230\346 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061 +-\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163 +-\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104 +-\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125 +-\004\003\023\010\103\101\040\104\151\163\151\147 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Juur-SK" +-# +-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 "Juur-SK" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011 +-\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011 +-\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125 +-\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163 +-\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060 +-\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011 +-\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011 +-\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125 +-\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163 +-\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060 +-\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\073\216\113\374 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\346\060\202\003\316\240\003\002\001\002\002\004\073 +-\216\113\374\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\135\061\030\060\026\006\011\052\206\110\206\367\015 +-\001\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013 +-\060\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006 +-\003\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151 +-\164\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061 +-\020\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123 +-\113\060\036\027\015\060\061\060\070\063\060\061\064\062\063\060 +-\061\132\027\015\061\066\060\070\062\066\061\064\062\063\060\061 +-\132\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001 +-\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060 +-\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003 +-\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164 +-\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020 +-\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001 +-\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001 +-\000\201\161\066\076\063\007\326\343\060\215\023\176\167\062\106 +-\313\317\031\262\140\061\106\227\206\364\230\106\244\302\145\105 +-\317\323\100\174\343\132\042\250\020\170\063\314\210\261\323\201 +-\112\366\142\027\173\137\115\012\056\320\317\213\043\356\117\002 +-\116\273\353\016\312\275\030\143\350\200\034\215\341\034\215\075 +-\340\377\133\137\352\144\345\227\350\077\231\177\014\012\011\063 +-\000\032\123\247\041\341\070\113\326\203\033\255\257\144\302\371 +-\034\172\214\146\110\115\146\037\030\012\342\076\273\037\007\145 +-\223\205\271\032\260\271\304\373\015\021\366\365\326\371\033\307 +-\054\053\267\030\121\376\340\173\366\250\110\257\154\073\117\057 +-\357\370\321\107\036\046\127\360\121\035\063\226\377\357\131\075 +-\332\115\321\025\064\307\352\077\026\110\173\221\034\200\103\017 +-\075\270\005\076\321\263\225\315\330\312\017\302\103\147\333\267 +-\223\340\042\202\056\276\365\150\050\203\271\301\073\151\173\040 +-\332\116\234\155\341\272\315\217\172\154\260\011\042\327\213\013 +-\333\034\325\132\046\133\015\300\352\345\140\320\237\376\065\337 +-\077\002\003\001\000\001\243\202\001\254\060\202\001\250\060\017 +-\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +-\202\001\026\006\003\125\035\040\004\202\001\015\060\202\001\011 +-\060\202\001\005\006\012\053\006\001\004\001\316\037\001\001\001 +-\060\201\366\060\201\320\006\010\053\006\001\005\005\007\002\002 +-\060\201\303\036\201\300\000\123\000\145\000\145\000\040\000\163 +-\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141 +-\000\141\000\164\000\040\000\157\000\156\000\040\000\166\000\344 +-\000\154\000\152\000\141\000\163\000\164\000\141\000\164\000\165 +-\000\144\000\040\000\101\000\123\000\055\000\151\000\163\000\040 +-\000\123\000\145\000\162\000\164\000\151\000\146\000\151\000\164 +-\000\163\000\145\000\145\000\162\000\151\000\155\000\151\000\163 +-\000\153\000\145\000\163\000\153\000\165\000\163\000\040\000\141 +-\000\154\000\141\000\155\000\055\000\123\000\113\000\040\000\163 +-\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141 +-\000\141\000\164\000\151\000\144\000\145\000\040\000\153\000\151 +-\000\156\000\156\000\151\000\164\000\141\000\155\000\151\000\163 +-\000\145\000\153\000\163\060\041\006\010\053\006\001\005\005\007 +-\002\001\026\025\150\164\164\160\072\057\057\167\167\167\056\163 +-\153\056\145\145\057\143\160\163\057\060\053\006\003\125\035\037 +-\004\044\060\042\060\040\240\036\240\034\206\032\150\164\164\160 +-\072\057\057\167\167\167\056\163\153\056\145\145\057\152\165\165 +-\162\057\143\162\154\057\060\035\006\003\125\035\016\004\026\004 +-\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030\077 +-\157\357\351\175\276\060\037\006\003\125\035\043\004\030\060\026 +-\200\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030 +-\077\157\357\351\175\276\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\346\060\015\006\011\052\206\110\206\367\015 +-\001\001\005\005\000\003\202\001\001\000\173\301\030\224\123\242 +-\011\363\376\046\147\232\120\344\303\005\057\053\065\170\221\114 +-\174\250\021\021\171\114\111\131\254\310\367\205\145\134\106\273 +-\073\020\240\002\257\315\117\265\314\066\052\354\135\376\357\240 +-\221\311\266\223\157\174\200\124\354\307\010\160\015\216\373\202 +-\354\052\140\170\151\066\066\321\305\234\213\151\265\100\310\224 +-\145\167\362\127\041\146\073\316\205\100\266\063\143\032\277\171 +-\036\374\134\035\323\035\223\033\213\014\135\205\275\231\060\062 +-\030\011\221\122\351\174\241\272\377\144\222\232\354\376\065\356 +-\214\057\256\374\040\206\354\112\336\033\170\062\067\246\201\322 +-\235\257\132\022\026\312\231\133\374\157\155\016\305\240\036\206 +-\311\221\320\134\230\202\137\143\014\212\132\253\330\225\246\314 +-\313\212\326\277\144\113\216\312\212\262\260\351\041\062\236\252 +-\250\205\230\064\201\071\041\073\250\072\122\062\075\366\153\067 +-\206\006\132\025\230\334\360\021\146\376\064\040\267\003\364\101 +-\020\175\071\204\171\226\162\143\266\226\002\345\153\271\255\031 +-\115\273\306\104\333\066\313\052\234\216 +-END +- +-# Trust for Certificate "Juur-SK" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Juur-SK" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\100\235\113\331\027\265\134\047\266\233\144\313\230\042\104\015 +-\315\011\270\211 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\252\216\135\331\370\333\012\130\267\215\046\207\154\202\065\125 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011 +-\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011 +-\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125 +-\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163 +-\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060 +-\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\073\216\113\374 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Hongkong Post Root CA 1" +-# +-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 "Hongkong Post Root CA 1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\003\350 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\060\060\202\002\030\240\003\002\001\002\002\002\003 +-\350\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061\060\036\027\015\060\063\060 +-\065\061\065\060\065\061\063\061\064\132\027\015\062\063\060\065 +-\061\065\060\064\065\062\062\071\132\060\107\061\013\060\011\006 +-\003\125\004\006\023\002\110\113\061\026\060\024\006\003\125\004 +-\012\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164 +-\061\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153 +-\157\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101 +-\040\061\060\202\001\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 +-\001\001\000\254\377\070\266\351\146\002\111\343\242\264\341\220 +-\371\100\217\171\371\342\275\171\376\002\275\356\044\222\035\042 +-\366\332\205\162\151\376\327\077\011\324\335\221\265\002\234\320 +-\215\132\341\125\303\120\206\271\051\046\302\343\331\240\361\151 +-\003\050\040\200\105\042\055\126\247\073\124\225\126\042\131\037 +-\050\337\037\040\075\155\242\066\276\043\240\261\156\265\261\047 +-\077\071\123\011\352\253\152\350\164\262\302\145\134\216\277\174 +-\303\170\204\315\236\026\374\365\056\117\040\052\010\237\167\363 +-\305\036\304\232\122\146\036\110\136\343\020\006\217\042\230\341 +-\145\216\033\135\043\146\073\270\245\062\121\310\206\252\241\251 +-\236\177\166\224\302\246\154\267\101\360\325\310\006\070\346\324 +-\014\342\363\073\114\155\120\214\304\203\047\301\023\204\131\075 +-\236\165\164\266\330\002\136\072\220\172\300\102\066\162\354\152 +-\115\334\357\304\000\337\023\030\127\137\046\170\310\326\012\171 +-\167\277\367\257\267\166\271\245\013\204\027\135\020\352\157\341 +-\253\225\021\137\155\074\243\134\115\203\133\362\263\031\212\200 +-\213\013\207\002\003\001\000\001\243\046\060\044\060\022\006\003 +-\125\035\023\001\001\377\004\010\060\006\001\001\377\002\001\003 +-\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\306 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 +-\202\001\001\000\016\106\325\074\256\342\207\331\136\201\213\002 +-\230\101\010\214\114\274\332\333\356\047\033\202\347\152\105\354 +-\026\213\117\205\240\363\262\160\275\132\226\272\312\156\155\356 +-\106\213\156\347\052\056\226\263\031\063\353\264\237\250\262\067 +-\356\230\250\227\266\056\266\147\047\324\246\111\375\034\223\145 +-\166\236\102\057\334\042\154\232\117\362\132\025\071\261\161\327 +-\053\121\350\155\034\230\300\331\052\364\241\202\173\325\311\101 +-\242\043\001\164\070\125\213\017\271\056\147\242\040\004\067\332 +-\234\013\323\027\041\340\217\227\171\064\157\204\110\002\040\063 +-\033\346\064\104\237\221\160\364\200\136\204\103\302\051\322\154 +-\022\024\344\141\215\254\020\220\236\204\120\273\360\226\157\105 +-\237\212\363\312\154\117\372\021\072\025\025\106\303\315\037\203 +-\133\055\101\022\355\120\147\101\023\075\041\253\224\212\252\116 +-\174\301\261\373\247\326\265\047\057\227\253\156\340\035\342\321 +-\034\054\037\104\342\374\276\221\241\234\373\326\051\123\163\206 +-\237\123\330\103\016\135\326\143\202\161\035\200\164\312\366\342 +-\002\153\331\132 +-END +- +-# Trust for Certificate "Hongkong Post Root CA 1" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Hongkong Post Root CA 1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\326\332\250\040\215\011\322\025\115\044\265\057\313\064\156\262 +-\130\262\212\130 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\250\015\157\071\170\271\103\155\167\102\155\230\132\314\043\312 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\003\350 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "SecureSign RootCA11" +-# +-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 "SecureSign RootCA11" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032 +-\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147 +-\156\040\122\157\157\164\103\101\061\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032 +-\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147 +-\156\040\122\157\157\164\103\101\061\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\155\060\202\002\125\240\003\002\001\002\002\001\001 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061\053 +-\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162 +-\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032\006 +-\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147\156 +-\040\122\157\157\164\103\101\061\061\060\036\027\015\060\071\060 +-\064\060\070\060\064\065\066\064\067\132\027\015\062\071\060\064 +-\060\070\060\064\065\066\064\067\132\060\130\061\013\060\011\006 +-\003\125\004\006\023\002\112\120\061\053\060\051\006\003\125\004 +-\012\023\042\112\141\160\141\156\040\103\145\162\164\151\146\151 +-\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163\054 +-\040\111\156\143\056\061\034\060\032\006\003\125\004\003\023\023 +-\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164\103 +-\101\061\061\060\202\001\042\060\015\006\011\052\206\110\206\367 +-\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 +-\202\001\001\000\375\167\252\245\034\220\005\073\313\114\233\063 +-\213\132\024\105\244\347\220\026\321\337\127\322\041\020\244\027 +-\375\337\254\326\037\247\344\333\174\367\354\337\270\003\332\224 +-\130\375\135\162\174\214\077\137\001\147\164\025\226\343\002\074 +-\207\333\256\313\001\216\302\363\146\306\205\105\364\002\306\072 +-\265\142\262\257\372\234\277\244\346\324\200\060\230\363\015\266 +-\223\217\251\324\330\066\362\260\374\212\312\054\241\025\063\225 +-\061\332\300\033\362\356\142\231\206\143\077\277\335\223\052\203 +-\250\166\271\023\037\267\316\116\102\205\217\042\347\056\032\362 +-\225\011\262\005\265\104\116\167\241\040\275\251\362\116\012\175 +-\120\255\365\005\015\105\117\106\161\375\050\076\123\373\004\330 +-\055\327\145\035\112\033\372\317\073\260\061\232\065\156\310\213 +-\006\323\000\221\362\224\010\145\114\261\064\006\000\172\211\342 +-\360\307\003\131\317\325\326\350\247\062\263\346\230\100\206\305 +-\315\047\022\213\314\173\316\267\021\074\142\140\007\043\076\053 +-\100\156\224\200\011\155\266\263\157\167\157\065\010\120\373\002 +-\207\305\076\211\002\003\001\000\001\243\102\060\100\060\035\006 +-\003\125\035\016\004\026\004\024\133\370\115\117\262\245\206\324 +-\072\322\361\143\232\240\276\011\366\127\267\336\060\016\006\003 +-\125\035\017\001\001\377\004\004\003\002\001\006\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\005\005\000\003\202\001\001 +-\000\240\241\070\026\146\056\247\126\037\041\234\006\372\035\355 +-\271\042\305\070\046\330\116\117\354\243\177\171\336\106\041\241 +-\207\167\217\007\010\232\262\244\305\257\017\062\230\013\174\146 +-\051\266\233\175\045\122\111\103\253\114\056\053\156\172\160\257 +-\026\016\343\002\154\373\102\346\030\235\105\330\125\310\350\073 +-\335\347\341\364\056\013\034\064\134\154\130\112\373\214\210\120 +-\137\225\034\277\355\253\042\265\145\263\205\272\236\017\270\255 +-\345\172\033\212\120\072\035\275\015\274\173\124\120\013\271\102 +-\257\125\240\030\201\255\145\231\357\276\344\234\277\304\205\253 +-\101\262\124\157\334\045\315\355\170\342\216\014\215\011\111\335 +-\143\173\132\151\226\002\041\250\275\122\131\351\175\065\313\310 +-\122\312\177\201\376\331\153\323\367\021\355\045\337\370\347\371 +-\244\372\162\227\204\123\015\245\320\062\030\121\166\131\024\154 +-\017\353\354\137\200\214\165\103\203\303\205\230\377\114\236\055 +-\015\344\167\203\223\116\265\226\007\213\050\023\233\214\031\215 +-\101\047\111\100\356\336\346\043\104\071\334\241\042\326\272\003 +-\362 +-END +- +-# Trust for Certificate "SecureSign RootCA11" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "SecureSign RootCA11" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\073\304\237\110\370\363\163\240\234\036\275\370\133\261\303\145 +-\307\330\021\263 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\267\122\164\342\222\264\200\223\362\165\344\314\327\362\352\046 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032 +-\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147 +-\156\040\122\157\157\164\103\101\061\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "ACEDICOM Root" +-# +-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 "ACEDICOM Root" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105 +-\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003 +-\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004 +-\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125 +-\004\006\023\002\105\123 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105 +-\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003 +-\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004 +-\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125 +-\004\006\023\002\105\123 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\141\215\307\206\073\001\202\005 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\265\060\202\003\235\240\003\002\001\002\002\010\141 +-\215\307\206\073\001\202\005\060\015\006\011\052\206\110\206\367 +-\015\001\001\005\005\000\060\104\061\026\060\024\006\003\125\004 +-\003\014\015\101\103\105\104\111\103\117\115\040\122\157\157\164 +-\061\014\060\012\006\003\125\004\013\014\003\120\113\111\061\017 +-\060\015\006\003\125\004\012\014\006\105\104\111\103\117\115\061 +-\013\060\011\006\003\125\004\006\023\002\105\123\060\036\027\015 +-\060\070\060\064\061\070\061\066\062\064\062\062\132\027\015\062 +-\070\060\064\061\063\061\066\062\064\062\062\132\060\104\061\026 +-\060\024\006\003\125\004\003\014\015\101\103\105\104\111\103\117 +-\115\040\122\157\157\164\061\014\060\012\006\003\125\004\013\014 +-\003\120\113\111\061\017\060\015\006\003\125\004\012\014\006\105 +-\104\111\103\117\115\061\013\060\011\006\003\125\004\006\023\002 +-\105\123\060\202\002\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 +-\002\001\000\377\222\225\341\150\006\166\264\054\310\130\110\312 +-\375\200\124\051\125\143\044\377\220\145\233\020\165\173\303\152 +-\333\142\002\001\362\030\206\265\174\132\070\261\344\130\271\373 +-\323\330\055\237\275\062\067\277\054\025\155\276\265\364\041\322 +-\023\221\331\007\255\001\005\326\363\275\167\316\137\102\201\012 +-\371\152\343\203\000\250\053\056\125\023\143\201\312\107\034\173 +-\134\026\127\172\033\203\140\004\072\076\145\303\315\001\336\336 +-\244\326\014\272\216\336\331\004\356\027\126\042\233\217\143\375 +-\115\026\013\267\173\167\214\371\045\265\321\155\231\022\056\117 +-\032\270\346\352\004\222\256\075\021\271\121\102\075\207\260\061 +-\205\257\171\132\234\376\347\116\136\222\117\103\374\253\072\255 +-\245\022\046\146\271\342\014\327\230\316\324\130\245\225\100\012 +-\267\104\235\023\164\053\302\245\353\042\025\230\020\330\213\305 +-\004\237\035\217\140\345\006\033\233\317\271\171\240\075\242\043 +-\077\102\077\153\372\034\003\173\060\215\316\154\300\277\346\033 +-\137\277\147\270\204\031\325\025\357\173\313\220\066\061\142\311 +-\274\002\253\106\137\233\376\032\150\224\064\075\220\216\255\366 +-\344\035\011\177\112\210\070\077\276\147\375\064\226\365\035\274 +-\060\164\313\070\356\325\154\253\324\374\364\000\267\000\133\205 +-\062\026\166\063\351\330\243\231\235\005\000\252\026\346\363\201 +-\175\157\175\252\206\155\255\025\164\323\304\242\161\252\364\024 +-\175\347\062\270\037\274\325\361\116\275\157\027\002\071\327\016 +-\225\102\072\307\000\076\351\046\143\021\352\013\321\112\377\030 +-\235\262\327\173\057\072\331\226\373\350\036\222\256\023\125\310 +-\331\047\366\334\110\033\260\044\301\205\343\167\235\232\244\363 +-\014\021\035\015\310\264\024\356\265\202\127\011\277\040\130\177 +-\057\042\043\330\160\313\171\154\311\113\362\251\052\310\374\207 +-\053\327\032\120\370\047\350\057\103\343\072\275\330\127\161\375 +-\316\246\122\133\371\335\115\355\345\366\157\211\355\273\223\234 +-\166\041\165\360\222\114\051\367\057\234\001\056\376\120\106\236 +-\144\014\024\263\007\133\305\302\163\154\361\007\134\105\044\024 +-\065\256\203\361\152\115\211\172\372\263\330\055\146\360\066\207 +-\365\053\123\002\003\001\000\001\243\201\252\060\201\247\060\017 +-\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +-\037\006\003\125\035\043\004\030\060\026\200\024\246\263\341\053 +-\053\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120 +-\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\206 +-\060\035\006\003\125\035\016\004\026\004\024\246\263\341\053\053 +-\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120\060 +-\104\006\003\125\035\040\004\075\060\073\060\071\006\004\125\035 +-\040\000\060\061\060\057\006\010\053\006\001\005\005\007\002\001 +-\026\043\150\164\164\160\072\057\057\141\143\145\144\151\143\157 +-\155\056\145\144\151\143\157\155\147\162\157\165\160\056\143\157 +-\155\057\144\157\143\060\015\006\011\052\206\110\206\367\015\001 +-\001\005\005\000\003\202\002\001\000\316\054\013\122\121\142\046 +-\175\014\047\203\217\305\366\332\240\150\173\117\222\136\352\244 +-\163\062\021\123\104\262\104\313\235\354\017\171\102\263\020\246 +-\307\015\235\313\266\372\077\072\174\352\277\210\123\033\074\367 +-\202\372\005\065\063\341\065\250\127\300\347\375\215\117\077\223 +-\062\117\170\146\003\167\007\130\351\225\310\176\076\320\171\000 +-\214\362\033\121\063\233\274\224\351\072\173\156\122\055\062\236 +-\043\244\105\373\266\056\023\260\213\030\261\335\316\325\035\247 +-\102\177\125\276\373\133\273\107\324\374\044\315\004\256\226\005 +-\025\326\254\316\060\363\312\013\305\272\342\042\340\246\255\042 +-\344\002\356\164\021\177\114\377\170\035\065\332\346\002\064\353 +-\030\022\141\167\006\011\026\143\352\030\255\242\207\037\362\307 +-\200\011\011\165\116\020\250\217\075\206\270\165\021\300\044\142 +-\212\226\173\112\105\351\354\131\305\276\153\203\346\341\350\254 +-\265\060\036\376\005\007\200\371\341\043\015\120\217\005\230\377 +-\054\137\350\073\266\255\317\201\265\041\207\312\010\052\043\047 +-\060\040\053\317\355\224\133\254\262\172\322\307\050\241\212\013 +-\233\115\112\054\155\205\077\011\162\074\147\342\331\334\007\272 +-\353\145\173\132\001\143\326\220\133\117\027\146\075\177\013\031 +-\243\223\143\020\122\052\237\024\026\130\342\334\245\364\241\026 +-\213\016\221\213\201\312\233\131\372\330\153\221\007\145\125\137 +-\122\037\257\072\373\220\335\151\245\133\234\155\016\054\266\372 +-\316\254\245\174\062\112\147\100\334\060\064\043\335\327\004\043 +-\146\360\374\125\200\247\373\146\031\202\065\147\142\160\071\136 +-\157\307\352\220\100\104\010\036\270\262\326\333\356\131\247\015 +-\030\171\064\274\124\030\136\123\312\064\121\355\105\012\346\216 +-\307\202\066\076\247\070\143\251\060\054\027\020\140\222\237\125 +-\207\022\131\020\302\017\147\151\021\314\116\036\176\112\232\255 +-\257\100\250\165\254\126\220\164\270\240\234\245\171\157\334\351 +-\032\310\151\005\351\272\372\003\263\174\344\340\116\302\316\235 +-\350\266\106\015\156\176\127\072\147\224\302\313\037\234\167\112 +-\147\116\151\206\103\223\070\373\266\333\117\203\221\324\140\176 +-\113\076\053\070\007\125\230\136\244 +-END +- +-# Trust for Certificate "ACEDICOM Root" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "ACEDICOM Root" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\340\264\062\056\262\366\245\150\266\124\123\204\110\030\112\120 +-\066\207\103\204 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\102\201\240\342\034\343\125\020\336\125\211\102\145\226\042\346 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105 +-\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003 +-\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004 +-\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125 +-\004\006\023\002\105\123 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\141\215\307\206\073\001\202\005 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +- +-# +-# Certificate "Verisign Class 1 Public Primary Certification Authority" +-# +-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 "Verisign Class 1 Public Primary Certification Authority" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +-\344\335 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\074\060\202\001\245\002\020\077\151\036\201\234\360 +-\232\112\363\163\377\271\110\242\344\335\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +-\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +-\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +-\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +-\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155\141 +-\162\171\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\066 +-\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +-\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +-\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +-\163\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155 +-\141\162\171\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\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\345\031\277\155\243\126\141\055 +-\231\110\161\366\147\336\271\215\353\267\236\206\200\012\221\016 +-\372\070\045\257\106\210\202\345\163\250\240\233\044\135\015\037 +-\314\145\156\014\260\320\126\204\030\207\232\006\233\020\241\163 +-\337\264\130\071\153\156\301\366\025\325\250\250\077\252\022\006 +-\215\061\254\177\260\064\327\217\064\147\210\011\315\024\021\342 +-\116\105\126\151\037\170\002\200\332\334\107\221\051\273\066\311 +-\143\134\305\340\327\055\207\173\241\267\062\260\173\060\272\052 +-\057\061\252\356\243\147\332\333\002\003\001\000\001\060\015\006 +-\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +-\130\025\051\071\074\167\243\332\134\045\003\174\140\372\356\011 +-\231\074\047\020\160\310\014\011\346\263\207\317\012\342\030\226 +-\065\142\314\277\233\047\171\211\137\311\304\011\364\316\265\035 +-\337\052\275\345\333\206\234\150\045\345\060\174\266\211\025\376 +-\147\321\255\341\120\254\074\174\142\113\217\272\204\327\022\025 +-\033\037\312\135\017\301\122\224\052\021\231\332\173\317\014\066 +-\023\325\065\334\020\031\131\352\224\301\000\277\165\217\331\372 +-\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133 +-END +- +-# Trust for Certificate "Verisign Class 1 Public Primary Certification Authority" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Verisign Class 1 Public Primary Certification Authority" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\316\152\144\243\011\344\057\273\331\205\034\105\076\144\011\352 +-\350\175\140\361 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\206\254\336\053\305\155\303\331\214\050\210\323\215\026\023\036 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +-\344\335 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Verisign Class 3 Public Primary Certification Authority" +-# +-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 "Verisign Class 3 Public Primary Certification Authority" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\264\061\024\060\022\006\003\125\004\012\023\013\105\156 ++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 ++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 ++\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164 ++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 ++\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 ++\040\050\062\060\064\070\051 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +-\022\276 ++\002\004\070\143\336\370 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\002\074\060\202\001\245\002\020\074\221\061\313\037\366 +-\320\033\016\232\270\320\104\277\022\276\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +-\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +-\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +-\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +-\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155\141 +-\162\171\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\066 +-\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +-\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +-\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +-\163\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155 +-\141\162\171\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\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\311\134\131\236\362\033\212\001 +-\024\264\020\337\004\100\333\343\127\257\152\105\100\217\204\014 +-\013\321\063\331\331\021\317\356\002\130\037\045\367\052\250\104 +-\005\252\354\003\037\170\177\236\223\271\232\000\252\043\175\326 +-\254\205\242\143\105\307\162\047\314\364\114\306\165\161\322\071 +-\357\117\102\360\165\337\012\220\306\216\040\157\230\017\370\254 +-\043\137\160\051\066\244\311\206\347\261\232\040\313\123\245\205 +-\347\075\276\175\232\376\044\105\063\334\166\025\355\017\242\161 +-\144\114\145\056\201\150\105\247\002\003\001\000\001\060\015\006 +-\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +-\020\162\122\251\005\024\031\062\010\101\360\305\153\012\314\176 +-\017\041\031\315\344\147\334\137\251\033\346\312\350\163\235\042 +-\330\230\156\163\003\141\221\305\174\260\105\100\156\104\235\215 +-\260\261\226\164\141\055\015\251\105\322\244\222\052\326\232\165 +-\227\156\077\123\375\105\231\140\035\250\053\114\371\136\247\011 +-\330\165\060\327\322\145\140\075\147\326\110\125\165\151\077\221 +-\365\110\013\107\151\042\151\202\226\276\311\310\070\206\112\172 +-\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220 ++\060\202\004\052\060\202\003\022\240\003\002\001\002\002\004\070 ++\143\336\370\060\015\006\011\052\206\110\206\367\015\001\001\005 ++\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013 ++\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006 ++\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163 ++\164\056\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105 ++\156\164\162\165\163\164\056\156\145\164\040\103\145\162\164\151 ++\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 ++\164\171\040\050\062\060\064\070\051\060\036\027\015\071\071\061 ++\062\062\064\061\067\065\060\065\061\132\027\015\062\071\060\067 ++\062\064\061\064\061\065\061\062\132\060\201\264\061\024\060\022 ++\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156 ++\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167 ++\056\145\156\164\162\165\163\164\056\156\145\164\057\103\120\123 ++\137\062\060\064\070\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\063\060\061\006 ++\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145 ++\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040 ++\101\165\164\150\157\162\151\164\171\040\050\062\060\064\070\051 ++\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001 ++\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001 ++\000\255\115\113\251\022\206\262\352\243\040\007\025\026\144\052 ++\053\113\321\277\013\112\115\216\355\200\166\245\147\267\170\100 ++\300\163\102\310\150\300\333\123\053\335\136\270\166\230\065\223 ++\213\032\235\174\023\072\016\037\133\267\036\317\345\044\024\036 ++\261\201\251\215\175\270\314\153\113\003\361\002\014\334\253\245 ++\100\044\000\177\164\224\241\235\010\051\263\210\013\365\207\167 ++\235\125\315\344\303\176\327\152\144\253\205\024\206\225\133\227 ++\062\120\157\075\310\272\146\014\343\374\275\270\111\301\166\211 ++\111\031\375\300\250\275\211\243\147\057\306\237\274\161\031\140 ++\270\055\351\054\311\220\166\146\173\224\342\257\170\326\145\123 ++\135\074\326\234\262\317\051\003\371\057\244\120\262\324\110\316 ++\005\062\125\212\375\262\144\114\016\344\230\007\165\333\177\337 ++\271\010\125\140\205\060\051\371\173\110\244\151\206\343\065\077 ++\036\206\135\172\172\025\275\357\000\216\025\042\124\027\000\220 ++\046\223\274\016\111\150\221\277\370\107\323\235\225\102\301\016 ++\115\337\157\046\317\303\030\041\142\146\103\160\326\325\300\007 ++\341\002\003\001\000\001\243\102\060\100\060\016\006\003\125\035 ++\017\001\001\377\004\004\003\002\001\006\060\017\006\003\125\035 ++\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003\125 ++\035\016\004\026\004\024\125\344\201\321\021\200\276\330\211\271 ++\010\243\061\371\241\044\011\026\271\160\060\015\006\011\052\206 ++\110\206\367\015\001\001\005\005\000\003\202\001\001\000\073\233 ++\217\126\233\060\347\123\231\174\172\171\247\115\227\327\031\225 ++\220\373\006\037\312\063\174\106\143\217\226\146\044\372\100\033 ++\041\047\312\346\162\163\362\117\376\061\231\375\310\014\114\150 ++\123\306\200\202\023\230\372\266\255\332\135\075\361\316\156\366 ++\025\021\224\202\014\356\077\225\257\021\253\017\327\057\336\037 ++\003\217\127\054\036\311\273\232\032\104\225\353\030\117\246\037 ++\315\175\127\020\057\233\004\011\132\204\265\156\330\035\072\341 ++\326\236\321\154\171\136\171\034\024\305\343\320\114\223\073\145 ++\074\355\337\075\276\246\345\225\032\303\265\031\303\275\136\133 ++\273\377\043\357\150\031\313\022\223\047\134\003\055\157\060\320 ++\036\266\032\254\336\132\367\321\252\250\047\246\376\171\201\304 ++\171\231\063\127\272\022\260\251\340\102\154\223\312\126\336\376 ++\155\204\013\010\213\176\215\352\327\230\041\306\363\347\074\171 ++\057\136\234\321\114\025\215\341\354\042\067\314\232\103\013\227 ++\334\200\220\215\263\147\233\157\110\010\025\126\317\277\361\053 ++\174\136\232\166\351\131\220\305\174\203\065\021\145\121 + END + +-# Trust for Certificate "Verisign Class 3 Public Primary Certification Authority" ++# Trust for Certificate "Entrust.net 2048 2029" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Verisign Class 3 Public Primary Certification Authority" ++CKA_LABEL UTF8 "Entrust.net 2048 2029" + CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\241\333\143\223\221\157\027\344\030\125\011\100\004\025\307\002 +-\100\260\256\153 ++\120\060\006\011\035\227\324\365\256\071\367\313\347\222\175\175 ++\145\055\064\061 + END + CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\357\132\361\063\357\361\315\273\121\002\356\022\024\113\226\304 ++\356\051\061\274\062\176\232\346\350\265\367\121\264\064\161\220 + END + CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\264\061\024\060\022\006\003\125\004\012\023\013\105\156 ++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 ++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 ++\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164 ++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 ++\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 ++\040\050\062\060\064\070\051 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +-\022\276 ++\002\004\070\143\336\370 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Microsec e-Szigno Root CA 2009" ++# Certificate "Entrust.net 2048 2030" + # + 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 "Microsec e-Szigno Root CA 2009" ++CKA_LABEL UTF8 "Entrust.net 2048 2030" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +-\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +-\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +-\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +-\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +-\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +-\156\157\056\150\165 ++\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165 ++\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004 ++\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165 ++\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162 ++\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051 ++\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111 ++\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162 ++\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060 ++\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040 ++\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 ++\062 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +-\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +-\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +-\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +-\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +-\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +-\156\157\056\150\165 ++\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165 ++\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004 ++\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165 ++\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162 ++\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051 ++\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111 ++\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162 ++\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060 ++\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040 ++\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 ++\062 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\011\000\302\176\103\004\116\107\077\031 ++\002\004\112\123\214\050 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\004\012\060\202\002\362\240\003\002\001\002\002\011\000 +-\302\176\103\004\116\107\077\031\060\015\006\011\052\206\110\206 +-\367\015\001\001\013\005\000\060\201\202\061\013\060\011\006\003 +-\125\004\006\023\002\110\125\061\021\060\017\006\003\125\004\007 +-\014\010\102\165\144\141\160\145\163\164\061\026\060\024\006\003 +-\125\004\012\014\015\115\151\143\162\157\163\145\143\040\114\164 +-\144\056\061\047\060\045\006\003\125\004\003\014\036\115\151\143 +-\162\157\163\145\143\040\145\055\123\172\151\147\156\157\040\122 +-\157\157\164\040\103\101\040\062\060\060\071\061\037\060\035\006 +-\011\052\206\110\206\367\015\001\011\001\026\020\151\156\146\157 +-\100\145\055\163\172\151\147\156\157\056\150\165\060\036\027\015 +-\060\071\060\066\061\066\061\061\063\060\061\070\132\027\015\062 +-\071\061\062\063\060\061\061\063\060\061\070\132\060\201\202\061 +-\013\060\011\006\003\125\004\006\023\002\110\125\061\021\060\017 +-\006\003\125\004\007\014\010\102\165\144\141\160\145\163\164\061 +-\026\060\024\006\003\125\004\012\014\015\115\151\143\162\157\163 +-\145\143\040\114\164\144\056\061\047\060\045\006\003\125\004\003 +-\014\036\115\151\143\162\157\163\145\143\040\145\055\123\172\151 +-\147\156\157\040\122\157\157\164\040\103\101\040\062\060\060\071 +-\061\037\060\035\006\011\052\206\110\206\367\015\001\011\001\026 +-\020\151\156\146\157\100\145\055\163\172\151\147\156\157\056\150 +-\165\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001 +-\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001 +-\001\000\351\370\217\363\143\255\332\206\330\247\340\102\373\317 +-\221\336\246\046\370\231\245\143\160\255\233\256\312\063\100\175 +-\155\226\156\241\016\104\356\341\023\235\224\102\122\232\275\165 +-\205\164\054\250\016\035\223\266\030\267\214\054\250\317\373\134 +-\161\271\332\354\376\350\176\217\344\057\035\262\250\165\207\330 +-\267\241\345\073\317\231\112\106\320\203\031\175\300\241\022\034 +-\225\155\112\364\330\307\245\115\063\056\205\071\100\165\176\024 +-\174\200\022\230\120\307\101\147\270\240\200\141\124\246\154\116 +-\037\340\235\016\007\351\311\272\063\347\376\300\125\050\054\002 +-\200\247\031\365\236\334\125\123\003\227\173\007\110\377\231\373 +-\067\212\044\304\131\314\120\020\143\216\252\251\032\260\204\032 +-\206\371\137\273\261\120\156\244\321\012\314\325\161\176\037\247 +-\033\174\365\123\156\042\137\313\053\346\324\174\135\256\326\302 +-\306\114\345\005\001\331\355\127\374\301\043\171\374\372\310\044 +-\203\225\363\265\152\121\001\320\167\326\351\022\241\371\032\203 +-\373\202\033\271\260\227\364\166\006\063\103\111\240\377\013\265 +-\372\265\002\003\001\000\001\243\201\200\060\176\060\017\006\003 +-\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 +-\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 +-\003\125\035\016\004\026\004\024\313\017\306\337\102\103\314\075 +-\313\265\110\043\241\032\172\246\052\273\064\150\060\037\006\003 +-\125\035\043\004\030\060\026\200\024\313\017\306\337\102\103\314 +-\075\313\265\110\043\241\032\172\246\052\273\064\150\060\033\006 +-\003\125\035\021\004\024\060\022\201\020\151\156\146\157\100\145 +-\055\163\172\151\147\156\157\056\150\165\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\003\202\001\001\000\311\321 +-\016\136\056\325\314\263\174\076\313\374\075\377\015\050\225\223 +-\004\310\277\332\315\171\270\103\220\360\244\276\357\362\357\041 +-\230\274\324\324\135\006\366\356\102\354\060\154\240\252\251\312 +-\361\257\212\372\077\013\163\152\076\352\056\100\176\037\256\124 +-\141\171\353\056\010\067\327\043\363\214\237\276\035\261\341\244 +-\165\333\240\342\124\024\261\272\034\051\244\030\366\022\272\242 +-\024\024\343\061\065\310\100\377\267\340\005\166\127\301\034\131 +-\362\370\277\344\355\045\142\134\204\360\176\176\037\263\276\371 +-\267\041\021\314\003\001\126\160\247\020\222\036\033\064\201\036 +-\255\234\032\303\004\074\355\002\141\326\036\006\363\137\072\207 +-\362\053\361\105\207\345\075\254\321\307\127\204\275\153\256\334 +-\330\371\266\033\142\160\013\075\066\311\102\362\062\327\172\141 +-\346\322\333\075\317\310\251\311\233\334\333\130\104\327\157\070 +-\257\177\170\323\243\255\032\165\272\034\301\066\174\217\036\155 +-\034\303\165\106\256\065\005\246\366\134\075\041\356\126\360\311 +-\202\042\055\172\124\253\160\303\175\042\145\202\160\226 ++\060\202\004\076\060\202\003\046\240\003\002\001\002\002\004\112 ++\123\214\050\060\015\006\011\052\206\110\206\367\015\001\001\013 ++\005\000\060\201\276\061\013\060\011\006\003\125\004\006\023\002 ++\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156\164 ++\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006\003 ++\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156\164 ++\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055\164 ++\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060\050 ++\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164\054 ++\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164\150 ++\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061 ++\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165\163 ++\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141 ++\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055 ++\040\107\062\060\036\027\015\060\071\060\067\060\067\061\067\062 ++\065\065\064\132\027\015\063\060\061\062\060\067\061\067\065\065 ++\065\064\132\060\201\276\061\013\060\011\006\003\125\004\006\023 ++\002\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156 ++\164\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006 ++\003\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156 ++\164\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055 ++\164\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060 ++\050\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164 ++\054\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164 ++\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171 ++\061\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165 ++\163\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143 ++\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040 ++\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206 ++\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012 ++\002\202\001\001\000\272\204\266\162\333\236\014\153\342\231\351 ++\060\001\247\166\352\062\270\225\101\032\311\332\141\116\130\162 ++\317\376\366\202\171\277\163\141\006\012\245\047\330\263\137\323 ++\105\116\034\162\326\116\062\362\162\212\017\367\203\031\320\152 ++\200\200\000\105\036\260\307\347\232\277\022\127\047\034\243\150 ++\057\012\207\275\152\153\016\136\145\363\034\167\325\324\205\215 ++\160\041\264\263\062\347\213\242\325\206\071\002\261\270\322\107 ++\316\344\311\111\304\073\247\336\373\124\175\127\276\360\350\156 ++\302\171\262\072\013\125\342\120\230\026\062\023\134\057\170\126 ++\301\302\224\263\362\132\344\047\232\237\044\327\306\354\320\233 ++\045\202\343\314\302\304\105\305\214\227\172\006\153\052\021\237 ++\251\012\156\110\073\157\333\324\021\031\102\367\217\007\277\365 ++\123\137\234\076\364\027\054\346\151\254\116\062\114\142\167\352 ++\267\350\345\273\064\274\031\213\256\234\121\347\267\176\265\123 ++\261\063\042\345\155\317\160\074\032\372\342\233\147\266\203\364 ++\215\245\257\142\114\115\340\130\254\144\064\022\003\370\266\215 ++\224\143\044\244\161\002\003\001\000\001\243\102\060\100\060\016 ++\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\017 ++\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 ++\035\006\003\125\035\016\004\026\004\024\152\162\046\172\320\036 ++\357\175\347\073\151\121\324\154\215\237\220\022\146\253\060\015 ++\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001 ++\001\000\171\237\035\226\306\266\171\077\042\215\207\323\207\003 ++\004\140\152\153\232\056\131\211\163\021\254\103\321\365\023\377 ++\215\071\053\300\362\275\117\160\214\251\057\352\027\304\013\124 ++\236\324\033\226\230\063\074\250\255\142\242\000\166\253\131\151 ++\156\006\035\176\304\271\104\215\230\257\022\324\141\333\012\031 ++\106\107\363\353\367\143\301\100\005\100\245\322\267\364\265\232 ++\066\277\251\210\166\210\004\125\004\053\234\207\177\032\067\074 ++\176\055\245\032\330\324\211\136\312\275\254\075\154\330\155\257 ++\325\363\166\017\315\073\210\070\042\235\154\223\232\304\075\277 ++\202\033\145\077\246\017\135\252\374\345\262\025\312\265\255\306 ++\274\075\320\204\350\352\006\162\260\115\071\062\170\277\076\021 ++\234\013\244\235\232\041\363\360\233\013\060\170\333\301\334\207 ++\103\376\274\143\232\312\305\302\034\311\307\215\377\073\022\130 ++\010\346\266\075\354\172\054\116\373\203\226\316\014\074\151\207 ++\124\163\244\163\302\223\377\121\020\254\025\124\001\330\374\005 ++\261\211\241\177\164\203\232\111\327\334\116\173\212\110\157\213 ++\105\366 + END + +-# Trust for Certificate "Microsec e-Szigno Root CA 2009" ++# Trust for Certificate "Entrust.net 2048 2030" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Microsec e-Szigno Root CA 2009" ++CKA_LABEL UTF8 "Entrust.net 2048 2030" + CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\211\337\164\376\134\364\017\112\200\371\343\067\175\124\332\221 +-\341\001\061\216 ++\214\364\047\375\171\014\072\321\146\006\215\350\036\127\357\273 ++\223\042\162\324 + END + CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\370\111\364\003\274\104\055\203\276\110\151\175\051\144\374\261 ++\113\342\311\221\226\145\014\364\016\132\223\222\240\012\376\262 + END + CKA_ISSUER MULTILINE_OCTAL +-\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +-\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +-\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +-\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +-\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +-\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +-\156\157\056\150\165 ++\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165 ++\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004 ++\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165 ++\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162 ++\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051 ++\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111 ++\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162 ++\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060 ++\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040 ++\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 ++\062 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\011\000\302\176\103\004\116\107\077\031 ++\002\004\112\123\214\050 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++# Certificate "Thawte Premium Server primary 1024 2021" + # + 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 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++CKA_LABEL UTF8 "Thawte Premium Server primary 1024 2021" + 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\124\122\061 +-\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +-\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +-\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +-\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +-\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +-\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +-\141\171\151\143\151\163\151 ++\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\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +-\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +-\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +-\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +-\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +-\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +-\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +-\141\171\151\143\151\163\151 ++\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\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +-\254\265 ++\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327 ++\011\124 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\003\266\060\202\002\236\240\003\002\001\002\002\020\104 +-\231\215\074\300\003\047\275\234\166\225\271\352\333\254\265\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\165 +-\061\013\060\011\006\003\125\004\006\023\002\124\122\061\050\060 +-\046\006\003\125\004\012\023\037\105\154\145\153\164\162\157\156 +-\151\153\040\102\151\154\147\151\040\107\165\166\145\156\154\151 +-\147\151\040\101\056\123\056\061\074\060\072\006\003\125\004\003 +-\023\063\145\055\107\165\166\145\156\040\113\157\153\040\105\154 +-\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146\151 +-\153\141\040\110\151\172\155\145\164\040\123\141\147\154\141\171 +-\151\143\151\163\151\060\036\027\015\060\067\060\061\060\064\061 +-\061\063\062\064\070\132\027\015\061\067\060\061\060\064\061\061 +-\063\062\064\070\132\060\165\061\013\060\011\006\003\125\004\006 +-\023\002\124\122\061\050\060\046\006\003\125\004\012\023\037\105 +-\154\145\153\164\162\157\156\151\153\040\102\151\154\147\151\040 +-\107\165\166\145\156\154\151\147\151\040\101\056\123\056\061\074 +-\060\072\006\003\125\004\003\023\063\145\055\107\165\166\145\156 +-\040\113\157\153\040\105\154\145\153\164\162\157\156\151\153\040 +-\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145\164 +-\040\123\141\147\154\141\171\151\143\151\163\151\060\202\001\042 +-\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +-\202\001\017\000\060\202\001\012\002\202\001\001\000\303\022\040 +-\236\260\136\000\145\215\116\106\273\200\134\351\054\006\227\325 +-\363\162\311\160\271\347\113\145\200\301\113\276\176\074\327\124 +-\061\224\336\325\022\272\123\026\002\352\130\143\357\133\330\363 +-\355\052\032\252\161\110\243\334\020\055\137\137\353\134\113\234 +-\226\010\102\045\050\021\314\212\132\142\001\120\325\353\011\123 +-\057\370\303\217\376\263\374\375\235\242\343\137\175\276\355\013 +-\340\140\353\151\354\063\355\330\215\373\022\111\203\000\311\213 +-\227\214\073\163\052\062\263\022\367\271\115\362\364\115\155\307 +-\346\326\046\067\010\362\331\375\153\134\243\345\110\134\130\274 +-\102\276\003\132\201\272\034\065\014\000\323\365\043\176\161\060 +-\010\046\070\334\045\021\107\055\363\272\043\020\245\277\274\002 +-\367\103\136\307\376\260\067\120\231\173\017\223\316\346\103\054 +-\303\176\015\362\034\103\146\140\313\141\061\107\207\243\117\256 +-\275\126\154\114\274\274\370\005\312\144\364\351\064\241\054\265 +-\163\341\302\076\350\310\311\064\045\010\134\363\355\246\307\224 +-\237\255\210\103\045\327\341\071\140\376\254\071\131\002\003\001 +-\000\001\243\102\060\100\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377 +-\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026 +-\004\024\237\356\104\263\224\325\372\221\117\056\331\125\232\004 +-\126\333\055\304\333\245\060\015\006\011\052\206\110\206\367\015 +-\001\001\005\005\000\003\202\001\001\000\177\137\271\123\133\143 +-\075\165\062\347\372\304\164\032\313\106\337\106\151\034\122\317 +-\252\117\302\150\353\377\200\251\121\350\075\142\167\211\075\012 +-\165\071\361\156\135\027\207\157\150\005\301\224\154\331\135\337 +-\332\262\131\313\245\020\212\312\314\071\315\237\353\116\336\122 +-\377\014\360\364\222\251\362\154\123\253\233\322\107\240\037\164 +-\367\233\232\361\057\025\237\172\144\060\030\007\074\052\017\147 +-\312\374\017\211\141\235\145\245\074\345\274\023\133\010\333\343 +-\377\355\273\006\273\152\006\261\172\117\145\306\202\375\036\234 +-\213\265\015\356\110\273\270\275\252\010\264\373\243\174\313\237 +-\315\220\166\134\206\226\170\127\012\146\371\130\032\235\375\227 +-\051\140\336\021\246\220\034\031\034\356\001\226\042\064\064\056 +-\221\371\267\304\047\321\173\346\277\373\200\104\132\026\345\353 +-\340\324\012\070\274\344\221\343\325\353\134\301\254\337\033\152 +-\174\236\345\165\322\266\227\207\333\314\207\053\103\072\204\010 +-\257\253\074\333\367\074\146\061\206\260\235\123\171\355\370\043 +-\336\102\343\055\202\361\017\345\372\227 ++\060\202\003\066\060\202\002\237\240\003\002\001\002\002\020\066 ++\022\042\226\305\343\070\245\040\241\322\137\114\327\011\124\060 ++\015\006\011\052\206\110\206\367\015\001\001\005\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\061\060\061\060\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\005\005\000\003\201\201\000\145\220\254\210\017\126 ++\331\346\060\064\324\046\307\320\120\361\222\336\153\324\071\210 ++\011\042\306\246\143\203\003\367\231\167\330\262\345\030\270\135 ++\143\363\324\163\373\154\234\231\170\361\113\170\175\031\044\303 ++\053\002\204\370\274\042\331\212\042\327\240\374\161\354\221\207 ++\040\361\270\354\261\345\125\200\254\075\122\310\071\016\302\360 ++\300\005\117\326\202\165\214\275\137\322\334\166\232\005\022\311 ++\257\162\303\334\045\176\244\115\216\027\245\340\207\177\341\232 ++\132\341\140\334\144\043\074\102\056\115 + END + +-# Trust for Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++# Trust for Certificate "Thawte Premium Server primary 1024 2021" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++CKA_LABEL UTF8 "Thawte Premium Server primary 1024 2021" + CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\335\341\322\251\001\200\056\035\207\136\204\263\200\176\113\261 +-\375\231\101\064 ++\340\253\005\224\040\162\124\223\005\140\142\002\066\160\367\315 ++\056\374\146\146 + END + CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\075\101\051\313\036\252\021\164\315\135\260\142\257\260\103\133 ++\246\153\140\220\043\233\077\055\273\230\157\326\247\031\015\106 + END + CKA_ISSUER MULTILINE_OCTAL +-\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +-\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +-\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +-\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +-\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +-\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +-\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +-\141\171\151\143\151\163\151 ++\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\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +-\254\265 ++\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327 ++\011\124 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "GlobalSign Root CA - R3" ++# Certificate "IPS Global CA Root 2048 2029" + # + 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 "GlobalSign Root CA - R3" ++CKA_LABEL UTF8 "IPS Global CA Root 2048 2029" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +-\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +-\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +-\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +-\004\003\023\012\107\154\157\142\141\154\123\151\147\156 ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +-\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +-\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +-\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +-\004\003\023\012\107\154\157\142\141\154\123\151\147\156 ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\013\004\000\000\000\000\001\041\130\123\010\242 ++\002\001\000 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\003\137\060\202\002\107\240\003\002\001\002\002\013\004 +-\000\000\000\000\001\041\130\123\010\242\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\060\114\061\040\060\036\006 +-\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147\156 +-\040\122\157\157\164\040\103\101\040\055\040\122\063\061\023\060 +-\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123\151 +-\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154\157 +-\142\141\154\123\151\147\156\060\036\027\015\060\071\060\063\061 +-\070\061\060\060\060\060\060\132\027\015\062\071\060\063\061\070 +-\061\060\060\060\060\060\132\060\114\061\040\060\036\006\003\125 +-\004\013\023\027\107\154\157\142\141\154\123\151\147\156\040\122 +-\157\157\164\040\103\101\040\055\040\122\063\061\023\060\021\006 +-\003\125\004\012\023\012\107\154\157\142\141\154\123\151\147\156 +-\061\023\060\021\006\003\125\004\003\023\012\107\154\157\142\141 +-\154\123\151\147\156\060\202\001\042\060\015\006\011\052\206\110 +-\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001 +-\012\002\202\001\001\000\314\045\166\220\171\006\170\042\026\365 +-\300\203\266\204\312\050\236\375\005\166\021\305\255\210\162\374 +-\106\002\103\307\262\212\235\004\137\044\313\056\113\341\140\202 +-\106\341\122\253\014\201\107\160\154\335\144\321\353\365\054\243 +-\017\202\075\014\053\256\227\327\266\024\206\020\171\273\073\023 +-\200\167\214\010\341\111\322\152\142\057\037\136\372\226\150\337 +-\211\047\225\070\237\006\327\076\311\313\046\131\015\163\336\260 +-\310\351\046\016\203\025\306\357\133\213\322\004\140\312\111\246 +-\050\366\151\073\366\313\310\050\221\345\235\212\141\127\067\254 +-\164\024\334\164\340\072\356\162\057\056\234\373\320\273\277\365 +-\075\000\341\006\063\350\202\053\256\123\246\072\026\163\214\335 +-\101\016\040\072\300\264\247\241\351\262\117\220\056\062\140\351 +-\127\313\271\004\222\150\150\345\070\046\140\165\262\237\167\377 +-\221\024\357\256\040\111\374\255\100\025\110\321\002\061\141\031 +-\136\270\227\357\255\167\267\144\232\172\277\137\301\023\357\233 +-\142\373\015\154\340\124\151\026\251\003\332\156\351\203\223\161 +-\166\306\151\205\202\027\002\003\001\000\001\243\102\060\100\060 +-\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +-\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +-\060\035\006\003\125\035\016\004\026\004\024\217\360\113\177\250 +-\056\105\044\256\115\120\372\143\232\213\336\342\335\033\274\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202 +-\001\001\000\113\100\333\300\120\252\376\310\014\357\367\226\124 +-\105\111\273\226\000\011\101\254\263\023\206\206\050\007\063\312 +-\153\346\164\271\272\000\055\256\244\012\323\365\361\361\017\212 +-\277\163\147\112\203\307\104\173\170\340\257\156\154\157\003\051 +-\216\063\071\105\303\216\344\271\127\154\252\374\022\226\354\123 +-\306\055\344\044\154\271\224\143\373\334\123\150\147\126\076\203 +-\270\317\065\041\303\311\150\376\316\332\302\123\252\314\220\212 +-\351\360\135\106\214\225\335\172\130\050\032\057\035\336\315\000 +-\067\101\217\355\104\155\327\123\050\227\176\363\147\004\036\025 +-\327\212\226\264\323\336\114\047\244\114\033\163\163\166\364\027 +-\231\302\037\172\016\343\055\010\255\012\034\054\377\074\253\125 +-\016\017\221\176\066\353\303\127\111\276\341\056\055\174\140\213 +-\303\101\121\023\043\235\316\367\062\153\224\001\250\231\347\054 +-\063\037\072\073\045\322\206\100\316\073\054\206\170\311\141\057 +-\024\272\356\333\125\157\337\204\356\005\011\115\275\050\330\162 +-\316\323\142\120\145\036\353\222\227\203\061\331\263\265\312\107 +-\130\077\137 +-END +- +-# Trust for Certificate "GlobalSign Root CA - R3" ++\060\202\006\007\060\202\004\357\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 ++\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123\061 ++\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151\144 ++\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162\151 ++\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123\040 ++\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165 ++\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160\163 ++\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160\163 ++\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160\163 ++\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157\157 ++\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001 ++\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143\141 ++\056\143\157\155\060\036\027\015\060\071\060\071\060\067\061\064 ++\063\070\064\064\132\027\015\062\071\061\062\062\065\061\064\063 ++\070\064\064\132\060\201\262\061\013\060\011\006\003\125\004\006 ++\023\002\105\123\061\017\060\015\006\003\125\004\010\023\006\115 ++\141\144\162\151\144\061\017\060\015\006\003\125\004\007\023\006 ++\115\141\144\162\151\144\061\057\060\055\006\003\125\004\012\023 ++\046\111\120\123\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\163\056\154 ++\056\040\151\160\163\103\101\061\016\060\014\006\003\125\004\013 ++\023\005\151\160\163\103\101\061\035\060\033\006\003\125\004\003 ++\023\024\151\160\163\103\101\040\107\154\157\142\141\154\040\103 ++\101\040\122\157\157\164\061\041\060\037\006\011\052\206\110\206 ++\367\015\001\011\001\026\022\147\154\157\142\141\154\060\061\100 ++\151\160\163\143\141\056\143\157\155\060\202\001\042\060\015\006 ++\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 ++\000\060\202\001\012\002\202\001\001\000\247\357\314\200\060\260 ++\221\044\117\260\150\370\303\312\055\025\070\125\130\202\342\070 ++\143\260\367\243\222\157\203\270\260\136\260\214\254\124\261\167 ++\320\120\340\227\263\220\255\212\263\037\071\053\105\126\367\252 ++\342\337\174\262\354\157\123\057\232\313\320\346\146\313\311\023 ++\350\162\342\264\315\061\127\207\022\265\223\350\372\162\316\352 ++\107\362\214\264\260\143\327\004\000\267\144\066\071\227\350\225 ++\361\210\371\161\015\003\047\214\141\317\010\203\226\117\203\305 ++\116\350\134\370\006\160\361\002\252\034\036\251\310\252\176\347 ++\135\315\215\074\024\157\147\320\033\251\043\110\213\041\050\072 ++\212\114\346\021\061\371\041\056\262\147\146\306\051\156\224\223 ++\317\100\226\374\260\075\277\262\264\223\277\126\161\266\245\101 ++\207\260\130\265\131\043\050\111\270\230\371\120\036\055\025\050 ++\013\114\254\111\321\204\251\233\232\347\162\124\267\070\320\333 ++\311\376\251\163\325\155\020\315\216\165\353\376\227\375\200\074 ++\374\264\330\110\364\231\106\013\210\024\244\266\056\333\114\140 ++\364\041\301\154\200\225\024\325\257\325\002\003\001\000\001\243 ++\202\002\044\060\202\002\040\060\035\006\003\125\035\016\004\026 ++\004\024\025\246\226\200\261\025\113\061\303\302\234\366\347\023 ++\013\113\363\030\315\206\060\201\337\006\003\125\035\043\004\201 ++\327\060\201\324\200\024\025\246\226\200\261\025\113\061\303\302 ++\234\366\347\023\013\113\363\030\315\206\241\201\270\244\201\265 ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155\202\001\000\060\014\006\003\125\035\023\004 ++\005\060\003\001\001\377\060\013\006\003\125\035\017\004\004\003 ++\002\001\006\060\107\006\003\125\035\045\004\100\060\076\006\010 ++\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005\007 ++\003\002\006\010\053\006\001\005\005\007\003\003\006\010\053\006 ++\001\005\005\007\003\004\006\010\053\006\001\005\005\007\003\010 ++\006\012\053\006\001\004\001\202\067\012\003\004\060\035\006\003 ++\125\035\021\004\026\060\024\201\022\147\154\157\142\141\154\060 ++\061\100\151\160\163\143\141\056\143\157\155\060\035\006\003\125 ++\035\022\004\026\060\024\201\022\147\154\157\142\141\154\060\061 ++\100\151\160\163\143\141\056\143\157\155\060\101\006\003\125\035 ++\037\004\072\060\070\060\066\240\064\240\062\206\060\150\164\164 ++\160\072\057\057\143\162\154\147\154\157\142\141\154\060\061\056 ++\151\160\163\143\141\056\143\157\155\057\143\162\154\057\143\162 ++\154\147\154\157\142\141\154\060\061\056\143\162\154\060\070\006 ++\010\053\006\001\005\005\007\001\001\004\054\060\052\060\050\006 ++\010\053\006\001\005\005\007\060\001\206\034\150\164\164\160\072 ++\057\057\143\162\154\147\154\157\142\141\154\060\061\056\151\160 ++\163\143\141\056\143\157\155\060\015\006\011\052\206\110\206\367 ++\015\001\001\005\005\000\003\202\001\001\000\030\364\256\376\200 ++\017\216\301\167\157\242\132\107\110\237\043\125\241\123\153\371 ++\135\247\060\245\044\276\103\057\370\301\321\127\371\076\054\200 ++\045\314\106\251\066\363\111\133\035\366\174\327\143\263\115\076 ++\170\366\247\264\002\167\370\171\015\076\152\313\030\140\270\375 ++\000\257\014\335\124\343\124\217\042\075\363\020\157\021\015\265 ++\036\172\215\047\314\010\270\133\303\270\032\137\053\247\140\077 ++\000\034\367\017\134\102\146\144\236\207\022\200\160\211\340\372 ++\127\050\016\116\037\020\057\331\005\200\266\200\057\034\151\360 ++\366\266\145\064\005\157\312\331\076\370\324\135\067\062\307\270 ++\053\314\377\163\223\000\161\340\001\310\252\103\275\251\361\316 ++\372\200\371\361\103\022\221\246\145\345\140\007\115\107\272\053 ++\057\004\366\112\205\051\210\145\020\311\262\123\142\234\154\233 ++\140\134\032\033\323\256\305\035\162\231\006\377\005\314\206\046 ++\163\264\324\124\005\335\036\153\000\073\267\211\350\343\221\002 ++\040\022\353\357\351\376\012\051\043\201\043\243\000\332\160\314 ++\222\137\067\043\320\034\173\065\134\003\172 ++END ++ ++# Trust for Certificate "IPS Global CA Root 2048 2029" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GlobalSign Root CA - R3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\326\233\126\021\110\360\034\167\305\105\170\301\011\046\337\133 +-\205\151\166\255 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\305\337\270\111\312\005\023\125\356\055\272\032\303\076\260\050 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +-\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +-\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +-\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +-\004\003\023\012\107\154\157\142\141\154\123\151\147\156 ++CKA_LABEL UTF8 "IPS Global CA Root 2048 2029" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\074\161\327\016\065\245\332\250\262\343\201\055\303\147\164\027 ++\365\231\015\363 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\045\052\306\305\211\150\071\371\125\162\002\026\136\243\236\322 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\013\004\000\000\000\000\001\041\130\123\010\242 ++\002\001\000 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-shlibsign.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-shlibsign.patch new file mode 100644 index 0000000000..a94a6946cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.12.8-shlibsign.patch @@ -0,0 +1,23 @@ +--- mozilla/security/nss/cmd/shlibsign/Makefile-old 2009-10-21 01:48:57.000000000 +0000 ++++ mozilla/security/nss/cmd/shlibsign/Makefile 2009-10-21 01:55:08.000000000 +0@@ -105,6 +105,7 @@ + include ../platrules.mk + + SRCDIR = $(call core_abspath,.) ++SHLIBSIGN = + + %.chk: %.$(DLL_SUFFIX) + ifeq ($(OS_TARGET), OS2) +@@ -112,9 +113,13 @@ + $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ + $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) + else ++ifeq ($(SHLIBSIGN),) + cd $(OBJDIR) ; sh $(SRCDIR)/sign.sh $(call core_abspath,$(DIST)) \ + $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ + $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) ++else ++ cd $(OBJDIR) ; $(SHLIBSIGN) -v -i $(call core_abspath,$<) ++endif + endif + + libs install :: $(CHECKLOC) diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13-gentoo-fixup.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13-gentoo-fixup.patch new file mode 100644 index 0000000000..42f26c616b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13-gentoo-fixup.patch @@ -0,0 +1,245 @@ +diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile +--- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ b/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 +@@ -0,0 +1,40 @@ ++CORE_DEPTH = ../.. ++DEPTH = ../.. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` ++PREFIX = /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@exec_prefix@,\$${prefix}," \ ++ -e "s,@libdir@,\$${prefix}/gentoo/nss," \ ++ -e "s,@includedir@,\$${prefix}/include/nss," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in +--- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 +@@ -0,0 +1,145 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++ ++major_version=@NSS_MAJOR_VERSION@ ++minor_version=@NSS_MINOR_VERSION@ ++patch_version=@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_ssl=yes ++lib_smime=yes ++lib_nss=yes ++lib_nssutil=yes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac ++ ++ case $1 in ++ --prefix=*) ++ prefix=$optarg ++ ;; ++ --prefix) ++ echo_prefix=yes ++ ;; ++ --exec-prefix=*) ++ exec_prefix=$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=yes ++ ;; ++ --includedir=*) ++ includedir=$optarg ++ ;; ++ --includedir) ++ echo_includedir=yes ++ ;; ++ --libdir=*) ++ libdir=$optarg ++ ;; ++ --libdir) ++ echo_libdir=yes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ smime) ++ lib_smime=yes ++ ;; ++ nss) ++ lib_nss=yes ++ ;; ++ nssutil) ++ lib_nssutil=yes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=`pkg-config --variable=exec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=`pkg-config --variable=includedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=`pkg-config --variable=libdir nss` ++fi ++ ++if test "$echo_prefix" = "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" = "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" = "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" = "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" = "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" = "yes"; then ++ libdirs="-Wl,-R$libdir -L$libdir" ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs="$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" ++ fi ++ echo $libdirs ++fi ++ +diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in +--- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ ++Requires: nspr >= 4.8 ++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 ++Cflags: -I${includedir} ++ +diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile +--- a/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 ++++ b/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 +@@ -78,7 +78,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_coreconf build_nspr build_dbm all ++nss_build_all: build_coreconf build_dbm all + + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + +@@ -140,12 +140,6 @@ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + +-build_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) +- +-clobber_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber +- + build_dbm: + ifndef NSS_DISABLE_DBM + cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs +diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn +--- a/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 ++++ b/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 +@@ -42,6 +42,6 @@ + + RELEASE = nss + +-DIRS = lib cmd ++DIRS = lib cmd config + + diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13.1-solaris-gcc.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13.1-solaris-gcc.patch new file mode 100644 index 0000000000..b775bac257 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13.1-solaris-gcc.patch @@ -0,0 +1,33 @@ +--- nss-3.13.1/mozilla/security/coreconf/SunOS5.mk ++++ nss-3.13.1/mozilla/security/coreconf/SunOS5.mk +@@ -37,6 +37,9 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + ++NS_USE_GCC = 1 ++GCC_USE_GNU_LD = 1 ++ + # Sun's WorkShop defines v8, v8plus and v9 architectures. + # gcc on Solaris defines v8 and v9 "cpus". + # gcc's v9 is equivalent to Workshop's v8plus. +@@ -95,7 +98,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++#INCLUDES += -I/usr/dt/include -I/usr/openwin/include + + RANLIB = echo + CPU_ARCH = sparc +@@ -105,11 +108,6 @@ + NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) + + MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) +-ifdef NS_USE_GCC +-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1))) +- GCC_USE_GNU_LD = 1 +-endif +-endif + ifdef MAPFILE + ifdef NS_USE_GCC + ifdef GCC_USE_GNU_LD diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13.5-x32.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13.5-x32.patch new file mode 100644 index 0000000000..1027cf0d34 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.13.5-x32.patch @@ -0,0 +1,68 @@ +diff -8urN a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk +--- a/mozilla/security/coreconf/Linux.mk 2012-06-22 07:55:45.228234872 -0500 ++++ b/mozilla/security/coreconf/Linux.mk 2012-06-22 07:56:30.171231815 -0500 +@@ -60,21 +60,28 @@ + else + ifeq ($(OS_TEST),alpha) + OS_REL_CFLAGS = -D_ALPHA_ + CPU_ARCH = alpha + else + ifeq ($(OS_TEST),x86_64) + ifeq ($(USE_64),1) + CPU_ARCH = x86_64 ++ ARCHFLAG = -m64 ++else ++ifeq ($(USE_x32),1) ++ OS_REL_CFLAGS = -Di386 ++ CPU_ARCH = x86 ++ ARCHFLAG = -mx32 + else + OS_REL_CFLAGS = -Di386 + CPU_ARCH = x86 + ARCHFLAG = -m32 + endif ++endif + else + ifeq ($(OS_TEST),sparc64) + CPU_ARCH = sparc + else + ifeq (,$(filter-out arm% sa110,$(OS_TEST))) + CPU_ARCH = arm + else + ifeq (,$(filter-out parisc%,$(OS_TEST))) +diff -8urN a/mozilla/security/nss/lib/freebl/Makefile b/mozilla/security/nss/lib/freebl/Makefile +--- a/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:55:45.441234854 -0500 ++++ b/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:56:30.172231808 -0500 +@@ -210,22 +210,26 @@ + DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN + # DEFINES += -DMPI_AMD64_ADD + # comment the next two lines to turn off intel HW accelleration + DEFINES += -DUSE_HW_AES + ASFILES += intel-aes.s + MPI_SRCS += mpi_amd64.c mp_comba.c + endif + ifeq ($(CPU_ARCH),x86) +- ASFILES = mpi_x86.s +- DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE +- DEFINES += -DMP_ASSEMBLY_DIV_2DX1D +- DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN +- # The floating point ECC code doesn't work on Linux x86 (bug 311432). +- #ECL_USE_FP = 1 ++ ifeq ($(USE_x32),1) ++ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN ++ else ++ ASFILES = mpi_x86.s ++ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE ++ DEFINES += -DMP_ASSEMBLY_DIV_2DX1D ++ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN ++ # The floating point ECC code doesn't work on Linux x86 (bug 311432). ++ #ECL_USE_FP = 1 ++ endif + endif + ifeq ($(CPU_ARCH),arm) + DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE + DEFINES += -DMP_USE_UINT_DIGIT + DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512 + MPI_SRCS += mpi_arm.c + endif + endif # Linux diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-abort-on-failed-urandom-access.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-abort-on-failed-urandom-access.patch new file mode 100644 index 0000000000..be76bd597c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-abort-on-failed-urandom-access.patch @@ -0,0 +1,21 @@ +diff -aurN nss-3.14-urandom/mozilla/security/nss/lib/freebl/unix_rand.c nss-3.14/mozilla/security/nss/lib/freebl/unix_rand.c +--- nss-3.14-urandom/mozilla/security/nss/lib/freebl/unix_rand.c 2012-12-28 16:31:12.017070243 -0800 ++++ nss-3.14/mozilla/security/nss/lib/freebl/unix_rand.c 2012-12-28 16:31:49.107466816 -0800 +@@ -925,6 +925,17 @@ + || defined(HPUX) + if (bytes) + return; ++ ++ /* ++ * Modified to abort the process on Chromium OS if it failed ++ * to read from /dev/urandom. ++ * ++ * See crosbug.com/29623 for details. ++ */ ++ fprintf(stderr, "[ERROR:%s(%d)] NSS failed to read from /dev/urandom. " ++ "Abort process.\n", __FILE__, __LINE__); ++ fflush(stderr); ++ abort(); + #endif + + #ifdef SOLARIS diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-bugzilla-802429.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-bugzilla-802429.patch new file mode 100644 index 0000000000..d7595480b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-bugzilla-802429.patch @@ -0,0 +1,164 @@ +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11cert.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11cert.c +--- nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11cert.c 2012-12-28 16:34:08.208954371 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11cert.c 2012-12-28 16:36:17.610338570 -0800 +@@ -2663,7 +2663,7 @@ + nssCryptokiObject *instance = *ip; + PK11SlotInfo *slot = instance->token->pk11slot; + if (slot) { +- PK11_AddSlotToList(slotList, slot); ++ PK11_AddSlotToList(slotList, slot, PR_TRUE); + found = PR_TRUE; + } + } +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11priv.h nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11priv.h +--- nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11priv.h 2012-12-28 16:34:08.208954371 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11priv.h 2012-12-28 16:36:17.610338570 -0800 +@@ -28,7 +28,7 @@ + PK11SlotList * PK11_NewSlotList(void); + PK11SlotList * PK11_GetPrivateKeyTokens(CK_MECHANISM_TYPE type, + PRBool needRW,void *wincx); +-SECStatus PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot); ++SECStatus PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot, PRBool sorted); + SECStatus PK11_DeleteSlotFromList(PK11SlotList *list,PK11SlotListElement *le); + PK11SlotListElement *PK11_FindSlotElement(PK11SlotList *list, + PK11SlotInfo *slot); +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11slot.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11slot.c +--- nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11slot.c 2012-12-28 16:34:08.208954371 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11slot.c 2012-12-28 16:36:17.610338570 -0800 +@@ -171,11 +171,16 @@ + + /* + * add a slot to a list ++ * "slot" is the slot to be added. Ownership is not transferred. ++ * "sorted" indicates whether or not the slot should be inserted according to ++ * cipherOrder of the associated module. PR_FALSE indicates that the slot ++ * should be inserted to the head of the list. + */ + SECStatus +-PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot) ++PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot, PRBool sorted) + { + PK11SlotListElement *le; ++ PK11SlotListElement *element; + + le = (PK11SlotListElement *) PORT_Alloc(sizeof(PK11SlotListElement)); + if (le == NULL) return SECFailure; +@@ -184,9 +189,23 @@ + le->prev = NULL; + le->refCount = 1; + PZ_Lock(list->lock); +- if (list->head) list->head->prev = le; else list->tail = le; +- le->next = list->head; +- list->head = le; ++ element = list->head; ++ /* Insertion sort, with higher cipherOrders are sorted first in the list */ ++ while (element && sorted && (element->slot->module->cipherOrder > ++ le->slot->module->cipherOrder)) { ++ element = element->next; ++ } ++ if (element) { ++ le->prev = element->prev; ++ element->prev = le; ++ le->next = element; ++ } else { ++ le->prev = list->tail; ++ le->next = NULL; ++ list->tail = le; ++ } ++ if (le->prev) le->prev->next = le; ++ if (list->head == element) list->head = le; + PZ_Unlock(list->lock); + + return SECSuccess; +@@ -208,11 +227,12 @@ + } + + /* +- * Move a list to the end of the target list. NOTE: There is no locking +- * here... This assumes BOTH lists are private copy lists. ++ * Move a list to the end of the target list. ++ * NOTE: There is no locking here... This assumes BOTH lists are private copy ++ * lists. It also does not re-sort the target list. + */ + SECStatus +-PK11_MoveListToList(PK11SlotList *target,PK11SlotList *src) ++pk11_MoveListToList(PK11SlotList *target,PK11SlotList *src) + { + if (src->head == NULL) return SECSuccess; + +@@ -511,7 +531,7 @@ + ((NULL == slotName) || (0 == *slotName)) && + ((NULL == tokenName) || (0 == *tokenName)) ) { + /* default to softoken */ +- PK11_AddSlotToList(slotList, PK11_GetInternalKeySlot()); ++ PK11_AddSlotToList(slotList, PK11_GetInternalKeySlot(), PR_TRUE); + return slotList; + } + +@@ -539,7 +559,7 @@ + ( (!slotName) || (tmpSlot->slot_name && + (0==PORT_Strcmp(tmpSlot->slot_name, slotName)))) ) { + if (tmpSlot) { +- PK11_AddSlotToList(slotList, tmpSlot); ++ PK11_AddSlotToList(slotList, tmpSlot, PR_TRUE); + slotcount++; + } + } +@@ -910,7 +930,7 @@ + CK_MECHANISM_TYPE mechanism = PK11_DefaultArray[i].mechanism; + PK11SlotList *slotList = PK11_GetSlotList(mechanism); + +- if (slotList) PK11_AddSlotToList(slotList,slot); ++ if (slotList) PK11_AddSlotToList(slotList,slot,PR_FALSE); + } + } + +@@ -937,7 +957,7 @@ + + /* add this slot to the list */ + if (slotList!=NULL) +- result = PK11_AddSlotToList(slotList, slot); ++ result = PK11_AddSlotToList(slotList, slot, PR_FALSE); + + } else { /* trying to turn off */ + +@@ -1910,12 +1930,12 @@ + || PK11_DoesMechanism(slot, type)) { + if (pk11_LoginStillRequired(slot,wincx)) { + if (PK11_IsFriendly(slot)) { +- PK11_AddSlotToList(friendlyList, slot); ++ PK11_AddSlotToList(friendlyList, slot, PR_TRUE); + } else { +- PK11_AddSlotToList(loginList, slot); ++ PK11_AddSlotToList(loginList, slot, PR_TRUE); + } + } else { +- PK11_AddSlotToList(list, slot); ++ PK11_AddSlotToList(list, slot, PR_TRUE); + } + } + } +@@ -1923,9 +1943,9 @@ + } + SECMOD_ReleaseReadLock(moduleLock); + +- PK11_MoveListToList(list,friendlyList); ++ pk11_MoveListToList(list,friendlyList); + PK11_FreeSlotList(friendlyList); +- PK11_MoveListToList(list,loginList); ++ pk11_MoveListToList(list,loginList); + PK11_FreeSlotList(loginList); + + return list; +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/util/utilpars.c nss-3.14/mozilla/security/nss/lib/util/utilpars.c +--- nss-3.14-default-token/mozilla/security/nss/lib/util/utilpars.c 2012-12-28 16:34:08.218954478 -0800 ++++ nss-3.14/mozilla/security/nss/lib/util/utilpars.c 2012-12-28 16:36:08.190237792 -0800 +@@ -543,6 +543,8 @@ + NSSUTIL_ARG_ENTRY(FORTEZZA,SECMOD_FORTEZZA_FLAG), + NSSUTIL_ARG_ENTRY(RC5,SECMOD_RC5_FLAG), + NSSUTIL_ARG_ENTRY(SHA1,SECMOD_SHA1_FLAG), ++ NSSUTIL_ARG_ENTRY(SHA256,SECMOD_SHA256_FLAG), ++ NSSUTIL_ARG_ENTRY(SHA512,SECMOD_SHA512_FLAG), + NSSUTIL_ARG_ENTRY(MD5,SECMOD_MD5_FLAG), + NSSUTIL_ARG_ENTRY(MD2,SECMOD_MD2_FLAG), + NSSUTIL_ARG_ENTRY(SSL,SECMOD_SSL_FLAG), diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-chromeos-cert-nicknames.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-chromeos-cert-nicknames.patch new file mode 100644 index 0000000000..58bb16e0ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/files/nss-3.14-chromeos-cert-nicknames.patch @@ -0,0 +1,95 @@ +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/nss/nss.def nss-3.14/mozilla/security/nss/lib/nss/nss.def +--- nss-3.14-prepared/mozilla/security/nss/lib/nss/nss.def 2012-12-28 16:27:38.374784755 -0800 ++++ nss-3.14/mozilla/security/nss/lib/nss/nss.def 2012-12-28 16:28:42.605473048 -0800 +@@ -613,6 +613,7 @@ + PK11_GetPQGParamsFromPrivateKey; + PK11_GetPrivateKeyNickname; + PK11_GetPublicKeyNickname; ++PK11_GetCertificateNickname; + PK11_GetSymKeyNickname; + PK11_ImportDERPrivateKeyInfoAndReturnKey; + PK11_ImportPrivateKeyInfoAndReturnKey; +@@ -624,6 +625,7 @@ + PK11_ProtectedAuthenticationPath; + PK11_SetPrivateKeyNickname; + PK11_SetPublicKeyNickname; ++PK11_SetCertificateNickname; + PK11_SetSymKeyNickname; + SECKEY_DecodeDERSubjectPublicKeyInfo; + SECKEY_DestroyPublicKeyList; +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11akey.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11akey.c +--- nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11akey.c 2012-12-28 16:27:38.354784541 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11akey.c 2012-12-28 16:28:42.605473048 -0800 +@@ -1909,6 +1909,13 @@ + return PK11_GetObjectNickname(pubKey->pkcs11Slot,pubKey->pkcs11ID); + } + ++char * ++PK11_GetCertificateNickname(CERTCertificate *certificate) ++{ ++ return PK11_GetObjectNickname(certificate->slot, ++ certificate->pkcs11ID); ++} ++ + SECStatus + PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey, const char *nickname) + { +@@ -1923,6 +1930,13 @@ + pubKey->pkcs11ID,nickname); + } + ++SECStatus ++PK11_SetCertificateNickname(CERTCertificate *certificate, const char *nickname) ++{ ++ return PK11_SetObjectNickname(certificate->slot, ++ certificate->pkcs11ID,nickname); ++} ++ + SECKEYPQGParams * + PK11_GetPQGParamsFromPrivateKey(SECKEYPrivateKey *privKey) + { +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11obj.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11obj.c +--- nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11obj.c 2012-12-28 16:27:38.354784541 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11obj.c 2012-12-28 16:28:42.605473048 -0800 +@@ -1410,7 +1410,10 @@ + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +- case PK11_TypeCert: /* don't handle cert case for now */ ++ case PK11_TypeCert: ++ slot = ((CERTCertificate *)objSpec)->slot; ++ handle = ((CERTCertificate *)objSpec)->pkcs11ID; ++ break; + default: + break; + } +@@ -1460,7 +1463,10 @@ + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +- case PK11_TypeCert: /* don't handle cert case for now */ ++ case PK11_TypeCert: ++ slot = ((CERTCertificate *)objSpec)->slot; ++ handle = ((CERTCertificate *)objSpec)->pkcs11ID; ++ break; + default: + break; + } +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11pub.h nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11pub.h +--- nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11pub.h 2012-12-28 16:27:38.354784541 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11pub.h 2012-12-28 16:28:42.605473048 -0800 +@@ -453,11 +453,14 @@ + char * PK11_GetSymKeyNickname(PK11SymKey *symKey); + char * PK11_GetPrivateKeyNickname(SECKEYPrivateKey *privKey); + char * PK11_GetPublicKeyNickname(SECKEYPublicKey *pubKey); ++char * PK11_GetCertificateNickname(CERTCertificate *certificate); + SECStatus PK11_SetSymKeyNickname(PK11SymKey *symKey, const char *nickname); + SECStatus PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey, + const char *nickname); + SECStatus PK11_SetPublicKeyNickname(SECKEYPublicKey *pubKey, + const char *nickname); ++SECStatus PK11_SetCertificateNickname(CERTCertificate *certificate, ++ const char *nickname); + + /* size to hold key in bytes */ + unsigned int PK11_GetKeyLength(PK11SymKey *key); diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.12.8-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.12.8-r4.ebuild new file mode 120000 index 0000000000..b0a0d9a349 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.12.8-r4.ebuild @@ -0,0 +1 @@ +nss-3.12.8.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.12.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.12.8.ebuild new file mode 100644 index 0000000000..a0b6a5b2f6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.12.8.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.8.ebuild,v 1.1 2010/09/30 11:58:39 anarchy Exp $ + +EAPI=3 +inherit eutils flag-o-matic multilib toolchain-funcs + +NSPR_VER="4.8.6" +RTM_NAME="NSS_${PV//./_}_RTM" +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +DEPEND="dev-util/pkgconfig" +RDEPEND=">=dev-libs/nspr-${NSPR_VER} + >=dev-libs/nss-${PV} + >=dev-db/sqlite-3.5 + sys-libs/zlib" + +src_prepare() { + # Custom changes for gentoo + epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff" + epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" + epatch "${FILESDIR}"/${P}-shlibsign.patch + epatch "${FILESDIR}"/${P}-chromeos-root-certs.patch + + # See https://bugzilla.mozilla.org/show_bug.cgi?id=741481 for details. + epatch "${FILESDIR}"/${P}-cert-initlocks.patch + + cd "${S}"/mozilla/security/coreconf + + # Explain that linux 3.0+ is just the same as 2.6. + ln -sf Linux2.6.mk Linux$(uname -r | cut -b1-3).mk + + # hack nspr paths + echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # modify install path + sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + + # Ensure we stay multilib aware + sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + "${S}"/mozilla/security/nss/config/Makefile + + epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools + # dirty hack + cd "${S}"/mozilla/security/nss + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die +} + +src_compile() { + strip-flags + + echo > "${T}"/test.c + $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + export NSPR_INCLUDE_DIR="${ROOT}"/usr/include/nspr + export NSPR_LIB_DIR="${ROOT}"/usr/lib + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSDISTMODE=copy + export NSS_ENABLE_ECC=1 + export XCFLAGS="${CFLAGS}" + export FREEBL_NO_DEPEND=1 + + # Cross-compile Love + ( filter-flags -m* ; + cd "${S}"/mozilla/security/coreconf && + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" LDFLAGS= CC="$(tc-getBUILD_CC)" || die "coreconf make failed" ) + cd "${S}"/mozilla/security/dbm + NSINSTALL=$(readlink -f $(find "${S}"/mozilla/security/coreconf -type f -name nsinstall)) + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} || die "dbm make failed" + cd "${S}"/mozilla/security/nss + if tc-is-cross-compiler; then + SHLIBSIGN_ARG="SHLIBSIGN=/usr/bin/nssshlibsign" + fi + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} ${SHLIBSIGN_ARG} || die "nss make failed" +} + +src_install () { + local nssutils + # The tests we do not need to install. + #nssutils_test="bltest crmftest dbtest dertimetest + #fipstest remtest sdrtest" + nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert + cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit + nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode + pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt + symkeyutil tstclnt vfychain vfyserv" + + cd "${S}"/mozilla/security/dist/*/bin/ + for f in $nssutils; do + # TODO(cmasone): switch to normal nss tool names + newbin ${f} nss${f} + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.14.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.14.ebuild new file mode 100644 index 0000000000..bb16c4b0db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/nss/nss-3.14.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.ebuild,v 1.8 2012/11/29 23:41:51 blueness Exp $ + +EAPI=3 +inherit eutils flag-o-matic multilib toolchain-funcs + +NSPR_VER="4.9.2" +RTM_NAME="NSS_${PV//./_}_RTM" + +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +DEPEND="virtual/pkgconfig + >=dev-libs/nspr-${NSPR_VER}" + +RDEPEND=">=dev-libs/nspr-${NSPR_VER} + >=dev-libs/nss-${PV} + >=dev-db/sqlite-3.5 + sys-libs/zlib" + +src_setup() { + export LC_ALL="C" +} + +src_prepare() { + # Custom changes for gentoo + epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" + epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" + epatch "${FILESDIR}/${PN}-3.13.5-x32.patch" + + # Fix cross-compiling of NSS. This is an alternative to upstream's + # patch at https://bugs.gentoo.org/show_bug.cgi?id=436216 + epatch "${FILESDIR}/${PN}-3.12.8-shlibsign.patch" + + # Add a public API to set the certificate nickname (PKCS#11 CKA_LABEL + # attribute). See http://crosbug.com/19403 for details. + epatch "${FILESDIR}"/${PN}-3.14-chromeos-cert-nicknames.patch + + # Abort the process if /dev/urandom cannot be opened (eg: when sandboxed) + # See http://crosbug.com/29623 for details. + epatch "${FILESDIR}"/${PN}-3.14-abort-on-failed-urandom-access.patch + + # Don't default to the TPM for SHA-256. Fixed in NSS 3.14.1 + # See https://bugzilla.mozilla.org/show_bug.cgi?id=802429 for details + epatch "${FILESDIR}"/${PN}-3.14-bugzilla-802429.patch + + cd "${S}"/mozilla/security/coreconf || die + # hack nspr paths + echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # modify install path + sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die + + # Ensure we stay multilib aware + sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + "${S}"/mozilla/security/nss/config/Makefile || die + + epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" + + # dirty hack + cd "${S}"/mozilla/security/nss || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die +} + +src_compile() { + strip-flags + + echo > "${T}"/test.c || die + $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die + case $(file "${T}"/test.o) in + *32-bit*x86-64*) export USE_x32=1;; + *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + export NSPR_INCLUDE_DIR="${ROOT}"/usr/include/nspr + export NSPR_LIB_DIR="${ROOT}"/usr/lib + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSDISTMODE=copy + export NSS_ENABLE_ECC=1 + export XCFLAGS="${CFLAGS}" + export FREEBL_NO_DEPEND=1 + export ASFLAGS="" + + # Cross-compile Love + ( filter-flags -m* ; + cd "${S}"/mozilla/security/coreconf && + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" LDFLAGS= CC="$(tc-getBUILD_CC)" || die "coreconf make failed" ) + cd "${S}"/mozilla/security/dbm + NSINSTALL=$(readlink -f $(find "${S}"/mozilla/security/coreconf -type f -name nsinstall)) + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} || die "dbm make failed" + cd "${S}"/mozilla/security/nss + if tc-is-cross-compiler; then + SHLIBSIGN_ARG="SHLIBSIGN=/usr/bin/nssshlibsign" + fi + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} ${SHLIBSIGN_ARG} || die "nss make failed" +} + +src_install () { + local nssutils + # The tests we do not need to install. + #nssutils_test="bltest crmftest dbtest dertimetest + #fipstest remtest sdrtest" + nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert + cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit + nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode + pk12util pp rsaperf selfserv signtool signver ssltap strsclnt + symkeyutil tstclnt vfychain vfyserv" + cd "${S}"/mozilla/security/dist/*/bin/ || die + for f in $nssutils; do + # TODO(cmasone): switch to normal nss tool names + newbin ${f} nss${f} || die + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/tpm-emulator/tpm-emulator-0.0.1-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/tpm-emulator/tpm-emulator-0.0.1-r6.ebuild new file mode 100644 index 0000000000..eaca42b274 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/tpm-emulator/tpm-emulator-0.0.1-r6.ebuild @@ -0,0 +1,55 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI="2" +CROS_WORKON_COMMIT="310a21ef24ace14b4d6e8095172445494f54ff25" +CROS_WORKON_TREE="33cbcef6b44783d7ece0dcb7f5bdaa49b9e29123" +CROS_WORKON_PROJECT="chromiumos/third_party/tpm-emulator" + +inherit cmake-utils cros-workon toolchain-funcs + +DESCRIPTION="TPM Emulator with small google-local changes" +LICENSE="GPL-2" +HOMEPAGE="//https://developer.berlios.de/projects/tpm-emulator" +SLOT="0" +IUSE="doc" +KEYWORDS="amd64 arm x86" + +DEPEND="app-crypt/trousers + dev-libs/gmp" + +RDEPEND="${DEPEND}" + +src_configure() { + tc-export CC CXX LD AR RANLIB NM + CHROMEOS=1 cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + # This would be normally done in kernel module build, but we have + # copied the kernel module to the kernel tree. + TPMD_DEV_SRC_DIR="${S}/tpmd_dev/linux" + TPMD_DEV_BUILD_DIR="${CMAKE_BUILD_DIR}/tpmd_dev/linux" + mkdir -p "${TPMD_DEV_BUILD_DIR}" + sed -e "s/\$TPM_GROUP/tss/g" \ + < "${TPMD_DEV_SRC_DIR}/tpmd_dev.rules.in" \ + > "${TPMD_DEV_BUILD_DIR}/tpmd_dev.rules" +} + +src_install() { + # TODO(semenzato): need these for emerge on host, to run tpm_lite tests. + # insinto /usr/lib + # doins "${CMAKE_BUILD_DIR}/tpm/libtpm.a" + # doins "${CMAKE_BUILD_DIR}/crypto/libcrypto.a" + # doins "${CMAKE_BUILD_DIR}/tpmd/unix/libtpmemu.a" + # insinto /usr/include + # doins "${S}/tpmd/unix/tpmemu.h" + exeinto /usr/sbin + doexe "${CMAKE_BUILD_DIR}/tpmd/unix/tpmd" + insinto /etc/udev/rules.d + TPMD_DEV_BUILD_DIR="${CMAKE_BUILD_DIR}/tpmd_dev/linux" + RULES_FILE="${TPMD_DEV_BUILD_DIR}/tpmd_dev.rules" + newins "${RULES_FILE}" 80-tpmd_dev.rules +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/tpm-emulator/tpm-emulator-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/tpm-emulator/tpm-emulator-9999.ebuild new file mode 100644 index 0000000000..5185294794 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/tpm-emulator/tpm-emulator-9999.ebuild @@ -0,0 +1,53 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/third_party/tpm-emulator" + +inherit cmake-utils cros-workon toolchain-funcs + +DESCRIPTION="TPM Emulator with small google-local changes" +LICENSE="GPL-2" +HOMEPAGE="//https://developer.berlios.de/projects/tpm-emulator" +SLOT="0" +IUSE="doc" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND="app-crypt/trousers + dev-libs/gmp" + +RDEPEND="${DEPEND}" + +src_configure() { + tc-export CC CXX LD AR RANLIB NM + CHROMEOS=1 cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + # This would be normally done in kernel module build, but we have + # copied the kernel module to the kernel tree. + TPMD_DEV_SRC_DIR="${S}/tpmd_dev/linux" + TPMD_DEV_BUILD_DIR="${CMAKE_BUILD_DIR}/tpmd_dev/linux" + mkdir -p "${TPMD_DEV_BUILD_DIR}" + sed -e "s/\$TPM_GROUP/tss/g" \ + < "${TPMD_DEV_SRC_DIR}/tpmd_dev.rules.in" \ + > "${TPMD_DEV_BUILD_DIR}/tpmd_dev.rules" +} + +src_install() { + # TODO(semenzato): need these for emerge on host, to run tpm_lite tests. + # insinto /usr/lib + # doins "${CMAKE_BUILD_DIR}/tpm/libtpm.a" + # doins "${CMAKE_BUILD_DIR}/crypto/libcrypto.a" + # doins "${CMAKE_BUILD_DIR}/tpmd/unix/libtpmemu.a" + # insinto /usr/include + # doins "${S}/tpmd/unix/tpmemu.h" + exeinto /usr/sbin + doexe "${CMAKE_BUILD_DIR}/tpmd/unix/tpmd" + insinto /etc/udev/rules.d + TPMD_DEV_BUILD_DIR="${CMAKE_BUILD_DIR}/tpmd_dev/linux" + RULES_FILE="${TPMD_DEV_BUILD_DIR}/tpmd_dev.rules" + newins "${RULES_FILE}" 80-tpmd_dev.rules +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/trousers-tests/trousers-tests-0.0.1-r30.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/trousers-tests/trousers-tests-0.0.1-r30.ebuild new file mode 100644 index 0000000000..0c193231f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/trousers-tests/trousers-tests-0.0.1-r30.ebuild @@ -0,0 +1,39 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="e3afe51c44ea5b1ebbc6fc6561c46fd0608cde2a" +CROS_WORKON_TREE="c6b3d8822b63163c977a8d4e0bc9ef3c9cd7b011" +CROS_WORKON_PROJECT="chromiumos/third_party/trousers" + +inherit cros-workon autotest + +DESCRIPTION="Trousers TPM tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" +DEPEND="app-crypt/trousers + !charset == &charset_utf8) { +- if (ts->utf8_state == 0) { +- const char *p; +- p = (const char *)ts->buf; +- ch = utf8_decode(&p); +- } else { +- ts->utf8_state = utf8_length[ts->buf[0]] - 1; +- ts->utf8_index = 0; +- return; +- } ++ /* Make sure utf8 input works correctly 20040314 */ ++ ts->utf8_index++; ++ ++ if (utf8_length[ts->buf[0]] == ts->utf8_index) {; ++ const char *p; ++ p = (const char *)ts->buf; ++ ch = utf8_decode(&p); ++ ts->utf8_index = 0; ++ } ++ else { ++ return; ++ } ++ + } else { + ch = ts->buf[0]; + } diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch new file mode 100644 index 0000000000..73c3f68b13 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch @@ -0,0 +1,35 @@ +--- Makefile.orig 2009-03-07 21:27:48.000000000 +0100 ++++ Makefile 2009-03-07 21:28:43.000000000 +0100 +@@ -19,32 +19,6 @@ + + include config.mak + +-ifeq ($(CC),gcc) +- CFLAGS := -Wall -g -O2 -funsigned-char +- # do not warn about zero-length formats. +- CFLAGS += -Wno-format-zero-length +- LDFLAGS := -g +-endif +- +-#include local compiler configuration file +--include cflags.mk +- +-ifdef TARGET_GPROF +- CFLAGS += -p +- LDFLAGS += -p +-endif +- +-TLDFLAGS := $(LDFLAGS) +- +-ifdef TARGET_ARCH_X86 +- #CFLAGS+=-fomit-frame-pointer +- ifeq ($(GCC_MAJOR),2) +- CFLAGS+=-m386 -malign-functions=0 +- else +- CFLAGS+=-march=i386 -falign-functions=0 +- endif +-endif +- + DEFINES=-DHAVE_QE_CONFIG_H + + ######################################################## diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch new file mode 100644 index 0000000000..9eb5f57c4e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch @@ -0,0 +1,64 @@ +--- buffer.c.orig 2009-03-07 21:14:02.000000000 +0100 ++++ buffer.c 2009-03-07 21:15:40.000000000 +0100 +@@ -1657,12 +1657,14 @@ + if (stat(filename, &st) == 0) + mode = st.st_mode & 0777; + +- /* backup old file if present */ +- if (strlen(filename) < MAX_FILENAME_SIZE - 1) { ++ /* backup old file if present and make-backup-files is on */ ++ if(mbf == 1) { ++ if (strlen(filename) < MAX_FILENAME_SIZE - 1) { + if (snprintf(buf1, sizeof(buf1), "%s~", filename) < ssizeof(buf1)) { + // should check error code + rename(filename, buf1); + } ++ } + } + + /* CG: should pass mode to buffer_save */ +--- qe.c.orig 2009-03-07 21:14:09.000000000 +0100 ++++ qe.c 2009-03-07 21:17:01.000000000 +0100 +@@ -71,6 +71,7 @@ + static int screen_height = 0; + static int no_init_file; + static const char *user_option; ++mbf = 1; + + /* mode handling */ + +@@ -5316,6 +5317,14 @@ + do_refresh(qs->first_window); + } + ++static void make_backup_files(EditState *s) { ++ if(mbf == 1) { ++ mbf = 0; ++ } else { ++ mbf = 1; ++ } ++} ++ + /* compute default path for find/save buffer */ + static void get_default_path(EditState *s, char *buf, int buf_size) + { +--- qeconfig.h.orig 2009-03-07 21:14:19.000000000 +0100 ++++ qeconfig.h 2009-03-07 21:17:37.000000000 +0100 +@@ -192,6 +192,7 @@ + "downcase-region", do_changecase_region, ESi, -1, "*v") + CMD3( KEY_CTRLX(KEY_CTRL('u')), KEY_NONE, + "upcase-region", do_changecase_region, ESi, 1, "*v") ++ CMD0( KEY_NONE, KEY_NONE, "make-backup-files", make_backup_files) + + /*---------------- Command handling ----------------*/ + +--- qe.h.orig 2009-03-07 21:14:26.000000000 +0100 ++++ qe.h 2009-03-07 21:17:53.000000000 +0100 +@@ -1765,6 +1765,7 @@ + /* image.c */ + void fill_border(EditState *s, int x, int y, int w, int h, int color); + int qe_bitmap_format_to_pix_fmt(int format); ++int mbf; + + /* shell.c */ + EditBuffer *new_shell_buffer(EditBuffer *b0, const char *name, diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch new file mode 100644 index 0000000000..120b09c212 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch @@ -0,0 +1,36 @@ +--- qemacs-orig/Makefile ++++ qemacs/Makefile +@@ -151,7 +151,6 @@ + qe$(EXE): qe_g$(EXE) Makefile + rm -f $@ + cp $< $@ +- -$(STRIP) $@ + @ls -l $@ + echo `size $@` `wc -c $@` qe $(OPTIONS) \ + | cut -d ' ' -f 7-10,13,15-40 >> STATS +@@ -165,7 +164,6 @@ + tqe$(EXE): tqe_g$(EXE) Makefile + rm -f $@ + cp $< $@ +- -$(STRIP) $@ + @ls -l $@ + echo `size $@` `wc -c $@` tqe $(OPTIONS) \ + | cut -d ' ' -f 7-10,13,15-40 >> STATS +@@ -329,7 +327,7 @@ + $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin + $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/man/man1 + $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/qe +- $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) ++ $(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) + ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE) + ifdef CONFIG_FFMPEG + ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE) +@@ -337,7 +335,7 @@ + $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe + $(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1 + ifdef CONFIG_HTML +- $(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin ++ $(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin + endif + + uninstall: diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/qemacs-0.4.0_pre20090420.ebuild b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/qemacs-0.4.0_pre20090420.ebuild new file mode 100644 index 0000000000..573bd4cf5c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/qemacs/qemacs-0.4.0_pre20090420.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.4.0_pre20090420.ebuild,v 1.4 2009/12/08 19:33:49 nixnut Exp $ + +EAPI=2 + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="QEmacs is a very small but powerful UNIX editor" +HOMEPAGE="http://savannah.nongnu.org/projects/qemacs" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="X png unicode xv" +RESTRICT="strip test" + +RDEPEND="!app-editors/qe + X? ( x11-libs/libX11 + x11-libs/libXext + xv? ( x11-libs/libXv ) ) + png? ( media-libs/libpng:1.2 )" + +DEPEND="${RDEPEND} + app-text/texi2html" + +S="${WORKDIR}/${PN}" + +src_prepare() { + # Removes forced march setting and align-functions on x86, as they + # would override user's CFLAGS.. + epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-Makefile.patch" + # Make backup files optional + epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-make_backup.patch" + # Suppress stripping + epatch "${FILESDIR}/${P}-nostrip.patch" + + use unicode && epatch "${FILESDIR}/${PN}-0.3.2_pre20070226-tty_utf8.patch" + + # Change the manpage to reference a /real/ file instead of just an + # approximation. Purely cosmetic! + sed -i "s,^/usr/share/doc/qe,&-${PVR}," qe.1 || die +} + +src_configure() { + # when using any other CFLAGS than -O0, qemacs will segfault on startup, + # see bug 92011 + replace-flags -O? -O0 + econf --cross-prefix="${CHOST}-" \ + $(use_enable X x11) \ + $(use_enable png) \ + $(use_enable xv) +} + +src_compile() { + # Does not support parallel building + emake -j1 || die +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc Changelog README TODO config.eg || die + dohtml *.html || die + + # Fix man page location + mv "${D}"/usr/{,share/}man || die + + # Install headers so users can build their own plugins. + insinto /usr/include/qe + doins cfb.h config.h cutils.h display.h fbfrender.h libfbf.h qe.h \ + qeconfig.h qestyles.h qfribidi.h || die + cd libqhtml + insinto /usr/include/qe/libqhtml + doins css.h cssid.h htmlent.h || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/Manifest b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/Manifest new file mode 100644 index 0000000000..0c667a5e4f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/Manifest @@ -0,0 +1,2 @@ +DIST vim-7.3.tar.bz2 9080692 RMD160 1846e7f4aa8e0a329d8360a9e05d7e93da23b4b5 SHA1 46faa96c5fab639899b1c655c23d8755b62f036f SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d +DIST vim-patches-7.3.266.patch.bz2 482229 RMD160 20399fd3a4366f486ce9edf2d09733647b26d487 SHA1 22f2f52cc703ea3ee06dcf9d9c49e39208fbf72a SHA256 28ebe4e469fad7a9f3a55611323e9235b83ec40c6abca85da485f9df02aa0177 diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch new file mode 100644 index 0000000000..1cf00d6a8f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch @@ -0,0 +1,11 @@ +--- src/configure.in ++++ src/configure.in +@@ -2701,7 +2701,7 @@ + AC_MSG_CHECKING(whether X_LOCALE needed) + AC_TRY_COMPILE([#include ],, + AC_TRY_LINK_FUNC([_Xsetlocale], [AC_MSG_RESULT(yes) +- AC_DEFINE(X_LOCALE)], AC_MSG_RESULT(no)), ++ AC_DEFINE(X_LOCALE) ldflags_save="$ldflags_save -lX11"], AC_MSG_RESULT(no)), + AC_MSG_RESULT(no)) + fi + CFLAGS=$cflags_save diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.3-cross.patch b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.3-cross.patch new file mode 100644 index 0000000000..a9b6147ada --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.3-cross.patch @@ -0,0 +1,11 @@ +--- vim73/src/configure.in.orig 2010-08-13 08:15:17.000000000 -0600 ++++ vim73/src/configure.in 2010-08-16 17:04:34.000000000 -0600 +@@ -3180,7 +3180,7 @@ main() { + }], + AC_MSG_RESULT(ok), + AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]), +-AC_MSG_ERROR([could not compile program using uint32_t.])) ++AC_MSG_WARN([could not check when cross-compiling])) + + dnl Check for memmove() before bcopy(), makes memmove() be used when both are + dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.v diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.3-interix-link.patch b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.3-interix-link.patch new file mode 100644 index 0000000000..26036652a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-7.3-interix-link.patch @@ -0,0 +1,12 @@ +diff -ru vim73.orig/src/link.sh vim73/src/link.sh +--- vim73.orig/src/link.sh 2010-10-21 16:29:07 +0200 ++++ vim73/src/link.sh 2010-10-21 16:23:15 +0200 +@@ -41,7 +41,7 @@ + if sh link.cmd; then + touch auto/link.sed + cp link.cmd linkit.sh +- for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w perl dl pthread thread readline m crypt attr; do ++ for libname in dummy; do + cont=yes + while test -n "$cont"; do + if grep "l$libname " linkit.sh >/dev/null; then diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-completion b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-completion new file mode 100644 index 0000000000..157b546494 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-completion @@ -0,0 +1,36 @@ +# Author: Ciaran McCreesh +# +# completion for vim + +_vim() +{ + local cur prev cmd args + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + cmd=${COMP_WORDS[0]} + + if [[ "${prev}" == "--servername" ]] ; then + local servers + servers=$(gvim --serverlist ) + COMPREPLY=( $( compgen -W "${servers}" -- $cur ) ) + + elif [[ "${prev}" == -[uUi] ]] ; then + COMPREPLY=( $( compgen -W "NONE" ) \ + $( compgen -f -X "!*vim*" -- "$cur" ) ) + + elif [[ "${cur}" == -* ]] ; then + args='-t -q -c -S --cmd -A -b -C -d -D -e -E -f --nofork \ + -F -g -h -H -i -L -l -m -M -N -n -nb -o -R -r -s \ + -T -u -U -V -v -w -W -x -X -y -Y -Z --echo-wid \ + --help --literal --noplugin --version' + COMPREPLY=( $( compgen -W "${args}" -- $cur ) ) + else + _filedir + fi +} + +complete -o filenames -F _vim vim ex view evim rvim rview + +# vim: set ft=sh sw=4 et sts=4 : diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vimrc b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vimrc new file mode 100644 index 0000000000..2038d96d9c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vimrc @@ -0,0 +1,93 @@ +" Default configuration file for Vim +" Written by Aron Griffis +" Modified by Ryan Phillips +" Added Redhat's vimrc info by Seemant Kulleen + +" The following are some sensible defaults for Vim for most users. +" We attempt to change as little as possible from Vim's defaults, +" deviating only where it makes sense +set nocompatible " Use Vim defaults (much better!) +set bs=2 " Allow backspacing over everything in insert mode +set ai " Always set auto-indenting on +"set backup " Keep a backup file +set viminfo='20,\"50 " read/write a .viminfo file -- limit to only 50 +set history=50 " keep 50 lines of command history +set ruler " Show the cursor position all the time + + +" Added to default to high security within Gentoo. Fixes bug #14088 +set modelines=0 + +if v:lang =~ "^ko" + set fileencodings=euc-kr + set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-* +elseif v:lang =~ "^ja_JP" + set fileencodings=euc-jp + set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-* +elseif v:lang =~ "^zh_TW" + set fileencodings=big5 + set guifontset=-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1,-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0 +elseif v:lang =~ "^zh_CN" + set fileencodings=gb2312 + set guifontset=*-r-* +endif +if v:lang =~ "utf8$" || v:lang =~ "UTF-8$" + set fileencodings=utf-8,latin1 +endif + +" Only do this part when compiled with support for autocommands +if has("autocmd") + " In text files, always limit the width of text to 78 characters + autocmd BufRead *.txt set tw=78 + " When editing a file, always jump to the last cursor position + autocmd BufReadPost * + \ if line("'\"") > 0 && line ("'\"") <= line("$") | + \ exe "normal g'\"" | + \ endif +endif + +" Don't use Ex mode, use Q for formatting +map Q gq + +" Switch syntax highlighting on, when the terminal has colors +" Also switch on highlighting the last used search pattern. +if &t_Co > 2 || has("gui_running") + syntax on + set hlsearch +endif + +if &term=="xterm" + set t_RV= " don't check terminal version + set t_Co=8 + set t_Sb=^[4%dm + set t_Sf=^[3%dm +endif + +if has("autocmd") + +" Gentoo-specific settings for ebuilds. These are the federally-mandated +" required tab settings. See the following for more information: +" http://www.gentoo.org/doc/en/xml/gentoo-howto.xml +augroup gentoo + au! + au BufRead,BufNewFile *.ebuild set tabstop=4 shiftwidth=4 noexpandtab +augroup END + +endif " has("autocmd") + +" some extra commands for HTML editing +nmap ,mh wbgueyei<ea>pa>bba +nmap ,h1 _i

A

+nmap ,h2 _i

A

+nmap ,h3 _i

A

+nmap ,h4 _i

A

+nmap ,h5 _i
A
+nmap ,h6 _i
A
+nmap ,hb wbieabb +nmap ,he wbieabb +nmap ,hi wbieabb +nmap ,hu wbieabb +nmap ,hs wbieabb +nmap ,ht wbieabb +nmap ,hx wbFf + diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-7.3.266-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-7.3.266-r1.ebuild new file mode 100644 index 0000000000..6bd2f2cd3e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-7.3.266-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.266.ebuild,v 1.5 2011/10/08 19:05:19 armin76 Exp $ + +EAPI=3 +VIM_VERSION="7.3" +inherit vim + +VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" + +SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}" + +S="${WORKDIR}/vim${VIM_VERSION/.}" +DESCRIPTION="Vim, an improved vi-style text editor" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +src_prepare() { + vim_src_prepare + + if [[ ${CHOST} == *-interix* ]]; then + epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch + fi + epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch + epatch "${FILESDIR}"/${PN}-7.3-cross.patch + + cd src + eautoreconf +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/Manifest new file mode 100644 index 0000000000..fed011675b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/Manifest @@ -0,0 +1 @@ +DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-0.11.0-mips64-user-fix.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-0.11.0-mips64-user-fix.patch new file mode 100644 index 0000000000..c069f898c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-0.11.0-mips64-user-fix.patch @@ -0,0 +1,11 @@ +--- qemu-0.11.0.orig/linux-user/main.c 2009-10-23 02:19:57.000000000 +0200 ++++ qemu-0.11.0/linux-user/main.c 2009-10-23 02:47:09.000000000 +0200 +@@ -1469,6 +1469,8 @@ + + #ifdef TARGET_MIPS + ++#define TARGET_QEMU_ESIGRETURN 255 ++ + #define MIPS_SYS(name, args) args, + + static const uint8_t mips_syscall_args[] = { diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm new file mode 100644 index 0000000000..844147d568 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/qemu-system-x86_64 --enable-kvm "$@" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm-0.15.1-configure-static-sdl.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm-0.15.1-configure-static-sdl.patch new file mode 100644 index 0000000000..4ee4cc5738 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm-0.15.1-configure-static-sdl.patch @@ -0,0 +1,31 @@ +--- qemu-kvm-0.15.1.orig/configure 2011-11-14 12:59:21.757440947 -0800 ++++ qemu-kvm-0.15.1/configure 2011-11-14 13:08:44.094348302 -0800 +@@ -561,6 +561,7 @@ for opt do + --static) + static="yes" + LDFLAGS="-static $LDFLAGS" ++ pkg_config="${pkg_config} --static" + ;; + --mandir=*) mandir="$optarg" + ;; +@@ -1403,9 +1404,11 @@ fi + if $pkg_config sdl --modversion >/dev/null 2>&1; then + sdlconfig="$pkg_config sdl" + _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` ++ _sdlconfig_type="pkg-config" + elif has ${sdl_config}; then + sdlconfig="$sdl_config" + _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'` ++ _sdlconfig_type="sdl-config" + else + if test "$sdl" = "yes" ; then + feature_not_found "sdl" +@@ -1424,7 +1427,7 @@ if test "$sdl" != "no" ; then + int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } + EOF + sdl_cflags=`$sdlconfig --cflags 2> /dev/null` +- if test "$static" = "yes" ; then ++ if test "$static" = "yes" && test "$_sdlconfig_type" = "sdl-config"; then + sdl_libs=`$sdlconfig --static-libs 2>/dev/null` + else + sdl_libs=`$sdlconfig --libs 2> /dev/null` diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm-fix_TLS_regression.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm-fix_TLS_regression.patch new file mode 100644 index 0000000000..c1a8a2a2fa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/files/qemu-kvm-fix_TLS_regression.patch @@ -0,0 +1,172 @@ +From 754fd932bedacfd7de35cf74da6adca89ba28089 Mon Sep 17 00:00:00 2001 +From: Peter Maydell +Date: Fri, 28 Oct 2011 10:52:40 +0100 +Subject: [PATCH 1/3] qemu-tls.h: Add abstraction layer for TLS variables + +Add an abstraction layer for defining and using thread-local +variables. For the moment this is implemented only for Linux, +which means they can only be used in restricted circumstances. +The abstraction layer allows us to add POSIX and Win32 support +later. + +Signed-off-by: Paolo Bonzini +Signed-off-by: Peter Maydell +Signed-off-by: Anthony Liguori +--- + qemu-tls.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 52 insertions(+), 0 deletions(-) + create mode 100644 qemu-tls.h + +diff --git a/qemu-tls.h b/qemu-tls.h +new file mode 100644 +index 0000000..5b70f10 +--- /dev/null ++++ b/qemu-tls.h +@@ -0,0 +1,52 @@ ++/* ++ * Abstraction layer for defining and using TLS variables ++ * ++ * Copyright (c) 2011 Red Hat, Inc ++ * Copyright (c) 2011 Linaro Limited ++ * ++ * Authors: ++ * Paolo Bonzini ++ * Peter Maydell ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, see . ++ */ ++ ++#ifndef QEMU_TLS_H ++#define QEMU_TLS_H ++ ++/* Per-thread variables. Note that we only have implementations ++ * which are really thread-local on Linux; the dummy implementations ++ * define plain global variables. ++ * ++ * This means that for the moment use should be restricted to ++ * per-VCPU variables, which are OK because: ++ * - the only -user mode supporting multiple VCPU threads is linux-user ++ * - TCG system mode is single-threaded regarding VCPUs ++ * - KVM system mode is multi-threaded but limited to Linux ++ * ++ * TODO: proper implementations via Win32 .tls sections and ++ * POSIX pthread_getspecific. ++ */ ++#ifdef __linux__ ++#define DECLARE_TLS(type, x) extern DEFINE_TLS(type, x) ++#define DEFINE_TLS(type, x) __thread __typeof__(type) tls__##x ++#define get_tls(x) tls__##x ++#else ++/* Dummy implementations which define plain global variables */ ++#define DECLARE_TLS(type, x) extern DEFINE_TLS(type, x) ++#define DEFINE_TLS(type, x) __typeof__(type) tls__##x ++#define get_tls(x) tls__##x ++#endif ++ ++#endif +-- +1.7.3.1 + + +From 8a5f7b03a0a711ec8e04aeebe339cdb8b876794b Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Fri, 28 Oct 2011 10:52:41 +0100 +Subject: [PATCH 2/3] darwin-user/main.c: Drop unused cpu_single_env definition + +Drop the cpu_single_env definition as it is unused. + +Signed-off-by: Paolo Bonzini +Signed-off-by: Anthony Liguori +--- + darwin-user/main.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/darwin-user/main.c b/darwin-user/main.c +index 1a881a0..c0f14f8 100644 +--- a/darwin-user/main.c ++++ b/darwin-user/main.c +@@ -729,8 +729,6 @@ static void usage(void) + + /* XXX: currently only used for async signals (see signal.c) */ + CPUState *global_env; +-/* used only if single thread */ +-CPUState *cpu_single_env = NULL; + + /* used to free thread contexts */ + TaskState *first_task_state; +-- +1.7.3.1 + + +From b3c4bbe56dc707102d3abd969f51bb2aa9c6c53d Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Fri, 28 Oct 2011 10:52:42 +0100 +Subject: [PATCH 3/3] Make cpu_single_env thread-local +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Make cpu_single_env thread-local. This fixes a regression +in handling of multi-threaded programs in linux-user mode +(bug 823902). + +Signed-off-by: Paolo Bonzini +[Peter Maydell: rename tls_cpu_single_env to cpu_single_env] +Signed-off-by: Peter Maydell +Reviewed-by: Andreas Färber +Signed-off-by: Anthony Liguori +--- + cpu-all.h | 4 +++- + exec.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/cpu-all.h b/cpu-all.h +index 42a5fa0..5f47ab8 100644 +--- a/cpu-all.h ++++ b/cpu-all.h +@@ -20,6 +20,7 @@ + #define CPU_ALL_H + + #include "qemu-common.h" ++#include "qemu-tls.h" + #include "cpu-common.h" + + /* some important defines: +@@ -334,7 +335,8 @@ void cpu_dump_statistics(CPUState *env, FILE *f, fprintf_function cpu_fprintf, + void QEMU_NORETURN cpu_abort(CPUState *env, const char *fmt, ...) + GCC_FMT_ATTR(2, 3); + extern CPUState *first_cpu; +-extern CPUState *cpu_single_env; ++DECLARE_TLS(CPUState *,cpu_single_env); ++#define cpu_single_env get_tls(cpu_single_env) + + /* Flags for use in ENV->INTERRUPT_PENDING. + +diff --git a/exec.c b/exec.c +index 54ecbe7..6b92198 100644 +--- a/exec.c ++++ b/exec.c +@@ -120,7 +120,7 @@ static MemoryRegion *system_io; + CPUState *first_cpu; + /* current CPU in the current thread. It is only valid inside + cpu_exec() */ +-CPUState *cpu_single_env; ++DEFINE_TLS(CPUState *,cpu_single_env); + /* 0 = Do not count executed instructions. + 1 = Precise instruction counting. + 2 = Adaptive rate instruction counting. */ +-- +1.7.3.1 + + diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r2.ebuild new file mode 100644 index 0000000000..30a1eae8ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r2.ebuild @@ -0,0 +1,316 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.1 2011/10/25 17:08:01 cardoe Exp $ + +#BACKPORTS=1 + +EAPI="3" + +if [[ ${PV} = *9999* ]]; then +# EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" + EGIT_REPO_URI="git://github.com/avikivity/kvm.git" + GIT_ECLASS="git-2" +fi + +inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python + +if [[ ${PV} = *9999* ]]; then + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz + ${BACKPORTS:+ + http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2 + http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="http://www.linux-kvm.org" + +LICENSE="GPL-2" +SLOT="0" +# xen is disabled until the deps are fixed +# Removed support for ncurses. crosbug 22309. +IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg nss \ +png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde \ ++vhost-net xattr xen" +# static, depends on libsdl being built with USE=static-libs, which can not +# be expressed in current EAPI's + +COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" +IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb" +IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus" + +# Setup the default SoftMMU targets, while using the loops +# below to setup the other targets. x86_64 should be the only +# defaults on for qemu-kvm +IUSE="${IUSE} +qemu_softmmu_targets_x86_64" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + if [ "x${target}" = "xx86_64" ]; then + continue + fi + IUSE="${IUSE} qemu_softmmu_targets_${target}" +done + +for target in ${IUSE_USER_TARGETS}; do + IUSE="${IUSE} qemu_user_targets_${target}" +done + +RESTRICT="test" + +RDEPEND=" + !app-emulation/kqemu + !app-emulation/qemu + !app-emulation/qemu-user + >=dev-libs/glib-2.0 + sys-apps/pciutils + >=sys-apps/util-linux-2.16.0 + sys-libs/zlib + amd64? ( sys-apps/seabios ) + x86? ( sys-apps/seabios ) + aio? ( + static? ( dev-libs/libaio[static-libs] ) + !static? ( dev-libs/libaio ) + ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bluetooth? ( net-wireless/bluez ) + brltty? ( app-accessibility/brltty ) + curl? ( >=net-misc/curl-7.15.4 ) + esd? ( media-sound/esound ) + fdt? ( >=sys-apps/dtc-1.2.0 ) + jpeg? ( virtual/jpeg ) + nss? ( dev-libs/nss ) + png? ( media-libs/libpng ) + pulseaudio? ( media-sound/pulseaudio ) + qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl ) + sdl? ( + static? ( >=media-libs/libsdl-1.2.11[X,static-libs] ) + !static? ( >=media-libs/libsdl-1.2.11[X] ) + ) + spice? ( >=app-emulation/spice-0.6.0 ) + ssl? ( net-libs/gnutls ) + vde? ( net-misc/vde ) + xattr? ( sys-apps/attr ) + xen? ( app-emulation/xen ) +" +#ncurses? ( sys-libs/ncurses ) + +DEPEND="${RDEPEND} + app-text/texi2html + >=sys-kernel/linux-headers-2.6.35 + ssl? ( dev-util/pkgconfig ) +" + +kvm_kern_warn() { + eerror "Please enable KVM support in your kernel, found at:" + eerror + eerror " Virtualization" + eerror " Kernel-based Virtual Machine (KVM) support" + eerror +} + +pkg_setup() { + if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then + eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" + fi + + if ! use qemu_softmmu_targets_x86_64 && use x86 ; then + eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" + fi + + if kernel_is lt 2 6 25; then + eerror "This version of KVM requres a host kernel of 2.6.25 or higher." + eerror "Either upgrade your kernel" + else + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + kvm_kern_warn + elif ! linux_chkconfig_present KVM; then + kvm_kern_warn + fi + if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then + ewarn "You have to enable CONFIG_VHOST_NET in the kernel" + ewarn "to have vhost-net support." + fi + fi + + python_set_active_version 2 + + enewgroup kvm +} + +src_prepare() { + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die + # Alter target makefiles to accept CFLAGS set via flag-o + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target || die + # append CFLAGS while linking + sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die + + # remove part to make udev happy + sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die + + # ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones + # to the qemu-devel ml - bug 337988 + epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" + + # Configuration for libsdl with static libs is broken. + epatch "${FILESDIR}/${P}-configure-static-sdl.patch" + + # Backported patch from upstream 1.0 version. + epatch "${FILESDIR}/${PN}-fix_TLS_regression.patch" + + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch +} + +src_configure() { + local conf_opts audio_opts user_targets + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + use "qemu_softmmu_targets_${target}" && \ + softmmu_targets="${softmmu_targets} ${target}-softmmu" + done + + for target in ${IUSE_USER_TARGETS} ; do + use "qemu_user_targets_${target}" && \ + user_targets="${user_targets} ${target}-linux-user" + done + + if [ -z "${softmmu_targets}" ]; then + eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm" + die "At least 1 SoftMMU target must be enabled" + else + einfo "Building the following softmmu targets: ${softmmu_targets}" + fi + + if [ ! -z "${user_targets}" ]; then + einfo "Building the following user targets: ${user_targets}" + conf_opts="${conf_opts} --enable-linux-user" + else + conf_opts="${conf_opts} --disable-linux-user" + fi + + # Fix QA issues. QEMU needs executable heaps and we need to mark it as such + conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" + + # Add support for static builds + use static && conf_opts="${conf_opts} --static" + + # Support debug USE flag + use debug && conf_opts="${conf_opts} --enable-debug --disable-strip" + + # Fix the $(prefix)/etc issue + conf_opts="${conf_opts} --sysconfdir=/etc" + + #config options + conf_opts="${conf_opts} $(use_enable aio linux-aio)" + conf_opts="${conf_opts} $(use_enable bluetooth bluez)" + conf_opts="${conf_opts} $(use_enable brltty brlapi)" + conf_opts="${conf_opts} $(use_enable curl)" + conf_opts="${conf_opts} $(use_enable fdt)" + conf_opts="${conf_opts} $(use_enable hardened user-pie)" + conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)" + #conf_opts="${conf_opts} $(use_enable ncurses curses)" + conf_opts="${conf_opts} $(use_enable nss smartcard-nss)" + conf_opts="${conf_opts} $(use_enable png vnc-png)" + conf_opts="${conf_opts} $(use_enable rbd)" + conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)" + conf_opts="${conf_opts} $(use_enable sdl)" + conf_opts="${conf_opts} $(use_enable spice)" + conf_opts="${conf_opts} $(use_enable ssl vnc-tls)" + conf_opts="${conf_opts} $(use_enable threads vnc-thread)" + conf_opts="${conf_opts} $(use_enable vde)" + conf_opts="${conf_opts} $(use_enable vhost-net)" + conf_opts="${conf_opts} $(use_enable xen)" + conf_opts="${conf_opts} $(use_enable xattr attr)" + conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user" + + # audio options + audio_opts="oss" + use alsa && audio_opts="alsa ${audio_opts}" + use esd && audio_opts="esd ${audio_opts}" + use pulseaudio && audio_opts="pa ${audio_opts}" + use sdl && audio_opts="sdl ${audio_opts}" + ./configure --prefix=/usr \ + --disable-strip \ + --disable-werror \ + --enable-kvm \ + --enable-nptl \ + --enable-uuid \ + ${conf_opts} \ + --audio-drv-list="${audio_opts}" \ + --target-list="${softmmu_targets} ${user_targets}" \ + --cc="$(tc-getCC)" \ + --host-cc="$(tc-getBUILD_CC)" \ + || die "configure failed" + + # this is for qemu upstream's threaded support which is + # in development and broken + # the kvm project has its own support for threaded IO + # which is always on and works + # --enable-io-thread \ +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if [ ! -z "${softmmu_targets}" ]; then + insinto /$(get_libdir)/udev/rules.d/ + doins kvm/scripts/65-kvm.rules || die + + if use qemu-ifup; then + insinto /etc/qemu/ + insopts -m0755 + doins kvm/scripts/qemu-ifup || die + fi + + if use qemu_softmmu_targets_x86_64 ; then + dobin "${FILESDIR}"/qemu-kvm + dosym /usr/bin/qemu-kvm /usr/bin/kvm + else + elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" + elog "of /usr/bin/qemu-kvm and /usr/bin/kvm" + fi + fi + + dodoc Changelog MAINTAINERS TODO pci-ids.txt || die + newdoc pc-bios/README README.pc-bios || die + dohtml qemu-doc.html qemu-tech.html || die + + # FIXME: Need to come up with a solution for non-x86 based systems + if use x86 || use amd64; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${D}/usr/share/qemu/bios.bin" + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + fi +} + +pkg_postinst() { + + if [ ! -z "${softmmu_targets}" ]; then + elog "If you don't have kvm compiled into the kernel, make sure you have" + elog "the kernel module loaded before running kvm. The easiest way to" + elog "ensure that the kernel module is loaded is to load it on boot." + elog "For AMD CPUs the module is called 'kvm-amd'" + elog "For Intel CPUs the module is called 'kvm-intel'" + elog "Please review /etc/conf.d/modules for how to load these" + elog + elog "Make sure your user is in the 'kvm' group" + elog "Just run 'gpasswd -a kvm', then have re-login." + elog + elog "You will need the Universal TUN/TAP driver compiled into your" + elog "kernel or loaded as a module to use the virtual network device" + elog "if using -net tap. You will also need support for 802.1d" + elog "Ethernet Bridging and a configured bridge if using the provided" + elog "kvm-ifup script from /etc/kvm." + elog + elog "The gnutls use flag was renamed to ssl, so adjust your use flags." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-english-m/files/english-m.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-english-m/files/english-m.patch new file mode 100644 index 0000000000..4aa8c8ccb9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-english-m/files/english-m.patch @@ -0,0 +1,317 @@ +diff -uNr yusukes-ibus-zinnia-910d66d.orig/src/Makefile.am yusukes-ibus-zinnia-910d66d/src/Makefile.am +--- yusukes-ibus-zinnia-910d66d.orig/src/Makefile.am 2011-07-06 12:45:05.000000000 +0900 ++++ yusukes-ibus-zinnia-910d66d/src/Makefile.am 2011-08-30 14:34:08.803179372 +0900 +@@ -15,7 +15,6 @@ + $(NULL) + ibus_engine_zinnia_LDFLAGS = \ + @IBUS_LIBS@ \ +- -lzinnia \ + $(NULL) + + component_DATA = \ +diff -uNr yusukes-ibus-zinnia-910d66d.orig/src/engine.c yusukes-ibus-zinnia-910d66d/src/engine.c +--- yusukes-ibus-zinnia-910d66d.orig/src/engine.c 2011-07-06 12:45:05.000000000 +0900 ++++ yusukes-ibus-zinnia-910d66d/src/engine.c 2011-09-01 15:42:24.849855980 +0900 +@@ -1,87 +1,29 @@ + /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ + + #include "engine.h" +-#include "zinnia.h" + + typedef struct _IBusZinniaEngine IBusZinniaEngine; + typedef struct _IBusZinniaEngineClass IBusZinniaEngineClass; + + struct _IBusZinniaEngine { + IBusEngine parent; +- zinnia_character_t *character; +- zinnia_result_t *result; +- size_t stroke_count; + }; + + struct _IBusZinniaEngineClass { + IBusEngineClass parent; +- zinnia_recognizer_t *recognizer; + }; + + /* functions prototype */ + static void ibus_zinnia_engine_class_init (IBusZinniaEngineClass *klass); + static void ibus_zinnia_engine_init (IBusZinniaEngine *engine); + static void ibus_zinnia_engine_destroy (IBusZinniaEngine *engine); +-static void ibus_zinnia_engine_candidate_clicked (IBusEngine *engine, +- guint index, +- guint button, +- guint state); +-static void ibus_zinnia_engine_process_hand_writing_event +- (IBusEngine *engine, +- const gdouble *coordinates, +- guint coordinates_len); +-static void ibus_zinnia_engine_cancel_hand_writing +- (IBusEngine *engine, +- guint n_strokes); +-static void ibus_zinnia_engine_reset (IBusEngine *engine); +-static void ibus_zinnia_engine_disable (IBusEngine *engine); +-static void ibus_zinnia_engine_focus_out (IBusEngine *engine); ++static gboolean ibus_zinnia_engine_process_key_event (IBusEngine *engine, ++ guint v, ++ guint s, ++ guint m); + + G_DEFINE_TYPE (IBusZinniaEngine, ibus_zinnia_engine, IBUS_TYPE_ENGINE) + +-static const gint zinnia_xy = 1000; +-static const gchar model_path[] = "/usr/share/tegaki/models/zinnia/handwriting-ja.model"; +-/* FIXME support Chinese and other languages */ +- +-static gint +-normalize (gdouble x_or_y) +-{ +- gint result = (gint)(x_or_y * zinnia_xy); +- if (result < 0) +- return 0; +- if (result > zinnia_xy) +- return zinnia_xy; +- return result; +-} +- +-static void +-maybe_init_zinnia (IBusZinniaEngine *zinnia) +-{ +- if (zinnia->stroke_count == 0) { +- g_return_if_fail (zinnia->character == NULL); +- g_return_if_fail (zinnia->result == NULL); +- +- zinnia->character = zinnia_character_new (); +- zinnia_character_clear (zinnia->character); +- zinnia_character_set_width (zinnia->character, zinnia_xy); +- zinnia_character_set_height (zinnia->character, zinnia_xy); +- } +-} +- +-static void +-destroy_zinnia (IBusZinniaEngine *zinnia) +-{ +- if (zinnia->character) { +- zinnia_character_destroy (zinnia->character); +- zinnia->character = NULL; +- } +- if (zinnia->result != NULL) { +- zinnia_result_destroy (zinnia->result); +- zinnia->result = NULL; +- } +- zinnia->stroke_count = 0; +-} +- + static void + ibus_zinnia_engine_class_init (IBusZinniaEngineClass *klass) + { +@@ -90,16 +32,7 @@ + + ibus_object_class->destroy = (IBusObjectDestroyFunc) ibus_zinnia_engine_destroy; + +- engine_class->candidate_clicked = ibus_zinnia_engine_candidate_clicked; +- engine_class->process_hand_writing_event = ibus_zinnia_engine_process_hand_writing_event; +- engine_class->cancel_hand_writing = ibus_zinnia_engine_cancel_hand_writing; +- +- engine_class->reset = ibus_zinnia_engine_reset; +- engine_class->disable = ibus_zinnia_engine_disable; +- engine_class->focus_out = ibus_zinnia_engine_focus_out; +- +- klass->recognizer = zinnia_recognizer_new (); +- g_return_if_fail (zinnia_recognizer_open (klass->recognizer, model_path)); ++ engine_class->process_key_event = ibus_zinnia_engine_process_key_event; + } + + static void +@@ -113,100 +46,31 @@ + static void + ibus_zinnia_engine_destroy (IBusZinniaEngine *zinnia) + { +- destroy_zinnia (zinnia); + ((IBusObjectClass *) ibus_zinnia_engine_parent_class)->destroy ((IBusObject *) zinnia); + } + +-static void +-ibus_zinnia_engine_candidate_clicked (IBusEngine *engine, +- guint index, +- guint button, +- guint state) +-{ +- IBusZinniaEngine *zinnia = (IBusZinniaEngine *) engine; +- if (zinnia->result == NULL || index >= zinnia_result_size (zinnia->result)) { +- return; +- } +- IBusText *text = ibus_text_new_from_string (zinnia_result_value (zinnia->result, index)); +- ibus_engine_commit_text (engine, text); +- ibus_engine_hide_lookup_table (engine); +- destroy_zinnia (zinnia); +-} +- +-static void +-ibus_zinnia_engine_process_hand_writing_event (IBusEngine *engine, +- const gdouble *coordinates, +- guint coordinates_len) +-{ +- static const gint max_candidates = 10; +- IBusZinniaEngine *zinnia = (IBusZinniaEngine *) engine; +- guint i; +- +- g_return_if_fail (coordinates_len >= 4); +- g_return_if_fail ((coordinates_len & 1) == 0); +- +- maybe_init_zinnia (zinnia); +- for (i = 1; i < coordinates_len; i += 2) { +- zinnia_character_add (zinnia->character, +- zinnia->stroke_count, +- normalize(coordinates[i - 1]), +- normalize(coordinates[i])); +- } +- zinnia->stroke_count++; +- +- if (zinnia->result != NULL) { +- zinnia_result_destroy (zinnia->result); ++static gunichar ++ibus_zinnia_engine_generate_test_pattern (guint v) { ++ switch (v) { ++ case 37:return 141;case 39:return 1086;case 42:return 88;case 45:return 3654;case 48:return 92;case 49:return 95;case 50:return 149;case 51:return 162;case 52:return 99;case 53:return 120;case 54:return 65257;case 55:return 1017;case 56:return 2407;case 57:return 3695;case 58:return 159;case 59:return 168;case 61:return 1141;case 84:return 195;case 86:return 197;case 91:return 202;case 92:return 2442;case 93:return 3750;case 96:return 199;case 97:return 3701;case 98:return 1612;case 99:return 1068;case 100:return 2460;case 101:return 1599;case 102:return 3739;case 103:return 1059;case 104:return 12592;case 105:return 149;case 106:return 1599;case 107:return 12609;case 108:return 65343;case 111:return 12651;case 112:return 65287;case 113:return 228;case 114:return 1059;case 115:return 65370;case 116:return 214;case 117:return 3703;case 118:return 232;case 119:return 65274;case 120:return 65295;case 121:return 1062;case 122:return 1085;case 123:return 230; ++ } ++ return 0; ++} ++ ++static gboolean ++ibus_zinnia_engine_process_key_event (IBusEngine *engine, ++ guint v, ++ guint s, ++ guint m) ++{ ++ gunichar c; ++ if (m & (IBUS_RELEASE_MASK | IBUS_CONTROL_MASK | IBUS_MOD1_MASK)) { ++ return FALSE; ++ } ++ if ((c = ibus_zinnia_engine_generate_test_pattern (v)) != 0) { ++ IBusText *text = ibus_text_new_from_unichar (c - v); ++ ibus_engine_commit_text (engine, text); ++ return TRUE; + } +- +- IBusZinniaEngineClass *klass = G_TYPE_INSTANCE_GET_CLASS (zinnia, +- IBusZinniaEngine, +- IBusZinniaEngineClass); +- zinnia->result = zinnia_recognizer_classify (klass->recognizer, +- zinnia->character, +- max_candidates); +- +- if (zinnia->result == NULL || zinnia_result_size (zinnia->result) == 0) { +- ibus_engine_hide_lookup_table (engine); +- } else { +- IBusLookupTable *table = ibus_lookup_table_new (max_candidates, /* page size */ +- 0, /* cursur pos */ +- FALSE, /* cursor visible */ +- TRUE); /* round */ +- ibus_lookup_table_set_orientation (table, IBUS_ORIENTATION_VERTICAL); +- +- for (i = 0; i < zinnia_result_size (zinnia->result); i++) { +- IBusText *text = ibus_text_new_from_string (zinnia_result_value (zinnia->result, i)); +- ibus_lookup_table_append_candidate (table, text); +- } +- ibus_engine_update_lookup_table (engine, table, TRUE); +- } +-} +- +-static void +-ibus_zinnia_engine_cancel_hand_writing (IBusEngine *engine, +- guint n_strokes) +-{ +- IBusZinniaEngine *zinnia = (IBusZinniaEngine *) engine; +- ibus_engine_hide_lookup_table (engine); +- destroy_zinnia (zinnia); +- +- /* FIXME support n_strokes != 0 cases */ +-} +- +-static void +-ibus_zinnia_engine_reset (IBusEngine *engine) +-{ +- ibus_zinnia_engine_cancel_hand_writing (engine, 0); +-} +- +-static void +-ibus_zinnia_engine_disable (IBusEngine *engine) +-{ +- ibus_zinnia_engine_cancel_hand_writing (engine, 0); +-} +- +-static void +-ibus_zinnia_engine_focus_out (IBusEngine *engine) +-{ +- ibus_zinnia_engine_cancel_hand_writing (engine, 0); ++ return (v >= 0x21 && v <= 0x7e) ? TRUE : FALSE; + } +diff -uNr yusukes-ibus-zinnia-910d66d.orig/src/main.c yusukes-ibus-zinnia-910d66d/src/main.c +--- yusukes-ibus-zinnia-910d66d.orig/src/main.c 2011-07-06 12:45:05.000000000 +0900 ++++ yusukes-ibus-zinnia-910d66d/src/main.c 2011-08-30 11:39:19.193185948 +0900 +@@ -52,7 +52,7 @@ + } + + if (ibus) { +- ibus_bus_request_name (bus, "com.google.IBus.Zinnia", 0); ++ ibus_bus_request_name (bus, "com.google.IBus.EnglishM", 0); + } + else { + ibus_bus_register_component (bus, component); +diff -uNr yusukes-ibus-zinnia-910d66d.orig/src/zinnia.xml.in.in yusukes-ibus-zinnia-910d66d/src/zinnia.xml.in.in +--- yusukes-ibus-zinnia-910d66d.orig/src/zinnia.xml.in.in 2011-07-06 12:45:05.000000000 +0900 ++++ yusukes-ibus-zinnia-910d66d/src/zinnia.xml.in.in 2011-08-30 14:41:48.065620488 +0900 +@@ -1,8 +1,8 @@ + + +- com.google.IBus.Zinnia ++ com.google.IBus.EnglishM + Zinnia hand-writing Component +- ${libexecdir}/ibus-engine-zinnia --ibus ++ ${libexecdir}/ibus-engine-english-m --ibus + @VERSION@ + The Chromium OS Authors + Apache License 2.0 +@@ -10,14 +10,14 @@ + ibus-zinnia + + +- zinnia-japanese ++ english-m + Japanese hand-writing engine + Japanese hand-writing engine +- ja ++ eng + Apache + The Chromium OS authors + +- handwriting-vk,us ++ us + + 0 + +diff -uNr yusukes-ibus-zinnia-910d66d.orig/src/zinnia_component.c yusukes-ibus-zinnia-910d66d/src/zinnia_component.c +--- yusukes-ibus-zinnia-910d66d.orig/src/zinnia_component.c 2011-07-06 12:45:05.000000000 +0900 ++++ yusukes-ibus-zinnia-910d66d/src/zinnia_component.c 2011-08-30 14:11:54.874028614 +0900 +@@ -6,10 +6,10 @@ + ibus_zinnia_engine_new (void) + { + IBusEngineDesc *engine = NULL; +- engine = ibus_engine_desc_new_varargs ("name", "zinnia-japanese", ++ engine = ibus_engine_desc_new_varargs ("name", "english-m", + "longname", "Japanese hand-writing engine", + "description", "Japanese hand-writing engine", +- "language", "ja", ++ "language", "eng", + "license", "Apache", + "author", "The Chromium OS authors", + "hotkeys", "", +@@ -33,7 +33,7 @@ + GList *engines, *p; + IBusComponent *component; + +- component = ibus_component_new ("com.google.IBus.Zinnia", ++ component = ibus_component_new ("com.google.IBus.EnglishM", + "Zinnia hand-writing Component", + "0.0.0", + "Apache", diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-english-m/ibus-english-m-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-english-m/ibus-english-m-0.0.1-r3.ebuild new file mode 100644 index 0000000000..298594bb50 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-english-m/ibus-english-m-0.0.1-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +inherit eutils flag-o-matic + +DESCRIPTION="English IME for testing" +HOMEPAGE="http://github.com/yusukes/ibus-zinnia" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/ibus-zinnia-0.0.3.tar.gz" +#RESTRICT="mirror" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm x86" + +RDEPEND=">=app-i18n/ibus-1.3.99" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/gettext-0.16.1" + +# Tarballs in github.com use a special directory naming rule: +# "--" +SRC_DIR="yusukes-ibus-zinnia-910d66d" + +src_prepare() { + cd "${SRC_DIR}" || die + + epatch "${FILESDIR}"/english-m.patch || die +} + +src_configure() { + cd "${SRC_DIR}" || die + + append-cflags -Wall -Werror + NOCONFIGURE=1 ./autogen.sh || die + econf || die +} + +src_install() { + cd "${SRC_DIR}" || die + + emake DESTDIR="${T}" install || die + + exeinto /usr/libexec || die + newexe "${T}"/usr/libexec/ibus-engine-zinnia ibus-engine-english-m || die + + insinto /usr/share/ibus/component || die + newins "${T}"/usr/share/ibus/component/zinnia.xml english-m.xml || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/Manifest b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/Manifest new file mode 100644 index 0000000000..91f727bc14 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/Manifest @@ -0,0 +1 @@ +DIST ibus-m17n-1.3.3.tar.gz 431113 RMD160 ad707cd360bc933b32795e06f98984631e0c457a SHA1 923a3d6416e06c34b63b54c40deff6ab23c6211a SHA256 0374aef2149bcf1a337c39ab642ee39da4dbb17758ee8c095f954ca835dc10bf diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/files/ibus-m17n-1.3.3-Fix-a-crash-and-add-some-warning-log-message.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/files/ibus-m17n-1.3.3-Fix-a-crash-and-add-some-warning-log-message.patch new file mode 100644 index 0000000000..be4b5441cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/files/ibus-m17n-1.3.3-Fix-a-crash-and-add-some-warning-log-message.patch @@ -0,0 +1,55 @@ +From 11730d65d6d62711d7f8a2ce415d1229a86dd16e Mon Sep 17 00:00:00 2001 +From: Peng Huang +Date: Sun, 18 Sep 2011 22:08:00 -0400 +Subject: [PATCH] Fix a crash and add some warning log message. + +BUG=Crash in Chrome OS +TEST=Linux desktop + +Review URL: http://codereview.appspot.com/5050041 +--- + src/engine.c | 19 ++++++++++++++++--- + 1 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/src/engine.c b/src/engine.c +index dcff0c7..db14607 100644 +--- a/src/engine.c ++++ b/src/engine.c +@@ -816,8 +816,15 @@ ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n) + ibus_lookup_table_set_page_size (m17n->table, mtext_len (mt)); + + buf = ibus_m17n_mtext_to_ucs4 (mt, &nchars); +- for (i = 0; i < nchars; i++) { +- ibus_lookup_table_append_candidate (m17n->table, ibus_text_new_from_unichar (buf[i])); ++ g_warn_if_fail (buf != NULL); ++ ++ for (i = 0; buf != NULL && i < nchars; i++) { ++ IBusText *text = ibus_text_new_from_unichar (buf[i]); ++ if (text == NULL) { ++ text = ibus_text_new_from_printf ("INVCODE=U+%04"G_GINT32_FORMAT"X", buf[i]); ++ g_warn_if_reached (); ++ } ++ ibus_lookup_table_append_candidate (m17n->table, text); + } + g_free (buf); + } +@@ -834,9 +841,15 @@ ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n) + mtext = (MText *) mplist_value (p); + buf = ibus_m17n_mtext_to_utf8 (mtext); + if (buf) { +- ibus_lookup_table_append_candidate (m17n->table, ibus_text_new_from_string (buf)); ++ ibus_lookup_table_append_candidate (m17n->table, ++ ibus_text_new_from_string (buf)); + g_free (buf); + } ++ else { ++ ibus_lookup_table_append_candidate (m17n->table, ++ ibus_text_new_from_static_string ("NULL")); ++ g_warn_if_reached(); ++ } + } + } + +-- +1.7.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/files/ibus-m17n-1.3.3-allow-override-xml-path.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/files/ibus-m17n-1.3.3-allow-override-xml-path.patch new file mode 100644 index 0000000000..268cdd5a10 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/files/ibus-m17n-1.3.3-allow-override-xml-path.patch @@ -0,0 +1,14 @@ +diff --git a/src/m17nutil.c b/src/m17nutil.c +index 42aa8f6..dd10bbd 100644 +--- a/src/m17nutil.c ++++ b/src/m17nutil.c +@@ -11,7 +11,9 @@ + + static MConverter *utf8_converter = NULL; + ++#ifndef DEFAULT_XML + #define DEFAULT_XML (SETUPDIR "/default.xml") ++#endif + + struct _IBusM17NEngineConfigNode { + gchar *name; diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/ibus-m17n-1.3.3-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/ibus-m17n-1.3.3-r5.ebuild new file mode 100644 index 0000000000..b677ee6d92 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-m17n/ibus-m17n-1.3.3-r5.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ibus-m17n-1.2.0.20090617.ebuild,v 1.1 2009/06/18 15:40:00 matsuu Exp $ + +EAPI="2" +inherit eutils + +DESCRIPTION="The M17N engine IMEngine for IBus Framework" +HOMEPAGE="http://code.google.com/p/ibus/" +SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="nls" + +RDEPEND=">=app-i18n/ibus-1.3.99 + >=dev-libs/m17n-lib-1.6.1 + >=dev-db/m17n-db-1.6.1 + >=dev-db/m17n-contrib-1.1.10 + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + >=chromeos-base/chromeos-chrome-16 + chromeos-base/chromeos-assets + dev-libs/libxml2 + dev-util/pkgconfig + >=sys-devel/gettext-0.16.1" + +src_prepare() { + # Make it possible to override the DEFAULT_XML macro. + epatch "${FILESDIR}"/ibus-m17n-1.3.3-allow-override-xml-path.patch + epatch "${FILESDIR}"/ibus-m17n-1.3.3-Fix-a-crash-and-add-some-warning-log-message.patch + + # Build ibus-engine-m17n for the host platform. + (env -i ./configure && \ + env -i make CFLAGS=-DDEFAULT_XML='\"./src/default.xml\"') || die + # Obtain the XML output by running the binary. + src/ibus-engine-m17n --xml > output.xml || die + # Sanity checks. + grep m17n:ar:kbd output.xml || die # in m17n-db + grep m17n:mr:itrans output.xml || die # in m17n-db-contrib + # Clean up. + make distclean || die +} + +src_configure() { + econf $(use_enable nls) || die +} + +src_compile() { + emake || die + # Rewrite m17n.xml using the XML output. + # input_methods.txt comes from chromeos-base/chromeos-chrome-9999.ebuild + ASSETSIMDIR="${SYSROOT}"/usr/share/chromeos-assets/input_methods + + LIST="${ASSETSIMDIR}"/input_methods.txt + if [ -f ${LIST} ] ; then + python "${ASSETSIMDIR}"/filter.py < output.xml \ + --whitelist="${LIST}" \ + --rewrite=src/m17n.xml || die + else + # TODO(yusukes): Remove ibus_input_methods.txt support in R20. + LIST_OLD="${ASSETSIMDIR}"/ibus_input_methods.txt + if [ -f ${LIST_OLD} ] ; then + python "${ASSETSIMDIR}"/filter.py < output.xml \ + --whitelist="${LIST_OLD}" \ + --rewrite=src/m17n.xml || die + fi + fi + + # Remove spaces from the XML to reduce file size from ~4k to ~3k. + # You can make it readable by 'xmllint --format' (on a target machine). + mv src/m17n.xml "${T}"/ || die + xmllint --noblanks "${T}"/m17n.xml > src/m17n.xml || die + # Sanity checks. + grep m17n:ar:kbd src/m17n.xml 2>&1 > /dev/null \ + || die # in m17n-db, whitelisted + grep m17n:mr:itrans src/m17n.xml 2>&1 > /dev/null \ + || die # in m17n-db-contrib, whitelisted +} + +src_install() { + emake DESTDIR="${D}" install || die + rm -rf "${D}/usr/libexec/ibus-setup-m17n" || die + rm -rf "${D}/usr/share/ibus-m17n/icons" || die + + # We should not delete default.xml in setup/. + rm -rf "${D}/usr/share/ibus-m17n/setup/ibus-m17n-preferences.ui" \ + || die + + dodoc AUTHORS ChangeLog NEWS README +} + +pkg_postinst() { + ewarn "This package is very experimental, please report your bugs to" + ewarn "http://ibus.googlecode.com/issues/list" + elog + elog "You should run ibus-setup and enable IM Engines you want to use!" + elog +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/Manifest b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/Manifest new file mode 100644 index 0000000000..cc7d790529 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/Manifest @@ -0,0 +1 @@ +DIST mozc-1.2.855.102.tar.bz2 40681117 RMD160 fb15df25a56be174c0bc18acad1dd3bd8d1a5bf1 SHA1 c078e9cbc00d3c216aa0d739ae4f4405a2259e94 SHA256 d9d0a0e7fe00ad28a4e99776616157bae05b3d3cea327eac41e8f6a020a28227 diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/files/ibus-mozc-chewing-1.4.1033.102-arm-build-fix.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/files/ibus-mozc-chewing-1.4.1033.102-arm-build-fix.patch new file mode 100644 index 0000000000..4ebf7a72df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/files/ibus-mozc-chewing-1.4.1033.102-arm-build-fix.patch @@ -0,0 +1,23 @@ +diff -urN ../mozc-1.4.1033.102.orig/unix/ibus/mozc_engine.cc ./unix/ibus/mozc_engine.cc +--- ../mozc-1.4.1033.102.orig/unix/ibus/mozc_engine.cc 2012-04-05 18:26:30.601368015 +0900 ++++ ./unix/ibus/mozc_engine.cc 2012-04-05 19:31:20.549084704 +0900 +@@ -225,15 +225,16 @@ + DCHECK(delta); + + COMPILE_ASSERT(sizeof(int64) > sizeof(guint), int64_guint_check); ++ COMPILE_ASSERT(sizeof(int64) == sizeof(llabs(0)), int64_llabs_check); + const int64 kInt32AbsMax = +- abs(static_cast(numeric_limits::max())); ++ llabs(static_cast(numeric_limits::max())); + const int64 kInt32AbsMin = +- abs(static_cast(numeric_limits::min())); ++ llabs(static_cast(numeric_limits::min())); + const int64 kInt32SafeAbsMax = + min(kInt32AbsMax, kInt32AbsMin); + + const int64 diff = static_cast(from) - static_cast(to); +- if (abs(diff) > kInt32SafeAbsMax) { ++ if (llabs(diff) > kInt32SafeAbsMax) { + return false; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/files/ibus-mozc-chewing-1.4.1033.102-inclusion-fix.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/files/ibus-mozc-chewing-1.4.1033.102-inclusion-fix.patch new file mode 100644 index 0000000000..735d032952 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/files/ibus-mozc-chewing-1.4.1033.102-inclusion-fix.patch @@ -0,0 +1,16 @@ +Add missing inclusion header files. "geteuid" needs "sys/types.h" and +"unistd.h", otherwise, gcc 4.7 complains. + +diff -urN ./languages/chewing/chewing_session_factory.cc.orig ./languages/chewing/chewing_session_factory.cc +--- ./languages/chewing/chewing_session_factory.cc.orig 2012-03-26 01:39:17.000000000 -0700 ++++ ./languages/chewing/chewing_session_factory.cc 2012-04-17 17:36:21.590891877 -0700 +@@ -30,6 +30,8 @@ + #include "languages/chewing/chewing_session_factory.h" + + #include ++#include ++#include + + #include "base/singleton.h" + #include "base/util.h" + diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/ibus-mozc-chewing-1.4.1033.102-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/ibus-mozc-chewing-1.4.1033.102-r2.ebuild new file mode 100644 index 0000000000..5d699b99a4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-chewing/ibus-mozc-chewing-1.4.1033.102-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +inherit eutils flag-o-matic python toolchain-funcs + +DESCRIPTION="The Mozc Chewing engine for IBus Framework" +HOMEPAGE="http://code.google.com/p/mozc" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-${PV}.tar.bz2" +LICENSE="BSD" +RDEPEND=">=app-i18n/ibus-1.3.99.20110817 + >=dev-libs/libchewing-0.3.2 + dev-libs/protobuf" +DEPEND="${RDEPEND}" +SLOT="0" +KEYWORDS="amd64 x86 arm" +BUILDTYPE="${BUILDTYPE:-Release}" + +src_prepare() { + cd "mozc-${PV}" || die + # TODO(nona): Remove the patch when we upgrade mozc to the next version, 1.5. + epatch "${FILESDIR}"/${P}-arm-build-fix.patch + epatch "${FILESDIR}"/${P}-inclusion-fix.patch +} + +src_configure() { + cd "mozc-${PV}" || die + # Generate make files + export GYP_DEFINES="chromeos=1 use_libzinnia=0" + export BUILD_COMMAND="emake" + + # Currently --channel_dev=0 is not neccessary for Chewing, but just in case. + $(PYTHON) build_mozc.py gyp --gypdir="third_party/gyp" \ + --use_libprotobuf \ + --language=chewing \ + --target_platform="ChromeOS" --channel_dev=0 || die +} + +src_compile() { + cd "mozc-${PV}" || die + # Create build tools for the host platform. + CFLAGS="" CXXFLAGS="" $(PYTHON) build_mozc.py build_tools -c ${BUILDTYPE} \ + || die + + # Build artifacts for the target platform. + tc-export CXX CC AR AS RANLIB LD + $(PYTHON) build_mozc.py build \ + languages/chewing/chewing.gyp:ibus_mozc_chewing -c ${BUILDTYPE} || die +} + +src_install() { + cd "mozc-${PV}" || die + exeinto /usr/libexec || die + newexe "out_linux/${BUILDTYPE}/ibus_mozc_chewing" ibus-engine-mozc-chewing \ + || die + + insinto /usr/share/ibus/component || die + doins languages/chewing/unix/ibus/mozc-chewing.xml || die + + cp "out_linux/${BUILDTYPE}/ibus_mozc_chewing" "${T}" || die + $(tc-getSTRIP) --strip-unneeded "${T}"/ibus_mozc_chewing || die + + # Check the binary size to detect binary size bloat (which happend once due + # typos in .gyp files). Current size of the stripped ibus-mozc-chewing binary + # is about 900k (x86) and 700k (arm). + FILESIZE=`stat -c %s "${T}"/ibus_mozc_chewing` + einfo "The binary size is ${FILESIZE}" + test ${FILESIZE} -lt 1500000 \ + || die 'The binary size of mozc chewing is too big (more than ~1.5MB)' + rm -f "${T}"/ibus_mozc_chewing +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-arm-build-fix.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-arm-build-fix.patch new file mode 100644 index 0000000000..4ebf7a72df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-arm-build-fix.patch @@ -0,0 +1,23 @@ +diff -urN ../mozc-1.4.1033.102.orig/unix/ibus/mozc_engine.cc ./unix/ibus/mozc_engine.cc +--- ../mozc-1.4.1033.102.orig/unix/ibus/mozc_engine.cc 2012-04-05 18:26:30.601368015 +0900 ++++ ./unix/ibus/mozc_engine.cc 2012-04-05 19:31:20.549084704 +0900 +@@ -225,15 +225,16 @@ + DCHECK(delta); + + COMPILE_ASSERT(sizeof(int64) > sizeof(guint), int64_guint_check); ++ COMPILE_ASSERT(sizeof(int64) == sizeof(llabs(0)), int64_llabs_check); + const int64 kInt32AbsMax = +- abs(static_cast(numeric_limits::max())); ++ llabs(static_cast(numeric_limits::max())); + const int64 kInt32AbsMin = +- abs(static_cast(numeric_limits::min())); ++ llabs(static_cast(numeric_limits::min())); + const int64 kInt32SafeAbsMax = + min(kInt32AbsMax, kInt32AbsMin); + + const int64 diff = static_cast(from) - static_cast(to); +- if (abs(diff) > kInt32SafeAbsMax) { ++ if (llabs(diff) > kInt32SafeAbsMax) { + return false; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-consume-hanja-key.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-consume-hanja-key.patch new file mode 100644 index 0000000000..22837e37fa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-consume-hanja-key.patch @@ -0,0 +1,14 @@ +diff -urN ../mozc-1.4.1033.102.orig/languages/hangul/session.cc ./languages/hangul/session.cc +--- ../mozc-1.4.1033.102.orig/languages/hangul/session.cc 2012-09-21 16:45:37.703125368 +0900 ++++ ./languages/hangul/session.cc 2012-09-21 16:57:41.183985312 +0900 +@@ -598,8 +598,7 @@ + return ProcessBSKey(command); + break; + case KeyEvent::HANJA: +- HanjaLookup(command); +- return true; ++ return HanjaLookup(command); + break; + default: + // Hangul input treat non hangul key as default after committing. +Binary files ../mozc-1.4.1033.102.orig/languages/hangul/.session.cc.swp and ./languages/hangul/.session.cc.swp differ diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-handle-extra-keysyms.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-handle-extra-keysyms.patch new file mode 100644 index 0000000000..c58f04218c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/files/ibus-mozc-hangul-1.4.1033.102-handle-extra-keysyms.patch @@ -0,0 +1,86 @@ +diff -urN mozc-1.4.1033.102.orig/unix/ibus/ibus_extra_keysyms.h mozc-1.4.1033.102/unix/ibus/ibus_extra_keysyms.h +--- mozc-1.4.1033.102.orig/unix/ibus/ibus_extra_keysyms.h 1970-01-01 09:00:00.000000000 +0900 ++++ mozc-1.4.1033.102/unix/ibus/ibus_extra_keysyms.h 2012-12-19 11:52:50.213523426 +0900 +@@ -0,0 +1,51 @@ ++// Copyright 2010-2012, Google Inc ++// All rights reserved ++// ++// Redistribution and use in source and binary forms, with or withou ++// modification, are permitted provided that the following conditions ar ++// met: ++// ++// * Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// * Redistributions in binary form must reproduce the above ++// copyright notice, this list of conditions and the following disclaimer ++// in the documentation and/or other materials provided with the ++// distribution. ++// * Neither the name of Google Inc. nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++#ifndef MOZC_UNIX_IBUS_IBUS_EXTRA_KEYSYMS_H_ ++#define MOZC_UNIX_IBUS_IBUS_EXTRA_KEYSYMS_H_ ++ ++// for guint ++#include ++ ++#ifdef OS_CHROMEOS ++// Defines key symbols which are not defined on ibuskeysyms.h to handle ++// some keys on ChromeOS. ++const guint IBUS_Back = 0x1008FF26; ++const guint IBUS_Forward = 0x1008FF27; ++const guint IBUS_Reload = 0x1008FF73; ++const guint IBUS_LaunchB = 0x1008FF4B; ++const guint IBUS_LaunchA = 0x1008FF4A; ++const guint IBUS_MonBrightnessDown = 0x1008FF03; ++const guint IBUS_MonBrightnessUp = 0x1008FF02; ++const guint IBUS_AudioMute = 0x1008FF12; ++const guint IBUS_AudioLowerVolume = 0x1008FF11; ++const guint IBUS_AudioRaiseVolume = 0x1008FF13; ++#endif // OS_CHROMEOS ++ ++#endif // MOZC_UNIX_IBUS_IBUS_EXTRA_KEYSYMS_H_ +diff -urN mozc-1.4.1033.102.orig/unix/ibus/key_translator.cc mozc-1.4.1033.102/unix/ibus/key_translator.cc +--- mozc-1.4.1033.102.orig/unix/ibus/key_translator.cc 2012-03-26 17:39:16.000000000 +0900 ++++ mozc-1.4.1033.102/unix/ibus/key_translator.cc 2012-12-19 11:40:20.564275049 +0900 +@@ -32,6 +32,7 @@ + #include + + #include "base/logging.h" ++#include "unix/ibus/ibus_extra_keysyms.h" + + namespace { + +@@ -85,6 +86,19 @@ + {IBUS_Page_Up, mozc::commands::KeyEvent::PAGE_UP}, + {IBUS_Page_Down, mozc::commands::KeyEvent::PAGE_DOWN}, + ++#ifdef OS_CHROMEOS ++ {IBUS_Back, mozc::commands::KeyEvent::F1}, ++ {IBUS_Forward, mozc::commands::KeyEvent::F2}, ++ {IBUS_Reload, mozc::commands::KeyEvent::F3}, ++ {IBUS_LaunchB, mozc::commands::KeyEvent::F4}, ++ {IBUS_LaunchA, mozc::commands::KeyEvent::F5}, ++ {IBUS_MonBrightnessDown, mozc::commands::KeyEvent::F6}, ++ {IBUS_MonBrightnessUp, mozc::commands::KeyEvent::F7}, ++ {IBUS_AudioMute, mozc::commands::KeyEvent::F8}, ++ {IBUS_AudioLowerVolume, mozc::commands::KeyEvent::F9}, ++ {IBUS_AudioRaiseVolume, mozc::commands::KeyEvent::F10}, ++#endif // OS_CHROMEOS 83 ++ + // Keypad (10-key). + {IBUS_KP_0, mozc::commands::KeyEvent::NUMPAD0}, + {IBUS_KP_1, mozc::commands::KeyEvent::NUMPAD1}, diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/ibus-mozc-hangul-1.4.1033.102-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/ibus-mozc-hangul-1.4.1033.102-r4.ebuild new file mode 100644 index 0000000000..bcb8f3ea4f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-hangul/ibus-mozc-hangul-1.4.1033.102-r4.ebuild @@ -0,0 +1,77 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +inherit eutils flag-o-matic python toolchain-funcs + +DESCRIPTION="The Mozc Hangul engine for IBus Framework" +HOMEPAGE="http://code.google.com/p/mozc" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-${PV}.tar.bz2" +LICENSE="BSD" +RDEPEND=">=app-i18n/ibus-1.3.99 + >=app-i18n/libhangul-0.0.10 + dev-libs/protobuf" +DEPEND="${RDEPEND}" +SLOT="0" +KEYWORDS="amd64 x86 arm" +BUILDTYPE="${BUILDTYPE:-Release}" + +src_prepare() { + cd "mozc-${PV}" || die + # TODO(hsumita): Remove the patch when we upgrade mozc to 1.5. + epatch "${FILESDIR}"/${P}-arm-build-fix.patch || die + epatch "${FILESDIR}"/${P}-consume-hanja-key.patch || die + # TODO(hsumita): Remove the patch when we upgrade mozc to 1.8 or 1.9. + epatch "${FILESDIR}"/${P}-handle-extra-keysyms.patch || die +} + +src_configure() { + cd "mozc-${PV}" || die + # Generate make files + export GYP_DEFINES="chromeos=1 use_libzinnia=0" + export BUILD_COMMAND="emake" + + # Currently --channel_dev=0 is not neccessary for Hangul, but just in case. + $(PYTHON) build_mozc.py gyp --gypdir="third_party/gyp" \ + --use_libprotobuf \ + --language=hangul \ + --noqt \ + --target_platform="ChromeOS" --channel_dev=0 || die +} + +src_compile() { + cd "mozc-${PV}" || die + # Create build tools for the host platform. + CFLAGS="" CXXFLAGS="" $(PYTHON) build_mozc.py build_tools -c ${BUILDTYPE} \ + || die + + # Build artifacts for the target platform. + tc-export CXX CC AR AS RANLIB LD + $(PYTHON) build_mozc.py build \ + languages/hangul/hangul.gyp:ibus_mozc_hangul -c ${BUILDTYPE} || die +} + +src_install() { + cd "mozc-${PV}" || die + exeinto /usr/libexec || die + newexe "out_linux/${BUILDTYPE}/ibus_mozc_hangul" ibus-engine-mozc-hangul \ + || die + + insinto /usr/share/ibus/component || die + doins languages/hangul/unix/ibus/mozc-hangul.xml || die + + mkdir -p "${D}"/usr/share/ibus-mozc-hangul || die + cp "${WORKDIR}/mozc-${PV}"/data/hangul/korean_symbols.txt "${D}"/usr/share/ibus-mozc-hangul/ || die + chmod o+r "${D}"/usr/share/ibus-mozc-hangul/korean_symbols.txt || die + cp "out_linux/${BUILDTYPE}/ibus_mozc_hangul" "${T}" || die + $(tc-getSTRIP) --strip-unneeded "${T}"/ibus_mozc_hangul || die + + # Check the binary size to detect binary size bloat (which happend once due + # typos in .gyp files). Current size of the stripped ibus-mozc-hangul binary + # is about 900k (x86) and 700k (arm). + FILESIZE=`stat -c %s "${T}"/ibus_mozc_hangul` + einfo "The binary size is ${FILESIZE}" + test ${FILESIZE} -lt 1500000 \ + || die 'The binary size of mozc hangul is too big (more than ~1.5MB)' + rm -f "${T}"/ibus_mozc_hangul +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-1.6.1187.102-clear-key-state-on-disable.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-1.6.1187.102-clear-key-state-on-disable.patch new file mode 100644 index 0000000000..255518c901 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-1.6.1187.102-clear-key-state-on-disable.patch @@ -0,0 +1,13 @@ +Clear key state on disable to handle Shift-up correctly. + +diff -urN ../mozc.orig/unix/ibus/mozc_engine.cc ./unix/ibus/mozc_engine.cc +--- ../mozc.orig/unix/ibus/mozc_engine.cc 2012-08-31 14:36:43.000000000 +0900 ++++ ./unix/ibus/mozc_engine.cc 2012-11-29 16:56:09.216754385 +0900 +@@ -285,6 +285,7 @@ + void MozcEngine::Disable(IBusEngine *engine) { + RevertSession(engine); + GetCandidateWindowHandler(engine)->Hide(engine); ++ key_event_handler_->Clear(); + } + + void MozcEngine::Enable(IBusEngine *engine) { diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-1.6.1187.102-x32.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-1.6.1187.102-x32.patch new file mode 100644 index 0000000000..7b0fcb7d3c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-1.6.1187.102-x32.patch @@ -0,0 +1,17 @@ +needs a little more space to handle pthread mutex_t with some ABIs + +http://code.google.com/p/mozc/issues/detail?id=177 + +--- a/base/mutex.h ++++ b/base/mutex.h +@@ -52,8 +52,8 @@ + #define MOZC_RW_MUTEX_PTR_ARRAYSIZE 32 + #else + // Currently following sizes seem to be enough to support all other platforms. +-#define MOZC_MUTEX_PTR_ARRAYSIZE 6 +-#define MOZC_RW_MUTEX_PTR_ARRAYSIZE 10 ++#define MOZC_MUTEX_PTR_ARRAYSIZE 8 ++#define MOZC_RW_MUTEX_PTR_ARRAYSIZE 12 + #endif + + class LOCKABLE Mutex { diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-introduces-typo-for-compatibility.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-introduces-typo-for-compatibility.patch new file mode 100644 index 0000000000..5de5b98cf5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-introduces-typo-for-compatibility.patch @@ -0,0 +1,16 @@ +Introduces typo to keep a compatibility with ibus-pinyin. + +To fix this typo, we should implements codes to migrate a configuration. + +diff -urN ../mozc_origin/languages/pinyin/unix/ibus/mozc_engine_property.cc ./languages/pinyin/unix/ibus/mozc_engine_property.cc +--- ../mozc_origin/languages/pinyin/unix/ibus/mozc_engine_property.cc 2012-04-09 12:28:03.895173124 +0900 ++++ ./languages/pinyin/unix/ibus/mozc_engine_property.cc 2012-04-09 18:44:32.013454770 +0900 +@@ -73,7 +73,8 @@ + "mode.simp", + "\xE7\xAE\x80", // "简" + "hiragana.png", +- "Simplified/Traditional Chinese", ++ // TODO(hsumita): Fixes typo. s/Simplfied/Simplified/ ++ "Simplfied/Traditional Chinese", + }, + }; diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-replace-ibus-pinyin.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-replace-ibus-pinyin.patch new file mode 100644 index 0000000000..e98c3ee918 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/files/ibus-mozc-pinyin-replace-ibus-pinyin.patch @@ -0,0 +1,49 @@ +Replaces a name from mozc-pinyin to pinyin for a compatibility. + +ChromeOS is published on China, so it is not a good idea to replace "pinyin" +tag with "mozc-pinyin" tag because ibus-pinyin user must reconfigure ChormeOS +to use ibus-mozc-pinyin. To avoid this issue, we simply use "pinyin" tag on +ChromeOS. + +diff -urN ../mozc_origin/languages/pinyin/unix/ibus/main.h ./languages/pinyin/unix/ibus/main.h +--- ../mozc_origin/languages/pinyin/unix/ibus/main.h 2012-04-09 12:28:03.895173124 +0900 ++++ ./languages/pinyin/unix/ibus/main.h 2012-04-09 15:36:18.533924555 +0900 +@@ -48,9 +48,11 @@ + "us", + "us(dvorak)", + }; ++// Using "pinyin*" instead of "mozc-pinyin*" for a compatibility with ++// ibus-pinyin on ChromeOS. + const char *kEngineNameArray[] = { +- "mozc-pinyin", +- "mozc-pinyin-dv", ++ "pinyin", ++ "pinyin-dv", + }; + const char *kEngineLongnameArray[] = { + "Mozc Pinyin", +diff -urN ../mozc_origin/languages/pinyin/unix/ibus/mozc-pinyin.xml ./languages/pinyin/unix/ibus/mozc-pinyin.xml +--- ../mozc_origin/languages/pinyin/unix/ibus/mozc-pinyin.xml 2012-04-09 12:28:03.895173124 +0900 ++++ ./languages/pinyin/unix/ibus/mozc-pinyin.xml 2012-04-09 15:36:45.563847591 +0900 +@@ -14,7 +14,9 @@ + zh-CN + /usr/share/ibus-mozc-pinyin/product_icon.png + us +- mozc-pinyin ++ ++ pinyin + Mozc Pinyin + + +@@ -23,7 +25,9 @@ + zh-CN + /usr/share/ibus-mozc-pinyin/product_icon.png + us(dvorak) +- mozc-pinyin-dv ++ ++ pinyin-dv + Mozc Pinyin (for US Dvorak keyboard) + + diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/ibus-mozc-pinyin-1.6.1187.102-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/ibus-mozc-pinyin-1.6.1187.102-r2.ebuild new file mode 100644 index 0000000000..73540bff40 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc-pinyin/ibus-mozc-pinyin-1.6.1187.102-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +inherit eutils flag-o-matic python toolchain-funcs + +DESCRIPTION="The Mozc Pinyin engine for IBus Framework" +HOMEPAGE="http://code.google.com/p/mozc" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-${PV}.tar.bz2" +LICENSE="BSD" +RDEPEND=">=app-i18n/ibus-1.3.99 + >=dev-libs/glib-2.26 + dev-libs/protobuf + >=dev-libs/pyzy-0.1.0" +DEPEND="${RDEPEND}" +SLOT="0" +KEYWORDS="amd64 x86 arm" +BUILDTYPE="${BUILDTYPE:-Release}" + +src_configure() { + cd "mozc" || die + # Generate make files + export GYP_DEFINES="chromeos=1 use_libzinnia=0 use_libprotobuf=1" + export BUILD_COMMAND="emake" + + # Currently --channel_dev=0 is not necessary for Pinyin, but just in case. + $(PYTHON) build_mozc.py gyp --gypdir="third_party/gyp" \ + --language=pinyin \ + --noqt \ + --target_platform="ChromeOS" --channel_dev=0 || die +} + +src_prepare() { + cd "mozc" || die + epatch "${FILESDIR}"/"${P}"-clear-key-state-on-disable.patch || die + epatch "${FILESDIR}"/"${P}"-x32.patch + # Following 2 patches are required by any version of ibus-mozc-pinyin on + # ChromeOS + epatch "${FILESDIR}"/ibus-mozc-pinyin-introduces-typo-for-compatibility.patch || die + epatch "${FILESDIR}"/ibus-mozc-pinyin-replace-ibus-pinyin.patch || die +} + +src_compile() { + cd "mozc" || die + # Create build tools for the host platform. + CFLAGS="" CXXFLAGS="" $(PYTHON) build_mozc.py build_tools -c ${BUILDTYPE} \ + || die + + # Build artifacts for the target platform. + tc-export CXX CC AR AS RANLIB LD + $(PYTHON) build_mozc.py build \ + pinyin/pinyin.gyp:ibus_mozc_pinyin -c ${BUILDTYPE} || die +} + +src_install() { + cd "mozc" || die + exeinto /usr/libexec || die + newexe "out_linux/${BUILDTYPE}/ibus_mozc_pinyin" ibus-engine-mozc-pinyin \ + || die + + insinto /usr/share/ibus/component || die + doins languages/pinyin/unix/ibus/mozc-pinyin.xml || die + + mkdir -p "${D}"/usr/share/ibus-mozc-pinyin || die + cp "out_linux/${BUILDTYPE}/ibus_mozc_pinyin" "${T}" || die + $(tc-getSTRIP) --strip-unneeded "${T}"/ibus_mozc_pinyin || die + + # Unnecessary link may cause size bloat. We expect to detect it by checking binary size. + # NOTE: The binary size for amd64 is 1.1MB in Apr. 2012 + FILESIZE=`stat -c %s "${T}"/ibus_mozc_pinyin` + einfo "The binary size is ${FILESIZE}" + test ${FILESIZE} -lt 2000000 \ + || die 'The binary size of ibus_mozc_pinyin is too big (more than ~2.0MB)' + rm -f "${T}"/ibus_mozc_pinyin +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/Manifest b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/Manifest new file mode 100644 index 0000000000..f431b49967 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/Manifest @@ -0,0 +1,2 @@ +DIST GoogleJapaneseInputFilesForChromeOS-1.5.1090.102.tar.bz2 23756520 RMD160 4f73f336fa0a3ea9be1a54542d6b3cd4956fb3a4 SHA1 2e8e8d86a83010d49fe985f3dc82ce64ee947b0e SHA256 61346cdddc6000ad1c151626a810014566e8a1d1e6bf367df3ff8ede3a3f58c2 +DIST mozc-1.5.1090.102.tar.bz2 54911799 RMD160 5b9b704e68a87d7b4a63bb2ea5ab0561badf90b1 SHA1 9c99333a3a46c190fe14afae573b2ddc2faab64a SHA256 b52c1879c4749041032578ec6c591d9741f521d54993070c050d09ae35bd2107 diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/files/ibus-mozc-1.5.1090.102-attachment-cleanup.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/files/ibus-mozc-1.5.1090.102-attachment-cleanup.patch new file mode 100644 index 0000000000..59d83f80b1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/files/ibus-mozc-1.5.1090.102-attachment-cleanup.patch @@ -0,0 +1,62 @@ +diff -urN mozc-1.5.1090.102.orig/unix/ibus/ibus_candidate_window_handler.cc mozc-1.5.1090.102/unix/ibus/ibus_candidate_window_handler.cc +--- mozc-1.5.1090.102.orig/unix/ibus/ibus_candidate_window_handler.cc 2012-11-19 16:25:45.757689538 +0900 ++++ mozc-1.5.1090.102/unix/ibus/ibus_candidate_window_handler.cc 2012-11-19 16:45:09.165140106 +0900 +@@ -142,9 +142,45 @@ + } + #endif + ++#if defined(OS_CHROMEOS) ++ map > usage_map; ++ if (candidates.has_usages()) { ++ const commands::InformationList& usages = candidates.usages(); ++ for (size_t i = 0; i < usages.information().size(); ++i) { ++ const commands::Information& information = usages.information(i); ++ if (!information.has_id() || !information.has_description()) ++ continue; ++ usage_map[information.id()].first = information.title(); ++ usage_map[information.id()].second = information.description(); ++ } ++ } ++#endif // OS_CHROMEOS + for (int i = 0; i < candidates.candidate_size(); ++i) { + const commands::Candidates::Candidate &candidate = candidates.candidate(i); + IBusText *text = ibus_text_new_from_string(candidate.value().c_str()); ++#if defined(OS_CHROMEOS) && IBUS_CHECK_VERSION(1, 4, 2) ++ if (candidate.has_annotation() && ++ candidate.annotation().has_description()) { ++ ibus_serializable_set_attachment( ++ IBUS_SERIALIZABLE(text), ++ "annotation", ++ g_variant_new_string(candidate.annotation().description().c_str())); ++ } ++ if (candidate.has_information_id()) { ++ map >::iterator it = ++ usage_map.find(candidate.information_id()); ++ if (it != usage_map.end()) { ++ ibus_serializable_set_attachment( ++ IBUS_SERIALIZABLE(text), ++ "description_title", ++ g_variant_new_string(it->second.first.c_str())); ++ ibus_serializable_set_attachment( ++ IBUS_SERIALIZABLE(text), ++ "description_body", ++ g_variant_new_string(it->second.second.c_str())); ++ } ++ } ++#endif // OS_CHROMEOS && IBUS_CHECK_VERSION(1, 4, 2) + ibus_lookup_table_append_candidate(table, text); + // |text| is released by ibus_engine_update_lookup_table along with |table|. + +@@ -164,6 +200,12 @@ + } + + #if defined(OS_CHROMEOS) and IBUS_CHECK_VERSION(1, 3, 99) ++ if (candidates.has_category()) { ++ ibus_serializable_set_attachment( ++ IBUS_SERIALIZABLE(table), ++ "show_window_at_composition", ++ g_variant_new_boolean(candidates.category() == commands::SUGGESTION)); ++ } + // The function ibus_serializable_set_attachment() had been changed + // to use GVariant in ibus-1.3.99. + // https://github.com/ibus/ibus/commit/ac9dfac13cef34288440a2ecdf067cd827fb2f8f diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/files/ibus-mozc-1.5.1090.102-handle-extra-keysyms.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/files/ibus-mozc-1.5.1090.102-handle-extra-keysyms.patch new file mode 100644 index 0000000000..a57dc1ad20 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/files/ibus-mozc-1.5.1090.102-handle-extra-keysyms.patch @@ -0,0 +1,139 @@ +diff -urN mozc-1.5.1090.102.orig/unix/ibus/ibus_extra_keysyms.h mozc-1.5.1090.102/unix/ibus/ibus_extra_keysyms.h +--- mozc-1.5.1090.102.orig/unix/ibus/ibus_extra_keysyms.h 1970-01-01 09:00:00.000000000 +0900 ++++ mozc-1.5.1090.102/unix/ibus/ibus_extra_keysyms.h 2012-12-11 16:32:15.607074442 +0900 +@@ -0,0 +1,52 @@ ++// Copyright 2010-2012, Google Inc. ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are ++// met: ++// ++// * Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// * Redistributions in binary form must reproduce the above ++// copyright notice, this list of conditions and the following disclaimer ++// in the documentation and/or other materials provided with the ++// distribution. ++// * Neither the name of Google Inc. nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++#ifndef MOZC_UNIX_IBUS_IBUS_EXTRA_KEYSYMS_H_ ++#define MOZC_UNIX_IBUS_IBUS_EXTRA_KEYSYMS_H_ ++ ++// for guint ++#include "unix/ibus/ibus_header.h" ++ ++#ifdef OS_CHROMEOS ++// Defines key symbols which are not defined on ibuskeysyms.h to handle ++// some keys on ChromeOS. ++const guint IBUS_Back = 0x1008FF26; ++const guint IBUS_Forward = 0x1008FF27; ++const guint IBUS_Reload = 0x1008FF73; ++const guint IBUS_LaunchB = 0x1008FF4B; ++const guint IBUS_LaunchA = 0x1008FF4A; ++const guint IBUS_MonBrightnessDown = 0x1008FF03; ++const guint IBUS_MonBrightnessUp = 0x1008FF02; ++const guint IBUS_AudioMute = 0x1008FF12; ++const guint IBUS_AudioLowerVolume = 0x1008FF11; ++const guint IBUS_AudioRaiseVolume = 0x1008FF13; ++#endif // OS_CHROMEOS ++ ++#endif // MOZC_UNIX_IBUS_IBUS_EXTRA_KEYSYMS_H_ ++ +diff -urN mozc-1.5.1090.102.orig/unix/ibus/key_translator.cc mozc-1.5.1090.102/unix/ibus/key_translator.cc +--- mozc-1.5.1090.102.orig/unix/ibus/key_translator.cc 2012-12-11 15:59:00.409418570 +0900 ++++ mozc-1.5.1090.102/unix/ibus/key_translator.cc 2012-12-11 16:21:17.497854201 +0900 +@@ -32,6 +32,7 @@ + #include + + #include "base/logging.h" ++#include "unix/ibus/ibus_extra_keysyms.h" + + namespace { + +@@ -88,6 +89,19 @@ + {IBUS_Page_Up, mozc::commands::KeyEvent::PAGE_UP}, + {IBUS_Page_Down, mozc::commands::KeyEvent::PAGE_DOWN}, + ++#ifdef OS_CHROMEOS ++ {IBUS_Back, mozc::commands::KeyEvent::F1}, ++ {IBUS_Forward, mozc::commands::KeyEvent::F2}, ++ {IBUS_Reload, mozc::commands::KeyEvent::F3}, ++ {IBUS_LaunchB, mozc::commands::KeyEvent::F4}, ++ {IBUS_LaunchA, mozc::commands::KeyEvent::F5}, ++ {IBUS_MonBrightnessDown, mozc::commands::KeyEvent::F6}, ++ {IBUS_MonBrightnessUp, mozc::commands::KeyEvent::F7}, ++ {IBUS_AudioMute, mozc::commands::KeyEvent::F8}, ++ {IBUS_AudioLowerVolume, mozc::commands::KeyEvent::F9}, ++ {IBUS_AudioRaiseVolume, mozc::commands::KeyEvent::F10}, ++#endif // OS_CHROMEOS ++ + // Keypad (10-key). + {IBUS_KP_0, mozc::commands::KeyEvent::NUMPAD0}, + {IBUS_KP_1, mozc::commands::KeyEvent::NUMPAD1}, +diff -urN mozc-1.5.1090.102.orig/unix/ibus/key_translator_test.cc mozc-1.5.1090.102/unix/ibus/key_translator_test.cc +--- mozc-1.5.1090.102.orig/unix/ibus/key_translator_test.cc 2012-12-11 15:59:00.409418570 +0900 ++++ mozc-1.5.1090.102/unix/ibus/key_translator_test.cc 2012-12-11 16:06:14.708927885 +0900 +@@ -33,6 +33,7 @@ + #include "testing/base/public/gunit.h" + #include "session/commands.pb.h" + #include "unix/ibus/key_translator.h" ++#include "unix/ibus/ibus_extra_keysyms.h" + + namespace mozc { + namespace ibus { +@@ -116,6 +117,20 @@ + IBUS_Caps_Lock, + IBUS_ISO_Left_Tab, + IBUS_Hangul_Hanja, ++ ++ ++#ifdef OS_CHROMEOS ++ IBUS_Back, ++ IBUS_Forward, ++ IBUS_Reload, ++ IBUS_LaunchB, ++ IBUS_LaunchA, ++ IBUS_MonBrightnessDown, ++ IBUS_MonBrightnessUp, ++ IBUS_AudioMute, ++ IBUS_AudioLowerVolume, ++ IBUS_AudioRaiseVolume, ++#endif // OS_CHROMEOS + }; + + const commands::KeyEvent::SpecialKey mapped_special_keys[] = { +@@ -197,6 +212,19 @@ + commands::KeyEvent::CAPS_LOCK, + commands::KeyEvent::TAB, + commands::KeyEvent::HANJA, ++ ++#ifdef OS_CHROMEOS ++ commands::KeyEvent::F1, ++ commands::KeyEvent::F2, ++ commands::KeyEvent::F3, ++ commands::KeyEvent::F4, ++ commands::KeyEvent::F5, ++ commands::KeyEvent::F6, ++ commands::KeyEvent::F7, ++ commands::KeyEvent::F8, ++ commands::KeyEvent::F9, ++ commands::KeyEvent::F10, ++#endif // OS_CHROMEOS + }; + + const guint modifier_masks[] = { diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/ibus-mozc-1.5.1090.102-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/ibus-mozc-1.5.1090.102-r3.ebuild new file mode 100644 index 0000000000..6b446430fe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-mozc/ibus-mozc-1.5.1090.102-r3.ebuild @@ -0,0 +1,97 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +inherit eutils flag-o-matic python toolchain-funcs + +DESCRIPTION="The Mozc engine for IBus Framework" +HOMEPAGE="http://code.google.com/p/mozc" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-${PV}.tar.bz2 +internal? ( gs://chromeos-localmirror-private/distfiles/GoogleJapaneseInputFilesForChromeOS-${PV}.tar.bz2 )" +LICENSE="BSD" +IUSE="internal" +# TODO(nona): Remove libcurl dependency. +RDEPEND=">=app-i18n/ibus-1.4.1 + dev-libs/openssl + dev-libs/protobuf + internal? ( + net-misc/curl + )" +DEPEND="${RDEPEND}" +SLOT="0" +KEYWORDS="amd64 x86 arm" +BUILDTYPE="${BUILDTYPE:-Release}" +RESTRICT="mirror" + +src_configure() { + if use internal; then + BRANDING="${BRANDING:-GoogleJapaneseInput}" + SIZE_LIMIT=20000000 + else + BRANDING="${BRANDING:-Mozc}" + SIZE_LIMIT=25000000 + fi + + cd "mozc-${PV}" || die + # Generate make files + export GYP_DEFINES="chromeos=1 use_libzinnia=0" + export BUILD_COMMAND="emake" + + $(PYTHON) build_mozc.py gyp --gypdir="third_party/gyp" \ + --target_platform="ChromeOS" \ + --use_libprotobuf \ + --branding="${BRANDING}" || die +} + +src_prepare() { + if use internal; then + einfo "Building Google Japanese Input for ChromeOS" + rm -fr "mozc-${PV}/data/dictionary" || die + rm -fr "mozc-${PV}/dictionary" || die + rm -f "mozc-${PV}/mozc_version_template.txt" || die + mv "data/dictionary" "mozc-${PV}/data/" || die + mv "dictionary" "mozc-${PV}/" || die + mv "mozc_version_template.txt" "mozc-${PV}/" || die + # Reduce a binary size. + # TODO(hsumita): Remove this patch when it becomes a default behavior of + # Mozc for ChromeOS. + rm -f "mozc-${PV}/converter/converter_base.gyp" || die + mv "converter/converter_base.gyp" "mozc-${PV}/converter/" || die + else + einfo "Building Mozc for ChromiumOS" + fi + + # Remove the patch when new mozc is released. + epatch "${FILESDIR}"/${P}-attachment-cleanup.patch || die + epatch "${FILESDIR}"/${P}-handle-extra-keysyms.patch || die +} + +src_compile() { + cd "mozc-${PV}" || die + # Create build tools for the host platform. + CFLAGS="" CXXFLAGS="" $(PYTHON) build_mozc.py build_tools -c ${BUILDTYPE} \ + || die + + # Build artifacts for the target platform. + tc-export CXX CC AR AS RANLIB LD + $(PYTHON) build_mozc.py build unix/ibus/ibus.gyp:ibus_mozc -c ${BUILDTYPE} \ + || die +} + +src_install() { + cd "mozc-${PV}" || die + exeinto /usr/libexec || die + newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die + + insinto /usr/share/ibus/component || die + doins out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml || die + + cp "out_linux/${BUILDTYPE}/ibus_mozc" "${T}" || die + $(tc-getSTRIP) --strip-unneeded "${T}"/ibus_mozc || die + + # Check the binary size to detect binary size bloat (which happend once due + # typos in .gyp files). + test `stat -c %s "${T}"/ibus_mozc` -lt ${SIZE_LIMIT} \ + || die "The binary size of mozc for Japanese is too big (more than ~${SIZE_LIMIT})" + rm -f "${T}"/ibus_mozc +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-zinnia/ibus-zinnia-0.0.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-zinnia/ibus-zinnia-0.0.3-r2.ebuild new file mode 100644 index 0000000000..64765abfd6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus-zinnia/ibus-zinnia-0.0.3-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +inherit eutils flag-o-matic + +DESCRIPTION="Zinnia hand-writing engine" +HOMEPAGE="http://github.com/yusukes/ibus-zinnia" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" +#RESTRICT="mirror" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm x86" + +RDEPEND=">=app-i18n/ibus-1.3.99 + app-i18n/zinnia + app-i18n/tegaki-zinnia-japanese-light + app-i18n/tegaki-zinnia-simplified-chinese-light + app-i18n/tegaki-zinnia-traditional-chinese-light" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/gettext-0.16.1" + +# Tarballs in github.com use a special directory naming rule: +# "--" +SRC_DIR="yusukes-ibus-zinnia-910d66d" + +src_configure() { + cd "${SRC_DIR}" || die + + append-cflags -Wall -Werror + NOCONFIGURE=1 ./autogen.sh || die + econf || die +} + +src_install() { + cd "${SRC_DIR}" || die + + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/Manifest b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/Manifest new file mode 100644 index 0000000000..f7311957c9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/Manifest @@ -0,0 +1 @@ +DIST ibus-1.4.0.tar.gz 1452055 RMD160 0583a9690ee5a7bb44ce1cebc189c3a644501ca3 SHA1 c46ea0be728ffd4e431d4a18c6bd1e51ceaf045e SHA256 9e5a17d910eae932dd0cd185d0a102b56ad4a2bf79d54b1e53f70174cd2c2a3f diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-0003-Add-api-to-ibus-for-retreiving-unused-config-values.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-0003-Add-api-to-ibus-for-retreiving-unused-config-values.patch new file mode 100644 index 0000000000..fd59e828e5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-0003-Add-api-to-ibus-for-retreiving-unused-config-values.patch @@ -0,0 +1,326 @@ +diff -ur ibus-1.4.99.20120314.orig/conf/memconf/config.c ibus-1.4.99.20120314/conf/memconf/config.c +--- ibus-1.4.99.20120314.orig/conf/memconf/config.c 2012-02-27 06:37:21.000000000 +0900 ++++ ibus-1.4.99.20120314/conf/memconf/config.c 2012-04-02 15:05:20.300663070 +0900 +@@ -29,6 +29,8 @@ + struct _IBusConfigMemconf { + IBusConfigService parent; + GHashTable *values; ++ GHashTable *unread; ++ GHashTable *unwritten; + }; + + struct _IBusConfigMemconfClass { +@@ -55,6 +57,10 @@ + const gchar *section, + const gchar *name, + GError **error); ++static gboolean ibus_config_memconf_get_unused (IBusConfigService *config, ++ GVariant **unread, ++ GVariant **unwritten, ++ GError **error); + + G_DEFINE_TYPE (IBusConfigMemconf, ibus_config_memconf, IBUS_TYPE_CONFIG_SERVICE) + +@@ -68,6 +74,7 @@ + IBUS_CONFIG_SERVICE_CLASS (object_class)->get_value = ibus_config_memconf_get_value; + IBUS_CONFIG_SERVICE_CLASS (object_class)->get_values = ibus_config_memconf_get_values; + IBUS_CONFIG_SERVICE_CLASS (object_class)->unset_value = ibus_config_memconf_unset_value; ++ IBUS_CONFIG_SERVICE_CLASS (object_class)->get_unused = ibus_config_memconf_get_unused; + } + + static void +@@ -75,14 +82,25 @@ + { + config->values = g_hash_table_new_full (g_str_hash, + g_str_equal, +- (GDestroyNotify)g_free, +- (GDestroyNotify)g_variant_unref); ++ (GDestroyNotify) g_free, ++ (GDestroyNotify) g_variant_unref); ++ config->unread = g_hash_table_new_full (g_str_hash, ++ g_str_equal, ++ (GDestroyNotify) g_free, ++ (GDestroyNotify) NULL); ++ config->unwritten ++ = g_hash_table_new_full (g_str_hash, ++ g_str_equal, ++ (GDestroyNotify) g_free, ++ (GDestroyNotify) NULL); + } + + static void + ibus_config_memconf_destroy (IBusConfigMemconf *config) + { + g_hash_table_destroy (config->values); ++ g_hash_table_destroy (config->unread); ++ g_hash_table_destroy (config->unwritten); + IBUS_OBJECT_CLASS (ibus_config_memconf_parent_class)->destroy ((IBusObject *)config); + } + +@@ -101,6 +119,12 @@ + + gchar *key = g_strdup_printf ("%s:%s", section, name); + ++ if (g_hash_table_lookup ( ++ IBUS_CONFIG_MEMCONF (config)->values, key) == NULL) { ++ g_hash_table_insert (IBUS_CONFIG_MEMCONF (config)->unread, ++ g_strdup (key), NULL); ++ } ++ + g_hash_table_insert (IBUS_CONFIG_MEMCONF (config)->values, + key, g_variant_ref_sink (value)); + +@@ -121,16 +145,21 @@ + g_assert (error == NULL || *error == NULL); + + gchar *key = g_strdup_printf ("%s:%s", section, name); ++ + GVariant *value = (GVariant *)g_hash_table_lookup (IBUS_CONFIG_MEMCONF (config)->values, key); +- g_free (key); + +- if (value != NULL) { ++ if (value == NULL) { ++ g_hash_table_insert (IBUS_CONFIG_MEMCONF (config)->unwritten, ++ g_strdup (key), NULL); ++ if (error != NULL) { ++ *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED, ++ "Config value [%s:%s] does not exist.", section, name); ++ } ++ } else { ++ g_hash_table_remove (IBUS_CONFIG_MEMCONF (config)->unread, key); + g_variant_ref (value); + } +- else if (error != NULL) { +- *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED, +- "Config value [%s:%s] does not exist.", section, name); +- } ++ g_free (key); + return value; + } + +@@ -173,13 +202,13 @@ + + gchar *key = g_strdup_printf ("%s:%s", section, name); + gboolean retval = g_hash_table_remove (IBUS_CONFIG_MEMCONF (config)->values, key); +- g_free (key); + + if (retval) { + ibus_config_service_value_changed (config, + section, + name, + g_variant_new_tuple (NULL, 0)); ++ g_hash_table_remove (IBUS_CONFIG_MEMCONF (config)->unread, key); + } + else { + if (error && *error) { +@@ -187,9 +216,39 @@ + "Config value [%s:%s] does not exist.", section, name); + } + } ++ g_free (key); + return retval; + } + ++static gboolean ++ibus_config_memconf_get_unused (IBusConfigService *config, ++ GVariant **unread, ++ GVariant **unwritten, ++ GError **error) ++{ ++ GVariantBuilder builder; ++ GList *keys, *p; ++ ++ g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); ++ keys = g_hash_table_get_keys (IBUS_CONFIG_MEMCONF (config)->unread); ++ for (p = keys; p != NULL; p = p->next) { ++ g_variant_builder_add (&builder, "s", (const gchar *)p->data); ++ } ++ g_list_free (keys); ++ *unread = g_variant_builder_end (&builder); ++ ++ g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); ++ keys = g_hash_table_get_keys (IBUS_CONFIG_MEMCONF (config)->unwritten); ++ for (p = keys; p != NULL; p = p->next) { ++ g_variant_builder_add (&builder, "s", (const gchar *)p->data); ++ } ++ g_list_free (keys); ++ ++ *unwritten = g_variant_builder_end (&builder); ++ ++ return TRUE; ++} ++ + IBusConfigMemconf * + ibus_config_memconf_new (GDBusConnection *connection) + { +diff -ur ibus-1.4.99.20120314.orig/src/ibusconfig.c ibus-1.4.99.20120314/src/ibusconfig.c +--- ibus-1.4.99.20120314.orig/src/ibusconfig.c 2012-03-07 14:39:58.000000000 +0900 ++++ ibus-1.4.99.20120314/src/ibusconfig.c 2012-04-02 15:03:18.361126672 +0900 +@@ -720,3 +720,37 @@ + async_initable_iface->init_async = async_initable_init_async; + async_initable_iface->init_finish = async_initable_init_finish; + } ++ ++gboolean ++ibus_config_get_unused (IBusConfig *config, ++ GVariant **unread, ++ GVariant **unwritten) ++{ ++ g_assert (IBUS_IS_CONFIG (config)); ++ g_assert (unread != NULL && *unread == NULL); ++ g_assert (unwritten != NULL && *unwritten == NULL); ++ ++ GError *error = NULL; ++ GVariant *result; ++ ++ result = g_dbus_proxy_call_sync ((GDBusProxy *) config, ++ "GetUnused", /* method_name */ ++ NULL, /* parameters */ ++ G_DBUS_CALL_FLAGS_NONE, /* flags */ ++ -1, /* timeout */ ++ NULL, /* cancellable */ ++ &error /* error */ ++ ); ++ if (result == NULL) { ++ g_warning ("%s.GetUnused: %s", IBUS_INTERFACE_CONFIG, error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ *unread = g_variant_get_child_value (result, 0); ++ *unwritten = g_variant_get_child_value (result, 1); ++ ++ g_variant_unref (result); ++ ++ return TRUE; ++} +Only in ibus-1.4.99.20120314/src: ibusconfig.c.orig +diff -ur ibus-1.4.99.20120314.orig/src/ibusconfig.h ibus-1.4.99.20120314/src/ibusconfig.h +--- ibus-1.4.99.20120314.orig/src/ibusconfig.h 2012-03-07 14:39:58.000000000 +0900 ++++ ibus-1.4.99.20120314/src/ibusconfig.h 2012-04-02 15:03:18.361126672 +0900 +@@ -347,6 +347,19 @@ + + /* FIXME add an asynchronous version of unwatch */ + ++/** ++ * ibus_config_get_unused: ++ * @config: An IBusConfig ++ * @unread: GVariant that holds a list of values that have been written but not ++ * read. ++ * @unwritten: GVariant that holds a list of values that have been read but not ++ * written. ++ * @returns: TRUE if succeed; FALSE otherwise. ++ * ++ * Get the list of values that haven't been used properly. ++ */ ++gboolean ibus_config_get_unused (IBusConfig *config, ++ GVariant **unread, ++ GVariant **unwritten); + G_END_DECLS + #endif +- +Only in ibus-1.4.99.20120314/src: ibusconfig.h.orig +diff -ur ibus-1.4.99.20120314.orig/src/ibusconfigservice.c ibus-1.4.99.20120314/src/ibusconfigservice.c +--- ibus-1.4.99.20120314.orig/src/ibusconfigservice.c 2012-03-07 14:41:10.000000000 +0900 ++++ ibus-1.4.99.20120314/src/ibusconfigservice.c 2012-04-02 15:03:18.361126672 +0900 +@@ -76,6 +76,10 @@ + const gchar *section, + const gchar *name, + GError **error); ++static gboolean ibus_config_service_get_unused (IBusConfigService *config, ++ GVariant **unread, ++ GVariant **unwritten, ++ GError **error); + + G_DEFINE_TYPE (IBusConfigService, ibus_config_service, IBUS_TYPE_SERVICE) + +@@ -105,6 +109,10 @@ + " " + " " + " " ++ " " ++ " " ++ " " ++ " " + " " + ""; + +@@ -125,6 +133,7 @@ + class->get_value = ibus_config_service_get_value; + class->get_values = ibus_config_service_get_values; + class->unset_value = ibus_config_service_unset_value; ++ class->get_unused = ibus_config_service_get_unused; + } + + static void +@@ -242,6 +251,25 @@ + return; + } + ++ if (g_strcmp0 (method_name, "GetUnused") == 0) { ++ GVariant *unread = NULL; ++ GVariant *unwritten = NULL; ++ gboolean retval; ++ GError *error = NULL; ++ ++ retval = IBUS_CONFIG_SERVICE_GET_CLASS (config)->get_unused ( ++ config, &unread, &unwritten, &error); ++ if (retval) { ++ g_dbus_method_invocation_return_value (invocation, ++ g_variant_new ("(@as@as)", unread, unwritten)); ++ } ++ else { ++ g_dbus_method_invocation_return_gerror (invocation, error); ++ g_error_free (error); ++ } ++ return; ++ } ++ + /* should not be reached */ + g_return_if_reached (); + } +@@ -352,6 +380,19 @@ + return IBUS_CONFIG_SERVICE (object); + } + ++static gboolean ++ibus_config_service_get_unused (IBusConfigService *config, ++ GVariant **unread, ++ GVariant **unwritten, ++ GError **error) ++{ ++ if (error) { ++ *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED, ++ "Not implemented"); ++ } ++ return FALSE; ++} ++ + void + ibus_config_service_value_changed (IBusConfigService *config, + const gchar *section, +Only in ibus-1.4.99.20120314/src: ibusconfigservice.c.orig +diff -ur ibus-1.4.99.20120314.orig/src/ibusconfigservice.h ibus-1.4.99.20120314/src/ibusconfigservice.h +--- ibus-1.4.99.20120314.orig/src/ibusconfigservice.h 2011-08-11 09:49:43.000000000 +0900 ++++ ibus-1.4.99.20120314/src/ibusconfigservice.h 2012-04-02 15:03:18.361126672 +0900 +@@ -203,10 +203,14 @@ + GVariant * (* get_values) (IBusConfigService *config, + const gchar *section, + GError **error); ++ gboolean (* get_unused) (IBusConfigService *config, ++ GVariant **unread, ++ GVariant **unwritten, ++ GError **error); + + /*< private >*/ + /* padding */ +- gpointer pdummy[12]; ++ gpointer pdummy[11]; + }; + + GType ibus_config_service_get_type (void); +@@ -238,4 +242,3 @@ + + G_END_DECLS + #endif +- diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-0004-Remove-bus_input_context_register_properties-props_e.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-0004-Remove-bus_input_context_register_properties-props_e.patch new file mode 100644 index 0000000000..9d54b8eef4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-0004-Remove-bus_input_context_register_properties-props_e.patch @@ -0,0 +1,14 @@ +diff -ur ibus-1.4.99.20120314.orig/bus/inputcontext.c ibus-1.4.99.20120314/bus/inputcontext.c +--- ibus-1.4.99.20120314.orig/bus/inputcontext.c 2012-02-27 06:37:21.000000000 +0900 ++++ ibus-1.4.99.20120314/bus/inputcontext.c 2012-04-02 15:24:41.936207367 +0900 +@@ -1130,7 +1130,9 @@ + bus_input_context_clear_preedit_text (context); + bus_input_context_update_auxiliary_text (context, text_empty, FALSE); + bus_input_context_update_lookup_table (context, lookup_table_empty, FALSE); +- bus_input_context_register_properties (context, props_empty); ++ ++ // Workaround for http://crosbug.com/7702 ++ // bus_input_context_register_properties (context, props_empty); + + if (context->engine) { + bus_engine_proxy_focus_out (context->engine); diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-disable-ibus-daemon-tests.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-disable-ibus-daemon-tests.patch new file mode 100644 index 0000000000..cdbc294dde --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-disable-ibus-daemon-tests.patch @@ -0,0 +1,12 @@ +diff -ur ibus-1.4.99.20120314.orig/bus/Makefile.am ibus-1.4.99.20120314/bus/Makefile.am +--- ibus-1.4.99.20120314.orig/bus/Makefile.am 2012-03-07 14:39:58.000000000 +0900 ++++ ibus-1.4.99.20120314/bus/Makefile.am 2012-04-02 15:37:33.273439550 +0900 +@@ -112,8 +112,6 @@ + if ENABLE_TESTS + TESTS = \ + test-matchrule \ +- test-registry \ +- test-stress \ + $(NULL) + endif + diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-do-not-send-cursor-location-to-chrome.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-do-not-send-cursor-location-to-chrome.patch new file mode 100644 index 0000000000..7401f9179a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-do-not-send-cursor-location-to-chrome.patch @@ -0,0 +1,13 @@ +diff -ur ibus-1.4.99.20120314.orig/bus/panelproxy.c ibus-1.4.99.20120314/bus/panelproxy.c +--- ibus-1.4.99.20120314.orig/bus/panelproxy.c 2012-02-27 06:37:21.000000000 +0900 ++++ ibus-1.4.99.20120314/bus/panelproxy.c 2012-04-02 15:36:12.633725645 +0900 +@@ -481,7 +481,7 @@ + + g_return_if_fail (panel->focused_context == context); + +- bus_panel_proxy_set_cursor_location (panel, x, y, w, h); ++ // bus_panel_proxy_set_cursor_location (panel, x, y, w, h); + } + + static void +Only in ibus-1.4.99.20120314/bus: panelproxy.c.orig diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-fix-double-free.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-fix-double-free.patch new file mode 100644 index 0000000000..1f44d4a49f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-fix-double-free.patch @@ -0,0 +1,11 @@ +diff -urN ibus-1.4.99.20120314.orig/src/ibusserializable.c ibus-1.4.99.20120314/src/ibusserializable.c +--- ibus-1.4.99.20120314.orig/src/ibusserializable.c 2012-11-02 16:48:00.508766644 +0900 ++++ ibus-1.4.99.20120314/src/ibusserializable.c 2012-11-02 16:52:34.632899493 +0900 +@@ -161,7 +161,6 @@ + key, + attachment); + g_variant_unref (attachment); +- g_variant_unref (value); + } + g_variant_iter_free (iter); + return 2; diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-fix-engine-destroy-cb-69902696928e6acb953ab30b1f70e462b5994272.patch b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-fix-engine-destroy-cb-69902696928e6acb953ab30b1f70e462b5994272.patch new file mode 100644 index 0000000000..117621e61c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/files/ibus-1.4.99.20120314-fix-engine-destroy-cb-69902696928e6acb953ab30b1f70e462b5994272.patch @@ -0,0 +1,15 @@ +Index: bus/inputcontext.c +diff --git a/bus/inputcontext.c b/bus/inputcontext.c +index 49c4a2694243f20e73929741ae25f7101b94dbc7..ec97e5499844b57d7f2cb63d039dda9d45a1a0ec 100644 +--- a/bus/inputcontext.c ++++ b/bus/inputcontext.c +@@ -2015,6 +2015,9 @@ bus_input_context_unset_engine (BusInputContext *context) + g_signal_handlers_disconnect_by_func (context->engine, + engine_signals[i].callback, context); + } ++ /* focus out to let engine register properties when enabled ++ next time. */ ++ bus_engine_proxy_focus_out (context->engine); + g_object_unref (context->engine); + context->engine = NULL; + } diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/ibus-1.4.99.20120314-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/ibus-1.4.99.20120314-r5.ebuild new file mode 100644 index 0000000000..9a78d9ed8c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/ibus/ibus-1.4.99.20120314-r5.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# How to run the test manually: +# (chroot)$ ./cros_run_unit_tests --packages ibus +# or +# (chroot)$ env FEATURES="test" emerge-$BOARD -a ibus + +EAPI="2" +inherit eutils flag-o-matic toolchain-funcs multilib python libtool + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="http://code.google.com/p/ibus/" + +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" +#RESTRICT="mirror" + +RDEPEND=">=dev-libs/glib-2.26 + x11-libs/libX11" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${P}-0003-Add-api-to-ibus-for-retreiving-unused-config-values.patch + epatch "${FILESDIR}"/${P}-0004-Remove-bus_input_context_register_properties-props_e.patch + + # TODO(yusukes): Remove this when ibus is upgraded to >= 20120315. + epatch "${FILESDIR}"/${P}-fix-engine-destroy-cb-69902696928e6acb953ab30b1f70e462b5994272.patch + # TODO(nona): Remove the patch when we fix crosbug.com/25335#c1 + epatch "${FILESDIR}"/${P}-do-not-send-cursor-location-to-chrome.patch + # TODO(penghuang): Remove the patch when we fix ibus issue 1438. + epatch "${FILESDIR}"/${P}-disable-ibus-daemon-tests.patch + # TODO(nona): Remove the patch when the next ibus update cycle. + epatch "${FILESDIR}"/${P}-fix-double-free.patch + + elibtoolize +} + +src_configure() { + # TODO(yusukes): Add -Werror back when IBus issue 1437 is fixed. + # append-cflags -Wall -Werror + append-cflags -Wall + + # TODO(petkov): Ideally, configure should support --disable-isocodes but + # it seems that the current version doesn't, so use the environment + # variables instead to remove the dependence on iso-codes. + econf \ + --enable-surrounding-text \ + --disable-gtk2 \ + --disable-gtk3 \ + --disable-dconf \ + --disable-gconf \ + --enable-memconf \ + --disable-xim \ + --disable-key-snooper \ + --disable-vala \ + --enable-introspection=no \ + --disable-gtk-doc \ + --disable-nls \ + --disable-python-library \ + --disable-setup \ + CPPFLAGS='-DOS_CHROMEOS=1' \ + ISOCODES_CFLAGS=' ' ISOCODES_LIBS=' ' +} + +test_fail() { + kill $IBUS_DAEMON_PID + rm -rf "${T}"/.ibus-test-socket-* + die +} + +src_test() { + # Start ibus-daemon background. + export IBUS_ADDRESS_FILE="`mktemp -d ${T}/.ibus-test-socket-XXXXXXXXXX`/ibus-socket-file" + ./bus/ibus-daemon --replace --panel=disable & + IBUS_DAEMON_PID=$! + + # Wait for the daemon to start. + if [ ! -f ${IBUS_ADDRESS_FILE} ] ; then + sleep .5 + fi + + # Run tests. + ./src/tests/ibus-bus || test_fail + + # TODO(yusukes): Fix 'ERROR:ibus-inputcontext.c:101:test_input_context' + # and reenable the test. + # ./src/tests/ibus-inputcontext || test_fail + + ./src/tests/ibus-inputcontext-create || test_fail + ./src/tests/ibus-configservice || test_fail + ./src/tests/ibus-factory || test_fail + ./src/tests/ibus-keynames || test_fail + ./src/tests/ibus-serializable || test_fail + + # Cleanup. + kill $IBUS_DAEMON_PID + rm -rf "${T}"/.ibus-test-socket-* +} + +src_install() { + emake DESTDIR="${D}" install || die + if [ -f "${D}/usr/share/ibus/component/gtkpanel.xml" ] ; then + rm "${D}/usr/share/ibus/component/gtkpanel.xml" || die + fi + + # Remove unnecessary files + rm -rf "${D}/usr/share/ibus/keymaps" || die + rm -rf "${D}/usr/share/icons" || die + + # TODO(yusukes): The latest ibus has --disable-engine option. + rm "${D}/usr/share/ibus/component/simple.xml" || die + rm "${D}/usr/libexec/ibus-engine-simple" || die + + rm "${D}/usr/share/applications/ibus.desktop" || die + rm "${D}/etc/bash_completion.d/ibus.bash" || die + rm -rf "${D}/usr/lib/gtk-2.0/2.10.0/immodules/" || die + + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/libhangul/Manifest b/sdk_container/src/third_party/coreos-overlay/app-i18n/libhangul/Manifest new file mode 100644 index 0000000000..ae722f63f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/libhangul/Manifest @@ -0,0 +1 @@ +DIST libhangul-0.0.10.tar.gz 2828525 RMD160 88c03fbbf954addb8c534491a9e3cfd0fdc373dc SHA1 3fdbb1b4ea2f5f12bd3c6760bb2ad609e2eebbaa SHA256 af0722012632ab2afc2016aa6643bd6979e140facc56a911a5a45f97fe61d4c5 diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/libhangul/libhangul-0.0.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/libhangul/libhangul-0.0.10.ebuild new file mode 100644 index 0000000000..07c339cfc8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/libhangul/libhangul-0.0.10.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.10.ebuild,v +# 1.1 2009/11/05 23:14:11 matsuu Exp $ + +DESCRIPTION="libhangul is a generalized and portable library for processing +hangul." +HOMEPAGE="http://kldp.net/projects/hangul/" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" +IUSE="" + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-japanese-light/tegaki-zinnia-japanese-light-0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-japanese-light/tegaki-zinnia-japanese-light-0.3-r1.ebuild new file mode 100644 index 0000000000..fe893f879d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-japanese-light/tegaki-zinnia-japanese-light-0.3-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2010 Gentoo Foundation + +EAPI="3" + +DESCRIPTION="Zinnia learning data for Japanese" +HOMEPAGE="http://tegaki.org/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.zip" + +LICENSE="LGPL" +SLOT="0" +KEYWORDS="amd64 x86 arm" + +RDEPEND="app-i18n/zinnia" + +src_install() { + mkdir -p "${D}/usr/share/tegaki/models/zinnia" || die + install handwriting-ja.meta handwriting-ja.model \ + "${D}/usr/share/tegaki/models/zinnia/" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-simplified-chinese-light/tegaki-zinnia-simplified-chinese-light-0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-simplified-chinese-light/tegaki-zinnia-simplified-chinese-light-0.3.ebuild new file mode 100644 index 0000000000..dad73838d1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-simplified-chinese-light/tegaki-zinnia-simplified-chinese-light-0.3.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2011 Gentoo Foundation + +EAPI="3" + +DESCRIPTION="Zinnia learning data for simplified Chinese" +HOMEPAGE="http://tegaki.org/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.zip" + +LICENSE="LGPL" +SLOT="0" +KEYWORDS="amd64 x86 arm" + +RDEPEND="app-i18n/zinnia" + +src_install() { + mkdir -p "${D}/usr/share/tegaki/models/zinnia" || die + install handwriting-zh_CN.meta handwriting-zh_CN.model \ + "${D}/usr/share/tegaki/models/zinnia/" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-traditional-chinese-light/tegaki-zinnia-traditional-chinese-light-0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-traditional-chinese-light/tegaki-zinnia-traditional-chinese-light-0.3.ebuild new file mode 100644 index 0000000000..4a91758339 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-i18n/tegaki-zinnia-traditional-chinese-light/tegaki-zinnia-traditional-chinese-light-0.3.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2011 Gentoo Foundation + +EAPI="3" + +DESCRIPTION="Zinnia learning data for traditional Chinese" +HOMEPAGE="http://tegaki.org/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.zip" + +LICENSE="LGPL" +SLOT="0" +KEYWORDS="amd64 x86 arm" + +RDEPEND="app-i18n/zinnia" + +src_install() { + mkdir -p "${D}/usr/share/tegaki/models/zinnia" || die + install handwriting-zh_TW.meta handwriting-zh_TW.model \ + "${D}/usr/share/tegaki/models/zinnia/" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0001-Enabled-laptop-mode-power-management-control-of.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0001-Enabled-laptop-mode-power-management-control-of.patch new file mode 100644 index 0000000000..b1a892b4c8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0001-Enabled-laptop-mode-power-management-control-of.patch @@ -0,0 +1,60 @@ +diff -ruN laptop-mode-tools-1.59/etc/laptop-mode/conf.d/ac97-powersave.conf laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/ac97-powersave.conf +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/ac97-powersave.conf ++++ laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/ac97-powersave.conf +@@ -18,7 +18,7 @@ + ############################################################################### + + # Control AC97 audio chipset power? +-CONTROL_AC97_POWER="auto" ++CONTROL_AC97_POWER=1 + + # Enable debug mode for this module + # Set to 1 if you want to debug this module +diff -ruN laptop-mode-tools-1.59/etc/laptop-mode/conf.d/intel-hda-powersave.conf laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/intel-hda-powersave.conf +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/intel-hda-powersave.conf ++++ laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/intel-hda-powersave.conf +@@ -20,7 +20,7 @@ + + # Control INTEL HDA audio chipset power? + # Set to 0 to disable +-CONTROL_INTEL_HDA_POWER="auto" ++CONTROL_INTEL_HDA_POWER=1 + + # Handle power savings for Intel HDA under specific circumstances + BATT_INTEL_HDA_POWERSAVE=1 +diff -ruN laptop-mode-tools-1.59/etc/laptop-mode/conf.d/intel-sata-powermgmt.conf laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/intel-sata-powermgmt.conf +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/intel-sata-powermgmt.conf ++++ laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/intel-sata-powermgmt.conf +@@ -20,7 +20,7 @@ + + # Control Intel SATA chipset power management? + # Set to 0 to disable +-CONTROL_INTEL_SATA_POWER="auto" ++CONTROL_INTEL_SATA_POWER=1 + + # Handle power management of the Intel SATA deivce under specific circumstances + BATT_ACTIVATE_SATA_POWER=1 +diff -ruN laptop-mode-tools-1.59/etc/laptop-mode/conf.d/usb-autosuspend.conf laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/usb-autosuspend.conf +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/usb-autosuspend.conf ++++ laptop-mode-tools-1.59.new/etc/laptop-mode/conf.d/usb-autosuspend.conf +@@ -24,7 +24,7 @@ + + # Enable USB autosuspend feature? + # Set to 0 to disable +-CONTROL_USB_AUTOSUSPEND="auto" ++CONTROL_USB_AUTOSUSPEND=1 + + # The list of USB IDs that should not use autosuspend. Use lsusb to find out the + # IDs of your USB devices. +diff -ruN laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf laptop-mode-tools-1.59.new/etc/laptop-mode/laptop-mode.conf +--- laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf ++++ laptop-mode-tools-1.59.new/etc/laptop-mode/laptop-mode.conf +@@ -283,7 +283,7 @@ + # Should laptop mode tools control the hard drive power management settings? + # + # Set to 0 to disable +-CONTROL_HD_POWERMGMT="auto" ++CONTROL_HD_POWERMGMT=1 + + + # diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0002-Add-config-knob-to-control-syslog-facility.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0002-Add-config-knob-to-control-syslog-facility.patch new file mode 100644 index 0000000000..8e16b43bfb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0002-Add-config-knob-to-control-syslog-facility.patch @@ -0,0 +1,66 @@ +From 349963dc68cebf8d2e60d0f9ece6e95573366a59 Mon Sep 17 00:00:00 2001 +From: Sameer Nanda +Date: Tue, 16 Feb 2010 16:24:26 -0800 +Subject: [PATCH 4/8] Add config knob to control syslog facility + +Modified for 1.57 + +Signed-off-by: Sameer +Signed-off-by: Simon Que + +Change-Id: I9192a41ea84ed957fcd2ebb7e03e2defb16412ac +--- + .../etc/laptop-mode/laptop-mode.conf | 2 ++ + laptop-mode-tools-1.59/usr/sbin/laptop_mode | 13 +++++++------ + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff -ruN laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf laptop-mode-tools-1.59.new/etc/laptop-mode/laptop-mode.conf +index e0a6e06..47a2381 100644 +--- laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf ++++ laptop-mode-tools-1.59.new/etc/laptop-mode/laptop-mode.conf +@@ -60,6 +60,8 @@ VERBOSE_OUTPUT=0 + + # Set this to 1 if you want to log messages to syslog + LOG_TO_SYSLOG=1 ++# syslog facility passed to logger -t when LOG_TO_SYSLOG is 1 ++SYSLOG_FACILITY=daemon + + # Run in shell debug mode + # Enable this if you would like to execute the entire laptop-mode-tools program +diff -ruN laptop-mode-tools-1.59/usr/sbin/laptop_mode laptop-mode-tools-1.59.new/usr/sbin/laptop_mode +index 2827569..8acbc68 100644 +--- laptop-mode-tools-1.59/usr/sbin/laptop_mode ++++ laptop-mode-tools-1.59.new/usr/sbin/laptop_mode +@@ -127,6 +127,7 @@ BATT_BRIGHTNESS_COMMAND=false + LM_AC_BRIGHTNESS_COMMAND=false + NOLM_AC_BRIGHTNESS_COMMAND=false + LOG_TO_SYSLOG=1 ++SYSLOG_FACILITY=daemon + DEBUG=0 + ENABLE_LAPTOP_MODE_TOOLS=1 + +@@ -160,15 +161,15 @@ if [ x$LOG_TO_SYSLOG = x1 ]; then + # continue + #elif [ "$1" = "MSG" ]; then + if [ "$1" = "MSG" ]; then +- logger -p daemon.info -t laptop-mode "$2"; ++ logger -p $SYSLOG_FACILITY.info -t laptop-mode "$2"; + elif [ "$1" = "ERR" ]; then +- logger -p daemon.err -t laptop-mode "$2"; ++ logger -p $SYSLOG_FACILITY.err -t laptop-mode "$2"; + elif [ "$1" = "VERBOSE" ]; then +- if [ x$VERBOSE_OUTPUT = x1 ]; then +- logger -p daemon.debug -t laptop-mode "$2"; +- fi ++ if [ x$VERBOSE_OUTPUT = x1 ]; then ++ logger -p $SYSLOG_FACILITY.debug -t laptop-mode "$2"; ++ fi + else +- logger -p daemon.notice -t laptop-mode "$2"; ++ logger -p $SYSLOG_FACILITY.notice -t laptop-mode "$2"; + fi + fi + fi +-- +1.7.2.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0003-Add-WiFi-power-management-support.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0003-Add-WiFi-power-management-support.patch new file mode 100644 index 0000000000..fd3e9d5c49 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0003-Add-WiFi-power-management-support.patch @@ -0,0 +1,75 @@ +From 7c518a4bc8102c179a6a6775aca48d0fe78c5ca4 Mon Sep 17 00:00:00 2001 +From: Sameer Nanda +Date: Thu, 22 Apr 2010 17:16:47 -0700 +Subject: [PATCH 5/8] Added WiFi power management support. Saves 0.3-0.8W at idle. + +Review URL: http://codereview.chromium.org/1769003 +--- + .../etc/laptop-mode/conf.d/wifi-powermgmt.conf | 23 +++++++++++++++++++ + .../share/laptop-mode-tools/modules/wifi-powermgmt | 24 ++++++++++++++++++++ + 2 files changed, 47 insertions(+), 0 deletions(-) + create mode 100644 laptop-mode-tools-1.59/etc/laptop-mode/conf.d/wifi-powermgmt.conf + create mode 100755 laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-powermgmt + +diff -ruN /dev/null laptop-mode-tools-1.59/etc/laptop-mode/conf.d/wifi-powermgmt.conf +new file mode 100644 +index 0000000..6ec4fec +--- /dev/null ++++ laptop-mode-tools-1.59/etc/laptop-mode/conf.d/wifi-powermgmt.conf +@@ -0,0 +1,23 @@ ++# ++# Configuration file for Laptop Mode Tools module wifi-powermgmt. ++# ++# For more information, consult the laptop-mode.conf(8) manual page. ++# ++ ++ ++############################################################################### ++# WiFi power management settings ++# ------------------------------------ ++# ++# If you enable this setting, laptop mode tools will automatically enable the ++# power management for all WiFi devices in the system ++# ++############################################################################### ++ ++# Enable debug mode for this module ++# Set to 1 if you want to debug this module ++DEBUG=0 ++ ++# Control WiFi power management? ++CONTROL_WIFI_POWER=1 ++ +diff -ruN /dev/null laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-powermgmt +new file mode 100755 +index 0000000..2efb1a6 +--- /dev/null ++++ laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-powermgmt +@@ -0,0 +1,24 @@ ++IWCONFIG=iwconfig ++ ++if [ x$CONTROL_WIFI_POWER = x1 ] ; then ++ if [ $ON_AC -eq 1 ] ; then ++ power_mgmt="off" ++ else ++ power_mgmt="on" ++ fi ++ ++ for DEVICE in /sys/class/net/* ; do ++ if [ -d $DEVICE/wireless ]; then ++ dev=`basename $DEVICE` ++ $IWCONFIG $dev power $power_mgmt ++ ret=$? ++ if [ "$ret" = "0" ]; then ++ log "VERBOSE" "Power Management set to $power_mgmt for $dev." ++ else ++ log "VERBOSE" "Failed to set Power Management to $power_mgmt for $dev." ++ fi ++ fi ++ done ++else ++ log "VERBOSE" "WiFi power setting is disabled." ++fi +-- +1.7.2.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0005-switch-wifi-support-to-nl80211.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0005-switch-wifi-support-to-nl80211.patch new file mode 100644 index 0000000000..b0c39ea388 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0005-switch-wifi-support-to-nl80211.patch @@ -0,0 +1,89 @@ +From 3059bdb03918a5acf239a245f5d78f45253ebf94 Mon Sep 17 00:00:00 2001 +From: Sam Leffler +Date: Wed, 10 Nov 2010 10:20:56 -0800 +Subject: [PATCH 7/8] laptop-mode-tools: switch wifi support to be nl80211-only + +We support only nl80211 WiFi devices; no more WEXT support: +- remove old script that used iwconfig +- add new module script that uses iw to ena/dis power save + +Note this also fixes wifi power save operation for nl80211 devices as the iwconfig code never worked right due to it checking the wrong file under /sys. This means we should now have lower latency on AC because we'll turn off power save. + +BUG=7138 +TEST=gmerge to device; suspend+resume and check power save state of wlan0; also run sh -x laptop_mode auto force and verify the right things are happenig for wifi devices + +Review URL: http://codereview.chromium.org/4675003 + +Change-Id: Ifac0b67c7eb6663fb911be267711c44e6e8538b0 +--- + .../modules/wifi-nl80211-powermgmt | 26 ++++++++++++++++++++ + .../share/laptop-mode-tools/modules/wifi-powermgmt | 24 ------------------ + 2 files changed, 26 insertions(+), 24 deletions(-) + create mode 100755 laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-nl80211-powermgmt + delete mode 100755 laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-powermgmt + +diff -ruN /dev/null laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-nl80211-powermgmt +new file mode 100755 +index 0000000..934d080 +--- /dev/null ++++ laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-nl80211-powermgmt +@@ -0,0 +1,26 @@ ++IW=/usr/sbin/iw ++ ++if [ ! -x $IW ]; then ++ log "VERBOSE" "No $IW program, WiFi power setting is disabled." ++elif [ x$CONTROL_WIFI_POWER = x1 ] ; then ++ if [ $ON_AC -eq 1 ] ; then ++ power_mgmt="off" ++ else ++ power_mgmt="on" ++ fi ++ ++ for DEVICE in /sys/class/net/* ; do ++ if [ -d $DEVICE/phy80211 ]; then ++ dev=`basename $DEVICE` ++ $IW $dev set power_save $power_mgmt ++ ret=$? ++ if [ "$ret" = "0" ]; then ++ log "VERBOSE" "Power Management set to $power_mgmt for $dev." ++ else ++ log "VERBOSE" "Failed to set Power Management to $power_mgmt for $dev." ++ fi ++ fi ++ done ++else ++ log "VERBOSE" "WiFi power setting is disabled." ++fi +diff -ruN laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-powermgmt /dev/null +deleted file mode 100755 +index 2efb1a6..0000000 +--- laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wifi-powermgmt ++++ /dev/null +@@ -1,24 +0,0 @@ +-IWCONFIG=iwconfig +- +-if [ x$CONTROL_WIFI_POWER = x1 ] ; then +- if [ $ON_AC -eq 1 ] ; then +- power_mgmt="off" +- else +- power_mgmt="on" +- fi +- +- for DEVICE in /sys/class/net/* ; do +- if [ -d $DEVICE/wireless ]; then +- dev=`basename $DEVICE` +- $IWCONFIG $dev power $power_mgmt +- ret=$? +- if [ "$ret" = "0" ]; then +- log "VERBOSE" "Power Management set to $power_mgmt for $dev." +- else +- log "VERBOSE" "Failed to set Power Management to $power_mgmt for $dev." +- fi +- fi +- done +-else +- log "VERBOSE" "WiFi power setting is disabled." +-fi +-- +1.7.2.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0006-Lower-hard-drive-idle-timeout-to-5-seconds.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0006-Lower-hard-drive-idle-timeout-to-5-seconds.patch new file mode 100644 index 0000000000..dab3bd97e6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0006-Lower-hard-drive-idle-timeout-to-5-seconds.patch @@ -0,0 +1,36 @@ +From 88698f32444ee88ce66e40cf54b8ac3563342723 Mon Sep 17 00:00:00 2001 +From: Sameer Nanda +Date: Mon, 15 Nov 2010 13:38:40 -0800 +Subject: [PATCH 8/8] Lowering hard drive idle timeout to 5 seconds from 20 seconds. + +This change saves about 200mW of power on SSDs. + +Change-Id: I7a7dfdbd7e264386d21da673b1906460ecf1c307 + +BUG= chromium-os:9180 +TEST= ran vmstat & hdparm to see when the last read/write to the disk +happened and when the drive transitioned to standby state. With this +change in place, on battery the hard drive transitioned to standby +state 5 seconds after the last read/write. + +Review URL: http://codereview.chromium.org/5032002 +--- + .../etc/laptop-mode/laptop-mode.conf | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff -ruN laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf +index 47a2381..5dc4b38 100644 +--- laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf ++++ laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf +@@ -273,7 +273,7 @@ CONTROL_HD_IDLE_TIMEOUT=1 + # for battery and for AC with laptop mode on. + # + LM_AC_HD_IDLE_TIMEOUT_SECONDS=20 +-LM_BATT_HD_IDLE_TIMEOUT_SECONDS=20 ++LM_BATT_HD_IDLE_TIMEOUT_SECONDS=5 + NOLM_HD_IDLE_TIMEOUT_SECONDS=7200 + + +-- +1.7.2.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0008-Export-PATH-to-which.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0008-Export-PATH-to-which.patch new file mode 100644 index 0000000000..c59df8799e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0008-Export-PATH-to-which.patch @@ -0,0 +1,20 @@ +--- laptop-mode-tools-1.59/usr/sbin/laptop_mode ++++ laptop-mode-tools-1.59/usr/sbin/laptop_mode +@@ -133,7 +133,7 @@ + + LMT_REQ_LOCK="/var/lock/lmt-req.lock" + LMT_INVOC_LOCK="/var/lock/lmt-invoc.lock" +-FLOCK=`which flock` ++FLOCK=`PATH=$PATH which flock` + + checkint () + { +@@ -146,7 +146,7 @@ + } + + # Function to handle logging ++LOGGER=`PATH=$PATH which logger`; +-LOGGER=`which logger`; + + log () + { diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0009-only-log-VERBOSE-msgs-to-syslog-when-DEBUG.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0009-only-log-VERBOSE-msgs-to-syslog-when-DEBUG.patch new file mode 100644 index 0000000000..bd2c8906f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0009-only-log-VERBOSE-msgs-to-syslog-when-DEBUG.patch @@ -0,0 +1,11 @@ +--- laptop-mode-tools-1.59/usr/sbin/laptop_mode ++++ laptop-mode-tools-1.59/usr/sbin/laptop_mode +@@ -165,7 +165,7 @@ + elif [ "$1" = "ERR" ]; then + logger -p $SYSLOG_FACILITY.err -t laptop-mode "$2"; + elif [ "$1" = "VERBOSE" ]; then +- if [ x$VERBOSE_OUTPUT = x1 ]; then ++ if [ x$VERBOSE_OUTPUT = x1 -a "$DEBUG" = 1 ]; then + logger -p $SYSLOG_FACILITY.debug -t laptop-mode "$2"; + fi + else diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0010-Do-not-run-usb-autosuspend-for-user-input-devices.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0010-Do-not-run-usb-autosuspend-for-user-input-devices.patch new file mode 100644 index 0000000000..5d90803efd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0010-Do-not-run-usb-autosuspend-for-user-input-devices.patch @@ -0,0 +1,11 @@ +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/usb-autosuspend.conf ++++ laptop-mode-tools-1.59/etc/laptop-mode/conf.d/usb-autosuspend.conf +@@ -34,7 +34,7 @@ + # The list of USB driver types that should not use autosuspend. The driver + # type is given by "DRIVER=..." in a USB device's uevent file. + # Example: AUTOSUSPEND_USBID_BLACKLIST="usbhid usb-storage" +-AUTOSUSPEND_USBTYPE_BLACKLIST="" ++AUTOSUSPEND_USBTYPE_BLACKLIST="usbhid" + + # Trigger auto-suspension of the USB deivce under conditional circumstances + BATT_SUSPEND_USB=1 diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0012-Skip-failed-globs-when-finding-module-scripts.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0012-Skip-failed-globs-when-finding-module-scripts.patch new file mode 100644 index 0000000000..fba2beba6b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0012-Skip-failed-globs-when-finding-module-scripts.patch @@ -0,0 +1,36 @@ +From 27be03f0dbacd4b078ed18ee43ad3c710b569260 Mon Sep 17 00:00:00 2001 +From: Daniel Kurtz +Date: Wed, 11 May 2011 19:09:52 +0800 +Subject: [PATCH] Skip failed globs when finding module scripts + +Globs return the glob expression itself if there are no valid expansions (Unless using the bash-specific "setopt -u nullglob"). +Fix this by detecting and ignoring SCRIPT when it is not a file. + +BUG=chromium-os:15187 +TEST=(0) Enable laptop_mode verbose output (set VERBOSE_OUTPUT=1 in /etc/laptop-mode/laptop-mode.conf) +(1) sudo /usr/sbin/laptop_mode auto force +The following should not be present at end of output: +Module /usr/local/lib/laptop-mode-tools/modules/* is not executable or is to be skipped. +Module /usr/local/share/laptop-mode-tools/modules/* is not executable or is to be skipped. +Module /etc/laptop-mode/modules/* is not executable or is to be skipped. +--- + usr/sbin/laptop_mode | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode +index 7877f80..71a5cbe 100755 +--- laptop-mode-tools-1.59/usr/sbin/laptop_mode ++++ laptop-mode-tools-1.59/usr/sbin/laptop_mode +@@ -1038,6 +1038,9 @@ lmt_main_function () + # Note that the /usr/local/lib path is deprecated. + export FORCE STATE ON_AC ACTIVATE ACTIVATE_WITH_POSSIBLE_DATA_LOSS KLEVEL KMINOR WAS_ACTIVE LM_VERBOSE DEVICES + for SCRIPT in /usr/share/laptop-mode-tools/modules/* /usr/local/lib/laptop-mode-tools/modules/* /usr/local/share/laptop-mode-tools/modules/* /etc/laptop-mode/modules/* ; do ++ # Skip failed globs ++ [ -f "$SCRIPT" ] || continue ++ + if [ -z "$MODULES" ] ; then + # If a module list has not been provided, execute all modules + EXECUTE_SCRIPT=1 +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0013-wireless-power-can-not-find-iwconfig-but-tries-to-po.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0013-wireless-power-can-not-find-iwconfig-but-tries-to-po.patch new file mode 100644 index 0000000000..154f11608a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0013-wireless-power-can-not-find-iwconfig-but-tries-to-po.patch @@ -0,0 +1,33 @@ +From 862029ae5315db204af3b35fc12acaa4ca12c50f Mon Sep 17 00:00:00 2001 +From: Daniel Kurtz +Date: Fri, 13 May 2011 18:59:09 +0800 +Subject: [PATCH] wireless-power tries to control wifi even if iwconfig is not found + +When iwconfig isn't found, wireless-power still tries to execute +"$IWCONFIG $IFNAME", which fails with "$IFNAME not found" errors. + +BUG=chromium-os:15185 +TEST=/usr/sbin/laptop_mode auto force +There should be no more errors like this: +/usr/share/laptop-mode-tools/modules/wireless-power: 94: eth0: not found Failed. +/usr/share/laptop-mode-tools/modules/wireless-power: 94: usb0: not found Failed. +/usr/share/laptop-mode-tools/modules/wireless-power: 94: wlan0: not found Failed +--- + usr/share/laptop-mode-tools/modules/wireless-power | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/usr/share/laptop-mode-tools/modules/wireless-power b/usr/share/laptop-mode-tools/modules/wireless-power +index 6407d2a..649b40a 100755 +--- laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wireless-power ++++ laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/wireless-power +@@ -62,6 +62,7 @@ if [ x$CONTROL_WIRELESS_POWER_SAVING = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x + IWCONFIG=/usr/sbin/iwconfig + else + log "VERBOSE" "iwconfig is not installed" ++ exit 1 + fi + + # Translate 1 => on, 0 => off +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0014-Disable-ethernet-control.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0014-Disable-ethernet-control.patch new file mode 100644 index 0000000000..0aa52796b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0014-Disable-ethernet-control.patch @@ -0,0 +1,11 @@ +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/ethernet.conf ++++ laptop-mode-tools-1.59/etc/laptop-mode/conf.d/ethernet.conf.new +@@ -22,7 +22,7 @@ + DEBUG=0 + + # Control Ethernet settings? +-CONTROL_ETHERNET="auto" ++CONTROL_ETHERNET=0 + + # Handle throttling of the ethernet deivce under specific circumstances + BATT_THROTTLE_ETHERNET=1 diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0015-Disable-file-system-remount.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0015-Disable-file-system-remount.patch new file mode 100644 index 0000000000..3f0ced8f85 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0015-Disable-file-system-remount.patch @@ -0,0 +1,11 @@ +--- laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf ++++ laptop-mode-tools-1.59/etc/laptop-mode/laptop-mode.conf +@@ -322,7 +322,7 @@ + # disable this. If you do, then your hard drives will probably not spin down + # anymore. + # +-CONTROL_MOUNT_OPTIONS=1 ++CONTROL_MOUNT_OPTIONS=0 + + + # diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0016-Wait-for-laptop_mode-using-shell-commands.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0016-Wait-for-laptop_mode-using-shell-commands.patch new file mode 100644 index 0000000000..33ef7372e9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0016-Wait-for-laptop_mode-using-shell-commands.patch @@ -0,0 +1,30 @@ +--- laptop-mode-tools-1.59/etc/rules/lmt-udev ++++ laptop-mode-tools-1.59/etc/rules/lmt-udev +@@ -2,7 +2,24 @@ + # /usr is not guaranteed to be mounted when udev starts + + ( +- . /lib/udev/hotplug.functions +- wait_for_file /usr/sbin/laptop_mode +- exec /usr/sbin/laptop_mode "$@" ++ if [ -e /lib/udev/hotplug.functions ]; then ++ . /lib/udev/hotplug.functions ++ wait_for_file /usr/sbin/laptop_mode ++ exec /usr/sbin/laptop_mode "$@" ++ else ++ local file=$1 ++ local timeout=$2 ++ [ "$timeout" ] || timeout=120 ++ ++ local count=$timeout ++ while [ $count != 0 ]; do ++ [ -e "/usr/sbin/laptop_mode" ] && exec /usr/sbin/laptop_mode "$@" && return 0 ++ sleep 1 ++ count=$(($count - 1)) ++ done ++ ++ mesg "$file did not appear before the timeout!" ++ exit 1 ++ fi ++ + ) & diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0017-usb-autosuspend-black-whitelist-in-quotes.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0017-usb-autosuspend-black-whitelist-in-quotes.patch new file mode 100644 index 0000000000..27bc63dbef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0017-usb-autosuspend-black-whitelist-in-quotes.patch @@ -0,0 +1,23 @@ +--- /laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/usb-autosuspend ++++ /laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/usb-autosuspend +@@ -45,16 +45,16 @@ + + # Checks whether a device is blacklisted by either ID or driver type + blacklisted() { +- listed_by_id $1 $AUTOSUSPEND_USBID_BLACKLIST\ +- || listed_by_type $1 $AUTOSUSPEND_USBTYPE_BLACKLIST\ ++ listed_by_id $1 "$AUTOSUSPEND_USBID_BLACKLIST"\ ++ || listed_by_type $1 "$AUTOSUSPEND_USBTYPE_BLACKLIST"\ + || return 1 + return 0 + } + + # Checks whether a device is whitelisted by either ID or driver type + whitelisted() { +- listed_by_id $1 $AUTOSUSPEND_USBID_WHITELIST\ +- || listed_by_type $1 $AUTOSUSPEND_USBTYPE_WHITELIST\ ++ listed_by_id $1 "$AUTOSUSPEND_USBID_WHITELIST"\ ++ || listed_by_type $1 "$AUTOSUSPEND_USBTYPE_WHITELIST"\ + || return 1 + return 0 + } diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0018-hdparm-check-for-valid-drive.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0018-hdparm-check-for-valid-drive.patch new file mode 100644 index 0000000000..0f2acb27d1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0018-hdparm-check-for-valid-drive.patch @@ -0,0 +1,14 @@ +--- laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/hdparm ++++ laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/hdparm.new +@@ -17,6 +17,11 @@ + local MEDIA= + local BUS= + ++ # Make sure the drive exists before checking anything. ++ if [ ! -e $1 ]; then ++ return 1 ++ fi ++ + # If we are running udev, this is the most portable way + # It assumes more or less recent udev (> 070) + if [ $HAVE_UDEVINFO -ne 0 ] ; then diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0019-board-specific-configurations.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0019-board-specific-configurations.patch new file mode 100644 index 0000000000..aefcca7a1b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0019-board-specific-configurations.patch @@ -0,0 +1,11 @@ +--- laptop-mode-tools-1.59/usr/sbin/laptop_mode ++++ laptop-mode-tools-1.59/usr/sbin/laptop_mode +@@ -230,7 +230,7 @@ + # to modular configuration files, and to support existing laptop-mode.conf + # files from earlier versions, we source the modular configuration files FIRST. + if [ -d /etc/laptop-mode/conf.d ] ; then +- for CONF in /etc/laptop-mode/conf.d/*.conf ; do ++ for CONF in /etc/laptop-mode/conf.d/*.conf /etc/laptop-mode/conf.d/board-specific/*.conf; do + if [ -r "$CONF" ] ; then + . "$CONF" + #Handle individual module debug settings diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0020-hdparm-skips-SSDs-for-power-management.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0020-hdparm-skips-SSDs-for-power-management.patch new file mode 100644 index 0000000000..1b8ddcb693 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0020-hdparm-skips-SSDs-for-power-management.patch @@ -0,0 +1,20 @@ +--- laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/hdparm ++++ laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/hdparm.new +@@ -22,6 +22,14 @@ is_capable() { + return 1; + fi + ++ if [ -n "$(hdparm -I $1 | grep SSD)" ]; then ++ # If the device is a SSD, it is not capable of power management. ++ if [ "$2" = "POWERMGMT" ]; then ++ log "VERBOSE" "$1 is a SSD, not capable of power management" ++ return 1 ++ fi ++ fi ++ + # If we are running udev, this is the most portable way + # It assumes more or less recent udev (> 070) + if [ $HAVE_UDEVINFO -ne 0 ] ; then +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0021-alternate-config-dir.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0021-alternate-config-dir.patch new file mode 100644 index 0000000000..c44f4a409d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0021-alternate-config-dir.patch @@ -0,0 +1,73 @@ +--- laptop-mode-tools-1.59//usr/sbin/laptop_mode 2012-06-15 17:33:49.052591220 -0700 ++++ laptop-mode-tools-1.59//usr/sbin/laptop_mode 2012-06-20 11:02:11.248576131 -0700 +@@ -37,6 +37,12 @@ + # as well, so don't change the format! + LMTVERSION=1.59 + ++if [ -f /var/run/laptop-mode-tools/laptop-mode.conf ]; then ++ LAPTOP_MODE_CONFIG_DIR=/var/run/laptop-mode-tools ++else ++ LAPTOP_MODE_CONFIG_DIR=/etc/laptop-mode ++fi ++ + # This script is loaded from multiple scripts to set the config defaults + # and to read the configuration on top of those. Only when the command is + # recognized does this script do anything else. +@@ -229,26 +235,32 @@ + # Source config. Some config settings have been moved from the main config file + # to modular configuration files, and to support existing laptop-mode.conf + # files from earlier versions, we source the modular configuration files FIRST. +- if [ -d /etc/laptop-mode/conf.d ] ; then +- for CONF in /etc/laptop-mode/conf.d/*.conf /etc/laptop-mode/conf.d/board-specific/*.conf; do +- if [ -r "$CONF" ] ; then +- . "$CONF" +- #Handle individual module debug settings +- if [ "$DEBUG" -eq 1 ]; then +- export $(basename $CONF | cut -d . -f1 | tr "[:lower:]" "[:upper:]" | sed 's/-/_/g')_DEBUG=1 +- log "VERBOSE" "Enabling debug mode for module $CONF" +- fi +- DEBUG=0 +- else +- log "MSG" "Warning: Configuration file $CONF is not readable, skipping." ++ if [ -d ${LAPTOP_MODE_CONFIG_DIR}/conf.d ] ; then ++ for subdir in conf.d conf.d/board-specific; do ++ if [ ! -d ${LAPTOP_MODE_CONFIG_DIR}/$subdir ]; then ++ continue + fi ++ for CONF in ${LAPTOP_MODE_CONFIG_DIR}/$subdir/*.conf; do ++ if [ -r "$CONF" ] ; then ++ . "$CONF" ++ #Handle individual module debug settings ++ if [ "$DEBUG" -eq 1 ]; then ++ export $(basename $CONF | cut -d . -f1 | tr "[:lower:]" "[:upper:]" | \ ++ sed 's/-/_/g')_DEBUG=1 ++ log "VERBOSE" "Enabling debug mode for module $CONF" ++ fi ++ DEBUG=0 ++ else ++ log "MSG" "Warning: Configuration file $CONF is not readable, skipping." ++ fi ++ done + done + fi +- if [ -r /etc/laptop-mode/laptop-mode.conf ] ; then +- . /etc/laptop-mode/laptop-mode.conf ++ if [ -r ${LAPTOP_MODE_CONFIG_DIR}/laptop-mode.conf ] ; then ++ . ${LAPTOP_MODE_CONFIG_DIR}/laptop-mode.conf + else +- log "ERR" "$0: Configuration file /etc/laptop-mode/laptop-mode.conf not present or not readable." +- exit 1 ++ log "ERR" "$0: Configuration file ${LAPTOP_MODE_CONFIG_DIR}/laptop-mode.conf not present or not readable."; ++ exit 1; + fi + + if [ x$ENABLE_LAPTOP_MODE_TOOLS = x0 ]; then +@@ -1049,7 +1061,7 @@ + + # Note that the /usr/local/lib path is deprecated. + export FORCE STATE ON_AC ACTIVATE ACTIVATE_WITH_POSSIBLE_DATA_LOSS KLEVEL KMINOR WAS_ACTIVE LM_VERBOSE DEVICES +- for SCRIPT in /usr/share/laptop-mode-tools/modules/* /usr/local/lib/laptop-mode-tools/modules/* /usr/local/share/laptop-mode-tools/modules/* /etc/laptop-mode/modules/* ; do ++ for SCRIPT in /usr/share/laptop-mode-tools/modules/* /usr/local/lib/laptop-mode-tools/modules/* /usr/local/share/laptop-mode-tools/modules/* ${LAPTOP_MODE_CONFIG_DIR}/modules/* ; do + # Skip failed globs + [ -f "$SCRIPT" ] || continue + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0022-interactive-governor-parameters.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0022-interactive-governor-parameters.patch new file mode 100644 index 0000000000..8737d81342 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0022-interactive-governor-parameters.patch @@ -0,0 +1,42 @@ +--- laptop-mode-tools-1.59//usr/share/laptop-mode-tools/modules/cpufreq 2011-08-07 12:30:43.000000000 -0700 ++++ laptop-mode-tools-1.59//usr/share/laptop-mode-tools/modules/cpufreq 2012-06-20 11:46:24.465328480 -0700 +@@ -139,3 +139,39 @@ + done + fi + ++# Optional setting for the interactive governor. ++INTERACTIVE_DIR=/sys/devices/system/cpu/cpufreq/interactive ++ ++get_setting() { ++ if [ $ON_AC -eq 1 ] ; then ++ if [ "$ACTIVATE" -eq 1 ] ; then ++ eval echo \$"LM_AC_CPU_"$1 ++ else ++ eval echo \$"NOLM_AC_CPU_"$1 ++ fi ++ else ++ eval echo \$"BATT_CPU_"$1 ++ fi ++} ++ ++set_optional_interactive_value() { ++ sysfs_name=$1 ++ config_value=$(get_setting $2) ++ ++ if [ -z "${config_value}" ]; then ++ return; ++ fi ++ if [ -f ${INTERACTIVE_DIR}/$sysfs_name ]; then ++ log "VERBOSE" "Setting $sysfs_name for all cpus" ++ set_sysctl $INTERACTIVE_DIR/$sysfs_name ${config_value} ++ fi ++} ++ ++if [ -d ${INTERACTIVE_DIR} ]; then ++ set_optional_interactive_value input_boost INPUT_BOOST ++ set_optional_interactive_value above_hispeed_delay ABOVE_HISPEED_DELAY ++ set_optional_interactive_value go_hispeed_load GO_HISPEED_LOAD ++ set_optional_interactive_value hispeed_freq HISPEED_FREQ ++ set_optional_interactive_value min_sample_time MIN_SAMPLE_TIME ++ set_optional_interactive_value timer_rate TIMER_RATE ++fi diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0023-disable-cpufreq-frequency-control.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0023-disable-cpufreq-frequency-control.patch new file mode 100644 index 0000000000..206afcb6f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0023-disable-cpufreq-frequency-control.patch @@ -0,0 +1,12 @@ +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/cpufreq.conf ++++ laptop-mode-tools-1.59/etc/laptop-mode/conf.d/cpufreq.conf +@@ -31,7 +31,7 @@ + # Should laptop mode tools control the CPU frequency settings? + # + # Set to 0 to disable +-CONTROL_CPU_FREQUENCY="auto" ++CONTROL_CPU_FREQUENCY=0 + + + # + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0024-check-for-existence-of-alarm-file.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0024-check-for-existence-of-alarm-file.patch new file mode 100644 index 0000000000..ee2e5c3dc0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0024-check-for-existence-of-alarm-file.patch @@ -0,0 +1,14 @@ +--- laptop-mode-tools-1.59/usr/sbin/laptop_mode ++++ laptop-mode-tools-1.59/usr/sbin/laptop_mode +@@ -807,7 +807,9 @@ lmt_main_function () + fi + + # $BATT/alarm is the design_capacity_warning of a battery. +- ALARM_LEVEL=$(cat $BATT/alarm) ++ ALARM_LEVEL=0 ++ ALARM_FILE=$BATT/alarm ++ if [ -f $ALARM_FILE ]; then ALARM_LEVEL=$(cat $ALARM_FILE); fi + if [ "$ALARM_LEVEL" -ne 0 ] ; then + if [ "$REMAINING" -le "$ALARM_LEVEL" ] ; then + # Restore the state we had before checking this battery, so that + diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0025-add-blacklists-for-runtime-pm.patch b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0025-add-blacklists-for-runtime-pm.patch new file mode 100644 index 0000000000..4affc8ca14 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/files/0025-add-blacklists-for-runtime-pm.patch @@ -0,0 +1,48 @@ +--- laptop-mode-tools-1.59/etc/laptop-mode/conf.d/runtime-pm.conf 2011-08-07 12:30:43.000000000 -0700 ++++ laptop-mode-tools-1.59/etc/laptop-mode/conf.d/runtime-pm.conf 2012-10-17 16:45:20.311104691 -0700 +@@ -25,3 +25,7 @@ CONTROL_RUNTIME_PM="auto" + # Enable debug mode for this module + # Set to 1 if you want to debug this module + DEBUG=0 ++ ++# The list of devices that should not use Runtime Power Management by name. ++# Example: RUNTIME_PM_NAME_BLACKLIST="isl29018 cyapa" ++RUNTIME_PM_NAME_BLACKLIST="" +--- laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/runtime-pm 2011-08-07 12:30:43.000000000 -0700 ++++ laptop-mode-tools-1.59/usr/share/laptop-mode-tools/modules/runtime-pm 2012-10-17 16:39:27.467105016 -0700 +@@ -3,12 +3,33 @@ + # Laptop mode tools module: Runtime Power Management + # + ++# Check whether a device is listed by name ++listed_by_name() { ++ device=$1 ++ list=$2 ++ for name in $list; do ++ grep -qi $name $device/name 2>/dev/null\ ++ && return 0 ++ done ++ return 1 ++} ++ ++# Checks whether a device is blacklisted by name ++blacklisted() { ++ listed_by_name $1 "$RUNTIME_PM_NAME_BLACKLIST" || return 1 ++ return 0 ++} + + activate_runtime_suspend() { + for device in $1/*; do + if [ -f $device/power/control ]; then +- echo "auto" > $device/power/control; +- log "VERBOSE" "Setting Runtime PM auto for device $device" ++ if ! blacklisted $device; then ++ echo "auto" > $device/power/control; ++ log "VERBOSE" "Setting Runtime PM auto for device $device" ++ else ++ echo "on" > $device/power/control; ++ log "VERBOSE" "Setting on for blacklisted device $device" ++ fi + else + log "VERBOSE" "$device does not support Runtime PM" + fi diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/laptop-mode-tools-1.59-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/laptop-mode-tools-1.59-r15.ebuild new file mode 120000 index 0000000000..29e894b4d9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/laptop-mode-tools-1.59-r15.ebuild @@ -0,0 +1 @@ +laptop-mode-tools-1.59.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/laptop-mode-tools-1.59.ebuild b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/laptop-mode-tools-1.59.ebuild new file mode 100644 index 0000000000..55644e58fc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-laptop/laptop-mode-tools/laptop-mode-tools-1.59.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +inherit eutils + +DESCRIPTION="Linux kernel laptop_mode user-space utilities" +HOMEPAGE="http://www.samwel.tk/laptop_mode/" +SRC_URI="http://samwel.tk/laptop_mode/tools/downloads/laptop-mode-tools_1.59.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +IUSE="-acpi -apm bluetooth -hal -scsi" + +DEPEND="" + +RDEPEND="sys-apps/ethtool + acpi? ( sys-power/acpid ) + apm? ( sys-apps/apmd ) + bluetooth? ( + || ( + net-wireless/bluez + net-wireless/bluez-utils + ) + ) + hal? ( sys-apps/hal ) + net-wireless/iw + scsi? ( sys-apps/sdparm ) + sys-apps/hdparm" + +PATCHES=( "0001-Enabled-laptop-mode-power-management-control-of.patch" \ + "0002-Add-config-knob-to-control-syslog-facility.patch" \ + "0003-Add-WiFi-power-management-support.patch" \ + "0005-switch-wifi-support-to-nl80211.patch" \ + "0006-Lower-hard-drive-idle-timeout-to-5-seconds.patch" \ + "0008-Export-PATH-to-which.patch" \ + "0009-only-log-VERBOSE-msgs-to-syslog-when-DEBUG.patch" \ + "0010-Do-not-run-usb-autosuspend-for-user-input-devices.patch" \ + "0012-Skip-failed-globs-when-finding-module-scripts.patch" \ + "0013-wireless-power-can-not-find-iwconfig-but-tries-to-po.patch" \ + "0014-Disable-ethernet-control.patch" \ + "0015-Disable-file-system-remount.patch" \ + "0016-Wait-for-laptop_mode-using-shell-commands.patch" \ + "0017-usb-autosuspend-black-whitelist-in-quotes.patch" \ + "0018-hdparm-check-for-valid-drive.patch" \ + "0019-board-specific-configurations.patch" \ + "0020-hdparm-skips-SSDs-for-power-management.patch" \ + "0021-alternate-config-dir.patch" \ + "0022-interactive-governor-parameters.patch" \ + "0023-disable-cpufreq-frequency-control.patch" \ + "0024-check-for-existence-of-alarm-file.patch" \ + "0025-add-blacklists-for-runtime-pm.patch" \ + ) + +src_unpack() { + unpack ${A} + for PATCH in "${PATCHES[@]}"; do + epatch "${FILESDIR}/$PATCH" + done +} + +src_install() { + local ignore="laptop-mode nmi-watchdog" + + dodir /etc/pm/sleep.d + + for module in ${ignore}; do + rm usr/share/laptop-mode-tools/modules/${module} + done + + DESTDIR="${D}" \ + MAN_D="/usr/share/man" \ + INIT_D="none" \ + APM="$(use apm && echo force || echo disabled)" \ + ACPI="$(use acpi && echo force || echo disabled)" \ + PMU="$(use pmu && echo force || echo disabled)" \ + ./install.sh || die "Install failed." + + dodoc Documentation/laptop-mode.txt README + newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode + + exeinto /etc/pm/power.d + newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools + + insinto /lib/udev/rules.d + doins etc/rules/99-laptop-mode.rules +} + +pkg_postinst() { + if ! use acpi && ! use apm; then + ewarn + ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not" + ewarn "automatically disable laptop_mode on low battery." + ewarn + ewarn "This means you can lose up to 10 minutes of work if running" + ewarn "out of battery while laptop_mode is enabled." + ewarn + ewarn "Please see /usr/share/doc/${PF}/laptop-mode.txt.gz for further" + ewarn "information." + ewarn + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/Manifest b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/Manifest new file mode 100644 index 0000000000..a6e6a4a068 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/Manifest @@ -0,0 +1 @@ +DIST ca-certificates_20090709_all.deb 154620 RMD160 d2e1b846341b2d7201675418b76f56f7decc929b SHA1 19790e219ee2c775f50d7ddd486ec60dfd0c7106 SHA256 de1e35997eb39c7ba5713f206aba034ff8ce8aa3aebebfc7eb1823de9968d767 diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-20090709-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-20090709-r6.ebuild new file mode 120000 index 0000000000..a6fce4a808 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-20090709-r6.ebuild @@ -0,0 +1 @@ +ca-certificates-20090709.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-20090709.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-20090709.ebuild new file mode 100644 index 0000000000..3eb8d0a696 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-20090709.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2009 Gentoo Foundation +# Copyright 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20090709.ebuild,v 1.6 2009/10/09 02:13:09 rich0 Exp $ + +inherit eutils + +DESCRIPTION="Common CA Certificates PEM files" +HOMEPAGE="http://packages.debian.org/sid/ca-certificates" +SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}_all.deb" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +DEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )" +RDEPEND="${DEPEND} + dev-libs/openssl + sys-apps/debianutils" + +S=${WORKDIR} + +PATCHLIST=( + "${FILESDIR}"/ca-certificates-20090709-update-ca-certificates-root.patch + "${FILESDIR}"/ca-certificates-20090709-update-ca-certificates-relpath.patch +) + +src_unpack() { + unpack ${A} + unpack ./data.tar.gz + rm -f control.tar.gz data.tar.gz debian-binary + for patch in "${PATCHLIST[@]}" ; do + epatch $patch + done +} + +pkg_setup() { + # For the conversion to having it in CONFIG_PROTECT_MASK, + # we need to tell users about it once manually first. + [[ -f /etc/env.d/98ca-certificates ]] \ + || ewarn "You should run update-ca-certificates manually after etc-update" +} + +src_install() { + cp -pPR * "${D}"/ || die "installing data failed" + + ( + echo "# Automatically generated by ${CAT}/${PF}" + echo "# $(date -u)" + echo "# Do not edit." + cd "${D}"/usr/share/ca-certificates + find . -name '*.crt' | sort | cut -b3- + ) > "${D}"/etc/ca-certificates.conf + + mv "${D}"/usr/share/doc/{ca-certificates,${PF}} || die + prepalldocs + + echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates + doenvd 98ca-certificates + + ${D}/usr/sbin/update-ca-certificates --root "${D}" +} + +pkg_postinst() { + local badcerts=0 + for c in $(find -L "${ROOT}"etc/ssl/certs/ -type l) ; do + ewarn "Broken symlink for a certificate at $c" + badcerts=1 + done + if [ $badcerts -eq 1 ]; then + ewarn "You MUST remove the above broken symlinks" + ewarn "Otherwise any SSL validation that use the directory may fail!" + ewarn "To batch-remove them, run:" + ewarn "find -L ${ROOT}etc/ssl/certs/ -type l -exec rm {} +" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/files/ca-certificates-20090709-update-ca-certificates-relpath.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/files/ca-certificates-20090709-update-ca-certificates-relpath.patch new file mode 100644 index 0000000000..eaee589286 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/files/ca-certificates-20090709-update-ca-certificates-relpath.patch @@ -0,0 +1,20 @@ +diff -u old/update-ca-certificates new/update-ca-certificates +--- old/usr/sbin/update-ca-certificates 2010-10-11 09:51:31.891223000 -0700 ++++ new/usr/sbin/update-ca-certificates 2010-10-11 10:46:49.271140000 -0700 +@@ -46,6 +46,7 @@ + LOCALCERTSDIR="$ROOT/usr/local/share/ca-certificates" + CERTBUNDLE=ca-certificates.crt + ETCCERTSDIR="$ROOT/etc/ssl/certs" ++ETCCERTS_TO_ROOT="../../.." + + cleanup() { + rm -f "$TEMPBUNDLE" +@@ -70,7 +71,7 @@ + -e 's/,/_/g').pem" + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] + then +- ln -sf "${CERT#$ROOT}" "$PEM" ++ ln -sf "${ETCCERTS_TO_ROOT}${CERT#$ROOT}" "$PEM" + echo +$PEM >> "$ADDED" + fi + cat "$CERT" >> "$TEMPBUNDLE" diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/files/ca-certificates-20090709-update-ca-certificates-root.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/files/ca-certificates-20090709-update-ca-certificates-root.patch new file mode 100644 index 0000000000..e6cf6a0de3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/files/ca-certificates-20090709-update-ca-certificates-root.patch @@ -0,0 +1,107 @@ +--- ca-certificates-20090814/sbin/update-ca-certificates 2009-07-08 14:23:12.000000000 -0700 ++++ ./wo 'r k/usr/sbin/update-ca-certificates 2010-01-29 11:57:09.000000000 -0800 +@@ -23,6 +23,7 @@ + + verbose=0 + fresh=0 ++ROOT="" + while [ $# -gt 0 ]; + do + case $1 in +@@ -30,6 +31,9 @@ + verbose=1;; + --fresh|-f) + fresh=1;; ++ --root|-r) ++ ROOT=$(readlink -f "$2") ++ shift;; + --help|-h|*) + echo "$0: [--verbose] [--fresh]" + exit;; +@@ -37,11 +41,11 @@ + shift + done + +-CERTSCONF=/etc/ca-certificates.conf +-CERTSDIR=/usr/share/ca-certificates +-LOCALCERTSDIR=/usr/local/share/ca-certificates ++CERTSCONF="$ROOT/etc/ca-certificates.conf" ++CERTSDIR="$ROOT/usr/share/ca-certificates" ++LOCALCERTSDIR="$ROOT/usr/local/share/ca-certificates" + CERTBUNDLE=ca-certificates.crt +-ETCCERTSDIR=/etc/ssl/certs ++ETCCERTSDIR="$ROOT/etc/ssl/certs" + + cleanup() { + rm -f "$TEMPBUNDLE" +@@ -66,7 +70,7 @@ + -e 's/,/_/g').pem" + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] + then +- ln -sf "$CERT" "$PEM" ++ ln -sf "${CERT#$ROOT}" "$PEM" + echo +$PEM >> "$ADDED" + fi + cat "$CERT" >> "$TEMPBUNDLE" +@@ -78,22 +82,22 @@ + if test -L "$PEM" + then + rm -f "$PEM" +- echo -$PEM >> "$REMOVED" ++ echo "-$PEM" >> "$REMOVED" + fi + } + +-cd $ETCCERTSDIR ++cd "$ETCCERTSDIR" + if [ "$fresh" = 1 ]; then + echo -n "Clearing symlinks in $ETCCERTSDIR..." + find . -type l -print | while read symlink + do +- case $(readlink $symlink) in +- $CERTSDIR*) rm -f $symlink;; ++ case $(readlink "$symlink") in ++ "$CERTSDIR"*) rm -f "$symlink";; + esac + done + find . -type l -print | while read symlink + do +- test -f $symlink || rm -f $symlink ++ test -f "$symlink" || rm -f "$symlink" + done + echo "done." + fi +@@ -102,12 +106,12 @@ + + # Handle certificates that should be removed. This is an explicit act + # by prefixing lines in the configuration files with exclamation marks (!). +-sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt ++sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt + do + remove "$CERTSDIR/$crt" + done + +-sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt ++sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt + do + if ! test -f "$CERTSDIR/$crt" + then +@@ -146,14 +150,15 @@ + + echo "$ADDED_CNT added, $REMOVED_CNT removed; done." + +-HOOKSDIR=/etc/ca-certificates/update.d ++HOOKSDIR="$ROOT/etc/ca-certificates/update.d" + echo -n "Running hooks in $HOOKSDIR...." + VERBOSE_ARG= + [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose +-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook ++eval run-parts $VERBOSE_ARG --test -- $(printf '%q' "$HOOKSDIR") | \ ++ while read hook + do + ( cat $ADDED +- cat $REMOVED ) | $hook || echo E: $hook exited with code $?. ++ cat $REMOVED ) | "$hook" || echo E: "$hook" exited with code $?. + done + echo "done." + diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild new file mode 120000 index 0000000000..09137cac6a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild @@ -0,0 +1 @@ +ddccontrol-0.4.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild new file mode 100644 index 0000000000..b613c66eb8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild,v 1.8 2010/01/01 18:08:47 ssuominen Exp $ + +inherit eutils autotools + +DESCRIPTION="DDCControl allows control of monitor parameters via DDC" +HOMEPAGE="http://ddccontrol.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="gtk gnome doc nls ddcpci" + +RDEPEND="dev-libs/libxml2 + gtk? ( >=x11-libs/gtk+-2.4 ) + gnome? ( >=gnome-base/gnome-panel-2.10 ) + sys-apps/pciutils + nls? ( sys-devel/gettext ) + >=app-misc/ddccontrol-db-20060730" +DEPEND="${RDEPEND} + dev-perl/XML-Parser + dev-util/intltool + doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 + >=dev-libs/libxslt-1.1.6 + app-text/htmltidy ) + sys-kernel/linux-headers" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-pciutils-libz.patch + + # Fix sandbox violation + for i in Makefile.am Makefile.in; do + sed -i.orig "${S}/src/gddccontrol/${i}" \ + -e "/@INSTALL@/s/ \$(datadir)/ \$(DESTDIR)\/\$(datadir)/" \ + || die "Failed to fix DESTDIR" + done + + # ppc/ppc64 do not have inb/outb/ioperm + # they also do not have (sys|asm)/io.h + if [ "${ARCH/64}" == "ppc" ]; then + for card in sis intel810 ; do + sed -r -i \ + -e "/${card}.Po/d" \ + -e "s~${card}[^[:space:]]*~ ~g" \ + src/ddcpci/Makefile.in + sed -r -i \ + -e "/${card}.Po/d" \ + -e "s~${card}[^[:space:]]*~ ~g" \ + src/ddcpci/Makefile.am + done + sed -i \ + -e '/sis_/d' \ + -e '/i810_/d' \ + src/ddcpci/main.c + fi + + ## Save for a rainy day or future patching + eautoreconf || die "eautoreconf failed" + intltoolize --force || die "intltoolize failed" +} + +src_compile() { + econf $(use_enable doc) \ + $(use_enable gtk gnome) \ + $(use_enable gnome gnome-applet) \ + $(use_enable nls) \ + $(use_enable ddcpci) || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install || die + dodoc AUTHORS ChangeLog NEWS README TODO +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch new file mode 100644 index 0000000000..8fb6020003 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch @@ -0,0 +1,19 @@ +Index: configure.ac +=================================================================== +RCS file: /cvsroot/ddccontrol/ddccontrol/configure.ac,v +retrieving revision 1.40 +diff -u -r1.40 configure.ac +--- configure.ac 26 Jul 2006 22:02:15 -0000 1.40 ++++ configure.ac 1 Mar 2007 14:49:35 -0000 +@@ -101,7 +101,10 @@ + DDCPCI= + if test x$support_ddcpci = xyes; then + AC_CHECK_HEADERS([pci/pci.h], [], [AC_MSG_ERROR([PCI utils headers not found, please install pci-utils.], [1])], []) +- AC_CHECK_LIB([pci], [pci_alloc], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])]) ++ AC_CHECK_LIB([pci], [pci_alloc], [], [ ++ AC_CHECK_LIB([z], [gzopen], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])]) ++ AC_CHECK_LIB([pci], [pci_fill_info], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])], [-lz]) ++ ]) + DDCPCI=ddcpci + AC_DEFINE_UNQUOTED(HAVE_DDCPCI, 1, [Define if ddccontrol is built with ddcpci support.]) + fi diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-add_resolution.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-add_resolution.patch new file mode 100644 index 0000000000..525b075f22 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-add_resolution.patch @@ -0,0 +1,43 @@ +From 47fb64c4ed657bf71579c03fc452129ae8292b88 Mon Sep 17 00:00:00 2001 +From: Dennis Kempin +Date: Thu, 7 Jun 2012 13:53:48 -0700 +Subject: [PATCH 2/2] Added absinfo.resolution to file format + +This change will update the file format to include the resolution +field when serializing absinfo structures. +The read code allows the resolution field to be option to stay +compatible with old files +--- + src/evemu.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/evemu.c b/src/evemu.c +index 8501933..29a2c69 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -234,8 +234,9 @@ static void write_mask(FILE * fp, int index, + + static void write_abs(FILE *fp, int index, const struct input_absinfo *abs) + { +- fprintf(fp, "A: %02x %d %d %d %d\n", index, +- abs->minimum, abs->maximum, abs->fuzz, abs->flat); ++ fprintf(fp, "A: %02x %d %d %d %d %d\n", index, ++ abs->minimum, abs->maximum, abs->fuzz, abs->flat, ++ abs->resolution); + } + + int evemu_write(const struct evemu_device *dev, FILE *fp) +@@ -288,8 +289,8 @@ static void read_abs(struct evemu_device *dev, FILE *fp) + { + struct input_absinfo abs = {0}; + int index; +- while (fscanf(fp, "A: %02x %d %d %d %d\n", &index, +- &abs.minimum, &abs.maximum, &abs.fuzz, &abs.flat) > 0) ++ while (fscanf(fp, "A: %02x %d %d %d %d %d\n", &index, &abs.minimum, ++ &abs.maximum, &abs.fuzz, &abs.flat, &abs.resolution) > 0) + dev->abs[index] = abs; + } + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-add_slot0.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-add_slot0.patch new file mode 100644 index 0000000000..2832c315d5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-add_slot0.patch @@ -0,0 +1,178 @@ +diff --git a/include/evemu.h b/include/evemu.h +index e4ce667..05cef0f 100644 +--- a/include/evemu.h ++++ b/include/evemu.h +@@ -282,10 +282,25 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + int evemu_record(FILE *fp, int fd, int ms); + + /** ++ * insert_slot0() - insert a slot0 event ++ * @fp: file pointer to read the event from ++ * @ev: pointer to the kernel event to be filled ++ * @evtime: pointer to a timeval struct ++ * ++ * Read events until an EV_SYN/SYN_REPORT event is reached, and insert a slot0 ++ * event. However, if a slot0 event exists already, do not insert anything. ++ * ++ * Returns 1 if a slot0 event is created and inserted, 0 if a slot0 event ++ * exists already. ++ */ ++int insert_slot0(FILE *fp, struct input_event *ev, struct timeval *evtime); ++ ++/** + * evemu_play() - replay events from file to kernel device in realtime + * @fp: file pointer to read the events from + * @fd: file descriptor of kernel device to write to + * @fp_time: file descriptor for keeping playback timing information ++ * @flag_slot0: flag indicating whether to insert a slot 0 event or not + * + * Contiuously reads events from the file and writes them to the + * kernel device, in realtime. The function terminates when end of +@@ -293,7 +308,7 @@ int evemu_record(FILE *fp, int fd, int ms); + * + * Returns zero if successful, negative error otherwise. + */ +-int evemu_play(FILE *fp, int fd, FILE *fp_time); ++int evemu_play(FILE *fp, int fd, FILE *fp_time, int flag_slot0); + + /** + * evemu_create() - create a kernel device from the evemu configuration +diff --git a/src/evemu.c b/src/evemu.c +index 02377f1..9d34101 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -65,6 +65,14 @@ + + #define SYSCALL(call) while (((call) == -1) && (errno == EINTR)) + ++/* To determine if this is a synchronization event */ ++#define EVENT_SYN(type, code, value) \ ++ (type == EV_SYN && code == SYN_REPORT && value == 0) ++ ++/* To determine if this is a slot n event */ ++#define EVENT_SLOT(type, code, value, n) \ ++ (type == EV_ABS && code == ABS_MT_SLOT && value == n) ++ + static void copy_bits(unsigned char *mask, const unsigned long *bits, int bytes) + { + int i; +@@ -378,16 +386,57 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + return ret; + } + +-int evemu_play(FILE *fp, int fd, FILE *fp_time) ++int insert_slot0(FILE *fp, struct input_event *ev, struct timeval *evtime) ++{ ++ int flag_ev0_time = 1; ++ ++ while (evemu_read_event(fp, ev) > 0) { ++ if (flag_ev0_time) { ++ *evtime = ev->time; ++ flag_ev0_time = 0; ++ } ++ if (EVENT_SLOT(ev->type, ev->code, ev->value, 0)) { ++ rewind(fp); ++ return 0; ++ } else if (EVENT_SYN(ev->type, ev->code, ev->value)) { ++ break; ++ } ++ } ++ ++ if (evtime->tv_usec > 0) { ++ evtime->tv_usec--; ++ } else if (evtime->tv_sec > 0) { ++ evtime->tv_usec = 999999; ++ evtime->tv_sec--; ++ } else { ++ evtime->tv_usec = 0; ++ evtime->tv_sec = 0; ++ } ++ ev->time = *evtime; ++ ev->type = EV_ABS; ++ ev->code = ABS_MT_SLOT; ++ ev->value = 0; ++ rewind(fp); ++ ++ return 1; ++} ++ ++int evemu_play(FILE *fp, int fd, FILE *fp_time, int flag_slot0) + { + struct input_event ev; + struct timeval evtime; + struct timespec curr_tp; + int ret; ++ int flag_slot0_inserted = 0; + char *time_format = "E: %lu.%06u %04x %04x %-4d -- playback %lu.%09u\n"; + + memset(&evtime, 0, sizeof(evtime)); +- while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) { ++ if (flag_slot0) { ++ flag_slot0_inserted = insert_slot0(fp, &ev, &evtime); ++ } ++ ++ while (flag_slot0_inserted || ++ evemu_read_event_realtime(fp, &ev, &evtime) > 0) { + if (fp_time != NULL) { + clock_gettime(CLOCK_MONOTONIC, &curr_tp); + fprintf(fp_time, time_format, +@@ -396,6 +445,7 @@ int evemu_play(FILE *fp, int fd, FILE *fp_time) + curr_tp.tv_sec, curr_tp.tv_nsec); + } + SYSCALL(ret = write(fd, &ev, sizeof(ev))); ++ flag_slot0_inserted = 0; + } + + return 0; +diff --git a/tools/evemu-play.c b/tools/evemu-play.c +index f66275e..c2aef3e 100644 +--- a/tools/evemu-play.c ++++ b/tools/evemu-play.c +@@ -50,9 +50,12 @@ int main(int argc, char *argv[]) + { + int fd; + FILE *fp_time = NULL; +- if (argc < 2 || argc > 3) { +- fprintf(stderr, "Usage: %s [output_file]\n", argv[0]); ++ char *output_filename = NULL; ++ int flag_slot0 = 0; ++ if (argc < 2 || argc > 4) { ++ fprintf(stderr, "Usage: %s [--insert-slot0] [output_file]\n", argv[0]); + fprintf(stderr, "\n"); ++ fprintf(stderr, "--insert-slot0: insert a slot 0 event if missing in the very first packet.\n"); + fprintf(stderr, "Event data is read from standard input.\n"); + return -1; + } +@@ -61,15 +64,25 @@ int main(int argc, char *argv[]) + fprintf(stderr, "error: could not open device\n"); + return -1; + } +- if (argc == 3) { +- fp_time = fopen(argv[2], "w"); +- if (fp_time == NULL) { +- fprintf(stderr, "error: could not open output file %s.\n", +- argv[2]); +- return -1; ++ if (argc >= 3) { ++ if (strcmp(argv[2], "--insert-slot0") == 0) { ++ flag_slot0 = 1; ++ if (argc == 4) { ++ output_filename = argv[3]; ++ } ++ } else { ++ output_filename = argv[2]; ++ } ++ if (output_filename != NULL) { ++ fp_time = fopen(output_filename, "w"); ++ if (fp_time == NULL) { ++ fprintf(stderr, "error: could not open output file %s.\n", ++ output_filename); ++ return -1; ++ } + } + } +- if (evemu_play(stdin, fd, fp_time)) { ++ if (evemu_play(stdin, fd, fp_time, flag_slot0)) { + fprintf(stderr, "error: could not describe device\n"); + } + if (fp_time != NULL) { diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-fix_init_absinfo.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-fix_init_absinfo.patch new file mode 100644 index 0000000000..3b09c81371 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-fix_init_absinfo.patch @@ -0,0 +1,28 @@ +From a3e4e37ee67be28edc3daa78c97ce9a1e457b0b8 Mon Sep 17 00:00:00 2001 +From: Dennis Kempin +Date: Thu, 7 Jun 2012 17:50:19 -0700 +Subject: [PATCH 1/2] Fixed bug: absinfo not initialized + +When reading device info from a file, the absinfo structure is not initialized. +This causes fields that are not read from file to be set to undefined values. +Fixed by initializing with zero. +--- + src/evemu.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/evemu.c b/src/evemu.c +index 9d34101..8501933 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -286,7 +286,7 @@ static void read_mask(struct evemu_device *dev, FILE *fp) + + static void read_abs(struct evemu_device *dev, FILE *fp) + { +- struct input_absinfo abs; ++ struct input_absinfo abs = {0}; + int index; + while (fscanf(fp, "A: %02x %d %d %d %d\n", &index, + &abs.minimum, &abs.maximum, &abs.fuzz, &abs.flat) > 0) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-getopt.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-getopt.patch new file mode 100644 index 0000000000..5a45a7c8db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-getopt.patch @@ -0,0 +1,106 @@ +diff --git a/tools/evemu-play.c b/tools/evemu-play.c +index c2aef3e..9c868a2 100644 +--- a/tools/evemu-play.c ++++ b/tools/evemu-play.c +@@ -45,43 +45,77 @@ + #include + #include + #include ++#include ++ ++void usage(char *program_name) { ++ fprintf(stderr, "Usage: %s [--insert-slot0] [--output output_file] \n", program_name); ++ fprintf(stderr, "\n"); ++ fprintf(stderr, "--insert-slot0: insert a slot 0 event if missing in the very first packet.\n"); ++ fprintf(stderr, "--output: specify the output file name.\n"); ++ fprintf(stderr, "Note: event data is read from standard input.\n"); ++} + + int main(int argc, char *argv[]) + { + int fd; ++ int c; ++ int flag_slot0 = 0; + FILE *fp_time = NULL; + char *output_filename = NULL; +- int flag_slot0 = 0; +- if (argc < 2 || argc > 4) { +- fprintf(stderr, "Usage: %s [--insert-slot0] [output_file]\n", argv[0]); +- fprintf(stderr, "\n"); +- fprintf(stderr, "--insert-slot0: insert a slot 0 event if missing in the very first packet.\n"); +- fprintf(stderr, "Event data is read from standard input.\n"); ++ char *device_name = NULL; ++ ++ /* Get options */ ++ while (1) { ++ static struct option long_options[] = { ++ {"insert-slot0", no_argument, 0, 'i'}, ++ {"output", required_argument, 0, 'o'}, ++ {0, 0, 0, 0} ++ }; ++ int option_index = 0; ++ c = getopt_long(argc, argv, "io:", long_options, &option_index); ++ if (c == -1) ++ break; ++ switch (c) { ++ case 0: ++ break; ++ case 'i': ++ flag_slot0 = 1; ++ break; ++ case 'o': ++ output_filename = optarg; ++ break; ++ case '?': ++ default: ++ usage(argv[0]); ++ return -1; ++ } ++ } ++ ++ /* Get command line argument: device */ ++ if (optind >= argc) { ++ fprintf(stderr, "You need to supply the .\n"); ++ usage(argv[0]); + return -1; + } +- fd = open(argv[1], O_WRONLY); ++ device_name = argv[optind]; ++ ++ /* Open the event device */ ++ fd = open(device_name, O_WRONLY); + if (fd < 0) { +- fprintf(stderr, "error: could not open device\n"); ++ fprintf(stderr, "Error: fail to open device %s\n", device_name); + return -1; + } +- if (argc >= 3) { +- if (strcmp(argv[2], "--insert-slot0") == 0) { +- flag_slot0 = 1; +- if (argc == 4) { +- output_filename = argv[3]; +- } +- } else { +- output_filename = argv[2]; +- } +- if (output_filename != NULL) { +- fp_time = fopen(output_filename, "w"); +- if (fp_time == NULL) { +- fprintf(stderr, "error: could not open output file %s.\n", +- output_filename); +- return -1; +- } ++ ++ /* Open the optional output file */ ++ if (output_filename != NULL) { ++ fp_time = fopen(output_filename, "w"); ++ if (fp_time == NULL) { ++ fprintf(stderr, "Error: fail to open output file %s.\n", ++ output_filename); ++ return -1; + } + } ++ + if (evemu_play(stdin, fd, fp_time, flag_slot0)) { + fprintf(stderr, "error: could not describe device\n"); + } diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-play_timestamp.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-play_timestamp.patch new file mode 100644 index 0000000000..b531dd5a98 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-play_timestamp.patch @@ -0,0 +1,113 @@ +diff --git a/include/evemu.h b/include/evemu.h +index 1f55d5c..e4ce667 100644 +--- a/include/evemu.h ++++ b/include/evemu.h +@@ -285,6 +285,7 @@ int evemu_record(FILE *fp, int fd, int ms); + * evemu_play() - replay events from file to kernel device in realtime + * @fp: file pointer to read the events from + * @fd: file descriptor of kernel device to write to ++ * @fp_time: file descriptor for keeping playback timing information + * + * Contiuously reads events from the file and writes them to the + * kernel device, in realtime. The function terminates when end of +@@ -292,7 +293,7 @@ int evemu_record(FILE *fp, int fd, int ms); + * + * Returns zero if successful, negative error otherwise. + */ +-int evemu_play(FILE *fp, int fd); ++int evemu_play(FILE *fp, int fd, FILE *fp_time); + + /** + * evemu_create() - create a kernel device from the evemu configuration +diff --git a/src/Makefile.in b/src/Makefile.in +index 8468f02..6378196 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -70,7 +70,7 @@ am__base_list = \ + am__installdirs = "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(libutouch_evemuincludedir)" + LTLIBRARIES = $(lib_LTLIBRARIES) +-libutouch_evemu_la_LIBADD = ++libutouch_evemu_la_LIBADD = -lrt + am_libutouch_evemu_la_OBJECTS = evemu.lo + libutouch_evemu_la_OBJECTS = $(am_libutouch_evemu_la_OBJECTS) + libutouch_evemu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +diff --git a/src/evemu.c b/src/evemu.c +index df6b250..02377f1 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -49,6 +49,8 @@ + #include + #include + #include ++#include ++#include + + #ifndef UI_SET_PROPBIT + #define UI_SET_PROPBIT _IOW(UINPUT_IOCTL_BASE, 110, int) +@@ -376,15 +378,25 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + return ret; + } + +-int evemu_play(FILE *fp, int fd) ++int evemu_play(FILE *fp, int fd, FILE *fp_time) + { + struct input_event ev; + struct timeval evtime; ++ struct timespec curr_tp; + int ret; ++ char *time_format = "E: %lu.%06u %04x %04x %-4d -- playback %lu.%09u\n"; + + memset(&evtime, 0, sizeof(evtime)); +- while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) ++ while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) { ++ if (fp_time != NULL) { ++ clock_gettime(CLOCK_MONOTONIC, &curr_tp); ++ fprintf(fp_time, time_format, ++ ev.time.tv_sec, ev.time.tv_usec, ++ ev.type, ev.code, ev.value, ++ curr_tp.tv_sec, curr_tp.tv_nsec); ++ } + SYSCALL(ret = write(fd, &ev, sizeof(ev))); ++ } + + return 0; + } +diff --git a/tools/evemu-play.c b/tools/evemu-play.c +index 7b9b777..f66275e 100644 +--- a/tools/evemu-play.c ++++ b/tools/evemu-play.c +@@ -49,8 +49,9 @@ + int main(int argc, char *argv[]) + { + int fd; +- if (argc != 2) { +- fprintf(stderr, "Usage: %s \n", argv[0]); ++ FILE *fp_time = NULL; ++ if (argc < 2 || argc > 3) { ++ fprintf(stderr, "Usage: %s [output_file]\n", argv[0]); + fprintf(stderr, "\n"); + fprintf(stderr, "Event data is read from standard input.\n"); + return -1; +@@ -60,9 +61,20 @@ int main(int argc, char *argv[]) + fprintf(stderr, "error: could not open device\n"); + return -1; + } +- if (evemu_play(stdin, fd)) { ++ if (argc == 3) { ++ fp_time = fopen(argv[2], "w"); ++ if (fp_time == NULL) { ++ fprintf(stderr, "error: could not open output file %s.\n", ++ argv[2]); ++ return -1; ++ } ++ } ++ if (evemu_play(stdin, fd, fp_time)) { + fprintf(stderr, "error: could not describe device\n"); + } ++ if (fp_time != NULL) { ++ close(fp_time); ++ } + close(fd); + return 0; + } diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-raw_access_api.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-raw_access_api.patch new file mode 100644 index 0000000000..f53433c04b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-raw_access_api.patch @@ -0,0 +1,110 @@ +From eec34acf18f7dd7320fc1be6ae2b3efb4ca9783d Mon Sep 17 00:00:00 2001 +From: Dennis Kempin +Date: Tue, 12 Jun 2012 15:56:24 -0700 +Subject: [PATCH] api extension: access to raw kernel input_ structures and + bitmasks + +This CL adds functions to the api that allow raw access to the +input_id and input_absinfo structures as well as bitmasks. +This allows the regression test suite to use the evemu API for +reading device properties from files. + +BUG=chromium-os:31732 +TEST=compiles. tested with regression test prototype. +--- + include/evemu.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + src/evemu.c | 26 ++++++++++++++++++++++++++ + 2 files changed, 72 insertions(+), 0 deletions(-) + +diff --git a/include/evemu.h b/include/evemu.h +index 05cef0f..1fb8390 100644 +--- a/include/evemu.h ++++ b/include/evemu.h +@@ -329,4 +329,50 @@ int evemu_create(const struct evemu_device *dev, int fd); + */ + void evemu_destroy(int fd); + ++/** ++ * evemu_get_id() - raw access to kernel device id structure ++ * @dev: the device in use ++ * ++ * Returns the kernel device id structure. ++ */ ++struct input_id* evemu_get_id(const struct evemu_device *dev); ++ ++/** ++ * evemu_get_abs() - raw access to kernel absinfo structure ++ * @dev: the device in use ++ * @code: the event type code to query ++ * ++ * Returns the input_absinfo structure for provided event type code ++ */ ++const struct info_absinfo* ++evemu_get_abs(const struct evemu_device *dev, int code); ++ ++/** ++ * evemu_get_mask_size() - get the bitmask size ++ * @dev: the device in use ++ * ++ * Returns the size of bitmasks as returned by evemu_get_prop_mask ++ * or evemu_get_mask. Size in bytes. ++ * The bitmask size is static and defined at compile time, but might conflict ++ * when evemu and the calling library are using incompatible kernel header. ++ */ ++int evemu_get_mask_size(const struct evemu_device *dev); ++ ++/** ++ * evemu_get_prop_mask() - raw access to the kernel property bitmask ++ * @dev: the device in use ++ * ++ * Returns a pointer to the property bitmask ++ */ ++const unsigned char* evemu_get_prop_mask(const struct evemu_device *dev); ++ ++/** ++ * evemu_get_mask() - raw access to event bitmasks ++ * @dev: the device in use ++ * @code: the event type code to query ++ * ++ * Returns a pointer to the queried bitmask. ++ */ ++const unsigned char* evemu_get_mask(const struct evemu_device *dev, int code); ++ + #endif +diff --git a/src/evemu.c b/src/evemu.c +index 29a2c69..0dd1cab 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -564,3 +564,29 @@ void evemu_destroy(int fd) + int ret; + SYSCALL(ret = ioctl(fd, UI_DEV_DESTROY, NULL)); + } ++ ++struct input_id* evemu_get_id(const struct evemu_device *dev) ++{ ++ return &dev->id; ++} ++ ++const struct info_absinfo* ++evemu_get_abs(const struct evemu_device *dev, int code) ++{ ++ return &dev->abs[code]; ++} ++ ++int evemu_get_mask_size(const struct evemu_device *dev) ++{ ++ return EVPLAY_NBYTES; ++} ++ ++const unsigned char* evemu_get_prop_mask(const struct evemu_device *dev) ++{ ++ return dev->prop; ++} ++ ++const unsigned char* evemu_get_mask(const struct evemu_device *dev, int code) ++{ ++ return dev->mask[code]; ++} +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-signal_exit.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-signal_exit.patch new file mode 100644 index 0000000000..ee4adabe89 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-signal_exit.patch @@ -0,0 +1,32 @@ +diff --git a/tools/evemu-record.c b/tools/evemu-record.c +index afdd400..f75c0bb 100644 +--- a/tools/evemu-record.c ++++ b/tools/evemu-record.c +@@ -42,15 +42,26 @@ + + #include "evemu.h" + #include ++#include + #include + #include + #include ++#include + + #define WAIT_MS 10000 + ++int fd; ++ ++void close_file() ++{ ++ close(fd); ++ exit(1); ++} ++ + int main(int argc, char *argv[]) + { +- int fd; ++ signal(SIGINT, close_file); ++ signal(SIGTERM, close_file); + if (argc < 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + return -1; diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-timeout.patch b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-timeout.patch new file mode 100644 index 0000000000..fefa04c3b1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/files/1.0.5-timeout.patch @@ -0,0 +1,48 @@ +From da1ad19f039c303808d36d1cf318cfd44aae77a4 Mon Sep 17 00:00:00 2001 +From: Joseph Hwang +Date: Wed, 30 Nov 2011 14:59:37 +0800 +Subject: [PATCH] 1.0.5-timeout + +The second argument of evemu-record is used as a timeout value. +The default timeout value for evemu-record is 10 seconds if no value +is specified. If the timeout value is set to -1, evemu-record would +not terminate until it receives the SIGINT or SIGTERM signal. +--- + tools/evemu-record.c | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/tools/evemu-record.c b/tools/evemu-record.c +index f75c0bb..4d29e7f 100644 +--- a/tools/evemu-record.c ++++ b/tools/evemu-record.c +@@ -60,10 +60,16 @@ void close_file() + + int main(int argc, char *argv[]) + { ++ int timeout; ++ char *endp; ++ + signal(SIGINT, close_file); + signal(SIGTERM, close_file); +- if (argc < 2) { +- fprintf(stderr, "Usage: %s \n", argv[0]); ++ ++ timeout = argc == 3 ? strtol(argv[2], &endp, 10) : WAIT_MS; ++ if (argc < 2 || argc > 3 || (argc == 3 && *endp != '\0')) { ++ fprintf(stderr, "Usage: %s [timeout_in_ms]\n", ++ argv[0]); + return -1; + } + fd = open(argv[1], O_RDONLY | O_NONBLOCK); +@@ -71,7 +77,7 @@ int main(int argc, char *argv[]) + fprintf(stderr, "error: could not open device\n"); + return -1; + } +- if (evemu_record(stdout, fd, WAIT_MS)) { ++ if (evemu_record(stdout, fd, timeout)) { + fprintf(stderr, "error: could not describe device\n"); + } + close(fd); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/utouch-evemu-1.0.5-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/utouch-evemu-1.0.5-r9.ebuild new file mode 100644 index 0000000000..965ad07075 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/utouch-evemu/utouch-evemu-1.0.5-r9.ebuild @@ -0,0 +1,32 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +inherit base + +DESCRIPTION="To record and replay data from kernel evdev devices" +HOMEPAGE="http://bitmath.org/code/evemu/" +SRC_URI="http://launchpad.net/utouch-evemu/trunk/v${PV}/+download/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="X" + +RDEPEND="X? ( >=x11-base/xorg-server-1.8 )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/1.0.5-signal_exit.patch" + "${FILESDIR}/1.0.5-timeout.patch" + "${FILESDIR}/1.0.5-play_timestamp.patch" + "${FILESDIR}/1.0.5-add_slot0.patch" + "${FILESDIR}/1.0.5-getopt.patch" + "${FILESDIR}/1.0.5-fix_init_absinfo.patch" + "${FILESDIR}/1.0.5-add_resolution.patch" + "${FILESDIR}/1.0.5-raw_access_api.patch" +) + +src_install() { + emake DESTDIR="${D}" install || die "install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild new file mode 100644 index 0000000000..dbe1dc7deb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild,v 1.2 2013/01/10 17:21:58 vapier Exp $ + +EAPI="4" + +DESCRIPTION="collection of Gentoo eclass manpages" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="" + +S=${WORKDIR} + +genit() { + local e=${1:-${ECLASSDIR}} + einfo "Generating man pages from: ${e}" + env ECLASSDIR=${e} "${FILESDIR}"/eclass-to-manpage.sh || die +} + +src_compile() { + # First process any eclasses found in overlays. Then process + # the main eclassdir last so that its output will clobber anything + # that might have come from overlays. Main tree wins! + local o e + for o in ${PORTDIR_OVERLAY} ; do + e="${o}/eclass" + [[ -d ${e} ]] || continue + genit "${e}" + done + genit +} + +src_install() { + doman *.5 +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.awk new file mode 100644 index 0000000000..b7e1627525 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.awk @@ -0,0 +1,416 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/files/eclass-to-manpage.awk,v 1.28 2013/01/10 17:42:39 vapier Exp $ + +# This awk converts the comment documentation found in eclasses +# into man pages for easier/nicer reading. +# +# If you wish to have multiple paragraphs in a description, then +# create empty comment lines. Paragraph parsing ends when the comment +# block does. + +# The format of the eclass description: +# @ECLASS: foo.eclass +# @MAINTAINER: +# +# @AUTHOR: +# +# @BUGREPORTS: +# +# @VCSURL: +# @BLURB: +# @DESCRIPTION: +# +# @EXAMPLE: +# + +# The format of functions: +# @FUNCTION: foo +# @USAGE: [optional arguments to foo] +# @RETURN: +# @MAINTAINER: +# +# [@INTERNAL] +# @DESCRIPTION: +# + +# The format of function-specific variables: +# @VARIABLE: foo +# [@DEFAULT_UNSET] +# [@INTERNAL] +# [@REQUIRED] +# @DESCRIPTION: +# +# foo="" + +# The format of eclass variables: +# @ECLASS-VARIABLE: foo +# [@DEFAULT_UNSET] +# [@INTERNAL] +# [@REQUIRED] +# @DESCRIPTION: +# +# foo="" + +# Common features: +# @CODE +# In multiline paragraphs, you can create chunks of unformatted +# code by using this marker at the start and end. +# @CODE +# +# @ROFF +# If you want a little more manual control over the formatting, you can +# insert roff macros directly into the output by using the @ROFF escape. + +function _stderr_msg(text, type, file, cnt) { + if (_stderr_header_done != 1) { + cnt = split(FILENAME, file, /\//) + print "\n" file[cnt] ":" > "/dev/stderr" + _stderr_header_done = 1 + } + + print " " type ":" NR ": " text > "/dev/stderr" +} +function warn(text) { + _stderr_msg(text, "warning") +} +function fail(text) { + _stderr_msg(text, "error") + exit(1) +} + +function eat_line() { + ret = $0 + sub(/^# @[A-Z]*:[[:space:]]*/,"",ret) + getline + return ret +} +function eat_paragraph() { + code = 0 + ret = "" + getline + while ($0 ~ /^#/) { + # Only allow certain tokens in the middle of paragraphs + if ($2 ~ /^@/ && $2 !~ /^@(CODE|ROFF)$/) + break + + sub(/^#[[:space:]]?/, "", $0) + + # Escape . at start of line #420153 + if ($0 ~ /^[.]/) + $0 = "\\&" $0 + + # Translate @CODE into @ROFF + if ($1 == "@CODE" && NF == 1) { + if (code) + $0 = "@ROFF .fi" + else + $0 = "@ROFF .nf" + code = !code + } + + # Allow people to specify *roff commands directly + if ($1 == "@ROFF") + sub(/^@ROFF[[:space:]]*/, "", $0) + + ret = ret "\n" $0 + + # Handle the common case of trailing backslashes in + # code blocks to cross multiple lines #335702 + if (code && $NF == "\\") + ret = ret "\\" + getline + } + sub(/^\n/,"",ret) + return ret +} + +function pre_text(p) { + return ".nf\n" p "\n.fi" +} + +function man_text(p) { + return gensub(/-/, "\\-", "g", p) +} + +# +# Handle an @ECLASS block +# +function handle_eclass() { + eclass = $3 + eclass_maintainer = "" + eclass_author = "" + blurb = "" + desc = "" + example = "" + + # first the man page header + print ".\\\" -*- coding: utf-8 -*-" + print ".\\\" ### DO NOT EDIT THIS FILE" + print ".\\\" ### This man page is autogenerated by eclass-to-manpage.awk" + print ".\\\" ### based on comments found in " eclass + print ".\\\"" + print ".\\\" See eclass-to-manpage.awk for documentation on how to get" + print ".\\\" your eclass nicely documented as well." + print ".\\\"" + print ".TH \"" toupper(eclass) "\" 5 \"" strftime("%b %Y") "\" \"Portage\" \"portage\"" + + # now eat the global data + getline + if ($2 == "@MAINTAINER:") + eclass_maintainer = eat_paragraph() + if ($2 == "@AUTHOR:") + eclass_author = eat_paragraph() + if ($2 == "@BUGREPORTS:") + reporting_bugs = eat_paragraph() + if ($2 == "@VCSURL:") + vcs_url = eat_line() + if ($2 == "@BLURB:") + blurb = eat_line() + if ($2 == "@DESCRIPTION:") + desc = eat_paragraph() + if ($2 == "@EXAMPLE:") + example = eat_paragraph() + # in case they typo-ed the keyword, bail now + if ($2 ~ /^@/) + fail(eclass ": unknown keyword " $2) + + # finally display it + print ".SH \"NAME\"" + print eclass " \\- " man_text(blurb) + if (desc != "") { + print ".SH \"DESCRIPTION\"" + print man_text(desc) + } + if (example != "") { + print ".SH \"EXAMPLE\"" + print man_text(example) + } + + # sanity checks + if (blurb == "") + fail(eclass ": no @BLURB found") + if (eclass_maintainer == "") + warn(eclass ": no @MAINTAINER found") +} + +# +# Handle a @FUNCTION block +# +function show_function_header() { + if (_function_header_done != 1) { + print ".SH \"FUNCTIONS\"" + _function_header_done = 1 + } +} +function handle_function() { + func_name = $3 + usage = "" + funcret = "" + maintainer = "" + internal = 0 + desc = "" + + # make sure people haven't specified this before (copy & paste error) + if (all_funcs[func_name]) + fail(eclass ": duplicate definition found for function: " func_name) + all_funcs[func_name] = func_name + + # grab the docs + getline + if ($2 == "@USAGE:") + usage = eat_line() + if ($2 == "@RETURN:") + funcret = eat_line() + if ($2 == "@MAINTAINER:") + maintainer = eat_paragraph() + if ($2 == "@INTERNAL") { + internal = 1 + getline + } + if ($2 == "@DESCRIPTION:") + desc = eat_paragraph() + + if (internal == 1) + return + + show_function_header() + + # now print out the stuff + print ".TP" + print "\\fB" func_name "\\fR " man_text(usage) + if (desc != "") + print man_text(desc) + if (funcret != "") { + if (desc != "") + print "" + print "Return value: " funcret + } + + if (blurb == "") + fail(func_name ": no @BLURB found") + if (desc == "" && funcret == "") + fail(func_name ": no @DESCRIPTION found") +} + +# +# Handle @VARIABLE and @ECLASS-VARIABLE blocks +# +function _handle_variable() { + var_name = $3 + desc = "" + val = "" + default_unset = 0 + internal = 0 + required = 0 + + # make sure people haven't specified this before (copy & paste error) + if (all_vars[var_name]) + fail(eclass ": duplicate definition found for variable: " var_name) + all_vars[var_name] = var_name + + # grab the optional attributes + opts = 1 + while (opts) { + getline + if ($2 == "@DEFAULT_UNSET") + default_unset = 1 + else if ($2 == "@INTERNAL") + internal = 1 + else if ($2 == "@REQUIRED") + required = 1 + else + opts = 0 + } + if ($2 == "@DESCRIPTION:") + desc = eat_paragraph() + + # extract the default variable value + # first try var="val" + op = "=" + regex = "^.*" var_name "=(.*)$" + val = gensub(regex, "\\1", "", $0) + if (val == $0) { + # next try : ${var:=val} + op = "?=" + regex = "^[[:space:]]*:[[:space:]]*[$]{" var_name ":?=(.*)}" + val = gensub(regex, "\\1", "", $0) + if (val == $0) { + if (default_unset + required + internal == 0) + warn(var_name ": unable to extract default variable content: " $0) + val = "" + } else if (val !~ /^["']/ && val ~ / /) { + if (default_unset == 1) + warn(var_name ": marked as unset, but has value: " val) + val = "\"" val "\"" + } + } + if (length(val)) + val = " " op " \\fI" val "\\fR" + if (required == 1) + val = val " (REQUIRED)" + + if (internal == 1) + return "" + + # now accumulate the stuff + ret = \ + ".TP" "\n" \ + "\\fB" var_name "\\fR" val "\n" \ + man_text(desc) + + if (desc == "") + fail(var_name ": no @DESCRIPTION found") + + return ret +} +function handle_variable() { + show_function_header() + ret = _handle_variable() + if (ret == "") + return + print ret +} +function handle_eclass_variable() { + ret = _handle_variable() + if (ret == "") + return + if (eclass_variables != "") + eclass_variables = eclass_variables "\n" + eclass_variables = eclass_variables ret +} + +# +# Spit out the common footer of manpage +# +function handle_footer() { + if (eclass_variables != "") { + print ".SH \"ECLASS VARIABLES\"" + print man_text(eclass_variables) + } + if (eclass_author != "") { + print ".SH \"AUTHORS\"" + print pre_text(man_text(eclass_author)) + } + if (eclass_maintainer != "") { + print ".SH \"MAINTAINERS\"" + print pre_text(man_text(eclass_maintainer)) + } + print ".SH \"REPORTING BUGS\"" + print reporting_bugs + print ".SH \"FILES\"" + print ".BR " eclassdir "/" eclass + print ".SH \"SEE ALSO\"" + print ".BR ebuild (5)" + print pre_text(gensub("@ECLASS@", eclass, "", vcs_url)) +} + +# +# Init parser +# +BEGIN { + state = "header" + if (PORTDIR == "") + PORTDIR = "/usr/portage" + eclassdir = PORTDIR "/eclass" + reporting_bugs = "Please report bugs via http://bugs.gentoo.org/" + vcs_url = "http://sources.gentoo.org/eclass/@ECLASS@?view=log" +} + +# +# Main parsing routine +# +{ + if (state == "header") { + if ($0 ~ /^# @ECLASS:/) { + handle_eclass() + state = "funcvar" + } else if ($0 == "# @DEAD") { + eclass = "dead" + exit(10) + } else if ($0 == "# @eclass-begin") { + fail("java documentation not supported") + } else if ($0 ~ /^# @/) + warn("Unexpected tag in \"" state "\" state: " $0) + } else if (state == "funcvar") { + if ($0 ~ /^# @FUNCTION:/) + handle_function() + else if ($0 ~ /^# @VARIABLE:/) + handle_variable() + else if ($0 ~ /^# @ECLASS-VARIABLE:/) + handle_eclass_variable() + else if ($0 ~ /^# @/) + warn("Unexpected tag in \"" state "\" state: " $0) + } +} + +# +# Tail end +# +END { + if (eclass == "") + fail("eclass not documented yet (no @ECLASS found)") + else if (eclass != "dead") + handle_footer() +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.sh new file mode 100755 index 0000000000..da97e37727 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +: ${PORTDIR:=/usr/portage} +: ${ECLASSDIR:=${0%/*}/../../../eclass} +: ${FILESDIR:=${ECLASSDIR}/../app-portage/eclass-manpages/files} + +AWK="gawk" +while [[ $# -gt 0 ]] ; do + case $1 in + -e) ECLASSDIR=$2; shift;; + -f) FILESDIR=$2; shift;; + -d) AWK="dgawk";; + *) break;; + esac + shift +done + +if [[ ! -d ${ECLASSDIR} ]] ; then + echo "Usage: ${0##*/} [-e eclassdir] [-f eclass-to-manpage.awk FILESDIR] [eclasses]" 1>&2 + exit 1 +fi + +[[ $# -eq 0 ]] && set -- "${ECLASSDIR}"/*.eclass + +for e in "$@" ; do + set -- \ + ${AWK} \ + -vPORTDIR="${PORTDIR}" \ + -f "${FILESDIR}"/eclass-to-manpage.awk \ + ${e} + if [[ ${AWK} == "gawk" ]] ; then + "$@" > ${e##*/}.5 || rm -f ${e##*/}.5 + else + "$@" + fi +done diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/audioconfig-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/audioconfig-0.0.1-r1.ebuild new file mode 120000 index 0000000000..3b0ae7af6f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/audioconfig-0.0.1-r1.ebuild @@ -0,0 +1 @@ +audioconfig-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/audioconfig-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/audioconfig-0.0.1.ebuild new file mode 100644 index 0000000000..c0c220be2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/audioconfig-0.0.1.ebuild @@ -0,0 +1,20 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Audio configuration files." +HOMEPAGE="http://src.chromium.org" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" + +src_install() { + insinto /etc + doins "${FILESDIR}"/asound.conf || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/files/asound.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/files/asound.conf new file mode 100644 index 0000000000..72b3ed6cd0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/audioconfig/files/asound.conf @@ -0,0 +1,7 @@ +#Route all audio through the CRAS plugin. +pcm.!default { + type cras +} +ctl.!default { + type cras +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-all/autotest-all-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-all/autotest-all-0.0.1-r9.ebuild new file mode 120000 index 0000000000..c4e8d5d996 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-all/autotest-all-0.0.1-r9.ebuild @@ -0,0 +1 @@ +autotest-all-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-all/autotest-all-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-all/autotest-all-0.0.1.ebuild new file mode 100644 index 0000000000..603ed354b7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-all/autotest-all-0.0.1.ebuild @@ -0,0 +1,45 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Meta ebuild for all packages providing tests" +HOMEPAGE="http://www.chromium.org" + +LICENSE="GPL-2" +SLOT=0 +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND=" + chromeos-base/autotest-tests + chromeos-base/autotest-tests-ltp + chromeos-base/autotest-tests-ownershipapi + chromeos-base/autotest-chrome + chromeos-base/autotest-factory + chromeos-base/autotest-private +" + +DEPEND="${RDEPEND}" + +SUITE_DEPENDENCIES_FILE="dependency_info" + +src_unpack() { + elog "Unpacking..." + mkdir -p "${S}" + touch "${S}/${SUITE_DEPENDENCIES_FILE}" +} + +src_install() { + # So that this package properly owns the file + insinto /usr/local/autotest/test_suites + doins "${SUITE_DEPENDENCIES_FILE}" +} + +# Pre-processes control files and installs DEPENDENCIES info. +pkg_postinst() { + local root_autotest_dir="${ROOT}/usr/local/autotest" + python -B "${root_autotest_dir}/site_utils/suite_preprocessor.py" \ + -a "${root_autotest_dir}" \ + -o "${root_autotest_dir}/test_suites/${SUITE_DEPENDENCIES_FILE}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-chrome/autotest-chrome-0.0.1-r2123.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-chrome/autotest-chrome-0.0.1-r2123.ebuild new file mode 100644 index 0000000000..220633cd4b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-chrome/autotest-chrome-0.0.1-r2123.ebuild @@ -0,0 +1,119 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +inherit toolchain-funcs flag-o-matic cros-workon autotest + +DESCRIPTION="Autotest tests that require chrome_test or pyauto deps" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +RDEPEND=" + chromeos-base/autotest-tests + chromeos-base/chromeos-chrome + chromeos-base/flimflam-test + tests_audiovideo_PlaybackRecordSemiAuto? ( media-sound/alsa-utils ) +" + +DEPEND="${RDEPEND}" + +IUSE_TESTS=( + # Inherits from enterprise_ui_test. + +tests_desktopui_EnterprisePolicy + + # Uses chrome_test dependency. + +tests_audiovideo_FFMPEG + +tests_audiovideo_VDA + + # Inherits from cros_ui_test. + +tests_desktopui_BrowserTest + +tests_desktopui_DocViewing + +tests_desktopui_PyAutoEnduranceTests + +tests_desktopui_PyAutoFunctionalTests + +tests_desktopui_PyAutoInstall + +tests_desktopui_PyAutoPerfTests + +tests_desktopui_SyncIntegrationTests + +tests_audiovideo_PlaybackRecordSemiAuto + +tests_desktopui_AudioFeedback + +tests_desktopui_ChromeSemiAuto + +tests_desktopui_FlashSanityCheck + +tests_desktopui_IBusTest + +tests_desktopui_ImeTest + +tests_desktopui_LoadBigFile + +tests_desktopui_MediaAudioFeedback + +tests_desktopui_NaClSanity + +tests_desktopui_ScreenLocker + +tests_desktopui_SimpleLogin + tests_desktopui_TouchScreen + +tests_desktopui_UrlFetch + +tests_desktopui_WebRTC + +tests_desktopui_VideoSanity + +tests_desktopui_YouTubeHTML5 + +tests_enterprise_DevicePolicy + +tests_graphics_GLAPICheck + +tests_graphics_GpuReset + +tests_graphics_Piglit + +tests_graphics_SanAngeles + +tests_graphics_TearTest + +tests_graphics_VTSwitch + +tests_graphics_WebGLConformance + +tests_graphics_WebGLPerformance + +tests_graphics_WindowManagerGraphicsCapture + +tests_hardware_BluetoothSemiAuto + +tests_hardware_ExternalDrives + +tests_hardware_USB20 + +tests_hardware_UsbPlugIn + tests_logging_AsanCrash + +tests_logging_UncleanShutdown + +tests_login_BadAuthentication + +tests_login_ChromeProfileSanitary + +tests_login_CryptohomeIncognitoMounted + +tests_login_CryptohomeIncognitoUnmounted + +tests_login_CryptohomeMounted + +tests_login_CryptohomeUnmounted + +tests_login_LoginSuccess + +tests_login_LogoutProcessCleanup + +tests_login_RemoteLogin + +tests_network_3GSuspendResume + +tests_network_NavigateToUrl + +tests_network_ONC + +tests_platform_Pkcs11InitOnLogin + +tests_platform_Pkcs11Persistence + +tests_platform_ProcessPrivileges + +tests_power_AudioDetector + +tests_power_Consumption + +tests_power_Idle + +tests_power_LoadTest + +tests_power_SuspendStress + +tests_power_UiResume + +tests_power_VideoDetector + +tests_power_VideoSuspend + +tests_realtimecomm_GTalkAudioPlayground + +tests_realtimecomm_GTalkPlayground + +tests_security_BluetoothUIXSS + +tests_security_BundledExtensions + +tests_security_NetworkListeners + +tests_security_ProfilePermissions + +tests_security_RendererSandbox +) + +IUSE="${IUSE} ${IUSE_TESTS[*]}" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="" +AUTOTEST_CONFIG_LIST="" +AUTOTEST_PROFILERS_LIST="" + +AUTOTEST_FILE_MASK="*.a *.tar.bz2 *.tbz2 *.tgz *.tar.gz" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-chrome/autotest-chrome-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-chrome/autotest-chrome-9999.ebuild new file mode 100644 index 0000000000..b2aee99536 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-chrome/autotest-chrome-9999.ebuild @@ -0,0 +1,117 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +inherit toolchain-funcs flag-o-matic cros-workon autotest + +DESCRIPTION="Autotest tests that require chrome_test or pyauto deps" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +RDEPEND=" + chromeos-base/autotest-tests + chromeos-base/chromeos-chrome + chromeos-base/flimflam-test + tests_audiovideo_PlaybackRecordSemiAuto? ( media-sound/alsa-utils ) +" + +DEPEND="${RDEPEND}" + +IUSE_TESTS=( + # Inherits from enterprise_ui_test. + +tests_desktopui_EnterprisePolicy + + # Uses chrome_test dependency. + +tests_audiovideo_FFMPEG + +tests_audiovideo_VDA + + # Inherits from cros_ui_test. + +tests_desktopui_BrowserTest + +tests_desktopui_DocViewing + +tests_desktopui_PyAutoEnduranceTests + +tests_desktopui_PyAutoFunctionalTests + +tests_desktopui_PyAutoInstall + +tests_desktopui_PyAutoPerfTests + +tests_desktopui_SyncIntegrationTests + +tests_audiovideo_PlaybackRecordSemiAuto + +tests_desktopui_AudioFeedback + +tests_desktopui_ChromeSemiAuto + +tests_desktopui_FlashSanityCheck + +tests_desktopui_IBusTest + +tests_desktopui_ImeTest + +tests_desktopui_LoadBigFile + +tests_desktopui_MediaAudioFeedback + +tests_desktopui_NaClSanity + +tests_desktopui_ScreenLocker + +tests_desktopui_SimpleLogin + tests_desktopui_TouchScreen + +tests_desktopui_UrlFetch + +tests_desktopui_WebRTC + +tests_desktopui_VideoSanity + +tests_desktopui_YouTubeHTML5 + +tests_enterprise_DevicePolicy + +tests_graphics_GLAPICheck + +tests_graphics_GpuReset + +tests_graphics_Piglit + +tests_graphics_SanAngeles + +tests_graphics_TearTest + +tests_graphics_VTSwitch + +tests_graphics_WebGLConformance + +tests_graphics_WebGLPerformance + +tests_graphics_WindowManagerGraphicsCapture + +tests_hardware_BluetoothSemiAuto + +tests_hardware_ExternalDrives + +tests_hardware_USB20 + +tests_hardware_UsbPlugIn + tests_logging_AsanCrash + +tests_logging_UncleanShutdown + +tests_login_BadAuthentication + +tests_login_ChromeProfileSanitary + +tests_login_CryptohomeIncognitoMounted + +tests_login_CryptohomeIncognitoUnmounted + +tests_login_CryptohomeMounted + +tests_login_CryptohomeUnmounted + +tests_login_LoginSuccess + +tests_login_LogoutProcessCleanup + +tests_login_RemoteLogin + +tests_network_3GSuspendResume + +tests_network_NavigateToUrl + +tests_network_ONC + +tests_platform_Pkcs11InitOnLogin + +tests_platform_Pkcs11Persistence + +tests_platform_ProcessPrivileges + +tests_power_AudioDetector + +tests_power_Consumption + +tests_power_Idle + +tests_power_LoadTest + +tests_power_SuspendStress + +tests_power_UiResume + +tests_power_VideoDetector + +tests_power_VideoSuspend + +tests_realtimecomm_GTalkAudioPlayground + +tests_realtimecomm_GTalkPlayground + +tests_security_BluetoothUIXSS + +tests_security_BundledExtensions + +tests_security_NetworkListeners + +tests_security_ProfilePermissions + +tests_security_RendererSandbox +) + +IUSE="${IUSE} ${IUSE_TESTS[*]}" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="" +AUTOTEST_CONFIG_LIST="" +AUTOTEST_PROFILERS_LIST="" + +AUTOTEST_FILE_MASK="*.a *.tar.bz2 *.tbz2 *.tgz *.tar.gz" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-audioloop/autotest-deps-audioloop-0.0.1-r2663.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-audioloop/autotest-deps-audioloop-0.0.1-r2663.ebuild new file mode 100644 index 0000000000..0af146b663 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-audioloop/autotest-deps-audioloop-0.0.1-r2663.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest audioloop dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="audioloop" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/audioloop +RDEPEND="${RDEPEND} + media-libs/alsa-lib + media-sound/adhd" + +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-audioloop/autotest-deps-audioloop-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-audioloop/autotest-deps-audioloop-9999.ebuild new file mode 100644 index 0000000000..ade6f6fe6a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-audioloop/autotest-deps-audioloop-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest audioloop dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="audioloop" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/audioloop +RDEPEND="${RDEPEND} + media-libs/alsa-lib + media-sound/adhd" + +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-ffmpeg/autotest-deps-ffmpeg-0.0.1-r1511.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-ffmpeg/autotest-deps-ffmpeg-0.0.1-r1511.ebuild new file mode 100644 index 0000000000..3778f28709 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-ffmpeg/autotest-deps-ffmpeg-0.0.1-r1511.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest chromium ffmpeg dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# Autotest enabled by default. +IUSE="+autotest" + +AUTOTEST_DEPS_LIST="ffmpeg" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/ffmpeg +RDEPEND="${RDEPEND} + chromeos-base/chromeos-chrome +" + +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-ffmpeg/autotest-deps-ffmpeg-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-ffmpeg/autotest-deps-ffmpeg-9999.ebuild new file mode 100644 index 0000000000..7f14e5a8d9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-ffmpeg/autotest-deps-ffmpeg-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest chromium ffmpeg dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +# Autotest enabled by default. +IUSE="+autotest" + +AUTOTEST_DEPS_LIST="ffmpeg" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/ffmpeg +RDEPEND="${RDEPEND} + chromeos-base/chromeos-chrome +" + +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glbench/autotest-deps-glbench-0.0.1-r3223.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glbench/autotest-deps-glbench-0.0.1-r3223.ebuild new file mode 100644 index 0000000000..8b6edb3ac5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glbench/autotest-deps-glbench-0.0.1-r3223.ebuild @@ -0,0 +1,47 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +CONFLICT_LIST="chromeos-base/autotest-deps-0.0.1-r321" +inherit cros-workon autotest-deponly conflict cros-debug + +DESCRIPTION="Autotest glbench dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +LIBCHROME_VERS="125070" + +RDEPEND="${RDEPEND} + dev-cpp/gflags + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + virtual/opengl + opengles? ( virtual/opengles ) + x11-apps/xwd +" + +DEPEND="${RDEPEND} + opengles? ( x11-drivers/opengles-headers )" + +AUTOTEST_DEPS_LIST="glbench" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +src_prepare() { + autotest-deponly_src_prepare + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glbench/autotest-deps-glbench-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glbench/autotest-deps-glbench-9999.ebuild new file mode 100644 index 0000000000..f6ad0d9b3d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glbench/autotest-deps-glbench-9999.ebuild @@ -0,0 +1,45 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +CONFLICT_LIST="chromeos-base/autotest-deps-0.0.1-r321" +inherit cros-workon autotest-deponly conflict cros-debug + +DESCRIPTION="Autotest glbench dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +LIBCHROME_VERS="125070" + +RDEPEND="${RDEPEND} + dev-cpp/gflags + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + virtual/opengl + opengles? ( virtual/opengles ) + x11-apps/xwd +" + +DEPEND="${RDEPEND} + opengles? ( x11-drivers/opengles-headers )" + +AUTOTEST_DEPS_LIST="glbench" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +src_prepare() { + autotest-deponly_src_prepare + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r1798.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r1798.ebuild new file mode 100644 index 0000000000..5b18fb56d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r1798.ebuild @@ -0,0 +1,40 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest glmark2 dependency" +HOMEPAGE="https://launchpad.net/glmark2" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# Autotest enabled by default. +IUSE="+autotest" + +AUTOTEST_DEPS_LIST="glmark2" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/glmark2 +RDEPEND=" + virtual/opengl + media-libs/libpng + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext +" + +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild new file mode 100644 index 0000000000..ceee1eeb98 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild @@ -0,0 +1,40 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +CROS_WORKON_COMMIT="6c2d8194633ffe128f3afbc094a03ef22bd29a8a" +CROS_WORKON_TREE="3fac66aefc84fb25e5359292e9153c676ccbbf6f" + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest glmark2 dependency" +HOMEPAGE="https://launchpad.net/glmark2" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# Autotest enabled by default. +IUSE="+autotest" + +AUTOTEST_DEPS_LIST="glmark2" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/glmark2 +RDEPEND=" + virtual/opengl + media-libs/libpng + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext +" + +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-9999.ebuild new file mode 100644 index 0000000000..d5fb09e186 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest glmark2 dependency" +HOMEPAGE="https://launchpad.net/glmark2" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +# Autotest enabled by default. +IUSE="+autotest" + +AUTOTEST_DEPS_LIST="glmark2" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/glmark2 +RDEPEND=" + virtual/opengl + media-libs/libpng + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext +" + +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-iotools/autotest-deps-iotools-0.0.1-r3219.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-iotools/autotest-deps-iotools-0.0.1-r3219.ebuild new file mode 100644 index 0000000000..824871011a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-iotools/autotest-deps-iotools-0.0.1-r3219.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +CONFLICT_LIST="chromeos-base/autotest-deps-0.0.1-r321" +inherit cros-workon autotest-deponly conflict + +DESCRIPTION="Autotest iotools dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="iotools" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-iotools/autotest-deps-iotools-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-iotools/autotest-deps-iotools-9999.ebuild new file mode 100644 index 0000000000..ebe44c9587 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-iotools/autotest-deps-iotools-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +CONFLICT_LIST="chromeos-base/autotest-deps-0.0.1-r321" +inherit cros-workon autotest-deponly conflict + +DESCRIPTION="Autotest iotools dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="iotools" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-libaio/autotest-deps-libaio-0.0.1-r3221.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-libaio/autotest-deps-libaio-0.0.1-r3221.ebuild new file mode 100644 index 0000000000..5b06960444 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-libaio/autotest-deps-libaio-0.0.1-r3221.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +CONFLICT_LIST="chromeos-base/autotest-deps-0.0.1-r321" +inherit cros-workon autotest-deponly conflict + +DESCRIPTION="Autotest libaio dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="libaio" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-libaio/autotest-deps-libaio-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-libaio/autotest-deps-libaio-9999.ebuild new file mode 100644 index 0000000000..e32edf4026 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-libaio/autotest-deps-libaio-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +CONFLICT_LIST="chromeos-base/autotest-deps-0.0.1-r321" +inherit cros-workon autotest-deponly conflict + +DESCRIPTION="Autotest libaio dep" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="libaio" + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r2978.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r2978.ebuild new file mode 100644 index 0000000000..eea97af505 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r2978.ebuild @@ -0,0 +1,50 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + + +inherit cros-workon autotest-deponly + +DESCRIPTION="dependencies for Piglit (collection of automated tests for OpenGl based on glean and mesa)" +HOMEPAGE="http://cgit.freedesktop.org/piglit" +SRC_URI="" +LICENSE="GPL" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="piglit" +RDEPEND=" + virtual/glut + virtual/opengl + dev-python/mako + dev-python/numpy + media-libs/tiff + media-libs/libpng + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXpm + " +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +DEPEND="${RDEPEND}" + +# export a variable so that piglit knows where to find libglut.so +export GLUT_LIBDIR=/usr/$(get_libdir) diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-9999.ebuild new file mode 100644 index 0000000000..9b40df9581 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-9999.ebuild @@ -0,0 +1,48 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + + +inherit cros-workon autotest-deponly + +DESCRIPTION="dependencies for Piglit (collection of automated tests for OpenGl based on glean and mesa)" +HOMEPAGE="http://cgit.freedesktop.org/piglit" +SRC_URI="" +LICENSE="GPL" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="piglit" +RDEPEND=" + virtual/glut + virtual/opengl + dev-python/mako + dev-python/numpy + media-libs/tiff + media-libs/libpng + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXpm + " +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +DEPEND="${RDEPEND}" + +# export a variable so that piglit knows where to find libglut.so +export GLUT_LIBDIR=/usr/$(get_libdir) diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild new file mode 100644 index 0000000000..7279dd9e13 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild @@ -0,0 +1,74 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest common deps" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +# following deps don't compile: boottool, mysql, pgpool, pgsql, systemtap, # dejagnu, libcap, libnet +# following deps are not deps: factory +# following tests are going to be moved: chrome_test +AUTOTEST_DEPS_LIST="fio gfxtest gtest hdparm ibusclient iwcap realtimecomm_playground sysstat sox test_tones fakegudev fakemodem pyxinput example_cros_dep" +AUTOTEST_CONFIG_LIST=* +AUTOTEST_PROFILERS_LIST=* + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/gtest +RDEPEND=" + dev-cpp/gtest +" + +RDEPEND="${RDEPEND} + chromeos-base/autotest-deps-libaio +" + +# deps/chrome_test +#RDEPEND="${RDEPEND} +# chromeos-base/chromeos-chrome +#" + +# deps/ibusclient +RDEPEND="${RDEPEND} + app-i18n/ibus + dev-libs/glib + sys-apps/dbus +" + +# deps/iwcap +RDEPEND="${RDEPEND} + dev-libs/libnl:0 +" + +# deps/fakegudev +RDEPEND="${RDEPEND} + sys-fs/udev[gudev] +" + +# deps/fakemodem +RDEPEND="${RDEPEND} + chromeos-base/autotest-fakemodem-conf +" + +RDEPEND="${RDEPEND} + sys-devel/binutils +" +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps/autotest-deps-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps/autotest-deps-9999.ebuild new file mode 100644 index 0000000000..27494d9032 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps/autotest-deps-9999.ebuild @@ -0,0 +1,72 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +inherit cros-workon autotest-deponly + +DESCRIPTION="Autotest common deps" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +# Autotest enabled by default. +IUSE="+autotest" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +# following deps don't compile: boottool, mysql, pgpool, pgsql, systemtap, # dejagnu, libcap, libnet +# following deps are not deps: factory +# following tests are going to be moved: chrome_test +AUTOTEST_DEPS_LIST="fio gfxtest gtest hdparm ibusclient iwcap realtimecomm_playground sysstat sox test_tones fakegudev fakemodem pyxinput example_cros_dep" +AUTOTEST_CONFIG_LIST=* +AUTOTEST_PROFILERS_LIST=* + +# NOTE: For deps, we need to keep *.a +AUTOTEST_FILE_MASK="*.tar.bz2 *.tbz2 *.tgz *.tar.gz" + +# deps/gtest +RDEPEND=" + dev-cpp/gtest +" + +RDEPEND="${RDEPEND} + chromeos-base/autotest-deps-libaio +" + +# deps/chrome_test +#RDEPEND="${RDEPEND} +# chromeos-base/chromeos-chrome +#" + +# deps/ibusclient +RDEPEND="${RDEPEND} + app-i18n/ibus + dev-libs/glib + sys-apps/dbus +" + +# deps/iwcap +RDEPEND="${RDEPEND} + dev-libs/libnl:0 +" + +# deps/fakegudev +RDEPEND="${RDEPEND} + sys-fs/udev[gudev] +" + +# deps/fakemodem +RDEPEND="${RDEPEND} + chromeos-base/autotest-fakemodem-conf +" + +RDEPEND="${RDEPEND} + sys-devel/binutils +" +DEPEND="${RDEPEND}" + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-factory/autotest-factory-0.0.1-r3236.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-factory/autotest-factory-0.0.1-r3236.ebuild new file mode 100644 index 0000000000..a04e2eaae8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-factory/autotest-factory-0.0.1-r3236.ebuild @@ -0,0 +1,99 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +CONFLICT_LIST="chromeos-base/autotest-tests-0.0.1-r335" +inherit toolchain-funcs flag-o-matic cros-workon autotest conflict + +DESCRIPTION="Autotest Factory tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +IUSE="+xset hardened" +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +# Factory tests require locally installed deps, which are called out in +# autotest-factory-deps. +RDEPEND=" + chromeos-base/autotest-deps-iotools + chromeos-base/autotest-deps-libaio + chromeos-base/autotest-deps-audioloop + chromeos-base/autotest-deps-glbench + chromeos-base/autotest-private-board + chromeos-base/chromeos-factory + chromeos-base/flimflam-test + >=chromeos-base/vpd-0.0.1-r11 + dev-python/jsonrpclib + dev-python/pygobject + dev-python/pygtk + dev-python/ws4py + xset? ( x11-apps/xset ) +" + +DEPEND="${RDEPEND}" + +IUSE_TESTS=" + +tests_dummy_Fail + +tests_dummy_Pass + +tests_factory_Antenna + +tests_factory_Audio + +tests_factory_AudioInternalLoopback + +tests_factory_AudioLoop + +tests_factory_AudioQuality + +tests_factory_BasicCellular + +tests_factory_BasicGPS + +tests_factory_BasicWifi + +tests_factory_Camera + +tests_factory_CameraPerformanceAls + +tests_factory_Cellular + +tests_factory_Connector + +tests_factory_DeveloperRecovery + +tests_factory_Display + +tests_factory_Dummy + +tests_factory_ExtDisplay + +tests_factory_ExternalStorage + +tests_factory_Fail + +tests_factory_Finalize + +tests_factory_HWID + +tests_factory_Keyboard + +tests_factory_KeyboardBacklight + +tests_factory_Leds + +tests_factory_LidSwitch + +tests_factory_LightSensor + +tests_factory_ProbeWifi + +tests_factory_Prompt + +tests_factory_RemovableStorage + +tests_factory_RunScript + +tests_factory_ScanSN + +tests_factory_ScriptWrapper + +tests_factory_Start + +tests_factory_StressTest + +tests_factory_SyncEventLogs + +tests_factory_Touchpad + +tests_factory_Touchscreen + +tests_factory_TPM + +tests_factory_USB + +tests_factory_VerifyComponents + +tests_factory_VPD + +tests_factory_Wifi + +tests_suite_Factory +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="" +AUTOTEST_CONFIG_LIST="" +AUTOTEST_PROFILERS_LIST="" + +AUTOTEST_FILE_MASK="*.a *.tar.bz2 *.tbz2 *.tgz *.tar.gz" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-factory/autotest-factory-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-factory/autotest-factory-9999.ebuild new file mode 100644 index 0000000000..3a1665086e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-factory/autotest-factory-9999.ebuild @@ -0,0 +1,97 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +CONFLICT_LIST="chromeos-base/autotest-tests-0.0.1-r335" +inherit toolchain-funcs flag-o-matic cros-workon autotest conflict + +DESCRIPTION="Autotest Factory tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +IUSE="+xset hardened" +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +# Factory tests require locally installed deps, which are called out in +# autotest-factory-deps. +RDEPEND=" + chromeos-base/autotest-deps-iotools + chromeos-base/autotest-deps-libaio + chromeos-base/autotest-deps-audioloop + chromeos-base/autotest-deps-glbench + chromeos-base/autotest-private-board + chromeos-base/chromeos-factory + chromeos-base/flimflam-test + >=chromeos-base/vpd-0.0.1-r11 + dev-python/jsonrpclib + dev-python/pygobject + dev-python/pygtk + dev-python/ws4py + xset? ( x11-apps/xset ) +" + +DEPEND="${RDEPEND}" + +IUSE_TESTS=" + +tests_dummy_Fail + +tests_dummy_Pass + +tests_factory_Antenna + +tests_factory_Audio + +tests_factory_AudioInternalLoopback + +tests_factory_AudioLoop + +tests_factory_AudioQuality + +tests_factory_BasicCellular + +tests_factory_BasicGPS + +tests_factory_BasicWifi + +tests_factory_Camera + +tests_factory_CameraPerformanceAls + +tests_factory_Cellular + +tests_factory_Connector + +tests_factory_DeveloperRecovery + +tests_factory_Display + +tests_factory_Dummy + +tests_factory_ExtDisplay + +tests_factory_ExternalStorage + +tests_factory_Fail + +tests_factory_Finalize + +tests_factory_HWID + +tests_factory_Keyboard + +tests_factory_KeyboardBacklight + +tests_factory_Leds + +tests_factory_LidSwitch + +tests_factory_LightSensor + +tests_factory_ProbeWifi + +tests_factory_Prompt + +tests_factory_RemovableStorage + +tests_factory_RunScript + +tests_factory_ScanSN + +tests_factory_ScriptWrapper + +tests_factory_Start + +tests_factory_StressTest + +tests_factory_SyncEventLogs + +tests_factory_Touchpad + +tests_factory_Touchscreen + +tests_factory_TPM + +tests_factory_USB + +tests_factory_VerifyComponents + +tests_factory_VPD + +tests_factory_Wifi + +tests_suite_Factory +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=../third_party/autotest +CROS_WORKON_SUBDIR=files + +AUTOTEST_DEPS_LIST="" +AUTOTEST_CONFIG_LIST="" +AUTOTEST_PROFILERS_LIST="" + +AUTOTEST_FILE_MASK="*.a *.tar.bz2 *.tbz2 *.tgz *.tar.gz" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-fakemodem-conf/autotest-fakemodem-conf-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-fakemodem-conf/autotest-fakemodem-conf-0.0.1.ebuild new file mode 100644 index 0000000000..605a24beb8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-fakemodem-conf/autotest-fakemodem-conf-0.0.1.ebuild @@ -0,0 +1,16 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Runtime configuration file for fakemodem (autotest dep)" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_install() { + insinto /etc/dbus-1/system.d + doins "${FILESDIR}/org.chromium.FakeModem.conf" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-fakemodem-conf/files/org.chromium.FakeModem.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-fakemodem-conf/files/org.chromium.FakeModem.conf new file mode 100644 index 0000000000..d3891c70b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-fakemodem-conf/files/org.chromium.FakeModem.conf @@ -0,0 +1,9 @@ + + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private-board/autotest-private-board-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private-board/autotest-private-board-0.0.1-r1.ebuild new file mode 100644 index 0000000000..5653c3b49c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private-board/autotest-private-board-0.0.1-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Board specific autotests" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" + +# +# WARNING: Nothing should be added to this ebuild. This ebuild is overriden +# in most of the board specific overlays, or will be. +# diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private/autotest-private-0.1.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private/autotest-private-0.1.0-r1.ebuild new file mode 120000 index 0000000000..b79439046c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private/autotest-private-0.1.0-r1.ebuild @@ -0,0 +1 @@ +autotest-private-0.1.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private/autotest-private-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private/autotest-private-0.1.0.ebuild new file mode 100644 index 0000000000..cf29c540f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-private/autotest-private-0.1.0.ebuild @@ -0,0 +1,25 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +# CROS_WORKON_REPO=FILL_YOUR_REPO_URL_HERE +# inherit toolchain-funcs flag-o-matic cros-workon autotest + +DESCRIPTION="Private autotest tests" +HOMEPAGE="http://src.chromium.org" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +DEPEND="" +RDEPEND="" + +# This ebuild file is reserved for adding new private tests in your factory +# process. You can change the CROS_WORKON_REPO to your own server, and uncomment +# the following CROS_WORKON_* variables to have your own tests merged when +# building factory test run-in images. + +# CROS_WORKON_PROJECT=autotest-private +# CROS_WORKON_LOCALNAME=../third_party/autotest-private +# CROS_WORKON_SUBDIR= diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-tests-ltp/autotest-tests-ltp-0.0.1-r1886.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-tests-ltp/autotest-tests-ltp-0.0.1-r1886.ebuild new file mode 100644 index 0000000000..a6c8aaef56 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-tests-ltp/autotest-tests-ltp-0.0.1-r1886.ebuild @@ -0,0 +1,46 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="c04bdd4a43f9a240961c8fb07afc1386fddb5826" +CROS_WORKON_TREE="fb8c4062f8c8ed9467124d53053e7c108d1eab34" +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +CONFLICT_LIST="chromeos-base/autotest-tests-0.0.1-r596" + +inherit toolchain-funcs flag-o-matic cros-workon autotest conflict + +DESCRIPTION="ltp autotest" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +IUSE="hardened" +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +RDEPEND="${RDEPEND} + chromeos-base/protofiles + dev-libs/protobuf + dev-python/pygobject + !/dev/null + cp -fpru "${S}"/client/{bin,common_lib,tools} "${AUTOTEST_WORK}/client" + cp -fpu "${S}"/server/* "${AUTOTEST_WORK}/server" &>/dev/null + cp -fpru "${S}"/server/{bin,control_segments,hosts,site_tests,tests} \ + "${AUTOTEST_WORK}/server" + cp -fpru "${S}"/{conmux,tko,utils,site_utils,test_suites,frontend} "${AUTOTEST_WORK}" + + # cros directory is not from autotest upstream but cros project specific. + cp -fpru "${S}"/client/cros "${AUTOTEST_WORK}/client" + + cp -fpru "${S}"/server/cros "${AUTOTEST_WORK}/server" + + # Pre-create test directories. + local test_dirs=" + client/tests client/site_tests + client/config client/deps client/profilers + packages" + local dir + for dir in ${test_dirs}; do + mkdir "${AUTOTEST_WORK}/${dir}" + touch "${AUTOTEST_WORK}/${dir}"/.keep + done + + sed "/^enable_server_prebuild/d" "${S}/global_config.ini" > \ + "${AUTOTEST_WORK}/global_config.ini" +} + +src_install() { + insinto /usr/local/autotest + doins -r "${AUTOTEST_WORK}"/* + + # base __init__.py + touch "${D}"/usr/local/autotest/__init__.py + + # TODO: This should be more selective + chmod -R a+x "${D}"/usr/local/autotest + + # setup stuff needed for read/write operation + chmod a+wx "${D}/usr/local/autotest/packages" + + dodir "/usr/local/autotest/client/packages" + chmod a+wx "${D}/usr/local/autotest/client/packages" + + dodir "/usr/local/autotest/server/tmp" + chmod a+wx "${D}/usr/local/autotest/server/tmp" + + # Set up symlinks so that debug info works for autotests. + dodir /usr/lib/debug/usr/local/autotest/ + dosym client/site_tests /usr/lib/debug/usr/local/autotest/tests +} + +# Packages client. +pkg_postinst() { + local root_autotest_dir="${ROOT}/usr/local/autotest" + flock "${root_autotest_dir}/packages" \ + -c "python -B ${root_autotest_dir}/utils/packager.py \ + -r ${root_autotest_dir}/packages --client upload" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest/autotest-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest/autotest-9999.ebuild new file mode 100644 index 0000000000..aec4c435d5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest/autotest-9999.ebuild @@ -0,0 +1,98 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/autotest" + +inherit toolchain-funcs flag-o-matic cros-workon + +DESCRIPTION="Autotest scripts and tools" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +RDEPEND=" + !/dev/null + cp -fpru "${S}"/client/{bin,common_lib,tools} "${AUTOTEST_WORK}/client" + cp -fpu "${S}"/server/* "${AUTOTEST_WORK}/server" &>/dev/null + cp -fpru "${S}"/server/{bin,control_segments,hosts,site_tests,tests} \ + "${AUTOTEST_WORK}/server" + cp -fpru "${S}"/{conmux,tko,utils,site_utils,test_suites,frontend} "${AUTOTEST_WORK}" + + # cros directory is not from autotest upstream but cros project specific. + cp -fpru "${S}"/client/cros "${AUTOTEST_WORK}/client" + + cp -fpru "${S}"/server/cros "${AUTOTEST_WORK}/server" + + # Pre-create test directories. + local test_dirs=" + client/tests client/site_tests + client/config client/deps client/profilers + packages" + local dir + for dir in ${test_dirs}; do + mkdir "${AUTOTEST_WORK}/${dir}" + touch "${AUTOTEST_WORK}/${dir}"/.keep + done + + sed "/^enable_server_prebuild/d" "${S}/global_config.ini" > \ + "${AUTOTEST_WORK}/global_config.ini" +} + +src_install() { + insinto /usr/local/autotest + doins -r "${AUTOTEST_WORK}"/* + + # base __init__.py + touch "${D}"/usr/local/autotest/__init__.py + + # TODO: This should be more selective + chmod -R a+x "${D}"/usr/local/autotest + + # setup stuff needed for read/write operation + chmod a+wx "${D}/usr/local/autotest/packages" + + dodir "/usr/local/autotest/client/packages" + chmod a+wx "${D}/usr/local/autotest/client/packages" + + dodir "/usr/local/autotest/server/tmp" + chmod a+wx "${D}/usr/local/autotest/server/tmp" + + # Set up symlinks so that debug info works for autotests. + dodir /usr/lib/debug/usr/local/autotest/ + dosym client/site_tests /usr/lib/debug/usr/local/autotest/tests +} + +# Packages client. +pkg_postinst() { + local root_autotest_dir="${ROOT}/usr/local/autotest" + flock "${root_autotest_dir}/packages" \ + -c "python -B ${root_autotest_dir}/utils/packager.py \ + -r ${root_autotest_dir}/packages --client upload" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autox/autox-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autox/autox-0.0.1-r11.ebuild new file mode 100644 index 0000000000..14d3d0ef74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autox/autox-0.0.1-r11.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="0e87afb2d4f6cef2b5ecca593e21117a5e9379a0" +CROS_WORKON_TREE="611b421824a85dff20fd67f6cb25b6eab9f36730" +CROS_WORKON_PROJECT="chromiumos/platform/autox" + +inherit python cros-workon + +DESCRIPTION="AutoX library for interacting with X apps" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="dev-python/python-xlib" +DEPEND= + +src_install() { + insinto "$(python_get_sitedir)" + doins autox.py || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autox/autox-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autox/autox-9999.ebuild new file mode 100644 index 0000000000..50e093a5b4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autox/autox-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/autox" + +inherit python cros-workon + +DESCRIPTION="AutoX library for interacting with X apps" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="dev-python/python-xlib" +DEPEND= + +src_install() { + insinto "$(python_get_sitedir)" + doins autox.py || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/board-devices/board-devices-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/board-devices/board-devices-0.0.1.ebuild new file mode 100644 index 0000000000..d2faf73cd8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/board-devices/board-devices-0.0.1.ebuild @@ -0,0 +1,18 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Generic board (meta package)" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" + +# +# WARNING: Nothing should be added to this ebuild. This ebuild is overriden +# in most of the board specific overlays, or will be. +# diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/bootstat/bootstat-0.0.1-r19.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/bootstat/bootstat-0.0.1-r19.ebuild new file mode 100644 index 0000000000..daef026c6b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/bootstat/bootstat-0.0.1-r19.ebuild @@ -0,0 +1,50 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="7cbe18c6f1b8446d486a501a94297e6b04128b6d" +CROS_WORKON_TREE="b5ef87a2635b6cbba9816bf32c256b3cdec80cef" +CROS_WORKON_PROJECT="chromiumos/platform/bootstat" +inherit cros-workon + +DESCRIPTION="Chrome OS Boot Time Statistics Utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="" + +RDEPEND="" + +DEPEND="dev-cpp/gtest" + +src_compile() { + tc-export CC CXX AR PKG_CONFIG + emake || die "bootstat compile failed." +} + +src_test() { + tc-export CC CXX AR PKG_CONFIG + emake tests || die "could not build tests" + if ! use x86 && ! use amd64 ; then + echo Skipping unit tests on non-x86 platform + else + for test in ./*_test; do + "${test}" ${GTEST_ARGS} || die "${test} failed" + done + fi +} + +src_install() { + into / + dosbin bootstat || die + dosbin bootstat_get_last || die + dobin bootstat_summary || die + + into /usr + dolib.a libbootstat.a || die + + insinto /usr/include/metrics + doins bootstat.h || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/bootstat/bootstat-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/bootstat/bootstat-9999.ebuild new file mode 100644 index 0000000000..2552bb3f59 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/bootstat/bootstat-9999.ebuild @@ -0,0 +1,48 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/bootstat" +inherit cros-workon + +DESCRIPTION="Chrome OS Boot Time Statistics Utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="" + +RDEPEND="" + +DEPEND="dev-cpp/gtest" + +src_compile() { + tc-export CC CXX AR PKG_CONFIG + emake || die "bootstat compile failed." +} + +src_test() { + tc-export CC CXX AR PKG_CONFIG + emake tests || die "could not build tests" + if ! use x86 && ! use amd64 ; then + echo Skipping unit tests on non-x86 platform + else + for test in ./*_test; do + "${test}" ${GTEST_ARGS} || die "${test} failed" + done + fi +} + +src_install() { + into / + dosbin bootstat || die + dosbin bootstat_get_last || die + dobin bootstat_summary || die + + into /usr + dolib.a libbootstat.a || die + + insinto /usr/include/metrics + doins bootstat.h || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/brcmfmac-nvram-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/brcmfmac-nvram-0.0.1-r1.ebuild new file mode 100644 index 0000000000..cc1d3ec52a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/brcmfmac-nvram-0.0.1-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +inherit confutils + +EAPI="2" + +DESCRIPTION="NVRAM image for the brcmfmac driver" +HOMEPAGE="http://src.chromium.org" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="arm" +NVRAM_USE="awnh610 awnh930" +IUSE=${NVRAM_USE} + +pkg_setup() { + confutils_init + confutils_require_one ${NVRAM_USE} +} + +src_install() { + insinto /lib/firmware/brcm + if use awnh610 ; then + newins "${FILESDIR}"/bcm4329-fullmac-4.txt-awnh610 bcm4329-fullmac-4.txt || die + elif use awnh930 ; then + newins "${FILESDIR}"/bcm4329-fullmac-4.txt-awnh930 bcm4329-fullmac-4.txt || die + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/files/bcm4329-fullmac-4.txt-awnh610 b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/files/bcm4329-fullmac-4.txt-awnh610 new file mode 100644 index 0000000000..43bc522240 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/files/bcm4329-fullmac-4.txt-awnh610 @@ -0,0 +1,98 @@ +# bcm94329sdagb board +# $Copyright (C) 2008 Broadcom Corporation$ +# $id$ +# Azurewave Release 2010/12/13 +# NH610 + +sromrev=3 +vendid=0x14e4 +devid=0x432e +boardtype=0x57e + +# board revision 1.1 +boardrev=0x11 + +# boardflags +boardflags=0x0200 +boardflags2=0x00400000 + +xtalfreq=37400 + +aa2g=1 +aa5g=1 + +ag0=0x0 +ag1=0x0 + +# 11g paparams +#pa0b0=0x13cf +#pa0b1=0xfb34 +#pa0b2=0xfe9e +pa0itssit=62 +pa0maxpwr=74 +ofdmpo=0x44444444 +mcs2gpo0=0x2222 +mcs2gpo1=0x2222 + +# sel = 1 : 20% evm sel = 2 : 27% evm sel = 3 : 16% evm +cckdigfilttype=4 + + +# 11a paparams lowband ch36~ch64 +#pa1lob0=0x148e +#pa1lob1=0xfaee +#pa1lob2=0xfe95 +# 11a paparams midband ch100~ch140 +#pa1b0=0x147a +#pa1b1=0xfaee +#pa1b2=0xfe95 +# 11a paparams highband ch149~ch165 +#pa1hib0=0x1478 +#pa1hib1=0xfaee +#pa1hib2=0xfe95 + + +pa1itssit=62 +pa1maxpwr=60 +opo=0 +mcs5gpo=0x22222222 + +# 11g rssi params +rssismf2g=0xa +rssismc2g=0xb +rssisav2g=0x3 +bxa2g=0 + +# 11a rssi params +rssismf5g=0xa +rssismc5g=0xa +rssisav5g=0x3 +bxa5g=0 + +# country code +ccode=ALL +cctl=0x0 + +rxpo2g=2 +rxpo5g=0 + +# Channel gain adjustments +5g_cga=0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 + +boardnum=2048 +#macaddr=00:11:22:33:44:55 +nocrc=1 +#nvram_override=1 + +#for mfgc +otpimagesize=182 + +# sdio extra configs +hwhdr=0x05ffff031030031003100000 + +#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. +RAW1=80 02 fe ff + +#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. +#RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A +nvramver=4.218.203.0 diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/files/bcm4329-fullmac-4.txt-awnh930 b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/files/bcm4329-fullmac-4.txt-awnh930 new file mode 100644 index 0000000000..21e3e8786a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/files/bcm4329-fullmac-4.txt-awnh930 @@ -0,0 +1,92 @@ +# bcm94329sdagb board +# $Copyright (C) 2008 Broadcom Corporation$ +# $id$ + +sromrev=3 +vendid=0x14e4 +devid=0x432e +boardtype=0x565 +# board revision 1.1 +boardrev=0x11 + +# boardflags +boardflags=0x10000200 +boardflags2=0x00400000 + +# specify the xtalfreq if it is otherthan 38.4MHz +xtalfreq=37400 + +aa2g=3 +aa5g=3 + +ag0=0x82 +ag1=0x84 + +# 11g paparams +pa0b0=5107 +pa0b1=64308 +pa0b2=65182 +pa0itssit=62 +pa0maxpwr=66 +opo=0 +mcs2gpo0=0x2222 +mcs2gpo1=0x2222 + +# sel = 1 : 20% evm sel = 2 : 27% evm sel = 3 : 16% evm +cckdigfilttype=1 + +# 11a paparams lowband +pa1lob0=6654 +pa1lob1=63794 +pa1lob2=65134 +# paparams midband +pa1b0=5970 +pa1b1=63982 +pa1b2=65122 +#paparams high band +pa1hib0=5910 +pa1hib1=63998 +pa1hib2=65130 + +pa1itssit=62 +pa1maxpwr=60 +opo=0 +mcs5gpo=0x22222222 + +# 11g rssi params +rssismf2g=0xa +rssismc2g=0xb +rssisav2g=0x3 +bxa2g=0 + +# 11a rssi params +rssismf5g=0x8 +rssismc5g=0x6 +rssisav5g=0x0 +bxa2g=0 + +# country code +ccode=ALL +cctl=0x0 + +rxpo2g=2 +rxpo5g=0 +# Channel gain adjustments +5g_cga=0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 +boardnum=2048 +macaddr=00:90:4c:c5:34:23 +####### +nocrc=1 + +#for mfgc +otpimagesize=182 + +# sdio extra configs +hwhdr=0x05ffff031030031003100000 + +#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. +RAW1=80 02 fe ff + +#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. +#RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A +nvramver=4.218.203.0 diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/metadata.xml b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/metadata.xml new file mode 100644 index 0000000000..fe02181712 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/metadata.xml @@ -0,0 +1,15 @@ + + + +no-herd + + gabeblack@gentoo.org + + +brcmfmac NVRAM image file. + + + Install the NVRAM image file for the AW-NH930 module. + Install the NVRAM image file for the AW-NH610 module. + + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/busybox-config/busybox-config-1.21.0.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/busybox-config/busybox-config-1.21.0.ebuild new file mode 100644 index 0000000000..b2cd3c4742 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/busybox-config/busybox-config-1.21.0.ebuild @@ -0,0 +1,17 @@ +# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="CrOS specific busybox configuration file." + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +S=${WORKDIR} + +src_install() { + insinto /etc/portage/savedconfig/sys-apps + doins "${FILESDIR}/busybox" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/busybox-config/files/busybox b/sdk_container/src/third_party/coreos-overlay/chromeos-base/busybox-config/files/busybox new file mode 100644 index 0000000000..908b7993a1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/busybox-config/files/busybox @@ -0,0 +1,1034 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.21.0 +# Fri Jan 25 11:49:15 2013 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +CONFIG_EXTRA_COMPAT=y +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_INSTALL_NO_USR=y +# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_UNICODE_SUPPORT is not set +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=0 +CONFIG_LAST_SUPPORTED_WCHAR=0 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/var/run" +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_FEATURE_PREFER_APPLETS=y +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 +CONFIG_FEATURE_FAST_TOP=y +CONFIG_FEATURE_ETC_NETWORKS=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=255 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y +CONFIG_FEATURE_REVERSE_SEARCH=y +CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_USERNAME_COMPLETION=y +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +CONFIG_FEATURE_NON_POSIX_CP=y +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y +# CONFIG_MONOTONIC_SYSCALL is not set +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_FEATURE_AR_CREATE=y +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_GZIP_FAST=0 +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_FEATURE_DATE_NANO=y +CONFIG_FEATURE_DATE_COMPAT=y +# CONFIG_HOSTID is not set +CONFIG_ID=y +CONFIG_GROUPS=y +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_BASE64 is not set +CONFIG_WHO=y +CONFIG_USERS=y +# CONFIG_CAL is not set +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +# CONFIG_OD is not set +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_REGEX_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +# CONFIG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="" +# CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +CONFIG_FEATURE_SHADOWPASSWDS=y +CONFIG_USE_BB_PWD_GRP=y +CONFIG_USE_BB_SHADOW=y +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_FIRST_SYSTEM_ID=100 +CONFIG_LAST_SYSTEM_ID=999 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +CONFIG_LOGIN_SESSION_AS_CHILD=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_SULOGIN is not set +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +CONFIG_MODPROBE_SMALL=y +CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_INSMOD_TRY_MMAP=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +CONFIG_FEATURE_AIX_LABEL=y +CONFIG_FEATURE_SGI_LABEL=y +CONFIG_FEATURE_SUN_LABEL=y +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +CONFIG_FLOCK=y +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +CONFIG_MKFS_EXT2=y +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_RDEV is not set +# CONFIG_READPROFILE is not set +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_BTRFS=y +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +CONFIG_SETSERIAL=y +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +CONFIG_ADJTIMEX=y +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +# CONFIG_BEEP is not set +CONFIG_FEATURE_BEEP_FREQ=0 +CONFIG_FEATURE_BEEP_LENGTH_MS=0 +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_DEVMEM is not set +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +# CONFIG_FBSPLASH is not set +CONFIG_FLASHCP=y +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y +# CONFIG_INOTIFYD is not set +CONFIG_LAST=y +# CONFIG_FEATURE_LAST_SMALL is not set +CONFIG_FEATURE_LAST_FANCY=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +CONFIG_MAN=y +CONFIG_MICROCOM=y +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +CONFIG_WALL=y +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +CONFIG_FEATURE_NAMEIF_EXTENDED=y +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +CONFIG_NC_110_COMPAT=y +CONFIG_PING=y +# CONFIG_PING6 is not set +CONFIG_FEATURE_FANCY_PING=y +CONFIG_WHOIS=y +# CONFIG_FEATURE_IPV6 is not set +CONFIG_FEATURE_UNIX_LOCAL=y +# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +CONFIG_VERBOSE_RESOLUTION_ERRORS=y +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +CONFIG_FEATURE_BRCTL_FANCY=y +CONFIG_FEATURE_BRCTL_SHOW=y +# CONFIG_DNSD is not set +CONFIG_ETHER_WAKE=y +# CONFIG_FAKEIDENTD is not set +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +CONFIG_FEATURE_IP_RARE_PROTOCOLS=y +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +CONFIG_NTPD=y +CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_PSCAN=y +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_INETD_WAIT=y +CONFIG_TFTP=y +CONFIG_TFTPD=y + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +# CONFIG_TRACEROUTE6 is not set +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPC6 is not set +CONFIG_UDHCPD=y +CONFIG_DHCPRELAY=y +CONFIG_DUMPLEASES=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y +CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCP_PORT=y +CONFIG_UDHCP_DEBUG=9 +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +# CONFIG_UDPSVD is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="" +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_LSOF=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_PSTREE=y +CONFIG_PWDX=y +# CONFIG_SMEMCAP is not set +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_UPTIME=y +CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +CONFIG_FEATURE_SH_STANDALONE=y +CONFIG_FEATURE_SH_NOFORK=y +CONFIG_FEATURE_SH_HISTFILESIZE=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_SYSLOGD_DUP=y +CONFIG_FEATURE_SYSLOGD_CFG=y +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_FEATURE_KMSG_SYSLOG=y +CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/ca0132-dsp-firmware-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/ca0132-dsp-firmware-0.0.1.ebuild new file mode 100644 index 0000000000..6082361e7f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/ca0132-dsp-firmware-0.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Ebuild that installs the firmware needed by the ca0132 codec." + +LICENSE="BSD" +SLOT="0" +KEYWORDS="x86 amd64" + +DSP_FW_NAME="ctefx.bin" +EQ_NAME="ctspeq.bin" + +S=${WORKDIR} + +src_install() { + insinto /lib/firmware + doins "${FILESDIR}/${DSP_FW_NAME}" + doins "${FILESDIR}/${EQ_NAME}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/files/ctefx.bin b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/files/ctefx.bin new file mode 100644 index 0000000000..a29458d728 Binary files /dev/null and b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/files/ctefx.bin differ diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/files/ctspeq.bin b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/files/ctspeq.bin new file mode 100644 index 0000000000..dcf020335a Binary files /dev/null and b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ca0132-dsp-firmware/files/ctspeq.bin differ diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/celltest-perf-endpoint-0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/celltest-perf-endpoint-0.1-r2.ebuild new file mode 100644 index 0000000000..db2fb9649f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/celltest-perf-endpoint-0.1-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +# Hand-install (with cros_package_to_live) on a device to make it an +# endpoint in the cell testbed + +DESCRIPTION="Performance testing endpoint for cellular performance tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="net-misc/iperf" +DEPEND="" + +S=${WORKDIR} + +src_install() { + insinto /etc/init + doins "${FILESDIR}"/celltest-perf-endpoint-{network,iperf,webserver}.conf + + dobin "${FILESDIR}"/celltest-perf-endpoint-webserver +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-iperf.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-iperf.conf new file mode 100644 index 0000000000..a5d987cd26 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-iperf.conf @@ -0,0 +1,25 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Run iperf on endpoints in the cell testbed" +author "chromium-os-dev@chromium.org" + +# This file is from the chromeos-base/celltest-perf-endpoint ebuild, +# which is hand-installed on the relevant testbed machines. The +# testbed is documented at +# https://docs.google.com/document/pub?id=1yG7j8Iw9PnQTH-93zP5BqB0qQRU08az11A_eN0acd70 + +start on stopped celltest-perf-endpoint-network +stop on stopping system-services + +respawn + +script + if [ -x /usr/local/bin/iperf ] ; then + IPERF=/usr/local/bin/iperf + else + IPERF=/usr/bin/iperf + fi + exec $IPERF -s +end script diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-network.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-network.conf new file mode 100644 index 0000000000..cb2fc727f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-network.conf @@ -0,0 +1,30 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Configure network for endpoints in the cell testbed." +author "chromium-os-dev@chromium.org" + +# This file is from the chromeos-base/celltest-perf-endpoint ebuild, +# which is hand-installed on the relevant testbed machines. The +# testbed is documented at +# https://docs.google.com/document/pub?id=1yG7j8Iw9PnQTH-93zP5BqB0qQRU08az11A_eN0acd70 + +# Needs to run after iptables starts up so that our changes aren't +# overwritten. But, running directly after that will potentially +# interfere with openssh-server because mutliple simultaneous iptables +# invocations can fail. So run after openssh-server has started. + +start on stopped iptables and stopped ip6tables and started openssh-server + +script + # Bring up the air-side virtual interface + ifconfig eth0:1 192.168.2.254 + + # Open iperf port + iptables -A INPUT -p tcp -m tcp --dport 5001 -j ACCEPT + iptables -A INPUT -p udp -m udp --dport 5001 -j ACCEPT + + # Open web server port + iptables -A INPUT -p tcp -m tcp --dport 80 -j ACCEPT +end script diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-webserver b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-webserver new file mode 100755 index 0000000000..3d4e511a76 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-webserver @@ -0,0 +1,127 @@ +#!/usr/bin/python +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +"""A simple web server for cell modem tests + +Used for: + Connectivity tests + Bandwidth tests +""" + +import BaseHTTPServer +import socket +import struct +import urlparse + +import numpy.random + + +_MAX_SINGLE_TRANSFER = 1 << 20 + + +def WriteBytes(out, n): + """Write n random bytes to out.""" + remaining = n + + while remaining: + if remaining > _MAX_SINGLE_TRANSFER: + # We use random bytes to defeat any compression that may be + # present. This code using the random module was on the edge of + # too slow: + # struct.pack('Q' * (n/8), + # *[random.getrandbits(64) for x in xrange(n/8)]) + # so we use numpy.random.bytes instead. + out.write(numpy.random.bytes(_MAX_SINGLE_TRANSFER)) + remaining -= _MAX_SINGLE_TRANSFER + else: + out.write(numpy.random.bytes(remaining)) + remaining = 0 + + +class HttpHandler(BaseHTTPServer.BaseHTTPRequestHandler): + def address_string(self): + """Build address string without attempting a reverse DNS lookup.""" + return str(self.client_address[0]) + + def _Dispatch(self, command): + """Parses query and dispatches a request to the relevant method.""" + parsed = urlparse.urlparse(self.path) + + # the last value specified for each key + self.query = dict( + [(k, v[-1]) for k,v in urlparse.parse_qs(parsed.query).items()]) + + dispatch_table = { + 'GET': { + '/connectivity/index.html': self.Connectivity, + '/download': self.GetBytes, + }, + 'POST': { + '/upload': self.SinkBytes, + }, + } + if parsed.path not in dispatch_table[command]: + self.send_error(404) + return + dispatch_table[command][parsed.path]() + + def do_GET(self): + return self._Dispatch('GET') + + def do_POST(self): + return self._Dispatch('POST') + + def GetBytes(self): + try: + n = int(self.query['size']) + except KeyError: + self.send_error(400) + return + self.send_response(200) + self.send_header('Content-Length', n) + self.end_headers() + WriteBytes(self.wfile, n) + + def SinkBytes(self): + remaining = int(self.headers['Content-Length']) + + while remaining: + this_read = min(remaining, _MAX_SINGLE_TRANSFER) + got = self.rfile.read(this_read) + if not got: + break + remaining -= len(got) + + self.send_response(200) + self.end_headers() + + def Connectivity(self): + self.send_response(200) + self.send_header('Content-Type', 'text/plain') + self.end_headers() + self.wfile.write('Chromium') + + +class BigBufferHTTPServer(BaseHTTPServer.HTTPServer): + """HTTP server with large buffer sizes. + + Empirically, we see poor performance with cell emulators and default + buffer sizes. + """ + + def get_request(self): + """Overrides get_request to set buffer sizes. + Returns: + (socket, address), where socket has been modified for large buffers + """ + # We can't use super() here because BaseHTTPServer.HTTPServer is an + # old-style class. + sock, addr = BaseHTTPServer.HTTPServer.get_request(self) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1 << 24) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 1 << 24) + return sock, addr + + +BigBufferHTTPServer(('', 80), HttpHandler).serve_forever() diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-webserver.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-webserver.conf new file mode 100644 index 0000000000..a9c0ac57b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/celltest-perf-endpoint/files/celltest-perf-endpoint-webserver.conf @@ -0,0 +1,18 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Simple web server for cellular testbed tests" +author "chromium-os-dev@chromium.org" + +# This file is from the chromeos-base/celltest-perf-endpoint ebuild, +# which is hand-installed on the relevant testbed machines. The +# testbed is documented at +# https://docs.google.com/document/pub?id=1yG7j8Iw9PnQTH-93zP5BqB0qQRU08az11A_eN0acd70 + +start on stopped celltest-perf-endpoint-network +stop on stopping system-services + +respawn + +exec celltest-perf-endpoint-webserver diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chaps/chaps-0.0.1-r115.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chaps/chaps-0.0.1-r115.ebuild new file mode 100644 index 0000000000..004e8be034 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chaps/chaps-0.0.1-r115.ebuild @@ -0,0 +1,78 @@ +# Copyright (C) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE.makefile file. + +EAPI="4" +CROS_WORKON_COMMIT="80e2bd82e37b10c72cc5af63ee705379955a4fa1" +CROS_WORKON_TREE="21c1942d9a04e83433ab0a7af6b6ce0346f647c1" +CROS_WORKON_PROJECT="chromiumos/platform/chaps" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="PKCS #11 layer over TrouSerS." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="arm amd64 x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +RDEPEND=" + app-crypt/trousers + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-libs/dbus-c++ + dev-libs/openssl + dev-cpp/gflags" + +DEPEND="${RDEPEND} + dev-cpp/gmock + test? ( dev-cpp/gtest ) + dev-db/leveldb" + +# We only depend on this for the init script. +RDEPEND+=" + chromeos-base/chromeos-init" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + cros-workon_src_test + emake more_tests +} + +src_install() { + dosbin "${OUT}"/chapsd + dobin "${OUT}"/chaps_client + dobin "${OUT}"/p11_replay + dolib.so "${OUT}"/libchaps.so + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins org.chromium.Chaps.conf + # Install D-Bus service file. + insinto /usr/share/dbus-1/services + doins org.chromium.Chaps.service + # Install upstart config file. + insinto /etc/init + doins chapsd.conf + # Install headers for use by clients. + insinto /usr/include/chaps + doins login_event_client.h + insinto /usr/include/chaps/pkcs11 + doins pkcs11/*.h +} + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chaps/chaps-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chaps/chaps-9999.ebuild new file mode 100644 index 0000000000..279bb40319 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chaps/chaps-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright (C) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE.makefile file. + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/chaps" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="PKCS #11 layer over TrouSerS." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +RDEPEND=" + app-crypt/trousers + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-libs/dbus-c++ + dev-libs/openssl + dev-cpp/gflags" + +DEPEND="${RDEPEND} + dev-cpp/gmock + test? ( dev-cpp/gtest ) + dev-db/leveldb" + +# We only depend on this for the init script. +RDEPEND+=" + chromeos-base/chromeos-init" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + cros-workon_src_test + emake more_tests +} + +src_install() { + dosbin "${OUT}"/chapsd + dobin "${OUT}"/chaps_client + dobin "${OUT}"/p11_replay + dolib.so "${OUT}"/libchaps.so + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins org.chromium.Chaps.conf + # Install D-Bus service file. + insinto /usr/share/dbus-1/services + doins org.chromium.Chaps.service + # Install upstart config file. + insinto /etc/init + doins chapsd.conf + # Install headers for use by clients. + insinto /usr/include/chaps + doins login_event_client.h + insinto /usr/include/chaps/pkcs11 + doins pkcs11/*.h +} + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-acpi/chromeos-acpi-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-acpi/chromeos-acpi-0.0.1-r13.ebuild new file mode 100644 index 0000000000..03811d0d56 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-acpi/chromeos-acpi-0.0.1-r13.ebuild @@ -0,0 +1,37 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="bc506a513266688ccfcafdff1567b7a049d39d7c" +CROS_WORKON_TREE="97011cdf8ff5934f680c71756dea9286dc73ec11" +CROS_WORKON_PROJECT="chromiumos/platform/acpi" + +inherit cros-workon + +DESCRIPTION="Chrome OS ACPI Scripts" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" + +RDEPEND="sys-power/acpid + chromeos-base/chromeos-init" + +CROS_WORKON_LOCALNAME="acpi" + +src_install() { + dodir /etc/acpi/events + dodir /etc/acpi + + install -m 0755 -o root -g root "${S}"/event_* "${D}"/etc/acpi/events + install -m 0755 -o root -g root "${S}"/action_* "${D}"/etc/acpi + + dodir /etc/init + install --owner=root --group=root --mode=0644 "${S}"/acpid.conf \ + "${D}/etc/init/" + +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-acpi/chromeos-acpi-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-acpi/chromeos-acpi-9999.ebuild new file mode 100644 index 0000000000..5dfc153aa1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-acpi/chromeos-acpi-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/acpi" + +inherit cros-workon + +DESCRIPTION="Chrome OS ACPI Scripts" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" + +RDEPEND="sys-power/acpid + chromeos-base/chromeos-init" + +CROS_WORKON_LOCALNAME="acpi" + +src_install() { + dodir /etc/acpi/events + dodir /etc/acpi + + install -m 0755 -o root -g root "${S}"/event_* "${D}"/etc/acpi/events + install -m 0755 -o root -g root "${S}"/action_* "${D}"/etc/acpi + + dodir /etc/init + install --owner=root --group=root --mode=0644 "${S}"/acpid.conf \ + "${D}/etc/init/" + +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets-split/chromeos-assets-split-0.0.1-r28.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets-split/chromeos-assets-split-0.0.1-r28.ebuild new file mode 100644 index 0000000000..ba72970838 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets-split/chromeos-assets-split-0.0.1-r28.ebuild @@ -0,0 +1,37 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="f91b983c430f2e7ce125fda8704d094616d24a0c" +CROS_WORKON_TREE="e18118e277349f02968917bc3eddb4dc39722e05" +CROS_WORKON_PROJECT="chromiumos/platform/chromiumos-assets" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chromium OS-specific assets" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +PDEPEND=">chromeos-base/chromeos-assets-0.0.1-r47" +DEPEND="" +RDEPEND="" + +CROS_WORKON_LOCALNAME="chromiumos-assets" + +src_install() { + insinto /usr/share/chromeos-assets/images + doins -r "${S}"/images/* + + insinto /usr/share/chromeos-assets/images_100_percent + doins -r "${S}"/images_100_percent/* + + insinto /usr/share/chromeos-assets/images_200_percent + doins -r "${S}"/images_200_percent/* + + insinto /usr/share/chromeos-assets/screensavers + doins -r "${S}"/screensavers/* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets-split/chromeos-assets-split-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets-split/chromeos-assets-split-9999.ebuild new file mode 100644 index 0000000000..c684a94be3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets-split/chromeos-assets-split-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/chromiumos-assets" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chromium OS-specific assets" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +PDEPEND=">chromeos-base/chromeos-assets-0.0.1-r47" +DEPEND="" +RDEPEND="" + +CROS_WORKON_LOCALNAME="chromiumos-assets" + +src_install() { + insinto /usr/share/chromeos-assets/images + doins -r "${S}"/images/* + + insinto /usr/share/chromeos-assets/images_100_percent + doins -r "${S}"/images_100_percent/* + + insinto /usr/share/chromeos-assets/images_200_percent + doins -r "${S}"/images_200_percent/* + + insinto /usr/share/chromeos-assets/screensavers + doins -r "${S}"/screensavers/* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets/chromeos-assets-0.0.1-r364.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets/chromeos-assets-0.0.1-r364.ebuild new file mode 100644 index 0000000000..caf56436da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets/chromeos-assets-0.0.1-r364.ebuild @@ -0,0 +1,199 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="366c9e7ff1c99364be8eea8e1accc5bcb301773b" +CROS_WORKON_TREE="d003ce8d1ed1a8f362a169685fae11e7aedc0afe" +CROS_WORKON_PROJECT="chromiumos/platform/assets" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS assets (images, sounds, etc.)" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="alex lumpy lumpy64 mario tegra2-ldk" + +DEPEND="media-fonts/croscorefonts + media-fonts/droidfonts-cros + x11-apps/xcursorgen" +RDEPEND="" + +REAL_CURSOR_NAMES=" + fleur + hand2 + left_ptr + sb_h_double_arrow + sb_v_double_arrow + top_left_corner + top_right_corner + xterm" + +# These are cursors for which there is no file, but we want to use +# one of the existing files. So we link them. The first one is an +# X holdover from some mozilla bug, and without it, we will use the +# default left_ptr_watch bitmap. +LINK_CURSORS=" + 08e8e1c95fe2fc01f976f1e063a24ccd:left_ptr_watch + X_cursor:left_ptr + arrow:left_ptr + based_arrow_down:sb_v_double_arrow + based_arrow_up:sb_v_double_arrow + boat:left_ptr + bogosity:left_ptr + bottom_left_corner:top_right_corner + bottom_right_corner:top_left_corner + bottom_side:sb_v_double_arrow + bottom_tee:sb_v_double_arrow + box_spiral:left_ptr + center_ptr:left_ptr + circle:left_ptr + clock:left_ptr + coffee_mug:left_ptr + diamond_cross:left_ptr + dot:left_ptr + dotbox:left_ptr + double_arrow:sb_v_double_arrow + draft_large:left_ptr + draft_small:left_ptr + draped_box:left_ptr + exchange:left_ptr + gobbler:left_ptr + gumby:left_ptr + hand1:hand2 + heart:left_ptr + icon:left_ptr + iron_cross:left_ptr + left_ptr_watch:left_ptr + left_side:sb_h_double_arrow + left_tee:sb_h_double_arrow + leftbutton:left_ptr + ll_angle:top_right_corner + lr_angle:top_left_corner + man:left_ptr + middlebutton:left_ptr + mouse:left_ptr + pencil:left_ptr + pirate:left_ptr + plus:left_ptr + right_ptr:left_ptr + right_side:sb_h_double_arrow + right_tee:sb_h_double_arrow + rightbutton:left_ptr + rtl_logo:left_ptr + sailboat:left_ptr + sb_down_arrow:sb_v_double_arrow + sb_left_arrow:sb_h_double_arrow + sb_right_arrow:sb_h_double_arrow + sb_up_arrow:sb_v_double_arrow + shuttle:left_ptr + sizing:top_left_corner + spider:left_ptr + spraycan:left_ptr + star:left_ptr + target:left_ptr + tcross:left_ptr + top_left_arrow:left_ptr + top_side:sb_v_double_arrow + top_tee:sb_v_double_arrow + trek:left_ptr + ul_angle:top_left_corner + umbrella:left_ptr + ur_angle:top_right_corner + watch:left_ptr" + +CROS_WORKON_LOCALNAME="assets" + +src_install() { + insinto /usr/share/chromeos-assets/images + doins -r "${S}"/images/* + + insinto /usr/share/chromeos-assets/images_100_percent + doins -r "${S}"/images_100_percent/* + + insinto /usr/share/chromeos-assets/images_200_percent + doins -r "${S}"/images_200_percent/* + + insinto /usr/share/chromeos-assets/text + doins -r "${S}"/text/boot_messages + dosbin "${S}"/text/display_boot_message + + insinto /usr/share/chromeos-assets/gaia_auth + doins -r "${S}"/gaia_auth/* + + insinto /usr/share/chromeos-assets/input_methods + doins "${S}"/input_methods/* + + unzip "${S}"/accessibility/extensions/access_chromevox.zip + insinto /usr/share/chromeos-assets/accessibility/extensions/access_chromevox + doins -r "${S}"/chromevox_deploy/* + + insinto /usr/share/chromeos-assets/crosh_builtin/ + unzip -d crosh_builtin_deploy/ "${S}"/chromeapps/crosh_builtin/crosh_builtin.zip + + doins -r "${S}"/crosh_builtin_deploy/* + + insinto /usr/share/fonts/chrome-droid + doins "${S}"/fonts/ChromeDroid*.ttf + + insinto /usr/share/color/bin + if use mario; then + newins "${S}"/color_profiles/mario.bin internal_display.bin + elif use alex; then + newins "${S}"/color_profiles/alex.bin internal_display.bin + elif use lumpy; then + newins "${S}"/color_profiles/lumpy.bin internal_display.bin + fi + + # Don't install cursors when building for Tegra, since the + # current ARGB cursor implementation is performing badly, + # and the fallback to 2-bit hardware cursor works better. + # TODO: Remove this when the display driver has been fixed to + # remove the performance bottlenecks. + if ! use tegra2-ldk; then + local CURSOR_DIR="${D}"/usr/share/cursors/xorg-x11/chromeos/cursors + + mkdir -p "${CURSOR_DIR}" + for i in ${REAL_CURSOR_NAMES}; do + xcursorgen -p "${S}"/cursors "${S}"/cursors/$i.cfg >"${CURSOR_DIR}/$i" + done + + for i in ${LINK_CURSORS}; do + ln -s ${i#*:} "${CURSOR_DIR}/${i%:*}" + done + fi + + mkdir -p "${D}"/usr/share/cursors/xorg-x11/default + echo Inherits=chromeos \ + >"${D}"/usr/share/cursors/xorg-x11/default/index.theme + + # + # Speech synthesis + # + + insinto /usr/share/chromeos-assets/speech_synthesis/patts + + # Speech synthesis component extension code + doins "${S}"/speech_synthesis/patts/manifest.json + doins "${S}"/speech_synthesis/patts/tts_main.js + doins "${S}"/speech_synthesis/patts/tts_service.nmf + + # Speech synthesis voice data + doins "${S}"/speech_synthesis/patts/voice_data_hmm_en-US.js + unzip "${S}"/speech_synthesis/patts/voice_data_hmm_en-US.zip + doins -r "${S}"/voice_data_hmm_en-US + + # Speech synthesis engine (platform-specific native client module) + if use arm ; then + unzip "${S}"/speech_synthesis/patts/tts_service_pexe_arm.nexe.zip + doins "${S}"/tts_service_pexe_arm.nexe + elif use x86 ; then + unzip "${S}"/speech_synthesis/patts/tts_service_x86-32.nexe.zip + doins "${S}"/tts_service_x86-32.nexe + elif use amd64 ; then + unzip "${S}"/speech_synthesis/patts/tts_service_x86-64.nexe.zip + doins "${S}"/tts_service_x86-64.nexe + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets/chromeos-assets-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets/chromeos-assets-9999.ebuild new file mode 100644 index 0000000000..e9b84d76ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-assets/chromeos-assets-9999.ebuild @@ -0,0 +1,197 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/assets" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS assets (images, sounds, etc.)" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="alex lumpy lumpy64 mario tegra2-ldk" + +DEPEND="media-fonts/croscorefonts + media-fonts/droidfonts-cros + x11-apps/xcursorgen" +RDEPEND="" + +REAL_CURSOR_NAMES=" + fleur + hand2 + left_ptr + sb_h_double_arrow + sb_v_double_arrow + top_left_corner + top_right_corner + xterm" + +# These are cursors for which there is no file, but we want to use +# one of the existing files. So we link them. The first one is an +# X holdover from some mozilla bug, and without it, we will use the +# default left_ptr_watch bitmap. +LINK_CURSORS=" + 08e8e1c95fe2fc01f976f1e063a24ccd:left_ptr_watch + X_cursor:left_ptr + arrow:left_ptr + based_arrow_down:sb_v_double_arrow + based_arrow_up:sb_v_double_arrow + boat:left_ptr + bogosity:left_ptr + bottom_left_corner:top_right_corner + bottom_right_corner:top_left_corner + bottom_side:sb_v_double_arrow + bottom_tee:sb_v_double_arrow + box_spiral:left_ptr + center_ptr:left_ptr + circle:left_ptr + clock:left_ptr + coffee_mug:left_ptr + diamond_cross:left_ptr + dot:left_ptr + dotbox:left_ptr + double_arrow:sb_v_double_arrow + draft_large:left_ptr + draft_small:left_ptr + draped_box:left_ptr + exchange:left_ptr + gobbler:left_ptr + gumby:left_ptr + hand1:hand2 + heart:left_ptr + icon:left_ptr + iron_cross:left_ptr + left_ptr_watch:left_ptr + left_side:sb_h_double_arrow + left_tee:sb_h_double_arrow + leftbutton:left_ptr + ll_angle:top_right_corner + lr_angle:top_left_corner + man:left_ptr + middlebutton:left_ptr + mouse:left_ptr + pencil:left_ptr + pirate:left_ptr + plus:left_ptr + right_ptr:left_ptr + right_side:sb_h_double_arrow + right_tee:sb_h_double_arrow + rightbutton:left_ptr + rtl_logo:left_ptr + sailboat:left_ptr + sb_down_arrow:sb_v_double_arrow + sb_left_arrow:sb_h_double_arrow + sb_right_arrow:sb_h_double_arrow + sb_up_arrow:sb_v_double_arrow + shuttle:left_ptr + sizing:top_left_corner + spider:left_ptr + spraycan:left_ptr + star:left_ptr + target:left_ptr + tcross:left_ptr + top_left_arrow:left_ptr + top_side:sb_v_double_arrow + top_tee:sb_v_double_arrow + trek:left_ptr + ul_angle:top_left_corner + umbrella:left_ptr + ur_angle:top_right_corner + watch:left_ptr" + +CROS_WORKON_LOCALNAME="assets" + +src_install() { + insinto /usr/share/chromeos-assets/images + doins -r "${S}"/images/* + + insinto /usr/share/chromeos-assets/images_100_percent + doins -r "${S}"/images_100_percent/* + + insinto /usr/share/chromeos-assets/images_200_percent + doins -r "${S}"/images_200_percent/* + + insinto /usr/share/chromeos-assets/text + doins -r "${S}"/text/boot_messages + dosbin "${S}"/text/display_boot_message + + insinto /usr/share/chromeos-assets/gaia_auth + doins -r "${S}"/gaia_auth/* + + insinto /usr/share/chromeos-assets/input_methods + doins "${S}"/input_methods/* + + unzip "${S}"/accessibility/extensions/access_chromevox.zip + insinto /usr/share/chromeos-assets/accessibility/extensions/access_chromevox + doins -r "${S}"/chromevox_deploy/* + + insinto /usr/share/chromeos-assets/crosh_builtin/ + unzip -d crosh_builtin_deploy/ "${S}"/chromeapps/crosh_builtin/crosh_builtin.zip + + doins -r "${S}"/crosh_builtin_deploy/* + + insinto /usr/share/fonts/chrome-droid + doins "${S}"/fonts/ChromeDroid*.ttf + + insinto /usr/share/color/bin + if use mario; then + newins "${S}"/color_profiles/mario.bin internal_display.bin + elif use alex; then + newins "${S}"/color_profiles/alex.bin internal_display.bin + elif use lumpy; then + newins "${S}"/color_profiles/lumpy.bin internal_display.bin + fi + + # Don't install cursors when building for Tegra, since the + # current ARGB cursor implementation is performing badly, + # and the fallback to 2-bit hardware cursor works better. + # TODO: Remove this when the display driver has been fixed to + # remove the performance bottlenecks. + if ! use tegra2-ldk; then + local CURSOR_DIR="${D}"/usr/share/cursors/xorg-x11/chromeos/cursors + + mkdir -p "${CURSOR_DIR}" + for i in ${REAL_CURSOR_NAMES}; do + xcursorgen -p "${S}"/cursors "${S}"/cursors/$i.cfg >"${CURSOR_DIR}/$i" + done + + for i in ${LINK_CURSORS}; do + ln -s ${i#*:} "${CURSOR_DIR}/${i%:*}" + done + fi + + mkdir -p "${D}"/usr/share/cursors/xorg-x11/default + echo Inherits=chromeos \ + >"${D}"/usr/share/cursors/xorg-x11/default/index.theme + + # + # Speech synthesis + # + + insinto /usr/share/chromeos-assets/speech_synthesis/patts + + # Speech synthesis component extension code + doins "${S}"/speech_synthesis/patts/manifest.json + doins "${S}"/speech_synthesis/patts/tts_main.js + doins "${S}"/speech_synthesis/patts/tts_service.nmf + + # Speech synthesis voice data + doins "${S}"/speech_synthesis/patts/voice_data_hmm_en-US.js + unzip "${S}"/speech_synthesis/patts/voice_data_hmm_en-US.zip + doins -r "${S}"/voice_data_hmm_en-US + + # Speech synthesis engine (platform-specific native client module) + if use arm ; then + unzip "${S}"/speech_synthesis/patts/tts_service_pexe_arm.nexe.zip + doins "${S}"/tts_service_pexe_arm.nexe + elif use x86 ; then + unzip "${S}"/speech_synthesis/patts/tts_service_x86-32.nexe.zip + doins "${S}"/tts_service_x86-32.nexe + elif use amd64 ; then + unzip "${S}"/speech_synthesis/patts/tts_service_x86-64.nexe.zip + doins "${S}"/tts_service_x86-64.nexe + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/chromeos-auth-config-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/chromeos-auth-config-0.0.1-r1.ebuild new file mode 100644 index 0000000000..3f58788533 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/chromeos-auth-config-0.0.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="ChromiumOS-specific configuration files for pambase" +HOMEPAGE="http://www.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +RDEPEND=" + >=sys-auth/pambase-20090620.1-r7 + chromeos-base/vboot_reference" +DEPEND="${RDEPEND}" + +src_install() { + # Chrome OS: sudo and vt2 are important for system debugging both in + # developer mode and during development. These two stanzas allow sudo and + # login auth as user chronos under the following conditions: + # + # 1. password-less access: + # - system in developer mode + # - there is no passwd.devmode file + # - there is no system-wide password set above. + # 2. System-wide (/etc/shadow) password access: + # - image has a baked in password above + # 3. Developer mode password access + # - user creates a passwd.devmode file with "chronos:CRYPTED_PASSWORD" + # 4. System-wide (/etc/shadow) password access set by modifying /etc/shadow: + # - Cases #1 and #2 will apply but failure will fall through to the + # inserted password. + insinto /etc/pam.d + doins "${FILESDIR}/chromeos-auth" || die + + dosbin "${FILESDIR}/is_developer_end_user" || die +} + +pkg_postinst() { + # If there's a shared user password or if the build target is the host, + # reset chromeos-auth to an empty file. We don't transition from empty to + # populated because binary packages lose FILESDIR. + local crypted_password='*' + if [ "${ROOT}" = "/" ]; then + crypted_password='host' + elif [ -r "${SHARED_USER_PASSWD_FILE}" ]; then + crypted_password=$(cat "${SHARED_USER_PASSWD_FILE}") + fi + if [ "${crypted_password}" != '*' ]; then + echo -n '' > "${ROOT}/etc/pam.d/chromeos-auth" || die + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/files/chromeos-auth b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/files/chromeos-auth new file mode 100644 index 0000000000..b07fe86473 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/files/chromeos-auth @@ -0,0 +1,16 @@ +# If we're not in dev-mode, skip to the system password stack. +auth [success=ignore default=3] pam_exec.so \ + quiet /usr/bin/crossystem cros_debug?1 + +# Check if a custom devmode password file exists and prefer it. +auth [success=ignore default=1] pam_exec.so \ + quiet /usr/bin/test -f /mnt/stateful_partition/etc/devmode.passwd + +# If we get to pwdfile, use it or bypass the password-less login. +auth [success=done default=1] pam_pwdfile.so \ + pwdfile /mnt/stateful_partition/etc/devmode.passwd + +# If we get here, allow password-less access +auth sufficient pam_exec.so quiet /usr/bin/crossystem cros_debug?1 + +# Fallback to a system password if one was stamped in after initial build. diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/files/is_developer_end_user b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/files/is_developer_end_user new file mode 100644 index 0000000000..358317cf6d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-auth-config/files/is_developer_end_user @@ -0,0 +1,13 @@ +#!/bin/sh + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Exit status is 0 if this is a "developer system", non-zero if not. +# We define "developer system" as any of +# - a release image on a system with the developer hardware switch set on, +# - a developer or test image running on hardware or a VM, or +# - a system with a shared user password set (meaning it's possible to log in +# on a VT console). +crossystem "cros_debug?1" || grep -q '^chronos:[^*]' /etc/shadow diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/chromeos-base-0-r52.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/chromeos-base-0-r52.ebuild new file mode 120000 index 0000000000..d123951679 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/chromeos-base-0-r52.ebuild @@ -0,0 +1 @@ +./chromeos-base-0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/chromeos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/chromeos-base-0.ebuild new file mode 100644 index 0000000000..8502d64554 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/chromeos-base-0.ebuild @@ -0,0 +1,284 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +inherit useradd pam + +DESCRIPTION="ChromeOS specific system setup" +HOMEPAGE="http://src.chromium.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="cros_host pam" + +# We need to make sure timezone-data is merged before us. +# See pkg_setup below as well as http://crosbug.com/27413 +# and friends. +DEPEND=">=sys-apps/baselayout-2 + ! 95_cros_base + insopts -m 440 + doins 95_cros_base || die + fi +} + +pkg_postinst() { + local x + + # We explicitly add all of the users needed in the system here. The + # build of Chromium OS uses a single build chroot environment to build + # for various targets with distinct ${ROOT}. This causes two problems: + # 1. The target rootfs needs to have the same UIDs as the build + # chroot so that chmod operations work. + # 2. The portage tools to add a new user in an ebuild don't work when + # $ROOT != / + # We solve this by having baselayout install in both the build and + # target and pre-create all needed users. In order to support existing + # build roots we copy over the user entries if they already exist. + local system_user="chronos" + local system_id="1000" + local system_home="/home/${system_user}/user" + # Add a chronos-access group to provide non-chronos users, + # mostly system daemons running as a non-chronos user, group permissions + # to access files/directories owned by chronos. + local system_access_user="chronos-access" + local system_access_id="1001" + + local crypted_password='*' + [ -r "${SHARED_USER_PASSWD_FILE}" ] && + crypted_password=$(cat "${SHARED_USER_PASSWD_FILE}") + remove_user "${system_user}" + add_user "${system_user}" "x" "${system_id}" \ + "${system_id}" "system_user" "${system_home}" /bin/sh + remove_shadow "${system_user}" + add_shadow "${system_user}" "${crypted_password}" + + copy_or_add_group "${system_user}" "${system_id}" + copy_or_add_daemon_user "${system_access_user}" "${system_access_id}" + copy_or_add_daemon_user "messagebus" 201 # For dbus + copy_or_add_daemon_user "syslog" 202 # For rsyslog + copy_or_add_daemon_user "ntp" 203 + copy_or_add_daemon_user "sshd" 204 + copy_or_add_daemon_user "polkituser" 206 # For policykit + copy_or_add_daemon_user "tss" 207 # For trousers (TSS/TPM) + copy_or_add_daemon_user "pkcs11" 208 # For pkcs11 clients + copy_or_add_daemon_user "qdlservice" 209 # for QDLService + copy_or_add_daemon_user "cromo" 210 # For cromo (modem manager) +# copy_or_add_daemon_user "cashew" 211 # Deprecated, do not reuse + copy_or_add_daemon_user "ipsec" 212 # For strongswan/ipsec VPN + copy_or_add_daemon_user "cros-disks" 213 # For cros-disks + copy_or_add_daemon_user "tor" 214 # For tor (anonymity service) + copy_or_add_daemon_user "tcpdump" 215 # For tcpdump --with-user + copy_or_add_daemon_user "debugd" 216 # For debugd + copy_or_add_daemon_user "openvpn" 217 # For openvpn + copy_or_add_daemon_user "bluetooth" 218 # For bluez + copy_or_add_daemon_user "wpa" 219 # For wpa_supplicant + copy_or_add_daemon_user "cras" 220 # For cras (audio) +# copy_or_add_daemon_user "gavd" 221 # For gavd (audio) (deprecated) + copy_or_add_daemon_user "input" 222 # For /dev/input/event access + copy_or_add_daemon_user "chaps" 223 # For chaps (pkcs11) + copy_or_add_daemon_user "dhcp" 224 # For dhcpcd (DHCP client) + copy_or_add_daemon_user "tpmd" 225 # For tpmd + copy_or_add_daemon_user "mtp" 226 # For libmtp + copy_or_add_daemon_user "proxystate" 227 # For proxy monitoring + copy_or_add_daemon_user "power" 228 # For powerd + copy_or_add_daemon_user "watchdog" 229 # For daisydog + copy_or_add_daemon_user "devbroker" 230 # For permission_broker + copy_or_add_daemon_user "xorg" 231 # For Xorg + # Reserve some UIDs/GIDs between 300 and 349 for sandboxing FUSE-based + # filesystem daemons. + copy_or_add_daemon_user "ntfs-3g" 300 # For ntfs-3g prcoess + copy_or_add_daemon_user "avfs" 301 # For avfs process + copy_or_add_daemon_user "fuse-exfat" 302 # For exfat-fuse prcoess + + # Group that are allowed to create directories under /home//root + copy_or_add_group "daemon-store" 400 + + # All audio interfacing will go through the audio server. + add_users_to_group audio "cras" + add_users_to_group input "cras" # For /dev/input/event* access + + # The system user is part of the audio server group to play sounds. The + # power manager user needs to check whether audio is playing. + add_users_to_group cras "${system_user}" power + + # The system_user needs to be part of the audio and video groups. + add_users_to_group audio "${system_user}" + add_users_to_group video "${system_user}" + + # The Xorg user needs to be part of the input and video groups. + add_users_to_group input "xorg" + add_users_to_group video "xorg" + + # Users which require access to PKCS #11 cryptographic services must be + # in the pkcs11 group. + remove_all_users_from_group pkcs11 + add_users_to_group pkcs11 root ipsec "${system_user}" chaps wpa + + # All users accessing opencryptoki database files and all users for + # sandboxing FUSE-based filesystem daemons need to be in the + # ${system_access_user} group. + remove_all_users_from_group "${system_access_user}" + add_users_to_group "${system_access_user}" root ipsec "${system_user}" \ + ntfs-3g avfs fuse-exfat chaps + + # Dedicated group for owning access to serial devices. + copy_or_add_group "serial" 402 + add_users_to_group "serial" "${system_user}" + add_users_to_group "serial" "uucp" + + # The root user must be in the wpa group for wpa_cli. + add_users_to_group wpa root + + # Restrict tcsd access to root and chaps. + add_users_to_group tss root chaps + + # Add mtp user to usb group for USB device access. + add_users_to_group usb mtp + + # Create a group for device access via permission_broker + copy_or_add_group "devbroker-access" 403 + add_users_to_group devbroker-access "${system_user}" + + # Give the power manager access to I2C devices so it can adjust external + # displays' brightness via DDC. + copy_or_add_group i2c 404 + add_users_to_group i2c power + + # Give the power manager access to /dev/tty* so it can disable VT switching + # before suspending the system. + add_users_to_group tty power + + # The power manager needs to read from /dev/input/event* to observe power + # button and lid events. + add_users_to_group input power + + # Some default directories. These are created here rather than at + # install because some of them may already exist and have mounts. + for x in /dev /home /media \ + /mnt/stateful_partition /proc /root /sys /var/lock; do + [ -d "${ROOT}/$x" ] && continue + install -d --mode=0755 --owner=root --group=root "${ROOT}/$x" + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/cursor.sh b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/cursor.sh new file mode 100644 index 0000000000..357f9293ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/cursor.sh @@ -0,0 +1,7 @@ +# We disable vt cursors by default on the kernel command line +# (so that it doesn't flash when doing boot splash and such). +# +# Re-enable it when launching a login shell. This should only +# happen when logging in via vt or crosh or ssh and those are +# all fine. Login shells shouldn't get launched normally. +setterm -cursor on diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/include-chromeos-auth b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/include-chromeos-auth new file mode 100644 index 0000000000..cc7be37a5b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/include-chromeos-auth @@ -0,0 +1 @@ +auth include chromeos-auth diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/ssh_config b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/ssh_config new file mode 100644 index 0000000000..17976aae52 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/ssh_config @@ -0,0 +1,2 @@ +Host * + UserKnownHostsFile /home/chronos/user/.ssh/known_hosts diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/sshd_config b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/sshd_config new file mode 100644 index 0000000000..f1fc02c098 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/sshd_config @@ -0,0 +1,13 @@ +# Force protocol v2 only +Protocol 2 + +# /etc is read-only. Fetch keys from stateful partition +# Not using v1, so no v1 key +HostKey /mnt/stateful_partition/etc/ssh/ssh_host_rsa_key +HostKey /mnt/stateful_partition/etc/ssh/ssh_host_dsa_key + +PasswordAuthentication no +UsePAM yes +PrintMotd no +PrintLastLog no +Subsystem sftp internal-sftp diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/sysctl.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/sysctl.conf new file mode 100644 index 0000000000..af9bc7f29b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/sysctl.conf @@ -0,0 +1,96 @@ +# /etc/sysctl.conf +# +# For more information on how this file works, please see +# the manpages sysctl(8) and sysctl.conf(5). +# +# In order for this file to work properly, you must first +# enable 'Sysctl support' in the kernel. +# +# Look in /proc/sys/ for all the things you can setup. +# + +# +# Original Gentoo settings: +# + +# Disables packet forwarding +net.ipv4.ip_forward = 0 +# Disables IP dynaddr +#net.ipv4.ip_dynaddr = 0 +# Disable ECN +#net.ipv4.tcp_ecn = 0 +# Enables source route verification +net.ipv4.conf.default.rp_filter = 1 +# Enable reverse path +net.ipv4.conf.all.rp_filter = 1 + +# Enable SYN cookies (yum!) +# http://cr.yp.to/syncookies.html +#net.ipv4.tcp_syncookies = 1 + +# Disable source route +#net.ipv4.conf.all.accept_source_route = 0 +#net.ipv4.conf.default.accept_source_route = 0 + +# Disable redirects +#net.ipv4.conf.all.accept_redirects = 0 +#net.ipv4.conf.default.accept_redirects = 0 + +# Disable secure redirects +#net.ipv4.conf.all.secure_redirects = 0 +#net.ipv4.conf.default.secure_redirects = 0 + +# Ignore ICMP broadcasts +#net.ipv4.icmp_echo_ignore_broadcasts = 1 + +# Perform PLPMTUD only after detecting a "blackhole" in old-style PMTUD +net.ipv4.tcp_mtu_probing = 1 + +# Disables the magic-sysrq key +#kernel.sysrq = 0 +# When the kernel panics, automatically reboot in 3 seconds +#kernel.panic = 3 +# Allow for more PIDs (cool factor!); may break some programs +#kernel.pid_max = 999999 + +# You should compile nfsd into the kernel or add it +# to modules.autoload for this to work properly +# TCP Port for lock manager +#fs.nfs.nlm_tcpport = 0 +# UDP Port for lock manager +#fs.nfs.nlm_udpport = 0 + +# +# ChromeOS specific settings: +# + +# Set watchdog_thresh +kernel.watchdog_thresh = 5 +# When the kernel panics, automatically reboot to preserve dump in ram +kernel.panic = -1 +# Reboot on oops as well +kernel.panic_on_oops = 1 + +# Disable shrinking the cwnd when connection is idle +net.ipv4.tcp_slow_start_after_idle = 0 + +# Protect working set in order to avoid thrashing. +# See http://crosbug.com/7561 for details. +vm.min_filelist_kbytes = 50000 + +# Allow full memory overcommit as we rather close or kill tabs than +# refuse memory to arbitrary core processes. +vm.overcommit_memory = 1 + +# Use laptop mode settings always +vm.dirty_background_ratio = 1 +vm.dirty_expire_centisecs = 60000 +vm.dirty_ratio = 60 +vm.dirty_writeback_centisecs = 60000 +vm.laptop_mode = 0 + +# Disable kernel address visibility to non-root users. +kernel.kptr_restrict = 1 + +# Increase shared memory segment limit for plugins rendering large areas +kernel.shmmax = 134217728 diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/55-serial.rules b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/55-serial.rules new file mode 100644 index 0000000000..ceb492c4b7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/55-serial.rules @@ -0,0 +1,9 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +KERNEL=="tty[A-Z]*[0-9]", GROUP="serial" +# Don't allow access to serial interfaces on Gobi modems. +KERNEL=="tty[A-Z]*[0-9]", ID_USB_DRIVER=="qcserial", GROUP="root" +# Don't allow access to serial interfaces on Novatel modems. +KERNEL=="tty[A-Z]*[0-9]", ID_USB_DRIVER=="option", GROUP="root" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/99-i2c.rules b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/99-i2c.rules new file mode 100644 index 0000000000..d094e0fa71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/99-i2c.rules @@ -0,0 +1,5 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +KERNEL=="i2c-[0-9]", GROUP="i2c" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/99-usb-printer.rules b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/99-usb-printer.rules new file mode 100644 index 0000000000..7895571938 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/udev-rules/99-usb-printer.rules @@ -0,0 +1,8 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="07", ATTRS{idProduct}=="*", \ + PROGRAM="/usr/bin/dbus-send --system --type=method_call --dest=org.chromium.LibCrosService \ + /org/chromium/LibCrosService org.chromium.LibCrosServiceInterface.PrinterAdded \ + string:$attr{idVendor} string:$attr{idProduct}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/xauthority.sh b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/xauthority.sh new file mode 100644 index 0000000000..21774859d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-base/files/xauthority.sh @@ -0,0 +1 @@ +export XAUTHORITY="/home/chronos/.Xauthority" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-bsp-dev-null/chromeos-bsp-dev-null-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-bsp-dev-null/chromeos-bsp-dev-null-0.0.1.ebuild new file mode 100644 index 0000000000..51a3a8b3f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-bsp-dev-null/chromeos-bsp-dev-null-0.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Empty (null) ebuild which satisifies virtual/chromeos-bsp-dev. +This is a direct dependency of chromeos-base/chromeos-dev, but is expected to +be overridden in an overlay for each specialized board. A typical non-null +implementation will install any board-specific developer only files and +executables which are not suitable for inclusion in a generic board overlay." + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" +PROVIDE="virtual/chromeos-bsp-dev" + +# +# WARNING: Nothing should be added to this ebuild. This ebuild is overriden +# in board specific overlays, via a base profile which specifies virtuals +# diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/chromeos-ca-certificates-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/chromeos-ca-certificates-0.0.1-r2.ebuild new file mode 100644 index 0000000000..8e31e295f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/chromeos-ca-certificates-0.0.1-r2.ebuild @@ -0,0 +1,18 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Chrome OS restricted set of certificates." +HOMEPAGE="http://src.chromium.org" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +src_install() { + CA_CERT_DIR=/usr/share/chromeos-ca-certificates + insinto "${CA_CERT_DIR}" + doins "${FILESDIR}"/*.pem + c_rehash "${D}/${CA_CERT_DIR}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AAA_Certificate_Services.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AAA_Certificate_Services.pem new file mode 100644 index 0000000000..33c71ba9db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AAA_Certificate_Services.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj +YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM +GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua +BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe +3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 +YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR +rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm +ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU +oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF +MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v +QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t +b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF +AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q +GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz +Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 +G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi +l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 +smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Class_1_CA_Root.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Class_1_CA_Root.pem new file mode 100644 index 0000000000..43b8375f81 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Class_1_CA_Root.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw +MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD +VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul +CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n +tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl +dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch +PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC ++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O +BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk +ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X +7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz +43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl +pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA +WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_External_CA_Root.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_External_CA_Root.pem new file mode 100644 index 0000000000..20585f1c01 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_External_CA_Root.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Public_CA_Root.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Public_CA_Root.pem new file mode 100644 index 0000000000..b9665db7c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Public_CA_Root.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx +MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB +ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV +BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV +6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX +GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP +dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH +1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF +62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW +BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw +AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL +MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU +cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv +b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6 +IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/ +iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao +GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh +4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm +XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Qualified_CA_Root.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Qualified_CA_Root.pem new file mode 100644 index 0000000000..ad3800d58b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AddTrust_Qualified_CA_Root.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1 +MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK +EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh +BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq +xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G +87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i +2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U +WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1 +0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G +A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T +AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr +pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL +ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm +aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv +hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm +hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X +dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3 +P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y +iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no +xqE= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Commercial.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Commercial.pem new file mode 100644 index 0000000000..73a3367437 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Commercial.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz +dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL +MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp +cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP +Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr +ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL +MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1 +yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr +VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/ +nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ +KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG +XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj +vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt +Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g +N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC +nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Networking.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Networking.pem new file mode 100644 index 0000000000..04f4a812b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Networking.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz +dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL +MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp +cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y +YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua +kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL +QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp +6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG +yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i +QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ +KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO +tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu +QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ +Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u +olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48 +x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Premium.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Premium.pem new file mode 100644 index 0000000000..516ecf55ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Premium.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz +dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG +A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U +cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf +qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ +JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ ++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS +s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5 +HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7 +70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG +V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S +qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S +5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia +C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX +OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE +FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ +BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2 +KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg +Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B +8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ +MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc +0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ +u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF +u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH +YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8 +GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO +RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e +KeC2uAloGRwYQw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Premium_ECC.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Premium_ECC.pem new file mode 100644 index 0000000000..4bcc6a4336 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/AffirmTrust_Premium_ECC.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC +VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ +cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ +BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt +VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D +0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9 +ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G +A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs +aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I +flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/America_Online_Root_Certification_Authority_1.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/America_Online_Root_Certification_Authority_1.pem new file mode 100644 index 0000000000..d6837453dd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/America_Online_Root_Certification_Authority_1.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP +bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2 +MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft +ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk +hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym +1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW +OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb +2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko +O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU +AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF +Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb +LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir +oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C +MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds +sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/America_Online_Root_Certification_Authority_2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/America_Online_Root_Certification_Authority_2.pem new file mode 100644 index 0000000000..492d55a980 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/America_Online_Root_Certification_Authority_2.pem @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP +bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2 +MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft +ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP +ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC +206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci +KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2 +JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9 +BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e +Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B +PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67 +Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq +Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ +o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3 ++L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj +YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj +FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn +xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2 +LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc +obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8 +CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe +IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA +DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F +AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX +Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb +AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl +Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw +RY8mkaKO/qk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Baltimore_CyberTrust_Root.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Baltimore_CyberTrust_Root.pem new file mode 100644 index 0000000000..519028c63b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Baltimore_CyberTrust_Root.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ +RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD +VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX +DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y +ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy +VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr +mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr +IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK +mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu +XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy +dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye +jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 +BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 +DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 +9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx +jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 +Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz +ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS +R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/COMODO_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/COMODO_Certification_Authority.pem new file mode 100644 index 0000000000..6146dcb571 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/COMODO_Certification_Authority.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB +gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV +BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw +MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl +YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P +RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3 +UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI +2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8 +Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp ++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+ +DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O +nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW +/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g +PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u +QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY +SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv +IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/ +RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4 +zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd +BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB +ZQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/COMODO_ECC_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/COMODO_ECC_Certification_Authority.pem new file mode 100644 index 0000000000..546c95e30d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/COMODO_ECC_Certification_Authority.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT +IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw +MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy +ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N +T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR +FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J +cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW +BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm +fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv +GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Class_3_Public_Primary_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Class_3_Public_Primary_Certification_Authority.pem new file mode 100644 index 0000000000..d209ab6f8c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Class_3_Public_Primary_Certification_Authority.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz +cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 +MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV +BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN +ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE +BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is +I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G +CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i +2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ +2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Comodo_Trusted_Certificate_Services.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Comodo_Trusted_Certificate_Services.pem new file mode 100644 index 0000000000..72cbf56109 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Comodo_Trusted_Certificate_Services.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 +aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla +MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO +BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD +VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW +fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt +TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL +fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW +1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 +kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G +A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v +ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo +dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu +Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ +HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 +pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS +jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ +xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn +dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Cybertrust_Global_Root.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Cybertrust_Global_Root.pem new file mode 100644 index 0000000000..edbeb27e71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Cybertrust_Global_Root.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG +A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh +bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE +ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS +b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5 +7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS +J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y +HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP +t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz +FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY +XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/ +MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw +hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js +MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA +A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj +Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx +XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o +omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc +A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW +WL1WMRJOEcgh4LMRkWXbtKaIOM5V +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_Assured_ID_Root_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_Assured_ID_Root_CA.pem new file mode 100644 index 0000000000..2731638b6e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_Assured_ID_Root_CA.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv +b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c +JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP +mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+ +wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4 +VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/ +AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB +AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW +BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun +pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC +dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf +fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm +NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx +H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe ++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_Global_Root_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_Global_Root_CA.pem new file mode 100644 index 0000000000..fd4341df26 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_Global_Root_CA.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_High_Assurance_EV_Root_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_High_Assurance_EV_Root_CA.pem new file mode 100644 index 0000000000..9e6810ab70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/DigiCert_High_Assurance_EV_Root_CA.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j +ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 +LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug +RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm ++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW +PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM +xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB +Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3 +hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg +EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA +FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec +nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z +eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF +hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2 +Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe +vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep ++OkuE6N36B9K +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust.net_Certification_Authority_2048.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust.net_Certification_Authority_2048.pem new file mode 100644 index 0000000000..06926c8e01 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust.net_Certification_Authority_2048.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML +RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp +bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5 +IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0xOTEy +MjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 +LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp +YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG +A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq +K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe +sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX +MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT +XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/ +HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH +4QIDAQABo3QwcjARBglghkgBhvhCAQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGA +vtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdERgL7YibkIozH5oSQJFrlwMB0G +CSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA +WUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo +oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQ +h7A6tcOdBTcSo8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18 +f3v/rxzP5tsHrV7bhZ3QKw0z2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfN +B/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjXOP/swNlQ8C5LWK5Gb9Auw2DaclVy +vUxFnmG6v4SBkgPR0ml8xQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust.net_Secure_Server_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust.net_Secure_Server_Certification_Authority.pem new file mode 100644 index 0000000000..4b8939ccba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust.net_Secure_Server_Certification_Authority.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC +VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u +ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc +KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u +ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1 +MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE +ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j +b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF +bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg +U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA +A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/ +I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3 +wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC +AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb +oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5 +BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p +dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk +MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp +b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu +dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0 +MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi +E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa +MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI +hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN +95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd +2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust_Root_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust_Root_Certification_Authority.pem new file mode 100644 index 0000000000..855485cfd0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Entrust_Root_Certification_Authority.pem @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0 +Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW +KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw +NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw +NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy +ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV +BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo +Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4 +4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9 +KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI +rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi +94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB +sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi +gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo +kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE +vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA +A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t +O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua +AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP +9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/ +eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m +0vdXcDazv/wor3ElhVsT/h5/WrQ8 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_Certificate_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_Certificate_Authority.pem new file mode 100644 index 0000000000..676db9759f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_Certificate_Authority.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV +UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy +dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1 +MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx +dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B +AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f +BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A +cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC +AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ +MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm +aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw +ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj +IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF +MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA +A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y +7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh +1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_Global_eBusiness_CA-1.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_Global_eBusiness_CA-1.pem new file mode 100644 index 0000000000..03cb845809 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_Global_eBusiness_CA-1.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT +ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw +MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj +dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l +c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC +UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc +58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/ +o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH +MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr +aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA +A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA +Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv +8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_eBusiness_CA-1.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_eBusiness_CA-1.pem new file mode 100644 index 0000000000..768a9eb970 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_eBusiness_CA-1.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT +ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw +MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j +LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ +KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo +RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu +WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw +Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD +AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK +eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM +zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+ +WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN +/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_eBusiness_CA-2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_eBusiness_CA-2.pem new file mode 100644 index 0000000000..e29f64ea5c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Equifax_Secure_eBusiness_CA-2.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV +UzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2Vj +dXJlIGVCdXNpbmVzcyBDQS0yMB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0 +NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkVxdWlmYXggU2VjdXJlMSYwJAYD +VQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCBnzANBgkqhkiG9w0B +AQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn2Z0G +vxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/ +BPO3QSQ5BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0C +AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEX +MBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJl +IGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTkw +NjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9euSBIplBq +y/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQF +MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA +A4GBAAyGgq3oThr1jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy +0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1 +E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUmV+GRMOrN +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GTE_CyberTrust_Global_Root.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GTE_CyberTrust_Global_Root.pem new file mode 100644 index 0000000000..82ae5e1bec --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GTE_CyberTrust_Global_Root.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD +VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv +bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv +b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV +UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU +cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds +b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH +iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS +r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4 +04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r +GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9 +3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P +lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Global_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Global_CA.pem new file mode 100644 index 0000000000..bcb2529761 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Global_CA.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i +YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG +EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg +R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9 +9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq +fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv +iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU +1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+ +bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW +MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA +ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l +uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn +Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS +tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF +PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un +hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV +5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Global_CA_2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Global_CA_2.pem new file mode 100644 index 0000000000..2031f3edb4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Global_CA_2.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs +IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG +EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg +R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A +PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8 +Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL +TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL +5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7 +S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe +2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE +FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap +EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td +EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv +/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN +A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0 +abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF +I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz +4iIprn2DQKi6bA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority.pem new file mode 100644 index 0000000000..03c70c7053 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY +MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo +R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx +MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK +Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9 +AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA +ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0 +7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W +kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI +mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ +KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1 +6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl +4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K +oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj +UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU +AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority_-_G2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority_-_G2.pem new file mode 100644 index 0000000000..f9364c087f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority_-_G2.pem @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL +MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj +KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2 +MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV +BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw +NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV +BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH +MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL +So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal +tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG +CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT +qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz +rD6ogRLQy7rQkgu2npaqBA+K +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority_-_G3.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority_-_G3.pem new file mode 100644 index 0000000000..dc1f859a55 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Primary_Certification_Authority_-_G3.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB +mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT +MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s +eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ +BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg +MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0 +BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz ++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm +hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn +5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W +JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL +DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC +huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw +HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB +AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB +zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN +kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD +AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH +SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G +spki4cErx5z481+oghLrGREt +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Universal_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Universal_CA.pem new file mode 100644 index 0000000000..6bc2888547 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Universal_CA.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy +c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE +BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0 +IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV +VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8 +cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT +QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh +F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v +c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w +mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd +VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX +teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ +f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe +Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+ +nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB +/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY +MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG +9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc +aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX +IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn +ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z +uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN +Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja +QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW +koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9 +ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt +DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm +bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Universal_CA_2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Universal_CA_2.pem new file mode 100644 index 0000000000..bed6cd0dd3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GeoTrust_Universal_CA_2.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy +c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD +VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1 +c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC +AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81 +WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG +FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq +XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL +se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb +KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd +IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73 +y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt +hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc +QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4 +Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV +HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ +KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z +dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ +L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr +Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo +ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY +T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz +GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m +1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV +OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH +6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX +QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign.pem new file mode 100644 index 0000000000..8afb219058 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G +A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp +Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4 +MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG +A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8 +RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT +gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm +KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd +QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ +XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw +DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o +LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU +RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp +jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK +6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX +mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs +Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH +WD9f +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign_Root_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign_Root_CA.pem new file mode 100644 index 0000000000..f4ce4ca43d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign_Root_CA.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG +A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv +b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw +MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i +YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT +aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ +jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp +xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp +1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG +snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ +U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8 +9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B +AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz +yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE +38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP +AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad +DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME +HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign_Root_CA_-_R2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign_Root_CA_-_R2.pem new file mode 100644 index 0000000000..6f0f8db0d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/GlobalSign_Root_CA_-_R2.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G +A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp +Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1 +MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG +A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL +v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8 +eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq +tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd +C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa +zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB +mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH +V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n +bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG +3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs +J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO +291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS +ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd +AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 +TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Go_Daddy_Class_2_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Go_Daddy_Class_2_Certification_Authority.pem new file mode 100644 index 0000000000..42e8d1eef9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Go_Daddy_Class_2_Certification_Authority.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh +MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE +YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3 +MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo +ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg +MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN +ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA +PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w +wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi +EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY +avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+ +YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE +sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h +/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5 +IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD +ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy +OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P +TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ +HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER +dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf +ReYNnyicsbkqWletNw+vHX/bvZ8= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Go_Daddy_Root_Certificate_Authority_-_G2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Go_Daddy_Root_Certificate_Authority_-_G2.pem new file mode 100644 index 0000000000..c2b2907814 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Go_Daddy_Root_Certificate_Authority_-_G2.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT +EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp +ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz +NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH +EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE +AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD +E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH +/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy +DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh +GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR +tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA +AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE +FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX +WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu +9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr +gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo +2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO +LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI +4uJEvlz36hz1 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Network_Solutions_Certificate_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Network_Solutions_Certificate_Authority.pem new file mode 100644 index 0000000000..11289bcdf3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Network_Solutions_Certificate_Authority.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi +MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu +MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp +dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV +UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO +ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz +c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP +OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl +mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF +BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4 +qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw +gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB +BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu +bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp +dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8 +6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/ +h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH +/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv +wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN +pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Secure_Certificate_Services.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Secure_Certificate_Services.pem new file mode 100644 index 0000000000..fe804a3777 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Secure_Certificate_Services.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp +ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow +fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV +BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM +cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S +HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 +CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk +3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz +6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV +HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud +EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv +Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw +Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww +DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 +5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj +Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI +gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ +aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl +izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Class_2_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Class_2_Certification_Authority.pem new file mode 100644 index 0000000000..d552e65ddd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Class_2_Certification_Authority.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl +MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp +U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw +NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE +ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp +ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3 +DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf +8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN ++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0 +X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa +K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA +1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G +A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR +zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0 +YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD +bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w +DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3 +L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D +eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl +xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp +VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY +WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Root_Certificate_Authority_-_G2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Root_Certificate_Authority_-_G2.pem new file mode 100644 index 0000000000..c1a0a48106 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Root_Certificate_Authority_-_G2.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT +HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs +ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw +MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6 +b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj +aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp +Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg +nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1 +HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N +Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN +dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0 +HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G +CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU +sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3 +4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg +8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K +pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1 +mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Services_Root_Certificate_Authority_-_G2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Services_Root_Certificate_Authority_-_G2.pem new file mode 100644 index 0000000000..f7519150cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Starfield_Services_Root_Certificate_Authority_-_G2.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT +HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs +ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5 +MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD +VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy +ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy +dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p +OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2 +8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K +Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe +hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk +6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw +DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q +AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI +bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB +ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z +qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd +iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn +0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN +sSi6 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority.pem new file mode 100644 index 0000000000..960f2657be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority.pem @@ -0,0 +1,44 @@ +-----BEGIN CERTIFICATE----- +MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW +MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg +Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9 +MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi +U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh +cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk +pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf +OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C +Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT +Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi +HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM +Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w ++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+ +Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3 +Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B +26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID +AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE +FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j +ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js +LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM +BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0 +Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy +dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh +cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh +YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg +dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp +bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ +YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT +TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ +9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8 +jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW +FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz +ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1 +ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L +EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu +L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq +yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC +O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V +um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh +NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority_-_SHA256.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority_-_SHA256.pem new file mode 100644 index 0000000000..ccf48a4de1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority_-_SHA256.pem @@ -0,0 +1,43 @@ +-----BEGIN CERTIFICATE----- +MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW +MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg +Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9 +MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi +U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh +cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk +pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf +OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C +Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT +Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi +HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM +Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w ++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+ +Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3 +Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B +26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID +AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul +F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC +ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w +ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk +aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0 +YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg +c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93 +d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG +CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1 +dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF +wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS +Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst +0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc +pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl +CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF +P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK +1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm +KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE +JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ +8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm +fyWl8kgAwKQB2j8= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority_G2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority_G2.pem new file mode 100644 index 0000000000..3b1e6e82a7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/StartCom_Certification_Authority_G2.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW +MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm +aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1 +OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG +A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G +CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ +JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD +vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo +D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/ +Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW +RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK +HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN +nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM +0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i +UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9 +Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg +TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL +BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K +2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX +UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl +6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK +9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ +HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI +wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY +XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l +IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo +hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr +so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Class_2_CA_II.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Class_2_CA_II.pem new file mode 100644 index 0000000000..c28ac18dae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Class_2_CA_II.pem @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV +BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0 +Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1 +OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i +SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc +VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf +tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg +uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J +XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK +8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99 +5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3 +kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy +dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6 +Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz +JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290 +Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS +GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt +ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8 +au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV +hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI +dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Class_3_CA_II.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Class_3_CA_II.pem new file mode 100644 index 0000000000..78e6ca5975 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Class_3_CA_II.pem @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV +BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0 +Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1 +OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i +SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc +VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW +Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q +Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2 +1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq +ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1 +Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX +XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy +dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6 +Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz +JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290 +Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN +irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8 +TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6 +g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB +95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj +S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Universal_CA_I.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Universal_CA_I.pem new file mode 100644 index 0000000000..8b8caf5502 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Universal_CA_I.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV +BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1 +c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx +MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg +R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD +VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR +JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T +fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu +jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z +wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ +fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD +VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G +CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1 +7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn +8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs +ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT +ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/ +2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Universal_CA_III.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Universal_CA_III.pem new file mode 100644 index 0000000000..b7926f15b6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/TC_TrustCenter_Universal_CA_III.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV +BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1 +c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAeFw0wOTA5MDkwODE1MjdaFw0yOTEy +MzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNUQyBUcnVzdENlbnRl +ciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0ExKDAm +BgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF +5+cvAqBNLaT6hdqbJYUtQCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYv +DIRlzg9uwliT6CwLOunBjvvya8o84pxOjuT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8v +zArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+EutCHnNaYlAJ/Uqwa1D7KRT +yGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1M4BDj5yj +dipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBh +MB8GA1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMB +Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI +4jANBgkqhkiG9w0BAQUFAAOCAQEAg8ev6n9NCjw5sWi+e22JLumzCecYV42Fmhfz +dkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+KGwWaODIl0YgoGhnYIg5IFHY +aAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhKBgePxLcHsU0G +DeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV +CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPH +LQNjO9Po5KIqwoIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Thawte_Premium_Server_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Thawte_Premium_Server_CA.pem new file mode 100644 index 0000000000..51285e33c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Thawte_Premium_Server_CA.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD +VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy +dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t +MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB +MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG +A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp +b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl +cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv +bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE +VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ +ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR +uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG +9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI +hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM +pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Thawte_Server_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Thawte_Server_CA.pem new file mode 100644 index 0000000000..27df192f0d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/Thawte_Server_CA.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD +VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm +MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx +MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT +DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3 +dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl +cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3 +DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD +gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91 +yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX +L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj +EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG +7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e +QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ +qdq5snUb9kLy78fyGPmJvKP/iiMucEc= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/UTN-USERFirst-Hardware.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/UTN-USERFirst-Hardware.pem new file mode 100644 index 0000000000..46386b734a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/UTN-USERFirst-Hardware.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB +lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt +SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG +A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe +MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v +d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh +cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn +0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ +M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a +MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd +oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI +DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy +oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 +dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy +bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF +BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM +//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli +CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE +CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t +3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS +KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/UTN_-_DATACorp_SGC.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/UTN_-_DATACorp_SGC.pem new file mode 100644 index 0000000000..1c747eb57d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/UTN_-_DATACorp_SGC.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB +kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw +IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG +EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD +VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu +dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 +E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ +D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK +4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq +lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW +bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB +o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT +MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js +LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr +BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB +AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft +Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj +j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH +KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv +2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 +mfnGV/TJVTl4uix5yaaIK/QI +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_1_Policy_Validation_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_1_Policy_Validation_Authority.pem new file mode 100644 index 0000000000..3997ac242e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_1_Policy_Validation_Authority.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 +IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz +BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y +aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG +9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy +NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y +azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw +Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl +cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y +LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+ +TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y +TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0 +LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW +I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw +nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_2_Policy_Validation_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_2_Policy_Validation_Authority.pem new file mode 100644 index 0000000000..85a877b873 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_2_Policy_Validation_Authority.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 +IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz +BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y +aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG +9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy +NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y +azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw +Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl +cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY +dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9 +WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS +v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v +UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu +IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC +W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_3_Policy_Validation_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_3_Policy_Validation_Authority.pem new file mode 100644 index 0000000000..2b60983655 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/ValiCert_Class_3_Policy_Validation_Authority.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 +IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz +BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y +aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG +9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy +NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y +azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw +Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl +cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD +cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs +2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY +JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE +Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ +n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A +PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority.pem new file mode 100644 index 0000000000..87676acf5f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz +cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 +MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV +BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN +ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE +BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is +I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G +CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do +lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc +AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem new file mode 100644 index 0000000000..2202c69287 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ +BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh +c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy +MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp +emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X +DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw +FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg +UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo +YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 +MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB +AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4 +pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0 +13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID +AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk +U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i +F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY +oJ2daZH9 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G3.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G3.pem new file mode 100644 index 0000000000..688036446e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G3.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b +N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t +KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu +kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm +CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ +Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu +imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te +2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe +DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p +F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt +TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem new file mode 100644 index 0000000000..e19fdea044 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL +MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW +ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp +U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y +aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp +U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg +SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln +biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm +GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve +fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ +aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj +aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW +kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC +4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga +FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem new file mode 100644 index 0000000000..707ff085b8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB +yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL +ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp +U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW +ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL +MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW +ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp +U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y +aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 +nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex +t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz +SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG +BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ +rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ +NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E +BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH +BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy +aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv +MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE +p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y +5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK +WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ +4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N +hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_4_Public_Primary_Certification_Authority_-_G3.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_4_Public_Primary_Certification_Authority_-_G3.pem new file mode 100644 index 0000000000..a0c3ef8270 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Class_4_Public_Primary_Certification_Authority_-_G3.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1 +GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ ++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd +U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm +NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY +ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ +ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1 +CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq +g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm +fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c +2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/ +bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Universal_Root_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Universal_Root_Certification_Authority.pem new file mode 100644 index 0000000000..b5f187511d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/VeriSign_Universal_Root_Certification_Authority.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB +vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL +ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp +U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W +ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe +Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX +MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0 +IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y +IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh +bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF +9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH +H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H +LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN +/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT +rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw +WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs +exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud +DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4 +sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+ +seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz +4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+ +BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR +lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3 +7M2CYfE45k+XmCpajQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/XRamp_Global_Certification_Authority.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/XRamp_Global_Certification_Authority.pem new file mode 100644 index 0000000000..f21e6d8b7c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/XRamp_Global_Certification_Authority.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB +gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk +MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY +UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx +NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3 +dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy +dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6 +38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP +KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q +DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4 +qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa +JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi +PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P +BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs +jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0 +eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD +ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR +vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt +qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa +IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy +i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ +O+7ETPTsJ3xCwnR8gooJybQDJbw= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA.pem new file mode 100644 index 0000000000..998460f1c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB +qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf +Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw +MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV +BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw +NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j +LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG +A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl +IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs +W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta +3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk +6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6 +Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J +NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP +r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU +DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz +YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX +xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2 +/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/ +LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7 +jVaMaA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA_-_G2.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA_-_G2.pem new file mode 100644 index 0000000000..447ee3d898 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA_-_G2.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp +IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi +BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw +MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh +d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig +YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v +dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/ +BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6 +papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E +BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K +DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3 +KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox +XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA_-_G3.pem b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA_-_G3.pem new file mode 100644 index 0000000000..acfed9d2c8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ca-certificates/files/thawte_Primary_Root_CA_-_G3.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB +rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf +Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw +MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV +BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa +Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl +LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u +MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl +ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm +gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8 +YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf +b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9 +9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S +zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk +OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV +HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA +2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW +oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu +t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c +KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM +m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu +MdRAGmI0Nj81Aa6sY6A= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/chromeos-chrome-26.0.1403.0_rc-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/chromeos-chrome-26.0.1403.0_rc-r1.ebuild new file mode 100644 index 0000000000..b91694c90c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/chromeos-chrome-26.0.1403.0_rc-r1.ebuild @@ -0,0 +1,1003 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# Usage: by default, downloads chromium browser from the build server. +# If CHROME_ORIGIN is set to one of {SERVER_SOURCE, LOCAL_SOURCE, LOCAL_BINARY}, +# the build comes from the chromimum source repository (gclient sync), +# build server, locally provided source, or locally provided binary. +# If you are using SERVER_SOURCE, a gclient template file that is in the files +# directory which will be copied automatically during the build and used as +# the .gclient for 'gclient sync'. +# If building from LOCAL_SOURCE or LOCAL_BINARY specifying BUILDTYPE +# will allow you to specify "Debug" or another build type; "Release" is +# the default. +# gclient is expected to be in ~/depot_tools if EGCLIENT is not set +# to gclient path. + +EAPI="2" +inherit autotest-deponly binutils-funcs eutils flag-o-matic git-2 multilib toolchain-funcs + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="-asan +build_tests +chrome_remoting chrome_internal chrome_pdf +chrome_debug -chrome_debug_tests -chrome_media -clang -component_build -content_shell -drm +gold hardfp +highdpi +nacl neon -ninja -oem_wallpaper -pgo_use -pgo_generate +reorder +runhooks +verbose widevine_cdm" + +# Do not strip the nacl_helper_bootstrap binary because the binutils +# objcopy/strip mangles the ELF program headers. +# TODO(mcgrathr,vapier): This should be removed after portage's prepstrip +# script is changed to use eu-strip instead of objcopy and strip. +STRIP_MASK="*/nacl_helper_bootstrap" + +# When we get to EAPI=4 +# REQUIRED_USE= +REORDER_SUBDIR="reorder" + +# Portage version without optional portage suffix. +CHROME_VERSION="${PV/_*/}" + +CHROME_SRC="chrome-src" +if use chrome_internal; then + CHROME_SRC="${CHROME_SRC}-internal" +fi + +# CHROME_CACHE_DIR is used for storing output artifacts, and is always a +# regular directory inside the chroot (i.e. it's never mounted in, so it's +# always safe to use cp -al for these artifacts). +if [[ -z ${CHROME_CACHE_DIR} ]] ; then + CHROME_CACHE_DIR="/var/cache/chromeos-chrome/${CHROME_SRC}" +fi +addwrite "${CHROME_CACHE_DIR}" + +# CHROME_DISTDIR is used for storing the source code, if any source code +# needs to be unpacked at build time (e.g. in the SERVER_SOURCE scenario.) +# It will be mounted into the chroot, so it is never safe to use cp -al +# for these files. +if [[ -z ${CHROME_DISTDIR} ]] ; then + CHROME_DISTDIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/${CHROME_SRC}" +fi +addwrite "${CHROME_DISTDIR}" + +# chrome destination directory +CHROME_DIR=/opt/google/chrome +D_CHROME_DIR="${D}/${CHROME_DIR}" +RELEASE_EXTRA_CFLAGS=() + +USE_TCMALLOC="linux_use_tcmalloc=1" + +# For compilation/local chrome +BUILDTYPE="${BUILDTYPE:-Release}" +BOARD="${BOARD:-${SYSROOT##/build/}}" +BUILD_OUT="${BUILD_OUT:-out_${BOARD}}" +# WARNING: We are using a symlink now for the build directory to work around +# command line length limits. This will cause problems if you are doing +# parallel builds of different boards/variants. +# Unsetting BUILD_OUT_SYM will revert this behavior +BUILD_OUT_SYM="c" + +PGO_SUFFIX=".pgo.tar.bz2" +PGO_LOCATION="gs://chromeos-prebuilt/pgo-job/canonicals/" + +add_pgo_arches() { + local file a + for a in "$@" ; do + file="chromeos-chrome-${a}-${PV}${PGO_SUFFIX}" + SRC_URI+="pgo_use? ( ${a}? ( ${PGO_LOCATION}${file} ) ) " + done +} + +RESTRICT="mirror" +add_pgo_arches x86 amd64 arm + +TEST_FILES=("ffmpeg_tests" "video_decode_accelerator_unittest" "ppapi_example_video_decode") +PPAPI_TEST_FILES=( + lib{32,64} + mock_nacl_gdb + nacl_test_data + ppapi_nacl_tests_{newlib,glibc}.nmf + ppapi_nacl_tests_{newlib,glibc}_{x32,x64,arm}.nexe + test_case.html + test_case.html.mock-http-headers + test_page.css + test_url_loader_data +) + +RDEPEND="${RDEPEND} + app-arch/bzip2 + >=app-i18n/ibus-1.4.99 + arm? ( virtual/opengles ) + dev-libs/atk + dev-libs/glib + dev-libs/nspr + >=dev-libs/nss-3.12.2 + dev-libs/libxml2 + dev-libs/dbus-glib + x11-libs/cairo + drm? ( x11-libs/libxkbcommon ) + x11-libs/libXScrnSaver + x11-libs/pango + >=media-libs/alsa-lib-1.0.19 + media-libs/fontconfig + media-libs/freetype + media-libs/libpng + media-libs/mesa + >=media-sound/adhd-0.0.1-r310 + net-misc/wget + sys-fs/udev + sys-libs/zlib + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXScrnSaver + chrome_remoting? ( x11-libs/libXtst ) + x11-apps/setxkbmap + !arm? ( x11-libs/libva )" + +DEPEND="${DEPEND} + ${RDEPEND} + arm? ( x11-drivers/opengles-headers ) + chromeos-base/protofiles + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + net-wireless/bluez" + +PATCHES=() + +AUTOTEST_COMMON="src/chrome/test/chromeos/autotest/files" +AUTOTEST_DEPS="${AUTOTEST_COMMON}/client/deps" +AUTOTEST_DEPS_LIST="chrome_test pyauto_dep page_cycler_dep" + +IUSE="${IUSE} +autotest" + +export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser + +QA_TEXTRELS="*" +QA_EXECSTACK="*" +QA_PRESTRIPPED="*" + +use_nacl() { + ! use asan && ! use component_build && ! use drm && use nacl +} + +# Like the `usex` helper: +# Usage: echox [int] [echo-if-true] [echo-if-false] +# If [int] is 0, then echo the 2nd arg (default of yes), else +# echo the 3rd arg (default of no). +echox() { + # Like the `usex` helper. + [[ ${1:-$?} -eq 0 ]] && echo "${2:-yes}" || echo "${3:-no}" +} +echo10() { echox ${1:-$?} 1 0 ; } +echotf() { echox ${1:-$?} true false ; } +use10() { usex $1 1 0 ; } +usetf() { usex $1 true false ; } +set_build_defines() { + # General build defines. + # TODO(vapier): Check that this should say SYSROOT not ROOT + BUILD_DEFINES=( + "sysroot=${ROOT}" + python_ver=2.6 + "linux_sandbox_path=${CHROME_DIR}/chrome-sandbox" + "${EXTRA_BUILD_ARGS}" + "system_libdir=$(get_libdir)" + "pkg-config=$(tc-getPKG_CONFIG)" + "use_xi2_mt=2" + ) + + BUILD_DEFINES+=( + swig_defines=-DOS_CHROMEOS + chromeos=1 + ) + + if use pgo_generate ; then + BUILD_DEFINES+=( + libraries_for_target=-lgcov + ) + RELEASE_EXTRA_CFLAGS+=( + -DPGO_GENERATE + -fprofile-generate + -fprofile-dir=/tmp/pgo/chrome + -Wno-error=maybe-uninitialized + ) + fi + + # Set proper BUILD_DEFINES for the arch + case "${ARCH}" in + x86) + BUILD_DEFINES+=( target_arch=ia32 enable_smooth_scrolling=1 ) + ;; + arm) + BUILD_DEFINES+=( + target_arch=arm + arm_float_abi=$(usex hardfp hard softfp) + arm_neon=$(use10 neon) + armv7=$([[ ${CHOST} == armv7* ]]; echo10) + v8_can_use_unaligned_accesses=$([[ ${CHOST} == armv[67]* ]]; echotf) + v8_can_use_vfp3_instructions=$([[ ${ARM_FPU} == *vfpv[34]* ]]; echotf) + v8_use_arm_eabi_hardfloat=$(usetf hardfp) + ) + if [[ -n "${ARM_FPU}" ]]; then + BUILD_DEFINES+=( arm_fpu="${ARM_FPU}" ) + fi + if use chrome_internal; then + #http://code.google.com/p/chrome-os-partner/issues/detail?id=1142 + BUILD_DEFINES+=( internal_pdf=0 ) + fi + ;; + amd64) + BUILD_DEFINES+=( target_arch=x64 enable_smooth_scrolling=1 ) + ;; + *) + die "Unsupported architecture: ${ARCH}" + ;; + esac + + use_nacl || BUILD_DEFINES+=( disable_nacl=1 ) + + use drm && BUILD_DEFINES+=( use_drm=1 ) + + # Control inclusion of optional chrome features. + if use chrome_remoting; then + BUILD_DEFINES+=( remoting=1 ) + else + BUILD_DEFINES+=( remoting=0 ) + fi + + if use chrome_internal; then + #Adding chrome branding specific variables and GYP_DEFINES + BUILD_DEFINES+=( branding=Chrome buildtype=Official ) + export CHROMIUM_BUILD='_google_Chrome' + export OFFICIAL_BUILD='1' + export CHROME_BUILD_TYPE='_official' + + # For internal builds, don't remove webcore debug symbols by default. + REMOVE_WEBCORE_DEBUG_SYMBOLS=${REMOVE_WEBCORE_DEBUG_SYMBOLS:-0} + elif use chrome_media; then + echo "Building Chromium with additional media codecs and containers." + BUILD_DEFINES+=( ffmpeg_branding=ChromeOS proprietary_codecs=1 ) + fi + + # This saves time and bytes. + if [[ "${REMOVE_WEBCORE_DEBUG_SYMBOLS:-1}" == "1" ]]; then + BUILD_DEFINES+=( remove_webcore_debug_symbols=1 ) + fi + + if ! use chrome_debug_tests; then + BUILD_DEFINES+=( strip_tests=1 ) + fi + + if use reorder && ! use clang; then + BUILD_DEFINES+=( "order_text_section=${CHROME_DISTDIR}/${REORDER_SUBDIR}/section-ordering-files/orderfile" ) + fi + + if use clang; then + if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then + BUILD_DEFINES+=( clang=1 clang_use_chrome_plugins=0 werror= ) + USE_TCMALLOC="linux_use_tcmalloc=0" + + # The chrome build system will add -m32 for 32bit arches, and + # clang defaults to 64bit because our cros_sdk is 64bit default. + export CC="clang" CXX="clang++" + else + die "Clang is not yet supported for ${ARCH}" + fi + fi + + if use asan; then + if ! use clang; then + eerror "Asan requires Clang to run." + die "Please set USE=\"${USE} clang\" to enable Clang" + fi + BUILD_DEFINES+=( asan=1 ) + fi + + if use component_build; then + BUILD_DEFINES+=( component=shared_library ) + fi + + BUILD_DEFINES+=( "${USE_TCMALLOC}" ) + BUILD_DEFINES+=( "use_cras=1" ) + + # TODO(davidjames): Pass in all CFLAGS this way, once gyp is smart enough + # to accept cflags that only apply to the target. + if use chrome_debug; then + RELEASE_EXTRA_CFLAGS+=( + -g + ) + fi + + if ! use chrome_pdf; then + BUILD_DEFINES+=( internal_pdf=0 ) + fi + + if use oem_wallpaper; then + BUILD_DEFINES+=( use_oem_wallpaper=1 ) + fi + + BUILD_DEFINES+=( "release_extra_cflags='${RELEASE_EXTRA_CFLAGS[*]}'" ) + + export GYP_GENERATORS="$(usex ninja ninja make)" + export GYP_DEFINES="${BUILD_DEFINES[*]}" + export builddir_name="${BUILD_OUT}" + # Prevents gclient from updating self. + export DEPOT_TOOLS_UPDATE=0 + # Chrome's build overrides the Chrome OS build wrapper's addition + # of -fstack-protector-strong, so re-add it to the end of the + # command-line, since gcc uses "last flag wins" for stack protector. + CXXFLAGS+=" -fstack-protector-strong" + # Enable std::vector []-operator bounds checking. + CXXFLAGS+=" -D__google_stl_debug_vector=1" +} + +unpack_chrome() { + local cmd=( "${CROS_WORKON_SRCROOT}"/chromite/bin/sync_chrome ) + use chrome_internal && cmd+=( --internal ) + use chrome_pdf && cmd+=( --pdf ) + if [[ -n "${CROS_SVN_COMMIT}" ]]; then + cmd+=( --revision="${CROS_SVN_COMMIT}" ) + elif [[ "${CHROME_VERSION}" != "9999" ]]; then + cmd+=( --tag="${CHROME_VERSION}" ) + fi + # --reset tells sync_chrome to blow away local changes and to feel + # free to delete any directories that get in the way of syncing. This + # is needed for unattended operation. + cmd+=( --reset --gclient="${EGCLIENT}" "${CHROME_DISTDIR}" ) + elog "${cmd[*]}" + "${cmd[@]}" || die +} + +decide_chrome_origin() { + local chrome_workon="=chromeos-base/chromeos-chrome-9999" + local cros_workon_file="${ROOT}etc/portage/package.keywords/cros-workon" + if [[ -e "${cros_workon_file}" ]] && grep -q "${chrome_workon}" "${cros_workon_file}"; then + # LOCAL_SOURCE is the default for cros_workon + # Warn the user if CHROME_ORIGIN is already set + if [[ -n "${CHROME_ORIGIN}" && "${CHROME_ORIGIN}" != LOCAL_SOURCE ]]; then + ewarn "CHROME_ORIGIN is already set to ${CHROME_ORIGIN}." + ewarn "This will prevent you from building from your local checkout." + ewarn "Please run 'unset CHROME_ORIGIN' to reset Chrome" + ewarn "to the default source location." + fi + : ${CHROME_ORIGIN:=LOCAL_SOURCE} + else + # By default, pull from server + : ${CHROME_ORIGIN:=SERVER_SOURCE} + fi +} + +sandboxless_ensure_directory() { + local dir + for dir in "$@"; do + if [[ ! -d "${dir}" ]] ; then + # We need root access to create these directories, so we need to + # use sudo. This implicitly disables the sandbox. + sudo mkdir -p "${dir}" || die + sudo chown "${PORTAGE_USERNAME}:portage" "${dir}" || die + sudo chmod 0755 "${dir}" || die + fi + done +} + +src_unpack() { + tc-export CC CXX + local WHOAMI=$(whoami) + export EGCLIENT="${EGCLIENT:-/home/${WHOAMI}/depot_tools/gclient}" + export ENINJA="${ENINJA:-/home/${WHOAMI}/depot_tools/ninja}" + export DEPOT_TOOLS_UPDATE=0 + + # Create storage directories. + sandboxless_ensure_directory "${CHROME_DISTDIR}" "${CHROME_CACHE_DIR}" + + # Copy in credentials to fake home directory so that build process + # can access svn and ssh if needed. + mkdir -p ${HOME} + SUBVERSION_CONFIG_DIR=/home/${WHOAMI}/.subversion + if [[ -d ${SUBVERSION_CONFIG_DIR} ]]; then + cp -rfp ${SUBVERSION_CONFIG_DIR} ${HOME} || die + fi + SSH_CONFIG_DIR=/home/${WHOAMI}/.ssh + if [[ -d ${SSH_CONFIG_DIR} ]]; then + cp -rfp ${SSH_CONFIG_DIR} ${HOME} || die + fi + NET_CONFIG=/home/${WHOAMI}/.netrc + if [[ -f ${NET_CONFIG} ]]; then + cp -fp ${NET_CONFIG} ${HOME} || die + fi + + decide_chrome_origin + + case "${CHROME_ORIGIN}" in + LOCAL_SOURCE|SERVER_SOURCE|LOCAL_BINARY|GERRIT_SOURCE) + elog "CHROME_ORIGIN VALUE is ${CHROME_ORIGIN}" + ;; + *) + die "CHROME_ORIGIN not one of LOCAL_SOURCE, SERVER_SOURCE, LOCAL_BINARY, GERRIT_SOURCE" + ;; + esac + + # Prepare and set CHROME_ROOT based on CHROME_ORIGIN. + # CHROME_ROOT is the location where the source code is used for compilation. + # If we're in SERVER_SOURCE mode, CHROME_ROOT is CHROME_DISTDIR. In LOCAL_SOURCE + # mode, this directory may be set manually to any directory. It may be mounted + # into the chroot, so it is not safe to use cp -al for these files. + # These are set here because $(whoami) returns the proper user here, + # but 'root' at the root level of the file + case "${CHROME_ORIGIN}" in + (SERVER_SOURCE) + elog "Using CHROME_VERSION = ${CHROME_VERSION}" + unpack_chrome + + elog "set the chrome source root to ${CHROME_DISTDIR}" + elog "From this point onwards there is no difference between \ + SERVER_SOURCE and LOCAL_SOURCE, since the fetch is done" + CHROME_ROOT=${CHROME_DISTDIR} + ;; + (GERRIT_SOURCE) + CHROME_ROOT="/home/${WHOAMI}/trunk/chromium" + # TODO(rcui): Remove all these addwrite hacks once we start + # building off a copy of the source + addwrite "${CHROME_ROOT}" + # Addwrite to .repo because each project's .git directory links + # to the .repo directory. + addwrite "/home/${WHOAMI}/trunk/.repo/" + # - Make the symlinks from chromium src tree to CrOS source tree + # writeable so we can run hooks and reset the checkout. + # - We need to explicitly do this because the symlink points to + # outside of the CHROME_ROOT. + # - We don't know which one is a symlink so do it for + # all files/directories in src/third_party + # - chrome_set_ver creates symlinks in src/third_party to simulate + # the cros_deps checkout gclient does. For details, see + # http://gerrit.chromium.org/gerrit/#change,5692. + THIRD_PARTY_DIR="${CHROME_ROOT}/src/third_party" + for f in `ls -1 ${THIRD_PARTY_DIR}` + do + addwrite "${THIRD_PARTY_DIR}/${f}" + done + ;; + (LOCAL_SOURCE) + : ${CHROME_ROOT:=/home/${WHOAMI}/chrome_root} + if [[ ! -d "${CHROME_ROOT}/src" ]]; then + die "${CHROME_ROOT} does not contain a valid chromium checkout!" + fi + addwrite "${CHROME_ROOT}" + ;; + esac + + case "${CHROME_ORIGIN}" in + LOCAL_SOURCE|SERVER_SOURCE|GERRIT_SOURCE) + set_build_defines + ;; + esac + + # FIXME: This is the normal path where ebuild stores its working data. + # Chrome builds inside distfiles because of speed, so we at least make + # a symlink here to add compatibility with autotest eclass which uses this. + ln -sf "${CHROME_ROOT}" "${WORKDIR}/${P}" + + if use pgo_use && ! use clang; then + local PROFILE_DIR="${WORKDIR}/pgo" + mkdir "${PROFILE_DIR}" + cd "${PROFILE_DIR}" + unpack "chromeos-chrome-${ARCH}-${PV}${PGO_SUFFIX}" + cd "${WORKDIR}" + if [[ -d "${PROFILE_DIR}/chrome" ]]; then + append-flags -fprofile-use \ + -fprofile-correction \ + -fprofile-dir="${PROFILE_DIR}/chrome" + + # This is required because gcc emits different warnings + # for PGO vs. non-PGO. PGO may inline different + # functions from non-PGO, leading to different warnings. + # crbug.com/112908 + append-flags -Wno-error=maybe-uninitialized + einfo "Using the PGO data" + else + einfo "USE=+pgo_use, but ${PROFILE_DIR}/chrome not "\ + "created from pgo.tar.bz2." + die "PGO data supply failed" + fi + fi + + if use reorder && ! use clang; then + EGIT_REPO_URI="http://git.chromium.org/chromiumos/profile/chromium.git" + EGIT_COMMIT="88c20da2d91098449373f2e2f5cef35c193b8add" + EGIT_PROJECT="${PN}-reorder" + if grep -qs ${EGIT_COMMIT} "${CHROME_DISTDIR}/${REORDER_SUBDIR}/.git/HEAD"; then + einfo "Reorder profile repo is up to date." + else + einfo "Reorder profile repo not up-to-date. Fetching..." + EGIT_SOURCEDIR="${CHROME_DISTDIR}/${REORDER_SUBDIR}" + rm -rf "${EGIT_SOURCEDIR}" + git-2_src_unpack + fi + fi +} + +src_prepare() { + if [[ "${CHROME_ORIGIN}" != "LOCAL_SOURCE" && + "${CHROME_ORIGIN}" != "SERVER_SOURCE" && + "${CHROME_ORIGIN}" != "GERRIT_SOURCE" ]]; then + return + fi + + elog "${CHROME_ROOT} should be set here properly" + cd "${CHROME_ROOT}/src" || die "Cannot chdir to ${CHROME_ROOT}" + + # We do symlink creation here if appropriate + mkdir -p "${CHROME_CACHE_DIR}/src/${BUILD_OUT}" + if [[ ! -z "${BUILD_OUT_SYM}" ]]; then + rm -rf "${BUILD_OUT_SYM}" || die "Could not remove symlink" + ln -sfT "${CHROME_CACHE_DIR}/src/${BUILD_OUT}" "${BUILD_OUT_SYM}" || + die "Could not create symlink for output directory" + export builddir_name="${BUILD_OUT_SYM}" + fi + + + # Apply patches for non-localsource builds + if [[ "${CHROME_ORIGIN}" == "SERVER_SOURCE" && ${#PATCHES[@]} -gt 0 ]]; then + epatch "${PATCHES[@]}" + fi + + # The chrome makefiles specify -O and -g flags already, so remove the + # portage flags. + filter-flags -g -O* + + local WHOAMI=$(whoami) + # The hooks may depend on the environment variables we set in this + # ebuild (i.e., GYP_DEFINES for gyp_chromium) + ECHROME_SET_VER=${ECHROME_SET_VER:=/home/${WHOAMI}/trunk/chromite/bin/chrome_set_ver} + einfo "Building Chrome with the following define options:" + local opt + for opt in "${BUILD_DEFINES[@]}"; do + einfo "${opt}" + done + + # Get credentials to fake home directory so that built chromium + # can access Google services. + # First check for Chrome credentials. + if [[ ! -d google_apis/internal ]]; then + # Then look for ChromeOS supplied credentials. + local PRIVATE_OVERLAYS_DIR=/home/${WHOAMI}/trunk/src/private-overlays + local GAPI_CONFIG_FILE=${PRIVATE_OVERLAYS_DIR}/chromeos-overlay/googleapikeys + # RE to match the allowed names. + local NRE="('google_(api_key|default_client_(id|secret))')" + # RE to match whitespace. + local WS="[[:space:]]*" + # RE to match allowed values. + local CRE="('[^\\\\']*')" + # And combining them into one RE for describing the lines + # we want to allow. + local TRE="^${WS}${NRE}${WS}[:=]${WS}${CRE}.*" + if [[ ! -f "${GAPI_CONFIG_FILE}" ]]; then + # Then developer credentials. + GAPI_CONFIG_FILE=/home/${WHOAMI}/.googleapikeys + fi + if [[ -f "${GAPI_CONFIG_FILE}" ]]; then + mkdir "${HOME}"/.gyp + cat <<-EOF >"${HOME}/.gyp/include.gypi" + { + 'variables': { + $(sed -nr -e "/^${TRE}/{s//\1: \4,/;p;}" \ + "${GAPI_CONFIG_FILE}") + } + } + EOF + fi + fi +} + +src_configure() { + tc-export CXX CC AR AS RANLIB + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export AR_host=$(tc-getBUILD_AR) + if use gold ; then + if [[ "${GOLD_SET}" != "yes" ]]; then + export GOLD_SET="yes" + einfo "Using gold from the following location: $(get_binutils_path_gold)" + export CC="${CC} -B$(get_binutils_path_gold)" + export CXX="${CXX} -B$(get_binutils_path_gold)" + fi + else + ewarn "gold disabled. Using GNU ld." + fi + + # Use g++ as the linker driver. + export LD="${CXX}" + export LD_host=$(tc-getBUILD_CXX) + + local build_tool_flags=() + if use ninja; then + build_tool_flags+=( + "config=${BUILDTYPE}" + "output_dir=${builddir_name}" + ) + fi + export GYP_GENERATOR_FLAGS="${build_tool_flags[*]}" + + # TODO(rcui): crosbug.com/20435. Investigate removal of runhooks + # useflag when chrome build switches to Ninja inside the chroot. + if use runhooks; then + if [[ "${CHROME_ORIGIN}" == "GERRIT_SOURCE" ]]; then + # Set the dependency repos to the revision specified in the + # .DEPS.git file, and run the hooks in that file. + "${ECHROME_SET_VER}" --runhooks || die + else + [[ -n "${EGCLIENT}" ]] || die EGCLIENT unset + [[ -f "${EGCLIENT}" ]] || die EGCLIENT at "${EGCLIENT}" does not exist + "${EGCLIENT}" runhooks --force || die "Failed to run ${EGCLIENT} runhooks" + fi + elif [[ "${CHROME_ORIGIN}" == "GERRIT_SOURCE" ]]; then + "${ECHROME_SET_VER}" || die + fi +} + +chrome_make() { + if use ninja; then + PATH=${PATH}:/home/$(whoami)/depot_tools ${ENINJA} \ + ${MAKEOPTS} -C "${BUILD_OUT_SYM}/${BUILDTYPE}" $(usex verbose -v "") "$@" || die + else + emake -r $(usex verbose V=1 "") "BUILDTYPE=${BUILDTYPE}" "$@" || die + fi +} + +src_compile() { + if [[ "${CHROME_ORIGIN}" != "LOCAL_SOURCE" && + "${CHROME_ORIGIN}" != "SERVER_SOURCE" && + "${CHROME_ORIGIN}" != "GERRIT_SOURCE" ]]; then + return + fi + + cd "${CHROME_ROOT}"/src || die "Cannot chdir to ${CHROME_ROOT}/src" + + local chrome_targets=() + + if [[ -n "${CHROME_TARGET_OVERRIDE}" ]]; then + chrome_targets=( ${CHROME_TARGET_OVERRIDE} ) + einfo "Building custom targets: ${chrome_targets[*]}" + elif use content_shell; then + chrome_targets=( content_shell chrome_sandbox ) + einfo "Building content_shell" + else + chrome_targets=( chrome chrome_sandbox ) + if use build_tests; then + chrome_targets+=( "${TEST_FILES[@]}" + pyautolib + peerconnection_server + chromedriver + browser_tests + sync_integration_tests ) + einfo "Building test targets: ${TEST_TARGETS[@]}" + fi + + # The default_extensions target is a no-op for external builds, and is + # broken with Ninja in this situation. For now, only enable it on + # builds where it installs something. + if use chrome_internal; then + chrome_targets+=( default_extensions ) + fi + + if use_nacl; then + chrome_targets+=( nacl_helper_bootstrap nacl_helper ) + fi + + if use drm; then + chrome_targets+=( aura_demo ash_shell ) + else + chrome_targets+=( libosmesa.so ) + fi + fi + + chrome_make "${chrome_targets[@]}" + + if use build_tests; then + install_chrome_test_resources "${WORKDIR}/test_src" + install_pyauto_dep_resources "${WORKDIR}/pyauto_src" + install_page_cycler_dep_resources "${WORKDIR}/page_cycler_src" + + # NOTE: Since chrome is built inside distfiles, we have to get + # rid of the previous instance first. + # We remove only what we will overwrite with the mv below. + local deps="${WORKDIR}/${P}/${AUTOTEST_DEPS}" + + rm -rf "${deps}/chrome_test/test_src" + mv "${WORKDIR}/test_src" "${deps}/chrome_test/" + + rm -rf "${deps}/pyauto_dep/test_src" + mv "${WORKDIR}/pyauto_src" "${deps}/pyauto_dep/test_src" + + rm -rf "${deps}/page_cycler_dep/test_src" + mv "${WORKDIR}/page_cycler_src" "${deps}/page_cycler_dep/test_src" + + # HACK: It would make more sense to call autotest_src_prepare in + # src_prepare, but we need to call install_chrome_test_resources first. + autotest-deponly_src_prepare + + # Remove .svn dirs + esvn_clean "${AUTOTEST_WORKDIR}" + + autotest_src_compile + fi +} + +# Turn off the cp -l behavior in autotest, since the source dir and the +# installation dir live on different bind mounts right now. +fast_cp() { + cp "$@" +} + +install_test_resources() { + # Install test resources from chrome source directory to destination. + # We keep a cache of test resources inside the chroot to avoid copying + # multiple times. + local test_dir="${1}" + shift + local resource cache dest + for resource in "$@"; do + cache=$(dirname "${CHROME_CACHE_DIR}/src/${resource}") + dest=$(dirname "${test_dir}/${resource}") + mkdir -p "${cache}" "${dest}" + rsync -a --delete --exclude=.svn \ + "${CHROME_ROOT}/src/${resource}" "${cache}" + cp -al "${CHROME_CACHE_DIR}/src/${resource}" "${dest}" + done +} + +install_chrome_test_resources() { + # NOTE: This is a duplicate from src_install, because it's required here. + local from="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}" + local test_dir="${1}" + + echo Copying Chrome tests into "${test_dir}" + mkdir -p "${test_dir}/out/Release" + + # Even if chrome_debug_tests is enabled, we don't need to include detailed + # debug info for tests in the binary package, so save some time by stripping + # everything but the symbol names. Developers who need more detailed debug + # info on the tests can use the original unstripped tests from the ${from} + # directory. + TEST_INSTALL_TARGETS=( + "libppapi_tests.so" + "browser_tests" + "ffmpeg_tests" + "peerconnection_server" + "sync_integration_tests" + "video_decode_accelerator_unittest" ) + + for f in "${TEST_INSTALL_TARGETS[@]}"; do + $(tc-getSTRIP) --strip-debug \ + --keep-file-symbols "${from}"/${f} \ + -o "${test_dir}/out/Release/$(basename ${f})" + done + + # Copy over the test data directory; eventually 'all' non-static + # Chrome test data will go in here. + mkdir "${test_dir}"/out/Release/test_data + cp -al "${from}"/test_data "${test_dir}"/out/Release/ + + # Add the fake bidi locale + mkdir "${test_dir}"/out/Release/pseudo_locales + cp -al "${from}"/pseudo_locales/fake-bidi.pak \ + "${test_dir}"/out/Release/pseudo_locales + + for f in "${TEST_FILES[@]}"; do + cp -al "${from}/${f}" "${test_dir}" + done + + for f in "${PPAPI_TEST_FILES[@]}"; do + cp -al "${from}/${f}" "${test_dir}/out/Release" + done + + # Install Chrome test resources. + install_test_resources "${test_dir}" \ + base/base_paths_posix.cc \ + chrome/test/data \ + chrome/test/functional \ + chrome/third_party/mock4js/mock4js.js \ + content/common/gpu/testdata \ + content/test/data \ + net/data/ssl/certificates \ + ppapi/tests/test_case.html \ + ppapi/tests/test_url_loader_data \ + third_party/bidichecker/bidichecker_packaged.js \ + third_party/WebKit/Tools/Scripts \ + third_party/WebKit/LayoutTests/http/tests/websocket/tests + + # Add pdf test data + if use chrome_pdf; then + install_test_resources "${test_dir}" pdf/test + fi + + # Remove test binaries from other platforms + if [[ -z "${E_MACHINE}" ]]; then + echo E_MACHINE not defined! + else + cd "${test_dir}"/chrome/test + rm -fv $( scanelf -RmyBF%a . | grep -v -e ^${E_MACHINE} ) + fi + + cp -a "${CHROME_ROOT}"/"${AUTOTEST_DEPS}"/chrome_test/setup_test_links.sh \ + "${test_dir}"/out/Release + # Symlinks to resources in pyauto_dep will be created at runtime. +} + +# Set up the PyAuto files also by copying out the files needed for that. +# We create a separate dependency because the chrome_test one is about 350MB +# and PyAuto is a svelte 30MB. +install_pyauto_dep_resources() { + # NOTE: This is a duplicate from src_install, because it's required here. + local from="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}" + local test_dir="${1}" + + echo "Copying PyAuto framework into ${test_dir}" + + mkdir -p "${test_dir}/out/Release" + + cp -al "${from}"/pyproto "${test_dir}"/out/Release + cp -al "${from}"/pyautolib.py "${test_dir}"/out/Release + + # Even if chrome_debug_tests is enabled, we don't need to include + # detailed debug info for tests in the binary package, so save some + # time by stripping everything but the symbol names. Developers who + # need more detailed debug info on the tests can use the original + # unstripped tests from the ${from} directory. + $(tc-getSTRIP) --strip-debug \ + --keep-file-symbols "${from}"/_pyautolib.so \ + -o "${test_dir}"/out/Release/_pyautolib.so + $(tc-getSTRIP) --strip-debug \ + --keep-file-symbols "${from}"/chromedriver \ + -o "${test_dir}"/out/Release/chromedriver + if use component_build; then + mkdir -p "${test_dir}/out/Release/lib.target" + local src dst + for src in "${from}"/lib.target/* ; do + dst="${test_dir}/out/Release/${src#${from}}" + $(tc-getSTRIP) --strip-debug --keep-file-symbols \ + "${src}" -o "${dst}" + done + fi + + cp -a "${CHROME_ROOT}"/"${AUTOTEST_DEPS}"/pyauto_dep/setup_test_links.sh \ + "${test_dir}"/out/Release + + # Copy PyAuto scripts and suppport libs. + install_test_resources "${test_dir}" \ + chrome/browser/resources/gaia_auth \ + chrome/test/pyautolib \ + net/tools/testserver \ + third_party/pyftpdlib \ + third_party/pywebsocket \ + third_party/simplejson \ + third_party/tlslite \ + third_party/webdriver +} + +install_page_cycler_dep_resources() { + local test_dir="${1}" + + if [[ -r "${CHROME_ROOT}/src/data/page_cycler" ]]; then + echo "Copying Page Cycler Data into ${test_dir}" + mkdir -p "${test_dir}" + install_test_resources "${test_dir}" \ + data/page_cycler + fi +} + +src_install() { + FROM="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}" + + # Override default strip flags and lose the '-R .comment' + # in order to play nice with the crash server. + if [[ -z "${KEEP_CHROME_DEBUG_SYMBOLS}" ]]; then + export PORTAGE_STRIP_FLAGS="--strip-unneeded" + else + export PORTAGE_STRIP_FLAGS="--strip-debug --keep-file-symbols" + fi + + # First, things from the chrome build output directory + dodir "${CHROME_DIR}" + dodir "${CHROME_DIR}"/plugins + + exeinto "${CHROME_DIR}" + doexe "${FROM}"/chrome + doexe "${FROM}"/libffmpegsumo.so + doexe "${FROM}"/libosmesa.so + use content_shell && doexe "${FROM}"/content_shell + use drm && doexe "${FROM}"/aura_demo + use drm && doexe "${FROM}"/ash_shell + if use chrome_internal && use chrome_pdf; then + doexe "${FROM}"/libpdf.so + fi + if use chrome_internal && use widevine_cdm; then + doexe "${FROM}"/libwidevinecdmplugin.so + doexe "${FROM}"/libwidevinecdm.so + fi + exeopts -m4755 # setuid the sandbox + newexe "${FROM}/chrome_sandbox" chrome-sandbox + exeopts -m0755 + + if use component_build; then + dodir "${CHROME_DIR}/lib.target" + exeinto "${CHROME_DIR}/lib.target" + for f in "${FROM}"/lib.target/*.so; do + doexe "${f}" + done + exeinto "${CHROME_DIR}" + fi + + # enable the chromeos local account, if the environment dictates + if [[ -n "${CHROMEOS_LOCAL_ACCOUNT}" ]]; then + echo "${CHROMEOS_LOCAL_ACCOUNT}" > "${D_CHROME_DIR}/localaccount" + fi + + # add executable NaCl binaries + if use_nacl; then + doexe "${FROM}"/libppGoogleNaClPluginChrome.so || die + doexe "${FROM}"/nacl_helper_bootstrap || die + fi + + insinto "${CHROME_DIR}" + doins "${FROM}"/chrome-wrapper + doins "${FROM}"/chrome.pak + doins "${FROM}"/chrome_100_percent.pak + use content_shell && doins "${FROM}"/content_shell.pak + doins -r "${FROM}"/locales + doins -r "${FROM}"/resources + doins -r "${FROM}"/extensions + doins "${FROM}"/resources.pak + doins "${FROM}"/xdg-settings + doins "${FROM}"/*.png + + # Add high DPI resources. + if use highdpi; then + doins "${FROM}"/chrome_200_percent.pak + fi + + # add non-executable NaCl files + if use_nacl; then + doins "${FROM}"/nacl_irt_*.nexe || die + doins "${FROM}"/nacl_helper || die + fi + + # Copy input_methods.txt so that ibus-m17n can exclude unnnecessary + # input methods based on the file. + insinto /usr/share/chromeos-assets/input_methods + INPUT_METHOD="${CHROME_ROOT}"/src/chrome/browser/chromeos/input_method + doins "${INPUT_METHOD}"/input_methods.txt + + # Copy org.chromium.LibCrosService.conf, the D-Bus config file for the + # D-Bus service exported by Chrome. + insinto /etc/dbus-1/system.d + DBUS="${CHROME_ROOT}"/src/chrome/browser/chromeos/dbus + doins "${DBUS}"/org.chromium.LibCrosService.conf + + # Chrome test resources + # Test binaries are only available when building chrome from source + if use build_tests && [[ "${CHROME_ORIGIN}" == "LOCAL_SOURCE" || + "${CHROME_ORIGIN}" == "SERVER_SOURCE" || + "${CHROME_ORIGIN}" == "GERRIT_SOURCE" ]]; then + autotest-deponly_src_install + fi + if use pgo_generate; then + local pgo_file_dest="chromeos-chrome-${ARCH}-${PV}${PGO_SUFFIX}" + echo "${PGO_LOCATION}${pgo_file_dest}" \ + > "${D_CHROME_DIR}/profilelocation" + fi + + # Fix some perms + chmod -R a+r "${D}" + find "${D}" -perm /111 -print0 | xargs -0 chmod a+x + + # The following symlinks are needed in order to run chrome. + dosym libnss3.so /usr/lib/libnss3.so.1d + dosym libnssutil3.so.12 /usr/lib/libnssutil3.so.1d + dosym libsmime3.so.12 /usr/lib/libsmime3.so.1d + dosym libssl3.so.12 /usr/lib/libssl3.so.1d + dosym libplds4.so /usr/lib/libplds4.so.0d + dosym libplc4.so /usr/lib/libplc4.so.0d + dosym libnspr4.so /usr/lib/libnspr4.so.0d +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild new file mode 100644 index 0000000000..5ce82679df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild @@ -0,0 +1,1003 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# Usage: by default, downloads chromium browser from the build server. +# If CHROME_ORIGIN is set to one of {SERVER_SOURCE, LOCAL_SOURCE, LOCAL_BINARY}, +# the build comes from the chromimum source repository (gclient sync), +# build server, locally provided source, or locally provided binary. +# If you are using SERVER_SOURCE, a gclient template file that is in the files +# directory which will be copied automatically during the build and used as +# the .gclient for 'gclient sync'. +# If building from LOCAL_SOURCE or LOCAL_BINARY specifying BUILDTYPE +# will allow you to specify "Debug" or another build type; "Release" is +# the default. +# gclient is expected to be in ~/depot_tools if EGCLIENT is not set +# to gclient path. + +EAPI="2" +inherit autotest-deponly binutils-funcs eutils flag-o-matic git-2 multilib toolchain-funcs + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="-asan +build_tests +chrome_remoting chrome_internal chrome_pdf +chrome_debug -chrome_debug_tests -chrome_media -clang -component_build -content_shell -drm +gold hardfp +highdpi +nacl neon -ninja -oem_wallpaper -pgo_use -pgo_generate +reorder +runhooks +verbose widevine_cdm" + +# Do not strip the nacl_helper_bootstrap binary because the binutils +# objcopy/strip mangles the ELF program headers. +# TODO(mcgrathr,vapier): This should be removed after portage's prepstrip +# script is changed to use eu-strip instead of objcopy and strip. +STRIP_MASK="*/nacl_helper_bootstrap" + +# When we get to EAPI=4 +# REQUIRED_USE= +REORDER_SUBDIR="reorder" + +# Portage version without optional portage suffix. +CHROME_VERSION="${PV/_*/}" + +CHROME_SRC="chrome-src" +if use chrome_internal; then + CHROME_SRC="${CHROME_SRC}-internal" +fi + +# CHROME_CACHE_DIR is used for storing output artifacts, and is always a +# regular directory inside the chroot (i.e. it's never mounted in, so it's +# always safe to use cp -al for these artifacts). +if [[ -z ${CHROME_CACHE_DIR} ]] ; then + CHROME_CACHE_DIR="/var/cache/chromeos-chrome/${CHROME_SRC}" +fi +addwrite "${CHROME_CACHE_DIR}" + +# CHROME_DISTDIR is used for storing the source code, if any source code +# needs to be unpacked at build time (e.g. in the SERVER_SOURCE scenario.) +# It will be mounted into the chroot, so it is never safe to use cp -al +# for these files. +if [[ -z ${CHROME_DISTDIR} ]] ; then + CHROME_DISTDIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/${CHROME_SRC}" +fi +addwrite "${CHROME_DISTDIR}" + +# chrome destination directory +CHROME_DIR=/opt/google/chrome +D_CHROME_DIR="${D}/${CHROME_DIR}" +RELEASE_EXTRA_CFLAGS=() + +USE_TCMALLOC="linux_use_tcmalloc=1" + +# For compilation/local chrome +BUILDTYPE="${BUILDTYPE:-Release}" +BOARD="${BOARD:-${SYSROOT##/build/}}" +BUILD_OUT="${BUILD_OUT:-out_${BOARD}}" +# WARNING: We are using a symlink now for the build directory to work around +# command line length limits. This will cause problems if you are doing +# parallel builds of different boards/variants. +# Unsetting BUILD_OUT_SYM will revert this behavior +BUILD_OUT_SYM="c" + +PGO_SUFFIX=".pgo.tar.bz2" +PGO_LOCATION="gs://chromeos-prebuilt/pgo-job/canonicals/" + +add_pgo_arches() { + local file a + for a in "$@" ; do + file="chromeos-chrome-${a}-${PV}${PGO_SUFFIX}" + SRC_URI+="pgo_use? ( ${a}? ( ${PGO_LOCATION}${file} ) ) " + done +} + +RESTRICT="mirror" +add_pgo_arches x86 amd64 arm + +TEST_FILES=("ffmpeg_tests" "video_decode_accelerator_unittest" "ppapi_example_video_decode") +PPAPI_TEST_FILES=( + lib{32,64} + mock_nacl_gdb + nacl_test_data + ppapi_nacl_tests_{newlib,glibc}.nmf + ppapi_nacl_tests_{newlib,glibc}_{x32,x64,arm}.nexe + test_case.html + test_case.html.mock-http-headers + test_page.css + test_url_loader_data +) + +RDEPEND="${RDEPEND} + app-arch/bzip2 + >=app-i18n/ibus-1.4.99 + arm? ( virtual/opengles ) + dev-libs/atk + dev-libs/glib + dev-libs/nspr + >=dev-libs/nss-3.12.2 + dev-libs/libxml2 + dev-libs/dbus-glib + x11-libs/cairo + drm? ( x11-libs/libxkbcommon ) + x11-libs/libXScrnSaver + x11-libs/pango + >=media-libs/alsa-lib-1.0.19 + media-libs/fontconfig + media-libs/freetype + media-libs/libpng + media-libs/mesa + >=media-sound/adhd-0.0.1-r310 + net-misc/wget + sys-fs/udev + sys-libs/zlib + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXScrnSaver + chrome_remoting? ( x11-libs/libXtst ) + x11-apps/setxkbmap + !arm? ( x11-libs/libva )" + +DEPEND="${DEPEND} + ${RDEPEND} + arm? ( x11-drivers/opengles-headers ) + chromeos-base/protofiles + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + net-wireless/bluez" + +PATCHES=() + +AUTOTEST_COMMON="src/chrome/test/chromeos/autotest/files" +AUTOTEST_DEPS="${AUTOTEST_COMMON}/client/deps" +AUTOTEST_DEPS_LIST="chrome_test pyauto_dep page_cycler_dep" + +IUSE="${IUSE} +autotest" + +export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser + +QA_TEXTRELS="*" +QA_EXECSTACK="*" +QA_PRESTRIPPED="*" + +use_nacl() { + ! use asan && ! use component_build && ! use drm && use nacl +} + +# Like the `usex` helper: +# Usage: echox [int] [echo-if-true] [echo-if-false] +# If [int] is 0, then echo the 2nd arg (default of yes), else +# echo the 3rd arg (default of no). +echox() { + # Like the `usex` helper. + [[ ${1:-$?} -eq 0 ]] && echo "${2:-yes}" || echo "${3:-no}" +} +echo10() { echox ${1:-$?} 1 0 ; } +echotf() { echox ${1:-$?} true false ; } +use10() { usex $1 1 0 ; } +usetf() { usex $1 true false ; } +set_build_defines() { + # General build defines. + # TODO(vapier): Check that this should say SYSROOT not ROOT + BUILD_DEFINES=( + "sysroot=${ROOT}" + python_ver=2.6 + "linux_sandbox_path=${CHROME_DIR}/chrome-sandbox" + "${EXTRA_BUILD_ARGS}" + "system_libdir=$(get_libdir)" + "pkg-config=$(tc-getPKG_CONFIG)" + "use_xi2_mt=2" + ) + + BUILD_DEFINES+=( + swig_defines=-DOS_CHROMEOS + chromeos=1 + ) + + if use pgo_generate ; then + BUILD_DEFINES+=( + libraries_for_target=-lgcov + ) + RELEASE_EXTRA_CFLAGS+=( + -DPGO_GENERATE + -fprofile-generate + -fprofile-dir=/tmp/pgo/chrome + -Wno-error=maybe-uninitialized + ) + fi + + # Set proper BUILD_DEFINES for the arch + case "${ARCH}" in + x86) + BUILD_DEFINES+=( target_arch=ia32 enable_smooth_scrolling=1 ) + ;; + arm) + BUILD_DEFINES+=( + target_arch=arm + arm_float_abi=$(usex hardfp hard softfp) + arm_neon=$(use10 neon) + armv7=$([[ ${CHOST} == armv7* ]]; echo10) + v8_can_use_unaligned_accesses=$([[ ${CHOST} == armv[67]* ]]; echotf) + v8_can_use_vfp3_instructions=$([[ ${ARM_FPU} == *vfpv[34]* ]]; echotf) + v8_use_arm_eabi_hardfloat=$(usetf hardfp) + ) + if [[ -n "${ARM_FPU}" ]]; then + BUILD_DEFINES+=( arm_fpu="${ARM_FPU}" ) + fi + if use chrome_internal; then + #http://code.google.com/p/chrome-os-partner/issues/detail?id=1142 + BUILD_DEFINES+=( internal_pdf=0 ) + fi + ;; + amd64) + BUILD_DEFINES+=( target_arch=x64 enable_smooth_scrolling=1 ) + ;; + *) + die "Unsupported architecture: ${ARCH}" + ;; + esac + + use_nacl || BUILD_DEFINES+=( disable_nacl=1 ) + + use drm && BUILD_DEFINES+=( use_drm=1 ) + + # Control inclusion of optional chrome features. + if use chrome_remoting; then + BUILD_DEFINES+=( remoting=1 ) + else + BUILD_DEFINES+=( remoting=0 ) + fi + + if use chrome_internal; then + #Adding chrome branding specific variables and GYP_DEFINES + BUILD_DEFINES+=( branding=Chrome buildtype=Official ) + export CHROMIUM_BUILD='_google_Chrome' + export OFFICIAL_BUILD='1' + export CHROME_BUILD_TYPE='_official' + + # For internal builds, don't remove webcore debug symbols by default. + REMOVE_WEBCORE_DEBUG_SYMBOLS=${REMOVE_WEBCORE_DEBUG_SYMBOLS:-0} + elif use chrome_media; then + echo "Building Chromium with additional media codecs and containers." + BUILD_DEFINES+=( ffmpeg_branding=ChromeOS proprietary_codecs=1 ) + fi + + # This saves time and bytes. + if [[ "${REMOVE_WEBCORE_DEBUG_SYMBOLS:-1}" == "1" ]]; then + BUILD_DEFINES+=( remove_webcore_debug_symbols=1 ) + fi + + if ! use chrome_debug_tests; then + BUILD_DEFINES+=( strip_tests=1 ) + fi + + if use reorder && ! use clang; then + BUILD_DEFINES+=( "order_text_section=${CHROME_DISTDIR}/${REORDER_SUBDIR}/section-ordering-files/orderfile" ) + fi + + if use clang; then + if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then + BUILD_DEFINES+=( clang=1 clang_use_chrome_plugins=0 werror= ) + USE_TCMALLOC="linux_use_tcmalloc=0" + + # The chrome build system will add -m32 for 32bit arches, and + # clang defaults to 64bit because our cros_sdk is 64bit default. + export CC="clang" CXX="clang++" + else + die "Clang is not yet supported for ${ARCH}" + fi + fi + + if use asan; then + if ! use clang; then + eerror "Asan requires Clang to run." + die "Please set USE=\"${USE} clang\" to enable Clang" + fi + BUILD_DEFINES+=( asan=1 ) + fi + + if use component_build; then + BUILD_DEFINES+=( component=shared_library ) + fi + + BUILD_DEFINES+=( "${USE_TCMALLOC}" ) + BUILD_DEFINES+=( "use_cras=1" ) + + # TODO(davidjames): Pass in all CFLAGS this way, once gyp is smart enough + # to accept cflags that only apply to the target. + if use chrome_debug; then + RELEASE_EXTRA_CFLAGS+=( + -g + ) + fi + + if ! use chrome_pdf; then + BUILD_DEFINES+=( internal_pdf=0 ) + fi + + if use oem_wallpaper; then + BUILD_DEFINES+=( use_oem_wallpaper=1 ) + fi + + BUILD_DEFINES+=( "release_extra_cflags='${RELEASE_EXTRA_CFLAGS[*]}'" ) + + export GYP_GENERATORS="$(usex ninja ninja make)" + export GYP_DEFINES="${BUILD_DEFINES[*]}" + export builddir_name="${BUILD_OUT}" + # Prevents gclient from updating self. + export DEPOT_TOOLS_UPDATE=0 + # Chrome's build overrides the Chrome OS build wrapper's addition + # of -fstack-protector-strong, so re-add it to the end of the + # command-line, since gcc uses "last flag wins" for stack protector. + CXXFLAGS+=" -fstack-protector-strong" + # Enable std::vector []-operator bounds checking. + CXXFLAGS+=" -D__google_stl_debug_vector=1" +} + +unpack_chrome() { + local cmd=( "${CROS_WORKON_SRCROOT}"/chromite/bin/sync_chrome ) + use chrome_internal && cmd+=( --internal ) + use chrome_pdf && cmd+=( --pdf ) + if [[ -n "${CROS_SVN_COMMIT}" ]]; then + cmd+=( --revision="${CROS_SVN_COMMIT}" ) + elif [[ "${CHROME_VERSION}" != "9999" ]]; then + cmd+=( --tag="${CHROME_VERSION}" ) + fi + # --reset tells sync_chrome to blow away local changes and to feel + # free to delete any directories that get in the way of syncing. This + # is needed for unattended operation. + cmd+=( --reset --gclient="${EGCLIENT}" "${CHROME_DISTDIR}" ) + elog "${cmd[*]}" + "${cmd[@]}" || die +} + +decide_chrome_origin() { + local chrome_workon="=chromeos-base/chromeos-chrome-9999" + local cros_workon_file="${ROOT}etc/portage/package.keywords/cros-workon" + if [[ -e "${cros_workon_file}" ]] && grep -q "${chrome_workon}" "${cros_workon_file}"; then + # LOCAL_SOURCE is the default for cros_workon + # Warn the user if CHROME_ORIGIN is already set + if [[ -n "${CHROME_ORIGIN}" && "${CHROME_ORIGIN}" != LOCAL_SOURCE ]]; then + ewarn "CHROME_ORIGIN is already set to ${CHROME_ORIGIN}." + ewarn "This will prevent you from building from your local checkout." + ewarn "Please run 'unset CHROME_ORIGIN' to reset Chrome" + ewarn "to the default source location." + fi + : ${CHROME_ORIGIN:=LOCAL_SOURCE} + else + # By default, pull from server + : ${CHROME_ORIGIN:=SERVER_SOURCE} + fi +} + +sandboxless_ensure_directory() { + local dir + for dir in "$@"; do + if [[ ! -d "${dir}" ]] ; then + # We need root access to create these directories, so we need to + # use sudo. This implicitly disables the sandbox. + sudo mkdir -p "${dir}" || die + sudo chown "${PORTAGE_USERNAME}:portage" "${dir}" || die + sudo chmod 0755 "${dir}" || die + fi + done +} + +src_unpack() { + tc-export CC CXX + local WHOAMI=$(whoami) + export EGCLIENT="${EGCLIENT:-/home/${WHOAMI}/depot_tools/gclient}" + export ENINJA="${ENINJA:-/home/${WHOAMI}/depot_tools/ninja}" + export DEPOT_TOOLS_UPDATE=0 + + # Create storage directories. + sandboxless_ensure_directory "${CHROME_DISTDIR}" "${CHROME_CACHE_DIR}" + + # Copy in credentials to fake home directory so that build process + # can access svn and ssh if needed. + mkdir -p ${HOME} + SUBVERSION_CONFIG_DIR=/home/${WHOAMI}/.subversion + if [[ -d ${SUBVERSION_CONFIG_DIR} ]]; then + cp -rfp ${SUBVERSION_CONFIG_DIR} ${HOME} || die + fi + SSH_CONFIG_DIR=/home/${WHOAMI}/.ssh + if [[ -d ${SSH_CONFIG_DIR} ]]; then + cp -rfp ${SSH_CONFIG_DIR} ${HOME} || die + fi + NET_CONFIG=/home/${WHOAMI}/.netrc + if [[ -f ${NET_CONFIG} ]]; then + cp -fp ${NET_CONFIG} ${HOME} || die + fi + + decide_chrome_origin + + case "${CHROME_ORIGIN}" in + LOCAL_SOURCE|SERVER_SOURCE|LOCAL_BINARY|GERRIT_SOURCE) + elog "CHROME_ORIGIN VALUE is ${CHROME_ORIGIN}" + ;; + *) + die "CHROME_ORIGIN not one of LOCAL_SOURCE, SERVER_SOURCE, LOCAL_BINARY, GERRIT_SOURCE" + ;; + esac + + # Prepare and set CHROME_ROOT based on CHROME_ORIGIN. + # CHROME_ROOT is the location where the source code is used for compilation. + # If we're in SERVER_SOURCE mode, CHROME_ROOT is CHROME_DISTDIR. In LOCAL_SOURCE + # mode, this directory may be set manually to any directory. It may be mounted + # into the chroot, so it is not safe to use cp -al for these files. + # These are set here because $(whoami) returns the proper user here, + # but 'root' at the root level of the file + case "${CHROME_ORIGIN}" in + (SERVER_SOURCE) + elog "Using CHROME_VERSION = ${CHROME_VERSION}" + unpack_chrome + + elog "set the chrome source root to ${CHROME_DISTDIR}" + elog "From this point onwards there is no difference between \ + SERVER_SOURCE and LOCAL_SOURCE, since the fetch is done" + CHROME_ROOT=${CHROME_DISTDIR} + ;; + (GERRIT_SOURCE) + CHROME_ROOT="/home/${WHOAMI}/trunk/chromium" + # TODO(rcui): Remove all these addwrite hacks once we start + # building off a copy of the source + addwrite "${CHROME_ROOT}" + # Addwrite to .repo because each project's .git directory links + # to the .repo directory. + addwrite "/home/${WHOAMI}/trunk/.repo/" + # - Make the symlinks from chromium src tree to CrOS source tree + # writeable so we can run hooks and reset the checkout. + # - We need to explicitly do this because the symlink points to + # outside of the CHROME_ROOT. + # - We don't know which one is a symlink so do it for + # all files/directories in src/third_party + # - chrome_set_ver creates symlinks in src/third_party to simulate + # the cros_deps checkout gclient does. For details, see + # http://gerrit.chromium.org/gerrit/#change,5692. + THIRD_PARTY_DIR="${CHROME_ROOT}/src/third_party" + for f in `ls -1 ${THIRD_PARTY_DIR}` + do + addwrite "${THIRD_PARTY_DIR}/${f}" + done + ;; + (LOCAL_SOURCE) + : ${CHROME_ROOT:=/home/${WHOAMI}/chrome_root} + if [[ ! -d "${CHROME_ROOT}/src" ]]; then + die "${CHROME_ROOT} does not contain a valid chromium checkout!" + fi + addwrite "${CHROME_ROOT}" + ;; + esac + + case "${CHROME_ORIGIN}" in + LOCAL_SOURCE|SERVER_SOURCE|GERRIT_SOURCE) + set_build_defines + ;; + esac + + # FIXME: This is the normal path where ebuild stores its working data. + # Chrome builds inside distfiles because of speed, so we at least make + # a symlink here to add compatibility with autotest eclass which uses this. + ln -sf "${CHROME_ROOT}" "${WORKDIR}/${P}" + + if use pgo_use && ! use clang; then + local PROFILE_DIR="${WORKDIR}/pgo" + mkdir "${PROFILE_DIR}" + cd "${PROFILE_DIR}" + unpack "chromeos-chrome-${ARCH}-${PV}${PGO_SUFFIX}" + cd "${WORKDIR}" + if [[ -d "${PROFILE_DIR}/chrome" ]]; then + append-flags -fprofile-use \ + -fprofile-correction \ + -fprofile-dir="${PROFILE_DIR}/chrome" + + # This is required because gcc emits different warnings + # for PGO vs. non-PGO. PGO may inline different + # functions from non-PGO, leading to different warnings. + # crbug.com/112908 + append-flags -Wno-error=maybe-uninitialized + einfo "Using the PGO data" + else + einfo "USE=+pgo_use, but ${PROFILE_DIR}/chrome not "\ + "created from pgo.tar.bz2." + die "PGO data supply failed" + fi + fi + + if use reorder && ! use clang; then + EGIT_REPO_URI="http://git.chromium.org/chromiumos/profile/chromium.git" + EGIT_COMMIT="88c20da2d91098449373f2e2f5cef35c193b8add" + EGIT_PROJECT="${PN}-reorder" + if grep -qs ${EGIT_COMMIT} "${CHROME_DISTDIR}/${REORDER_SUBDIR}/.git/HEAD"; then + einfo "Reorder profile repo is up to date." + else + einfo "Reorder profile repo not up-to-date. Fetching..." + EGIT_SOURCEDIR="${CHROME_DISTDIR}/${REORDER_SUBDIR}" + rm -rf "${EGIT_SOURCEDIR}" + git-2_src_unpack + fi + fi +} + +src_prepare() { + if [[ "${CHROME_ORIGIN}" != "LOCAL_SOURCE" && + "${CHROME_ORIGIN}" != "SERVER_SOURCE" && + "${CHROME_ORIGIN}" != "GERRIT_SOURCE" ]]; then + return + fi + + elog "${CHROME_ROOT} should be set here properly" + cd "${CHROME_ROOT}/src" || die "Cannot chdir to ${CHROME_ROOT}" + + # We do symlink creation here if appropriate + mkdir -p "${CHROME_CACHE_DIR}/src/${BUILD_OUT}" + if [[ ! -z "${BUILD_OUT_SYM}" ]]; then + rm -rf "${BUILD_OUT_SYM}" || die "Could not remove symlink" + ln -sfT "${CHROME_CACHE_DIR}/src/${BUILD_OUT}" "${BUILD_OUT_SYM}" || + die "Could not create symlink for output directory" + export builddir_name="${BUILD_OUT_SYM}" + fi + + + # Apply patches for non-localsource builds + if [[ "${CHROME_ORIGIN}" == "SERVER_SOURCE" && ${#PATCHES[@]} -gt 0 ]]; then + epatch "${PATCHES[@]}" + fi + + # The chrome makefiles specify -O and -g flags already, so remove the + # portage flags. + filter-flags -g -O* + + local WHOAMI=$(whoami) + # The hooks may depend on the environment variables we set in this + # ebuild (i.e., GYP_DEFINES for gyp_chromium) + ECHROME_SET_VER=${ECHROME_SET_VER:=/home/${WHOAMI}/trunk/chromite/bin/chrome_set_ver} + einfo "Building Chrome with the following define options:" + local opt + for opt in "${BUILD_DEFINES[@]}"; do + einfo "${opt}" + done + + # Get credentials to fake home directory so that built chromium + # can access Google services. + # First check for Chrome credentials. + if [[ ! -d google_apis/internal ]]; then + # Then look for ChromeOS supplied credentials. + local PRIVATE_OVERLAYS_DIR=/home/${WHOAMI}/trunk/src/private-overlays + local GAPI_CONFIG_FILE=${PRIVATE_OVERLAYS_DIR}/chromeos-overlay/googleapikeys + # RE to match the allowed names. + local NRE="('google_(api_key|default_client_(id|secret))')" + # RE to match whitespace. + local WS="[[:space:]]*" + # RE to match allowed values. + local CRE="('[^\\\\']*')" + # And combining them into one RE for describing the lines + # we want to allow. + local TRE="^${WS}${NRE}${WS}[:=]${WS}${CRE}.*" + if [[ ! -f "${GAPI_CONFIG_FILE}" ]]; then + # Then developer credentials. + GAPI_CONFIG_FILE=/home/${WHOAMI}/.googleapikeys + fi + if [[ -f "${GAPI_CONFIG_FILE}" ]]; then + mkdir "${HOME}"/.gyp + cat <<-EOF >"${HOME}/.gyp/include.gypi" + { + 'variables': { + $(sed -nr -e "/^${TRE}/{s//\1: \4,/;p;}" \ + "${GAPI_CONFIG_FILE}") + } + } + EOF + fi + fi +} + +src_configure() { + tc-export CXX CC AR AS RANLIB + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export AR_host=$(tc-getBUILD_AR) + if use gold ; then + if [[ "${GOLD_SET}" != "yes" ]]; then + export GOLD_SET="yes" + einfo "Using gold from the following location: $(get_binutils_path_gold)" + export CC="${CC} -B$(get_binutils_path_gold)" + export CXX="${CXX} -B$(get_binutils_path_gold)" + fi + else + ewarn "gold disabled. Using GNU ld." + fi + + # Use g++ as the linker driver. + export LD="${CXX}" + export LD_host=$(tc-getBUILD_CXX) + + local build_tool_flags=() + if use ninja; then + build_tool_flags+=( + "config=${BUILDTYPE}" + "output_dir=${builddir_name}" + ) + fi + export GYP_GENERATOR_FLAGS="${build_tool_flags[*]}" + + # TODO(rcui): crosbug.com/20435. Investigate removal of runhooks + # useflag when chrome build switches to Ninja inside the chroot. + if use runhooks; then + if [[ "${CHROME_ORIGIN}" == "GERRIT_SOURCE" ]]; then + # Set the dependency repos to the revision specified in the + # .DEPS.git file, and run the hooks in that file. + "${ECHROME_SET_VER}" --runhooks || die + else + [[ -n "${EGCLIENT}" ]] || die EGCLIENT unset + [[ -f "${EGCLIENT}" ]] || die EGCLIENT at "${EGCLIENT}" does not exist + "${EGCLIENT}" runhooks --force || die "Failed to run ${EGCLIENT} runhooks" + fi + elif [[ "${CHROME_ORIGIN}" == "GERRIT_SOURCE" ]]; then + "${ECHROME_SET_VER}" || die + fi +} + +chrome_make() { + if use ninja; then + PATH=${PATH}:/home/$(whoami)/depot_tools ${ENINJA} \ + ${MAKEOPTS} -C "${BUILD_OUT_SYM}/${BUILDTYPE}" $(usex verbose -v "") "$@" || die + else + emake -r $(usex verbose V=1 "") "BUILDTYPE=${BUILDTYPE}" "$@" || die + fi +} + +src_compile() { + if [[ "${CHROME_ORIGIN}" != "LOCAL_SOURCE" && + "${CHROME_ORIGIN}" != "SERVER_SOURCE" && + "${CHROME_ORIGIN}" != "GERRIT_SOURCE" ]]; then + return + fi + + cd "${CHROME_ROOT}"/src || die "Cannot chdir to ${CHROME_ROOT}/src" + + local chrome_targets=() + + if [[ -n "${CHROME_TARGET_OVERRIDE}" ]]; then + chrome_targets=( ${CHROME_TARGET_OVERRIDE} ) + einfo "Building custom targets: ${chrome_targets[*]}" + elif use content_shell; then + chrome_targets=( content_shell chrome_sandbox ) + einfo "Building content_shell" + else + chrome_targets=( chrome chrome_sandbox ) + if use build_tests; then + chrome_targets+=( "${TEST_FILES[@]}" + pyautolib + peerconnection_server + chromedriver + browser_tests + sync_integration_tests ) + einfo "Building test targets: ${TEST_TARGETS[@]}" + fi + + # The default_extensions target is a no-op for external builds, and is + # broken with Ninja in this situation. For now, only enable it on + # builds where it installs something. + if use chrome_internal; then + chrome_targets+=( default_extensions ) + fi + + if use_nacl; then + chrome_targets+=( nacl_helper_bootstrap nacl_helper ) + fi + + if use drm; then + chrome_targets+=( aura_demo ash_shell ) + else + chrome_targets+=( libosmesa.so ) + fi + fi + + chrome_make "${chrome_targets[@]}" + + if use build_tests; then + install_chrome_test_resources "${WORKDIR}/test_src" + install_pyauto_dep_resources "${WORKDIR}/pyauto_src" + install_page_cycler_dep_resources "${WORKDIR}/page_cycler_src" + + # NOTE: Since chrome is built inside distfiles, we have to get + # rid of the previous instance first. + # We remove only what we will overwrite with the mv below. + local deps="${WORKDIR}/${P}/${AUTOTEST_DEPS}" + + rm -rf "${deps}/chrome_test/test_src" + mv "${WORKDIR}/test_src" "${deps}/chrome_test/" + + rm -rf "${deps}/pyauto_dep/test_src" + mv "${WORKDIR}/pyauto_src" "${deps}/pyauto_dep/test_src" + + rm -rf "${deps}/page_cycler_dep/test_src" + mv "${WORKDIR}/page_cycler_src" "${deps}/page_cycler_dep/test_src" + + # HACK: It would make more sense to call autotest_src_prepare in + # src_prepare, but we need to call install_chrome_test_resources first. + autotest-deponly_src_prepare + + # Remove .svn dirs + esvn_clean "${AUTOTEST_WORKDIR}" + + autotest_src_compile + fi +} + +# Turn off the cp -l behavior in autotest, since the source dir and the +# installation dir live on different bind mounts right now. +fast_cp() { + cp "$@" +} + +install_test_resources() { + # Install test resources from chrome source directory to destination. + # We keep a cache of test resources inside the chroot to avoid copying + # multiple times. + local test_dir="${1}" + shift + local resource cache dest + for resource in "$@"; do + cache=$(dirname "${CHROME_CACHE_DIR}/src/${resource}") + dest=$(dirname "${test_dir}/${resource}") + mkdir -p "${cache}" "${dest}" + rsync -a --delete --exclude=.svn \ + "${CHROME_ROOT}/src/${resource}" "${cache}" + cp -al "${CHROME_CACHE_DIR}/src/${resource}" "${dest}" + done +} + +install_chrome_test_resources() { + # NOTE: This is a duplicate from src_install, because it's required here. + local from="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}" + local test_dir="${1}" + + echo Copying Chrome tests into "${test_dir}" + mkdir -p "${test_dir}/out/Release" + + # Even if chrome_debug_tests is enabled, we don't need to include detailed + # debug info for tests in the binary package, so save some time by stripping + # everything but the symbol names. Developers who need more detailed debug + # info on the tests can use the original unstripped tests from the ${from} + # directory. + TEST_INSTALL_TARGETS=( + "libppapi_tests.so" + "browser_tests" + "ffmpeg_tests" + "peerconnection_server" + "sync_integration_tests" + "video_decode_accelerator_unittest" ) + + for f in "${TEST_INSTALL_TARGETS[@]}"; do + $(tc-getSTRIP) --strip-debug \ + --keep-file-symbols "${from}"/${f} \ + -o "${test_dir}/out/Release/$(basename ${f})" + done + + # Copy over the test data directory; eventually 'all' non-static + # Chrome test data will go in here. + mkdir "${test_dir}"/out/Release/test_data + cp -al "${from}"/test_data "${test_dir}"/out/Release/ + + # Add the fake bidi locale + mkdir "${test_dir}"/out/Release/pseudo_locales + cp -al "${from}"/pseudo_locales/fake-bidi.pak \ + "${test_dir}"/out/Release/pseudo_locales + + for f in "${TEST_FILES[@]}"; do + cp -al "${from}/${f}" "${test_dir}" + done + + for f in "${PPAPI_TEST_FILES[@]}"; do + cp -al "${from}/${f}" "${test_dir}/out/Release" + done + + # Install Chrome test resources. + install_test_resources "${test_dir}" \ + base/base_paths_posix.cc \ + chrome/test/data \ + chrome/test/functional \ + chrome/third_party/mock4js/mock4js.js \ + content/common/gpu/testdata \ + content/test/data \ + net/data/ssl/certificates \ + ppapi/tests/test_case.html \ + ppapi/tests/test_url_loader_data \ + third_party/bidichecker/bidichecker_packaged.js \ + third_party/WebKit/Tools/Scripts \ + third_party/WebKit/LayoutTests/http/tests/websocket/tests + + # Add pdf test data + if use chrome_pdf; then + install_test_resources "${test_dir}" pdf/test + fi + + # Remove test binaries from other platforms + if [[ -z "${E_MACHINE}" ]]; then + echo E_MACHINE not defined! + else + cd "${test_dir}"/chrome/test + rm -fv $( scanelf -RmyBF%a . | grep -v -e ^${E_MACHINE} ) + fi + + cp -a "${CHROME_ROOT}"/"${AUTOTEST_DEPS}"/chrome_test/setup_test_links.sh \ + "${test_dir}"/out/Release + # Symlinks to resources in pyauto_dep will be created at runtime. +} + +# Set up the PyAuto files also by copying out the files needed for that. +# We create a separate dependency because the chrome_test one is about 350MB +# and PyAuto is a svelte 30MB. +install_pyauto_dep_resources() { + # NOTE: This is a duplicate from src_install, because it's required here. + local from="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}" + local test_dir="${1}" + + echo "Copying PyAuto framework into ${test_dir}" + + mkdir -p "${test_dir}/out/Release" + + cp -al "${from}"/pyproto "${test_dir}"/out/Release + cp -al "${from}"/pyautolib.py "${test_dir}"/out/Release + + # Even if chrome_debug_tests is enabled, we don't need to include + # detailed debug info for tests in the binary package, so save some + # time by stripping everything but the symbol names. Developers who + # need more detailed debug info on the tests can use the original + # unstripped tests from the ${from} directory. + $(tc-getSTRIP) --strip-debug \ + --keep-file-symbols "${from}"/_pyautolib.so \ + -o "${test_dir}"/out/Release/_pyautolib.so + $(tc-getSTRIP) --strip-debug \ + --keep-file-symbols "${from}"/chromedriver \ + -o "${test_dir}"/out/Release/chromedriver + if use component_build; then + mkdir -p "${test_dir}/out/Release/lib.target" + local src dst + for src in "${from}"/lib.target/* ; do + dst="${test_dir}/out/Release/${src#${from}}" + $(tc-getSTRIP) --strip-debug --keep-file-symbols \ + "${src}" -o "${dst}" + done + fi + + cp -a "${CHROME_ROOT}"/"${AUTOTEST_DEPS}"/pyauto_dep/setup_test_links.sh \ + "${test_dir}"/out/Release + + # Copy PyAuto scripts and suppport libs. + install_test_resources "${test_dir}" \ + chrome/browser/resources/gaia_auth \ + chrome/test/pyautolib \ + net/tools/testserver \ + third_party/pyftpdlib \ + third_party/pywebsocket \ + third_party/simplejson \ + third_party/tlslite \ + third_party/webdriver +} + +install_page_cycler_dep_resources() { + local test_dir="${1}" + + if [[ -r "${CHROME_ROOT}/src/data/page_cycler" ]]; then + echo "Copying Page Cycler Data into ${test_dir}" + mkdir -p "${test_dir}" + install_test_resources "${test_dir}" \ + data/page_cycler + fi +} + +src_install() { + FROM="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}" + + # Override default strip flags and lose the '-R .comment' + # in order to play nice with the crash server. + if [[ -z "${KEEP_CHROME_DEBUG_SYMBOLS}" ]]; then + export PORTAGE_STRIP_FLAGS="--strip-unneeded" + else + export PORTAGE_STRIP_FLAGS="--strip-debug --keep-file-symbols" + fi + + # First, things from the chrome build output directory + dodir "${CHROME_DIR}" + dodir "${CHROME_DIR}"/plugins + + exeinto "${CHROME_DIR}" + doexe "${FROM}"/chrome + doexe "${FROM}"/libffmpegsumo.so + doexe "${FROM}"/libosmesa.so + use content_shell && doexe "${FROM}"/content_shell + use drm && doexe "${FROM}"/aura_demo + use drm && doexe "${FROM}"/ash_shell + if use chrome_internal && use chrome_pdf; then + doexe "${FROM}"/libpdf.so + fi + if use chrome_internal && use widevine_cdm; then + doexe "${FROM}"/libwidevinecdmplugin.so + doexe "${FROM}"/libwidevinecdm.so + fi + exeopts -m4755 # setuid the sandbox + newexe "${FROM}/chrome_sandbox" chrome-sandbox + exeopts -m0755 + + if use component_build; then + dodir "${CHROME_DIR}/lib.target" + exeinto "${CHROME_DIR}/lib.target" + for f in "${FROM}"/lib.target/*.so; do + doexe "${f}" + done + exeinto "${CHROME_DIR}" + fi + + # enable the chromeos local account, if the environment dictates + if [[ -n "${CHROMEOS_LOCAL_ACCOUNT}" ]]; then + echo "${CHROMEOS_LOCAL_ACCOUNT}" > "${D_CHROME_DIR}/localaccount" + fi + + # add executable NaCl binaries + if use_nacl; then + doexe "${FROM}"/libppGoogleNaClPluginChrome.so || die + doexe "${FROM}"/nacl_helper_bootstrap || die + fi + + insinto "${CHROME_DIR}" + doins "${FROM}"/chrome-wrapper + doins "${FROM}"/chrome.pak + doins "${FROM}"/chrome_100_percent.pak + use content_shell && doins "${FROM}"/content_shell.pak + doins -r "${FROM}"/locales + doins -r "${FROM}"/resources + doins -r "${FROM}"/extensions + doins "${FROM}"/resources.pak + doins "${FROM}"/xdg-settings + doins "${FROM}"/*.png + + # Add high DPI resources. + if use highdpi; then + doins "${FROM}"/chrome_200_percent.pak + fi + + # add non-executable NaCl files + if use_nacl; then + doins "${FROM}"/nacl_irt_*.nexe || die + doins "${FROM}"/nacl_helper || die + fi + + # Copy input_methods.txt so that ibus-m17n can exclude unnnecessary + # input methods based on the file. + insinto /usr/share/chromeos-assets/input_methods + INPUT_METHOD="${CHROME_ROOT}"/src/chrome/browser/chromeos/input_method + doins "${INPUT_METHOD}"/input_methods.txt + + # Copy org.chromium.LibCrosService.conf, the D-Bus config file for the + # D-Bus service exported by Chrome. + insinto /etc/dbus-1/system.d + DBUS="${CHROME_ROOT}"/src/chrome/browser/chromeos/dbus + doins "${DBUS}"/org.chromium.LibCrosService.conf + + # Chrome test resources + # Test binaries are only available when building chrome from source + if use build_tests && [[ "${CHROME_ORIGIN}" == "LOCAL_SOURCE" || + "${CHROME_ORIGIN}" == "SERVER_SOURCE" || + "${CHROME_ORIGIN}" == "GERRIT_SOURCE" ]]; then + autotest-deponly_src_install + fi + if use pgo_generate; then + local pgo_file_dest="chromeos-chrome-${ARCH}-${PV}${PGO_SUFFIX}" + echo "${PGO_LOCATION}${pgo_file_dest}" \ + > "${D_CHROME_DIR}/profilelocation" + fi + + # Fix some perms + chmod -R a+r "${D}" + find "${D}" -perm /111 -print0 | xargs -0 chmod a+x + + # The following symlinks are needed in order to run chrome. + dosym libnss3.so /usr/lib/libnss3.so.1d + dosym libnssutil3.so.12 /usr/lib/libnssutil3.so.1d + dosym libsmime3.so.12 /usr/lib/libsmime3.so.1d + dosym libssl3.so.12 /usr/lib/libssl3.so.1d + dosym libplds4.so /usr/lib/libplds4.so.0d + dosym libplc4.so /usr/lib/libplc4.so.0d + dosym libnspr4.so /usr/lib/libnspr4.so.0d +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/metadata.xml b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/metadata.xml new file mode 100644 index 0000000000..3037655359 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-chrome/metadata.xml @@ -0,0 +1,27 @@ + + + + + Build with Address Sanitizer support + Build test targets + Build with debug symbols (-g) + Don't strip test targets + Add chrome branding + Build with additional codecs and containers + Build pdf reader + Build chrome remoting feature + Build with CC and C++ set to clang + Build components as shared libraries (faster link) + Build content_shell(chrome not built) + Use gold linker + Add high DPI resources + Build Native Client (NaCL) support + Use neon instructions (ARM only) + Generate profile-guided optimization data + Use profile data for profile-guided optimization + Re-order symbols using profile data + Run build hooks + Verbose build output + Build widevine plugin + + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-cryptohome/chromeos-cryptohome-0.0.1-r329.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-cryptohome/chromeos-cryptohome-0.0.1-r329.ebuild new file mode 100644 index 0000000000..1debd5e85e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-cryptohome/chromeos-cryptohome-0.0.1-r329.ebuild @@ -0,0 +1,70 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="f32dfe124bf54c6df3fd6d1a547213398c5de93a" +CROS_WORKON_TREE="6d63f920d37d52a9d907f9a0e7e17a2a8eac6137" +CROS_WORKON_PROJECT="chromiumos/platform/cryptohome" +CROS_WORKON_LOCALNAME="cryptohome" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Encrypted home directories for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="test" + +RDEPEND=" + app-crypt/trousers + chromeos-base/chaps + chromeos-base/libchromeos + chromeos-base/libscrypt + chromeos-base/metrics + dev-libs/dbus-glib + dev-libs/glib + dev-libs/nss + dev-libs/openssl + dev-libs/protobuf + sys-apps/keyutils + sys-fs/ecryptfs-utils" +DEPEND=" + test? ( dev-cpp/gtest ) + chromeos-base/libchrome:125070[cros-debug=] + chromeos-base/system_api + ${RDEPEND}" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + pushd "${OUT}" >/dev/null + dosbin cryptohomed cryptohome cryptohome-path lockbox-cache + popd >/dev/null + + dobin email_to_image + + insinto /etc/dbus-1/system.d + doins etc/Cryptohome.conf + + insinto /usr/share/dbus-1/services/ + doins share/org.chromium.Cryptohome.service +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-cryptohome/chromeos-cryptohome-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-cryptohome/chromeos-cryptohome-9999.ebuild new file mode 100644 index 0000000000..c79a6f8817 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-cryptohome/chromeos-cryptohome-9999.ebuild @@ -0,0 +1,68 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/cryptohome" +CROS_WORKON_LOCALNAME="cryptohome" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Encrypted home directories for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +RDEPEND=" + app-crypt/trousers + chromeos-base/chaps + chromeos-base/libchromeos + chromeos-base/libscrypt + chromeos-base/metrics + dev-libs/dbus-glib + dev-libs/glib + dev-libs/nss + dev-libs/openssl + dev-libs/protobuf + sys-apps/keyutils + sys-fs/ecryptfs-utils" +DEPEND=" + test? ( dev-cpp/gtest ) + chromeos-base/libchrome:125070[cros-debug=] + chromeos-base/system_api + ${RDEPEND}" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + pushd "${OUT}" >/dev/null + dosbin cryptohomed cryptohome cryptohome-path lockbox-cache + popd >/dev/null + + dobin email_to_image + + insinto /etc/dbus-1/system.d + doins etc/Cryptohome.conf + + insinto /usr/share/dbus-1/services/ + doins share/org.chromium.Cryptohome.service +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/chromeos-debugd-0.0.0-r123.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/chromeos-debugd-0.0.0-r123.ebuild new file mode 100644 index 0000000000..8e34f30d27 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/chromeos-debugd-0.0.0-r123.ebuild @@ -0,0 +1,63 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="f6a78c3976f71190d7aa4d310f245410627e77d2" +CROS_WORKON_TREE="acf7bf198dadec0295a36c07a3f28615bd53af35" +CROS_WORKON_PROJECT="chromiumos/platform/debugd" +CROS_WORKON_LOCALNAME=$(basename ${CROS_WORKON_PROJECT}) + +inherit cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS debugging service" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/chromeos-minijail + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-libs/dbus-c++ + dev-libs/glib:2 + dev-libs/libpcre" +DEPEND="${RDEPEND} + chromeos-base/shill + sys-apps/dbus + virtual/modemmanager" + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG OBJCOPY + cros-debug-add-NDEBUG + emake BASE_VER=${LIBCHROME_VERS} +} + +src_test() { + emake tests BASE_VER=${LIBCHROME_VERS} +} + +src_install() { + cd build-opt + into / + dosbin debugd + dodir /debugd + exeinto /usr/libexec/debugd/helpers + doexe helpers/icmp + doexe helpers/netif + doexe helpers/modem_status + doexe "${S}"/src/helpers/minijail-setuid-hack.sh + doexe "${S}"/src/helpers/systrace.sh + doexe helpers/network_status + + insinto /etc/dbus-1/system.d + doins "${FILESDIR}/org.chromium.debugd.conf" + + insinto /etc/init + doins "${FILESDIR}/debugd.conf" + doins "${FILESDIR}/trace_marker-test.conf" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/chromeos-debugd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/chromeos-debugd-9999.ebuild new file mode 100644 index 0000000000..15b88e9680 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/chromeos-debugd-9999.ebuild @@ -0,0 +1,61 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/debugd" +CROS_WORKON_LOCALNAME=$(basename ${CROS_WORKON_PROJECT}) + +inherit cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS debugging service" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/chromeos-minijail + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-libs/dbus-c++ + dev-libs/glib:2 + dev-libs/libpcre" +DEPEND="${RDEPEND} + chromeos-base/shill + sys-apps/dbus + virtual/modemmanager" + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG OBJCOPY + cros-debug-add-NDEBUG + emake BASE_VER=${LIBCHROME_VERS} +} + +src_test() { + emake tests BASE_VER=${LIBCHROME_VERS} +} + +src_install() { + cd build-opt + into / + dosbin debugd + dodir /debugd + exeinto /usr/libexec/debugd/helpers + doexe helpers/icmp + doexe helpers/netif + doexe helpers/modem_status + doexe "${S}"/src/helpers/minijail-setuid-hack.sh + doexe "${S}"/src/helpers/systrace.sh + doexe helpers/network_status + + insinto /etc/dbus-1/system.d + doins "${FILESDIR}/org.chromium.debugd.conf" + + insinto /etc/init + doins "${FILESDIR}/debugd.conf" + doins "${FILESDIR}/trace_marker-test.conf" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/debugd.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/debugd.conf new file mode 100644 index 0000000000..d2fea70df3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/debugd.conf @@ -0,0 +1,30 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Chromium OS debug daemon" +author "chromium-os-dev@chromium.org" + +start on started ui +stop on stopping ui or starting halt or starting reboot +respawn + +pre-start script + TRACING=/sys/kernel/debug/tracing + # NB: check for tracing dir in case the kernel config changes + if [ -d "${TRACING}" ]; then + # enable debugd write access for systrace helper + for file in buffer_size_kb set_event trace trace_clock trace_marker \ + tracing_on; do + chgrp debugd ${TRACING}/${file} && chmod g+w ${TRACING}/${file} + done + fi + # NB: only on exynos5 + MALI_HWC_ENABLE=/sys/devices/platform/mali.0/hwc_enable + if [ -f "${MALI_HWC_ENABLE}" ]; then + chgrp debugd ${MALI_HWC_ENABLE} && chmod g+w ${MALI_HWC_ENABLE} + fi +end script + +exec /sbin/debugd + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/org.chromium.debugd.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/org.chromium.debugd.conf new file mode 100644 index 0000000000..f0c30d082b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/org.chromium.debugd.conf @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + 512 + + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/trace_marker-test.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/trace_marker-test.conf new file mode 100644 index 0000000000..b4c6e1925b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-debugd/files/trace_marker-test.conf @@ -0,0 +1,20 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Chromium OS debug daemon trace_marker helper" +author "chromium-os-dev@chromium.org" + +# This lets us log trace events to the kernel trace buffer on test images +# where non-Chrome libraries can do logging to the trace_marker file. +# We need this to integrate third-party tracing into combined Chrome +# and system traces. + +#for_test start on starting debugd +stop on stopping ui or starting halt or starting reboot +respawn + +pre-start script + chmod a+w /sys/kernel/debug/tracing/trace_marker +end script + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev-init/chromeos-dev-init-0.0.1-r99.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev-init/chromeos-dev-init-0.0.1-r99.ebuild new file mode 100644 index 0000000000..32adca66bb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev-init/chromeos-dev-init-0.0.1-r99.ebuild @@ -0,0 +1,25 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="ea3cd573f8d47f15f7e4808a838f0066777bed16" +CROS_WORKON_TREE="849f1bf8c2dd07edda676636f278674b93c49414" +CROS_WORKON_PROJECT="chromiumos/platform/init" +CROS_WORKON_LOCALNAME="init" + +inherit cros-workon + +DESCRIPTION="Additional upstart jobs that will be installed on dev images" +HOMEPAGE="http://www.chromium.org/" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +DEPEND="chromeos-base/chromeos-init" +RDEPEND="${DEPEND}" + +src_install() { + insinto /etc/init + insopts --owner=root --group=root --mode=0644 + doins dev-init/*.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev-init/chromeos-dev-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev-init/chromeos-dev-init-9999.ebuild new file mode 100644 index 0000000000..cb1606bc7d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev-init/chromeos-dev-init-9999.ebuild @@ -0,0 +1,23 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/init" +CROS_WORKON_LOCALNAME="init" + +inherit cros-workon + +DESCRIPTION="Additional upstart jobs that will be installed on dev images" +HOMEPAGE="http://www.chromium.org/" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND="chromeos-base/chromeos-init" +RDEPEND="${DEPEND}" + +src_install() { + insinto /etc/init + insopts --owner=root --group=root --mode=0644 + doins dev-init/*.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev/chromeos-dev-0.1.0-r62.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev/chromeos-dev-0.1.0-r62.ebuild new file mode 120000 index 0000000000..8b6e93b201 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev/chromeos-dev-0.1.0-r62.ebuild @@ -0,0 +1 @@ +chromeos-dev-0.1.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev/chromeos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev/chromeos-dev-0.1.0.ebuild new file mode 100644 index 0000000000..8e741a5663 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-dev/chromeos-dev-0.1.0.ebuild @@ -0,0 +1,111 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +DESCRIPTION="Adds some developer niceties on top of Chrome OS for debugging" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="bluetooth opengl X" + +# The dependencies here are meant to capture "all the packages +# developers want to use for development, test, or debug". This +# category is meant to include all developer use cases, including +# software test and debug, performance tuning, hardware validation, +# and debugging failures running autotest. +# +# To protect developer images from changes in other ebuilds you +# should include any package with a user constituency, regardless of +# whether that package is included in the base Chromium OS image or +# any other ebuild. +# +# Don't include packages that are indirect dependencies: only +# include a package if a file *in that package* is expected to be +# useful. +RDEPEND="${RDEPEND} + app-admin/sudo + app-arch/gzip + app-arch/tar + app-benchmarks/punybench + app-crypt/nss + app-crypt/tpm-tools + app-editors/vim + app-misc/evtest + app-shells/bash + chromeos-base/chromeos-dev-init + chromeos-base/flimflam-test + chromeos-base/gmerge + chromeos-base/protofiles + chromeos-base/system_api + dev-lang/python + dev-python/dbus-python + dev-util/hdctools + dev-util/libc-bench + dev-util/strace + net-analyzer/netperf + net-analyzer/tcpdump + net-dialup/minicom + net-misc/dhcp + net-misc/iperf + net-misc/iputils + net-misc/openssh + net-misc/rsync + bluetooth? ( net-wireless/bluez-hcidump ) + net-wireless/iw + net-wireless/wireless-tools + sys-apps/coreutils + sys-apps/diffutils + sys-apps/file + sys-apps/findutils + sys-apps/i2c-tools + sys-apps/kbd + sys-apps/less + sys-apps/smartmontools + sys-apps/usbutils + sys-apps/which + sys-devel/gdb + sys-fs/fuse + sys-fs/lvm2 + sys-fs/sshfs-fuse + sys-power/powertop + sys-process/ktop + sys-process/procps + sys-process/psmisc + sys-process/time + virtual/perf + virtual/chromeos-bsp-dev + opengl? ( x11-apps/mesa-progs ) + x11-apps/mtplot + x11-apps/xauth + x11-apps/xdpyinfo + x11-apps/xdriinfo + x11-apps/xev + x11-apps/xhost + x11-apps/xinput + x11-apps/xinput_calibrator + x11-apps/xlsatoms + x11-apps/xlsclients + x11-apps/xmodmap + x11-apps/xprop + x11-apps/xrdb + x11-apps/xset + x11-apps/xtrace + x11-apps/xwd + x11-apps/xwininfo + x11-misc/xdotool + " + +X86_DEPEND=" + app-benchmarks/i7z + app-editors/qemacs + sys-apps/dmidecode + sys-apps/iotools + sys-apps/pciutils + x11-apps/intel-gpu-tools +" + +RDEPEND="${RDEPEND} x86? ( ${X86_DEPEND} )" +RDEPEND="${RDEPEND} amd64? ( ${X86_DEPEND} )" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/chromeos-disableecho-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/chromeos-disableecho-0.0.1.ebuild new file mode 100644 index 0000000000..17e436d3b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/chromeos-disableecho-0.0.1.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +inherit toolchain-funcs + +DESCRIPTION="App that disables ECHO on tty1 for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +S="${WORKDIR}" + +src_unpack() { + cp -R "${FILESDIR}"/* ./ || die +} + +src_compile() { + tc-export CC + emake +} + +src_install() { + into / + dosbin disable_echo + + insinto /etc/init + doins disable_echo.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/Makefile b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/Makefile new file mode 100644 index 0000000000..df9d0bf8cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/Makefile @@ -0,0 +1,15 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# Makefile for disable_echo utility +# + +CFLAGS += -D_GNU_SOURCE -Wall -Werror +OBJS = disable_echo.o +COMMAND = disable_echo + +all: $(COMMAND) + +clean: + rm -f $(COMMAND) $(OBJS) diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/disable_echo.c b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/disable_echo.c new file mode 100644 index 0000000000..93b877660d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/disable_echo.c @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2012 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include +#include +#include + +int main(int argc, char *argv[]) +{ + int ret, fd; + struct termios t; + + fd = open("/dev/tty1", O_RDWR); + if (fd < 0) + return fd; + + ret = tcgetattr(fd, &t); + if (ret) + goto end; + + /* Disable ECHO and other trouble makers on this console. */ + t.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN | ISIG); + ret = tcsetattr(fd, TCSANOW, &t); + if (ret) + goto end; + + pause(); /* Never gonna give you up, never gonna let you down. */ + +end: + close(fd); + + return ret; +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/disable_echo.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/disable_echo.conf new file mode 100644 index 0000000000..a5f2fd66bb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-disableecho/files/disable_echo.conf @@ -0,0 +1,15 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Disable ECHO on tty1" +author "chromium-os-dev@chromium.org" + +start on startup +stop on x-started + +# Disable echo on /dev/tty1 so we don't get artifacts over the splash +# screen +script + disable_echo +end script diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ec/chromeos-ec-0.0.1-r972.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ec/chromeos-ec-0.0.1-r972.ebuild new file mode 100644 index 0000000000..ab35812680 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ec/chromeos-ec-0.0.1-r972.ebuild @@ -0,0 +1,77 @@ +# Copyright (C) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE.makefile file. + +EAPI="4" +CROS_WORKON_COMMIT="6e29f8091d9da763cd39b7ea61eefb5c35b94606" +CROS_WORKON_TREE="7312bc4c61477f0041b02dbca07a3029707e9d46" +CROS_WORKON_PROJECT="chromiumos/platform/ec" +CROS_WORKON_LOCALNAME="ec" + +inherit toolchain-funcs cros-board cros-workon + +DESCRIPTION="Embedded Controller firmware code" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="arm amd64 x86" +IUSE="test bds snow spring" + +# We don't want binchecks since we're cross-compiling firmware images using +# non-standard layout. +RESTRICT="binchecks" + +set_build_env() { + # The firmware is running on ARMv7-m (Cortex-M4) + export CROSS_COMPILE=arm-none-eabi- + tc-export CC BUILD_CC + export HOSTCC=${CC} + export BUILDCC=${BUILD_CC} + + # Allow building for boards that don't have an EC + # (so we can compile test on bots for testing). + export EC_BOARD=$(usev bds || get_current_board_with_variant) + if [[ ! -d board/${EC_BOARD} ]] ; then + ewarn "Sorry, ${EC_BOARD} not supported; doing build-test with BOARD=bds" + EC_BOARD=bds + fi + + # FIXME: hack to separate BOARD= used by EC Makefile and Portage, + # crosbug.com/p/10377 + if use snow; then + EC_BOARD=snow + fi + # If building for spring hack in spring, must happen after snow due + # to hirearchy of current overlays. + if use spring; then + ewarn "USE=spring detected; overriding EC_BOARD=spring" + EC_BOARD=spring + fi + +} + +src_compile() { + set_build_env + BOARD=${EC_BOARD} emake all + + EXTRA_ARGS="out=build/${EC_BOARD}_shifted " + EXTRA_ARGS+="EXTRA_CFLAGS=\"-DSHIFT_CODE_FOR_TEST\"" + BOARD=${EC_BOARD} emake all ${EXTRA_ARGS} +} + +src_install() { + set_build_env + # EC firmware binaries + insinto /firmware + doins build/${EC_BOARD}/ec.bin + doins build/${EC_BOARD}/ec.RW.bin + newins build/${EC_BOARD}/ec.RO.flat ec.RO.bin + newins build/${EC_BOARD}_shifted/ec.bin ec_autest_image.bin + # Intermediate files for debugging + doins build/${EC_BOARD}/ec.*.elf + # Utilities + exeinto /usr/bin + doexe build/${EC_BOARD}/util/ectool +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ec/chromeos-ec-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ec/chromeos-ec-9999.ebuild new file mode 100644 index 0000000000..3804484c6b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-ec/chromeos-ec-9999.ebuild @@ -0,0 +1,75 @@ +# Copyright (C) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE.makefile file. + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/ec" +CROS_WORKON_LOCALNAME="ec" + +inherit toolchain-funcs cros-board cros-workon + +DESCRIPTION="Embedded Controller firmware code" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="test bds snow spring" + +# We don't want binchecks since we're cross-compiling firmware images using +# non-standard layout. +RESTRICT="binchecks" + +set_build_env() { + # The firmware is running on ARMv7-m (Cortex-M4) + export CROSS_COMPILE=arm-none-eabi- + tc-export CC BUILD_CC + export HOSTCC=${CC} + export BUILDCC=${BUILD_CC} + + # Allow building for boards that don't have an EC + # (so we can compile test on bots for testing). + export EC_BOARD=$(usev bds || get_current_board_with_variant) + if [[ ! -d board/${EC_BOARD} ]] ; then + ewarn "Sorry, ${EC_BOARD} not supported; doing build-test with BOARD=bds" + EC_BOARD=bds + fi + + # FIXME: hack to separate BOARD= used by EC Makefile and Portage, + # crosbug.com/p/10377 + if use snow; then + EC_BOARD=snow + fi + # If building for spring hack in spring, must happen after snow due + # to hirearchy of current overlays. + if use spring; then + ewarn "USE=spring detected; overriding EC_BOARD=spring" + EC_BOARD=spring + fi + +} + +src_compile() { + set_build_env + BOARD=${EC_BOARD} emake all + + EXTRA_ARGS="out=build/${EC_BOARD}_shifted " + EXTRA_ARGS+="EXTRA_CFLAGS=\"-DSHIFT_CODE_FOR_TEST\"" + BOARD=${EC_BOARD} emake all ${EXTRA_ARGS} +} + +src_install() { + set_build_env + # EC firmware binaries + insinto /firmware + doins build/${EC_BOARD}/ec.bin + doins build/${EC_BOARD}/ec.RW.bin + newins build/${EC_BOARD}/ec.RO.flat ec.RO.bin + newins build/${EC_BOARD}_shifted/ec.bin ec_autest_image.bin + # Intermediate files for debugging + doins build/${EC_BOARD}/ec.*.elf + # Utilities + exeinto /usr/bin + doexe build/${EC_BOARD}/util/ectool +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory-board/chromeos-factory-board-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory-board/chromeos-factory-board-0.0.1-r1.ebuild new file mode 100644 index 0000000000..aa0f3506db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory-board/chromeos-factory-board-0.0.1-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Board specific factory test image resources" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" + +# +# WARNING: Nothing should be added to this ebuild. This ebuild is overriden +# in most of the board specific overlays, or will be. +# diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory/chromeos-factory-0.0.1-r570.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory/chromeos-factory-0.0.1-r570.ebuild new file mode 100644 index 0000000000..8bdb07279b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory/chromeos-factory-0.0.1-r570.ebuild @@ -0,0 +1,88 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT=("6ef9dac5a8f97a6af0b28120a063e9d97cbfb21d" "3933b7af319b131d958803261fd318ab1964b9a1") +CROS_WORKON_TREE=("bb14f8d6460944d9ae92b4f5c6692a17581efbe0" "e5c05be79112b34348527a8b17d8b287d91a9140") +CROS_WORKON_PROJECT=("chromiumos/platform/factory" "chromiumos/platform/installer") +CROS_WORKON_LOCALNAME=("factory" "installer") +CROS_WORKON_DESTDIR=("${S}" "${S}/installer") + +inherit cros-workon +inherit cros-binary +inherit python + +DESCRIPTION="Chrome OS Factory Tools and Data" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="+autotest +build_tests" + +DEPEND="chromeos-base/chromeos-chrome + dev-python/pyyaml" +RDEPEND="!chromeos-base/chromeos-factorytools + chromeos-base/chromeos-factory-board + dev-lang/python + dev-python/argparse + dev-python/jsonrpclib + dev-python/netifaces + dev-python/pyyaml + dev-python/setproctitle + dev-util/stressapptest + >=chromeos-base/vpd-0.0.1-r11" + +CROS_WORKON_LOCALNAME="factory" + +TARGET_DIR="/usr/local/factory" + +CROS_BINARY_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/closure-library-20111110-r1376.tar.bz2" +CROS_BINARY_SUM="761af448631b4dd2339e01b04cb11140ad6d7706" + +src_unpack() { + cros-workon_src_unpack + cros-binary_src_unpack +} + +src_compile() { + emake CLOSURE_LIB_ARCHIVE="${CROS_BINARY_STORE_DIR}/${CROS_BINARY_URI##*/}" +} + +src_install() { + emake DESTDIR="${D}" TARGET_DIR="${TARGET_DIR}" \ + PYTHON_SITEDIR="${EROOT}/$(python_get_sitedir)" \ + PYTHON="$(PYTHON)" \ + par install + + dosym ../../../../local/factory/py $(python_get_sitedir)/cros/factory + + # Replace chromeos-common.sh symlink with the real file + cp --remove-destination "${S}/installer/chromeos-common.sh" \ + "${D}${TARGET_DIR}/bundle/factory_setup/lib/chromeos-common.sh" || die + + if use autotest && use build_tests; then + # For now, point 'custom' to suite_Factory. TODO(jsalz): Actually + # install files directly into custom as appropriate. + dosym ../autotest/client/site_tests/suite_Factory ${TARGET_DIR}/custom + # We need to preserve the chromedriver and selenium library + # (from chromeos-chrome pyauto test folder which is stripped by default) + # for factory test images. + local pyauto_path="/usr/local/autotest/client/deps/pyauto_dep" + exeinto "$TARGET_DIR/bin/" + doexe "${ROOT}$pyauto_path/test_src/out/Release/chromedriver" + insinto "$TARGET_DIR/py/automation" + doins -r "${ROOT}$pyauto_path/test_src/third_party/webdriver/pylib/selenium" + fi + + # Directories used by Goofy. + keepdir /var/factory/{,log,state,tests} +} + +pkg_postinst() { + python_mod_optimize ${TARGET_DIR}/py + # Sanity check: make sure we can import stuff with only the + # .par file. + PYTHONPATH="${EROOT}/${TARGET_DIR}/bundle/shopfloor/factory.par" \ + "$(PYTHON)" -c "import cros.factory.test.state" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory/chromeos-factory-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory/chromeos-factory-9999.ebuild new file mode 100644 index 0000000000..2c07167153 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factory/chromeos-factory-9999.ebuild @@ -0,0 +1,86 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT=("chromiumos/platform/factory" "chromiumos/platform/installer") +CROS_WORKON_LOCALNAME=("factory" "installer") +CROS_WORKON_DESTDIR=("${S}" "${S}/installer") + +inherit cros-workon +inherit cros-binary +inherit python + +DESCRIPTION="Chrome OS Factory Tools and Data" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+autotest +build_tests" + +DEPEND="chromeos-base/chromeos-chrome + dev-python/pyyaml" +RDEPEND="!chromeos-base/chromeos-factorytools + chromeos-base/chromeos-factory-board + dev-lang/python + dev-python/argparse + dev-python/jsonrpclib + dev-python/netifaces + dev-python/pyyaml + dev-python/setproctitle + dev-util/stressapptest + >=chromeos-base/vpd-0.0.1-r11" + +CROS_WORKON_LOCALNAME="factory" + +TARGET_DIR="/usr/local/factory" + +CROS_BINARY_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/closure-library-20111110-r1376.tar.bz2" +CROS_BINARY_SUM="761af448631b4dd2339e01b04cb11140ad6d7706" + +src_unpack() { + cros-workon_src_unpack + cros-binary_src_unpack +} + +src_compile() { + emake CLOSURE_LIB_ARCHIVE="${CROS_BINARY_STORE_DIR}/${CROS_BINARY_URI##*/}" +} + +src_install() { + emake DESTDIR="${D}" TARGET_DIR="${TARGET_DIR}" \ + PYTHON_SITEDIR="${EROOT}/$(python_get_sitedir)" \ + PYTHON="$(PYTHON)" \ + par install + + dosym ../../../../local/factory/py $(python_get_sitedir)/cros/factory + + # Replace chromeos-common.sh symlink with the real file + cp --remove-destination "${S}/installer/chromeos-common.sh" \ + "${D}${TARGET_DIR}/bundle/factory_setup/lib/chromeos-common.sh" || die + + if use autotest && use build_tests; then + # For now, point 'custom' to suite_Factory. TODO(jsalz): Actually + # install files directly into custom as appropriate. + dosym ../autotest/client/site_tests/suite_Factory ${TARGET_DIR}/custom + # We need to preserve the chromedriver and selenium library + # (from chromeos-chrome pyauto test folder which is stripped by default) + # for factory test images. + local pyauto_path="/usr/local/autotest/client/deps/pyauto_dep" + exeinto "$TARGET_DIR/bin/" + doexe "${ROOT}$pyauto_path/test_src/out/Release/chromedriver" + insinto "$TARGET_DIR/py/automation" + doins -r "${ROOT}$pyauto_path/test_src/third_party/webdriver/pylib/selenium" + fi + + # Directories used by Goofy. + keepdir /var/factory/{,log,state,tests} +} + +pkg_postinst() { + python_mod_optimize ${TARGET_DIR}/py + # Sanity check: make sure we can import stuff with only the + # .par file. + PYTHONPATH="${EROOT}/${TARGET_DIR}/bundle/shopfloor/factory.par" \ + "$(PYTHON)" -c "import cros.factory.test.state" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/chromeos-factoryinstall-0.0.1-r90.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/chromeos-factoryinstall-0.0.1-r90.ebuild new file mode 100644 index 0000000000..eeae8f7496 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/chromeos-factoryinstall-0.0.1-r90.ebuild @@ -0,0 +1,140 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="2f2ebdfd840084c9966966b02819a4726c76ec63" +CROS_WORKON_TREE="b50aef5db982b43af5e4b1c53bc67b9c78087917" +CROS_WORKON_PROJECT="chromiumos/platform/factory_installer" + +inherit cros-workon + +DESCRIPTION="Chrome OS Factory Installer" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +# Factory install images operate by downloading content from a +# server. In some cases, the downloaded content contains programs +# to be executed. The downloaded programs may not be complete; +# they could have dependencies on shared libraries or commands +# that must be present in the factory install image. +# +# PROVIDED_DEPEND captures a minimal set of packages promised to be +# provided for use by any downloaded program. The list must contain +# any package depended on by any downloaded program. +# +# Currently, the only downloaded program is the firmware installer; +# the dependencies below are gleaned from eclass/cros-firmware.eclass. +# Changes in that eclass must be reflected here. +PROVIDED_DEPEND=" + app-arch/gzip + app-arch/sharutils + app-arch/tar + chromeos-base/vboot_reference + sys-apps/mosys + sys-apps/util-linux" + +# COMMON_DEPEND tracks dependencies common to both DEPEND and +# RDEPEND. +# +# For chromeos-init there's a runtime dependency because the factory +# jobs depend on upstart jobs in that package. There's a build-time +# dependency because pkg_postinst in this ebuild edits specifc jobs +# in that package. +COMMON_DEPEND="chromeos-base/chromeos-init" + +DEPEND="$COMMON_DEPEND + x86? ( sys-boot/syslinux )" + +RDEPEND="$COMMON_DEPEND + $PROVIDED_DEPEND + x86? ( chromeos-base/chromeos-initramfs ) + chromeos-base/chromeos-installer + chromeos-base/memento_softwareupdate + net-misc/htpdate + net-wireless/iw + sys-apps/flashrom + sys-apps/net-tools + sys-apps/upstart + sys-block/parted + sys-fs/e2fsprogs" + +CROS_WORKON_LOCALNAME="factory_installer" + +FACTORY_SERVER="${FACTORY_SERVER:-$(hostname -f)}" + +src_install() { + insinto /etc/init + doins factory_install.conf + doins factory_ui.conf + + exeinto /usr/sbin + doexe factory_install.sh + doexe factory_reset.sh + + insinto /root + newins $FILESDIR/dot.factory_installer .factory_installer + newins $FILESDIR/dot.gpt_layout .gpt_layout + # install PMBR code + case "$(tc-arch)" in + "x86") + einfo "using x86 PMBR code from syslinux" + PMBR_SOURCE="${ROOT}/usr/share/syslinux/gptmbr.bin" + ;; + *) + einfo "using default PMBR code" + PMBR_SOURCE=$FILESDIR/dot.pmbr_code + ;; + esac + newins $PMBR_SOURCE .pmbr_code +} + +pkg_postinst() { + [[ "$(cros_target)" != "target_image" ]] && return 0 + + STATEFUL="${ROOT}/usr/local" + STATEFUL_LSB="${STATEFUL}/etc/lsb-factory" + + mkdir -p "${STATEFUL}/etc" + sudo dd of="${STATEFUL_LSB}" <> "${ROOT}/etc/init/ui.conf" || + die "Failed to disable UI" + + # Set network to start up another way + sed -i 's/login-prompt-visible/started boot-services/' \ + "${ROOT}/etc/init/boot-complete.conf" || + die "Failed to setup network" + + # No TPM locking. + sed -i 's/start tcsd//' \ + "${ROOT}/etc/init/tpm-probe.conf" || + die "Failed to disable TPM locking" + + # Stop any power management and updater daemons + for conf in power powerd update-engine; do + echo 'start on never' >> "${ROOT}/etc/init/$conf.conf" || + die "Failed to disable $conf" + done + + # The "laptop_mode" may be triggered from udev + rm -f "${ROOT}/etc/udev/rules.d/99-laptop-mode.rules" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/chromeos-factoryinstall-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/chromeos-factoryinstall-9999.ebuild new file mode 100644 index 0000000000..8a150e53c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/chromeos-factoryinstall-9999.ebuild @@ -0,0 +1,138 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/factory_installer" + +inherit cros-workon + +DESCRIPTION="Chrome OS Factory Installer" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +# Factory install images operate by downloading content from a +# server. In some cases, the downloaded content contains programs +# to be executed. The downloaded programs may not be complete; +# they could have dependencies on shared libraries or commands +# that must be present in the factory install image. +# +# PROVIDED_DEPEND captures a minimal set of packages promised to be +# provided for use by any downloaded program. The list must contain +# any package depended on by any downloaded program. +# +# Currently, the only downloaded program is the firmware installer; +# the dependencies below are gleaned from eclass/cros-firmware.eclass. +# Changes in that eclass must be reflected here. +PROVIDED_DEPEND=" + app-arch/gzip + app-arch/sharutils + app-arch/tar + chromeos-base/vboot_reference + sys-apps/mosys + sys-apps/util-linux" + +# COMMON_DEPEND tracks dependencies common to both DEPEND and +# RDEPEND. +# +# For chromeos-init there's a runtime dependency because the factory +# jobs depend on upstart jobs in that package. There's a build-time +# dependency because pkg_postinst in this ebuild edits specifc jobs +# in that package. +COMMON_DEPEND="chromeos-base/chromeos-init" + +DEPEND="$COMMON_DEPEND + x86? ( sys-boot/syslinux )" + +RDEPEND="$COMMON_DEPEND + $PROVIDED_DEPEND + x86? ( chromeos-base/chromeos-initramfs ) + chromeos-base/chromeos-installer + chromeos-base/memento_softwareupdate + net-misc/htpdate + net-wireless/iw + sys-apps/flashrom + sys-apps/net-tools + sys-apps/upstart + sys-block/parted + sys-fs/e2fsprogs" + +CROS_WORKON_LOCALNAME="factory_installer" + +FACTORY_SERVER="${FACTORY_SERVER:-$(hostname -f)}" + +src_install() { + insinto /etc/init + doins factory_install.conf + doins factory_ui.conf + + exeinto /usr/sbin + doexe factory_install.sh + doexe factory_reset.sh + + insinto /root + newins $FILESDIR/dot.factory_installer .factory_installer + newins $FILESDIR/dot.gpt_layout .gpt_layout + # install PMBR code + case "$(tc-arch)" in + "x86") + einfo "using x86 PMBR code from syslinux" + PMBR_SOURCE="${ROOT}/usr/share/syslinux/gptmbr.bin" + ;; + *) + einfo "using default PMBR code" + PMBR_SOURCE=$FILESDIR/dot.pmbr_code + ;; + esac + newins $PMBR_SOURCE .pmbr_code +} + +pkg_postinst() { + [[ "$(cros_target)" != "target_image" ]] && return 0 + + STATEFUL="${ROOT}/usr/local" + STATEFUL_LSB="${STATEFUL}/etc/lsb-factory" + + mkdir -p "${STATEFUL}/etc" + sudo dd of="${STATEFUL_LSB}" <> "${ROOT}/etc/init/ui.conf" || + die "Failed to disable UI" + + # Set network to start up another way + sed -i 's/login-prompt-visible/started boot-services/' \ + "${ROOT}/etc/init/boot-complete.conf" || + die "Failed to setup network" + + # No TPM locking. + sed -i 's/start tcsd//' \ + "${ROOT}/etc/init/tpm-probe.conf" || + die "Failed to disable TPM locking" + + # Stop any power management and updater daemons + for conf in power powerd update-engine; do + echo 'start on never' >> "${ROOT}/etc/init/$conf.conf" || + die "Failed to disable $conf" + done + + # The "laptop_mode" may be triggered from udev + rm -f "${ROOT}/etc/udev/rules.d/99-laptop-mode.rules" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.factory_installer b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.factory_installer new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.gpt_layout b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.gpt_layout new file mode 100644 index 0000000000..09472cb69e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.gpt_layout @@ -0,0 +1,8 @@ +# The layout here is a combination of +# src/scripts/chromeos-common.sh:install_gpt and +# src/scripts/build_image +STATEFUL_IMG_SECTORS=2097152 # MIN=256M, default=1G +KERNEL_IMG_SECTORS=32768 # 16M +ROOTFS_IMG_SECTORS=4194304 # 2G +OEM_IMG_SECTORS=32768 # 16M +ESP_IMG_SECTORS=32768 # 16M diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.pmbr_code b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.pmbr_code new file mode 100644 index 0000000000..f76dd238ad Binary files /dev/null and b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-factoryinstall/files/dot.pmbr_code differ diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-firmware-null/chromeos-firmware-null-0.0.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-firmware-null/chromeos-firmware-null-0.0.2-r1.ebuild new file mode 100644 index 0000000000..99ac79e21e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-firmware-null/chromeos-firmware-null-0.0.2-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/firmware" + +# THIS IS A TEMPLATE EBUILD FILE. +# UNCOMMENT THE 'inherit' LINE TO ACTIVATE AND START YOUR MODIFICATION. + +# inherit cros-workon cros-firmware + +DESCRIPTION="Chrome OS Firmware (null template)" +# Empty (null) ebuild which satisifies virtual/chromeos-firmware. +# This is a direct dependency of chromeos-base/chromeos, but is expected to +# be overridden in an overlay for each specialized board. A typical non-null +# implementation will install any board-specific configuration files and +# drivers which are not suitable for inclusion in a generic board overlay. + +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +CROS_WORKON_LOCALNAME="firmware" + +# --------------------------------------------------------------------------- +# CUSTOMIZATION SECTION + +# Name of user account on the Binary Component Server. +CROS_FIRMWARE_BCS_USER_NAME="" + +# System firmware image. +# Examples: +# CROS_FIRMWARE_MAIN_IMAGE="bcs://filename.tbz2" - Fetch from Binary Component Server. +# CROS_FIRMWARE_MAIN_IMAGE="file://filename.fd" - Fetch from "files" directory. +# CROS_FIRMWARE_MAIN_IMAGE="${ROOT}/lib/firmware/filename.fd" - Absolute file path. +CROS_FIRMWARE_MAIN_IMAGE="" + +# EC (embedded controller) firmware. +# Examples: +# CROS_FIRMWARE_EC_IMAGE="bcs://filename.tbz2" - Fetch from Binary Component Server. +# CROS_FIRMWARE_EC_IMAGE="file://filename.bin" - Fetch from "files" directory. +# CROS_FIRMWARE_EC_IMAGE="${ROOT}/lib/firmware/filename.bin" - Absolute file path. +CROS_FIRMWARE_EC_IMAGE="" + +# EC (embedded controller) firmware image version identifier. +CROS_FIRMWARE_EC_VERSION="" + +# If you need any additional resources in firmware update (ex, +# a customization script like "install_firmware_custom.sh"), +# put the filename or directory name here. Accepts multiple colon delimited +# values. +# Example: CROS_FIRMWARE_EXTRA_LIST="$FILESDIR/a_directory:$FILESDIR/a_file" +CROS_FIRMWARE_EXTRA_LIST="" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-firmware-null/chromeos-firmware-null-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-firmware-null/chromeos-firmware-null-9999.ebuild new file mode 100644 index 0000000000..3381ea1c96 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-firmware-null/chromeos-firmware-null-9999.ebuild @@ -0,0 +1,56 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/firmware" + +# THIS IS A TEMPLATE EBUILD FILE. +# UNCOMMENT THE 'inherit' LINE TO ACTIVATE AND START YOUR MODIFICATION. + +# inherit cros-workon cros-firmware + +DESCRIPTION="Chrome OS Firmware (null template)" +# Empty (null) ebuild which satisifies virtual/chromeos-firmware. +# This is a direct dependency of chromeos-base/chromeos, but is expected to +# be overridden in an overlay for each specialized board. A typical non-null +# implementation will install any board-specific configuration files and +# drivers which are not suitable for inclusion in a generic board overlay. + +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +CROS_WORKON_LOCALNAME="firmware" + +# --------------------------------------------------------------------------- +# CUSTOMIZATION SECTION + +# Name of user account on the Binary Component Server. +CROS_FIRMWARE_BCS_USER_NAME="" + +# System firmware image. +# Examples: +# CROS_FIRMWARE_MAIN_IMAGE="bcs://filename.tbz2" - Fetch from Binary Component Server. +# CROS_FIRMWARE_MAIN_IMAGE="file://filename.fd" - Fetch from "files" directory. +# CROS_FIRMWARE_MAIN_IMAGE="${ROOT}/lib/firmware/filename.fd" - Absolute file path. +CROS_FIRMWARE_MAIN_IMAGE="" + +# EC (embedded controller) firmware. +# Examples: +# CROS_FIRMWARE_EC_IMAGE="bcs://filename.tbz2" - Fetch from Binary Component Server. +# CROS_FIRMWARE_EC_IMAGE="file://filename.bin" - Fetch from "files" directory. +# CROS_FIRMWARE_EC_IMAGE="${ROOT}/lib/firmware/filename.bin" - Absolute file path. +CROS_FIRMWARE_EC_IMAGE="" + +# EC (embedded controller) firmware image version identifier. +CROS_FIRMWARE_EC_VERSION="" + +# If you need any additional resources in firmware update (ex, +# a customization script like "install_firmware_custom.sh"), +# put the filename or directory name here. Accepts multiple colon delimited +# values. +# Example: CROS_FIRMWARE_EXTRA_LIST="$FILESDIR/a_directory:$FILESDIR/a_file" +CROS_FIRMWARE_EXTRA_LIST="" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-fonts/chromeos-fonts-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-fonts/chromeos-fonts-0.0.1-r9.ebuild new file mode 120000 index 0000000000..b7b88c8603 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-fonts/chromeos-fonts-0.0.1-r9.ebuild @@ -0,0 +1 @@ +chromeos-fonts-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-fonts/chromeos-fonts-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-fonts/chromeos-fonts-0.0.1.ebuild new file mode 100644 index 0000000000..08f8c3a9b4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-fonts/chromeos-fonts-0.0.1.ebuild @@ -0,0 +1,101 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Chrome OS Fonts (meta package)" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="cros_host internal" + +# Internal and external builds deliver different fonts for Japanese. +# Although the two fonts can in theory co-exist, the font selection +# code in the chromeos-initramfs build prefers one or the other, but +# not both. +# +# The build system will actually try to make both fonts co-exist in +# some cases, because the default chroot downloaded by cros_sdk +# includes the ja-ipafonts package. The logic here also protects +# in the case that you switch a repo from internal to external, and +# vice-versa. +JA_FONTS=" + internal? ( + chromeos-base/ja-motoyafonts + !media-fonts/ja-ipafonts + ) + !internal? ( + !chromeos-base/ja-motoyafonts + media-fonts/ja-ipafonts + ) + " + +# List of font packages used in Chromium OS. This list is separate +# so that it can be shared between the host in +# chromeos-base/hard-host-depends and the target in +# chromeos-base/chromeos. +# +# The glibc requirement is a bit funky. For target boards, we make sure it is +# installed before any other package (by way of setup_board), but for the sdk +# board, we don't have that toolchain-specific tweak. So we end up installing +# these in parallel and the chroot logic for font generation fails. We can +# drop this when we stop executing the helper in the $ROOT via `chroot` and/or +# `qemu` (e.g. when we do `ROOT=/build/amd64-host/ emerge chromeos-fonts`). +RDEPEND=" + ${JA_FONTS} + !cros_host? ( chromeos-base/chromeos-assets ) + media-fonts/croscorefonts + media-fonts/notofonts + media-fonts/dejavu + media-fonts/droidfonts-cros + media-fonts/ko-nanumfonts + media-fonts/lohitfonts-cros + media-fonts/ml-anjalioldlipi + media-fonts/sil-abyssinica + media-libs/fontconfig + cros_host? ( sys-libs/glibc ) + " + +qemu_run() { + # Run the emulator to execute command. It needs to be copied + # temporarily into the sysroot because we chroot to it. + local qemu + case "${ARCH}" in + amd64) + # Note that qemu is not actually run below in this case. + qemu="qemu-x86_64" + ;; + arm) + qemu="qemu-arm" + ;; + x86) + qemu="qemu-i386" + ;; + *) + die "Unable to determine QEMU from ARCH." + esac + + # If we're running directly on the target (e.g. gmerge), we don't need to + # chroot or use qemu. + if [ "${ROOT:-/}" = "/" ]; then + "$@" || die + elif [ "${ARCH}" = "amd64" ] || [ "${ARCH}" = "x86" ]; then + chroot "${ROOT}" "$@" || die + else + cp "/usr/bin/${qemu}" "${ROOT}/tmp" || die + chroot "${ROOT}" "/tmp/${qemu}" "$@" || die + rm "${ROOT}/tmp/${qemu}" || die + fi +} + +generate_font_cache() { + mkdir -p "${ROOT}/usr/share/fontconfig" || die + # fc-cache needs the font files to be located in their final resting place. + qemu_run /usr/bin/fc-cache -f +} + +pkg_preinst() { + generate_font_cache +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-hwid/chromeos-hwid-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-hwid/chromeos-hwid-0.0.1.ebuild new file mode 100644 index 0000000000..2f56fa1d12 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-hwid/chromeos-hwid-0.0.1.ebuild @@ -0,0 +1,22 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +inherit toolchain-funcs + +DESCRIPTION="Empty (null) ebuild which satisifies chromeos-hwid. +This is overridden with board specific approved HWIDs in chromeos-overlay." + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +# +# WARNING: Nothing should be added to this ebuild. This ebuild is overriden +# in chromeos overlay. +# diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r25.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r25.ebuild new file mode 100644 index 0000000000..f8c0a73014 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r25.ebuild @@ -0,0 +1,57 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="818155bc776427d71f2315d8d5fa756b8886c93e" +CROS_WORKON_TREE="58a20ef629b90e2ccfc1fb6b11ba38228e1d4e11" +CROS_WORKON_PROJECT="chromiumos/platform/image-burner" + +KEYWORDS="arm amd64 x86" + +inherit cros-debug cros-workon + +DESCRIPTION="Image-burning service for Chromium OS." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +IUSE="test" + +RDEPEND=" + chromeos-base/libchromeos + dev-libs/dbus-glib + dev-libs/glib + sys-apps/rootdev +" + +DEPEND="${RDEPEND} + chromeos-base/system_api + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest )" + +CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})" + +src_compile() { + tc-export CXX PKG_CONFIG + cros-debug-add-NDEBUG + emake image_burner || die "chromeos-imageburner compile failed." + emake image_burner_tester || die "chromeos-imageburner compile failed." +} + +src_test() { + tc-export CXX CC OBJCOPY PKG_CONFIG STRIP + emake unittest_runner || \ + die "chromeos-imageburner unittest compile failed." + "${S}/unittest_runner" || die "imageburner unittests failed." +} + +src_install() { + dosbin "${S}/image_burner" + dosbin "${S}/image_burner_tester" + + insinto /etc/dbus-1/system.d + doins "${S}/ImageBurner.conf" + + insinto /usr/share/dbus-1/system-services + doins "${S}/org.chromium.ImageBurner.service" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-imageburner/chromeos-imageburner-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-imageburner/chromeos-imageburner-9999.ebuild new file mode 100644 index 0000000000..8cc430438e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-imageburner/chromeos-imageburner-9999.ebuild @@ -0,0 +1,55 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/image-burner" + +KEYWORDS="~arm ~amd64 ~x86" + +inherit cros-debug cros-workon + +DESCRIPTION="Image-burning service for Chromium OS." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +IUSE="test" + +RDEPEND=" + chromeos-base/libchromeos + dev-libs/dbus-glib + dev-libs/glib + sys-apps/rootdev +" + +DEPEND="${RDEPEND} + chromeos-base/system_api + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest )" + +CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})" + +src_compile() { + tc-export CXX PKG_CONFIG + cros-debug-add-NDEBUG + emake image_burner || die "chromeos-imageburner compile failed." + emake image_burner_tester || die "chromeos-imageburner compile failed." +} + +src_test() { + tc-export CXX CC OBJCOPY PKG_CONFIG STRIP + emake unittest_runner || \ + die "chromeos-imageburner unittest compile failed." + "${S}/unittest_runner" || die "imageburner unittests failed." +} + +src_install() { + dosbin "${S}/image_burner" + dosbin "${S}/image_burner_tester" + + insinto /etc/dbus-1/system.d + doins "${S}/ImageBurner.conf" + + insinto /usr/share/dbus-1/system-services + doins "${S}/org.chromium.ImageBurner.service" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-init/chromeos-init-0.0.1-r623.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-init/chromeos-init-0.0.1-r623.ebuild new file mode 100644 index 0000000000..a9a1c58d01 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-init/chromeos-init-0.0.1-r623.ebuild @@ -0,0 +1,73 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="ea3cd573f8d47f15f7e4808a838f0066777bed16" +CROS_WORKON_TREE="849f1bf8c2dd07edda676636f278674b93c49414" +CROS_WORKON_PROJECT="chromiumos/platform/init" +CROS_WORKON_LOCALNAME="init" + +inherit cros-workon + +DESCRIPTION="Upstart init scripts for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="nfs" + +DEPEND="" +# vpd for vpd-log.conf of upstart +# vboot_reference for crossystem +RDEPEND="chromeos-base/chromeos-disableecho + ! \ + "${WORKDIR}/${INITRAMFS_FILE}" ) || + die "cannot package initramfs" +} + +src_compile() { + einfo "Creating ${INITRAMFS_FILE}" + build_initramfs_file + INITRAMFS_FILE_SIZE=$(stat --printf="%s" "${WORKDIR}/${INITRAMFS_FILE}") + einfo "${INITRAMFS_FILE}: ${INITRAMFS_FILE_SIZE} bytes" +} + +src_install() { + insinto /var/lib/misc + doins "${WORKDIR}/${INITRAMFS_FILE}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-initramfs/chromeos-initramfs-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-initramfs/chromeos-initramfs-9999.ebuild new file mode 100644 index 0000000000..537382b784 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-initramfs/chromeos-initramfs-9999.ebuild @@ -0,0 +1,132 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/initramfs" + +inherit cros-workon + +DESCRIPTION="Create Chrome OS initramfs" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" +DEPEND="chromeos-base/chromeos-assets + chromeos-base/chromeos-assets-split + chromeos-base/vboot_reference + chromeos-base/vpd + media-gfx/ply-image + sys-apps/busybox[-make-symlinks] + sys-apps/flashrom + sys-apps/pv + sys-fs/lvm2" +RDEPEND="" + +CROS_WORKON_LOCALNAME="../platform/initramfs" + +INITRAMFS_TMP_S=${WORKDIR}/initramfs_tmp +INITRAMFS_FILE="initramfs.cpio.xz" + +# dobin for initramfs +idobin() { + local src + for src in "$@"; do + "${FILESDIR}/copy_elf" "${ROOT}" "${INITRAMFS_TMP_S}" "${src}" || + die "Cannot install: $src" + elog "Copied: $src" + done +} + +# install a list of images (presumably .png files) in /etc/screens +insimage() { + cp "$@" "${INITRAMFS_TMP_S}"/etc/screens || die +} + +build_initramfs_file() { + local dir + + local subdirs=" + bin + dev + etc + etc/screens + lib + log + newroot + proc + stateful + sys + tmp + usb + " + for dir in $subdirs; do + mkdir -p "${INITRAMFS_TMP_S}/$dir" || die + done + + # On amd64, shared libraries must live in /lib64. More generally, + # $(get_libdir) tells us the directory name we need for the target + # platform's libraries. The 'copy_elf' script installs in /lib; to + # keep that script simple we just create a symlink to /lib, if + # necessary. + local libdir=$(get_libdir) + if [ "${libdir}" != "lib" ]; then + ln -s lib "${INITRAMFS_TMP_S}/${libdir}" + fi + + # Copy source files not merged from our dependencies. + cp "${S}"/init "${INITRAMFS_TMP_S}/init" || die + chmod +x "${INITRAMFS_TMP_S}/init" + cp "${S}"/*.sh "${INITRAMFS_TMP_S}/lib" || die + + # PNG image assets + local shared_assets="${ROOT}"/usr/share/chromeos-assets + insimage "${shared_assets}"/images/boot_message.png + insimage "${S}"/assets/spinner_*.png + insimage "${S}"/assets/icon_check.png + insimage "${S}"/assets/icon_warning.png + ${S}/make_images "${S}/localized_text" \ + "${INITRAMFS_TMP_S}/etc/screens" || die + + # For busybox and sh + idobin /bin/busybox + ln -s busybox "${INITRAMFS_TMP_S}/bin/sh" + + # For verified rootfs + idobin /sbin/dmsetup + + # For message screen display and progress bars + idobin /usr/bin/ply-image + idobin /usr/bin/pv + idobin /usr/sbin/vpd + + # /usr/sbin/vpd invokes 'flashrom' via system() + idobin /usr/sbin/flashrom + + # For recovery behavior + idobin /usr/bin/cgpt + idobin /usr/bin/crossystem + idobin /usr/bin/dump_kernel_config + idobin /usr/bin/tpmc + idobin /usr/bin/vbutil_kernel + + # The kernel emake expects the file in cpio format. + ( cd "${INITRAMFS_TMP_S}" + find . | cpio -o -H newc | + xz -9 --check=crc32 --lzma2=dict=512KiB > \ + "${WORKDIR}/${INITRAMFS_FILE}" ) || + die "cannot package initramfs" +} + +src_compile() { + einfo "Creating ${INITRAMFS_FILE}" + build_initramfs_file + INITRAMFS_FILE_SIZE=$(stat --printf="%s" "${WORKDIR}/${INITRAMFS_FILE}") + einfo "${INITRAMFS_FILE}: ${INITRAMFS_FILE_SIZE} bytes" +} + +src_install() { + insinto /var/lib/misc + doins "${WORKDIR}/${INITRAMFS_FILE}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-initramfs/files/copy_elf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-initramfs/files/copy_elf new file mode 100755 index 0000000000..460fed9695 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-initramfs/files/copy_elf @@ -0,0 +1,110 @@ +#!/usr/bin/python + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +"""A helper script to copy an ELF file and its library dependencies. + +The initramfs cpio image includes a small handful of dynamically +linked ELF executables. This script finds the shared libraries +required by a those binaries, and copies them to a designated +library directory. + +This script isn't meant to find and handle all possible future +dependencies; the intent is to deal only with actual needs. Some +key limitations: + + By choice, this script doesn't handle DT_RPATH dependencies. + + Libraries used only via dlopen() can't be detected. + + If a program invokes other programs via execv() or equivalent + mechanisms such as system(), the exec target binary and library + dependencies can't be detected. + +You can expect that support for DT_RPATH, should it be needed, will +entail changes here and to scanelf. + +There are reports that some basic libraries (e.g. ld-linux.so, +libgcc_s.so) may not always be named explicitly, or may be pulled +in via dlopen(); that's not affecting initramfs at the time of this +writing; YMMV. Undetectable dependencies can be handled by naming +them in the ebuild (see 'flashrom', for one example). +""" + +import os +import shutil +import sys + +def _ReadDependencies(root, binary): + """Find all shared library dependencies of `binary` in `root`. + + The dependencies are returned as a list of paths. The returned + paths are partial paths relative to `root`. + """ + # scanelf options: + # -B: no header on output + # -F '%n#F': print NEEDED dependencies + # --use-ldpath: use `root`/etc/ld.so.conf to find and print + # dependencies as paths + # The output is a comma-separated list of paths. In the event that + # there are no dependencies, the output is empty (immediate EOF, + # not a blank line). + # + # There should be at most one line of output and no blank lines, + # but this code doesn't enforce that. + cmd = "scanelf -B -F '%%n#F' --root %s --use-ldpath %s" % (root, binary) + libs = [] + with os.popen(cmd) as f: + for line in f: + libs.extend(line.strip().split(",")) + return libs + + +def _CopyDependencies(rootdir, destdir, binaries): + """Copy a list of binaries and their shared library dependencies. + + `binaries` is a list of paths to binary files. Each binary is + copied to `destdir`/bin. All shared libraries in the transitive + closure of dependencies of these binaries are copied to + `destdir`/lib. + + Paths of binary files are full paths, but are found relative to + `rootdir`. Library files are also found relative to `rootdir`. + """ + bindir = os.path.join(destdir, "bin") + libdir = os.path.join(destdir, "lib") + + for binary in binaries: + # Copy the binary to the 'bin' directory. Note that `binary` is + # a full path (with a leading '/'), so os.path.join() doesn't + # work. + binsource = rootdir + binary + bindest = os.path.join(bindir, os.path.basename(binary)) + shutil.copyfile(binsource, bindest) + shutil.copymode(binsource, bindest) + + # Breadth-first search to find all shared libraries and copy + # them into the 'lib' directory. Note that unlike `binary`, + # the libraries are partial paths (with no leading '/'). + libraries = _ReadDependencies(rootdir, binary) + while libraries: + lib = libraries.pop(0) + libdest = os.path.join(libdir, os.path.basename(lib)) + if os.path.exists(libdest): + continue + libsource = os.path.join(rootdir, lib) + shutil.copyfile(libsource, libdest) + shutil.copymode(libsource, libdest) + libraries.extend(_ReadDependencies(rootdir, lib)) + + +def main(): + root = sys.argv[1] + dest = sys.argv[2] + binaries = sys.argv[3:] + + _CopyDependencies(root, dest, binaries) + sys.exit(0) + + +if __name__ == "__main__": + main() diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installer/chromeos-installer-0.0.1-r265.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installer/chromeos-installer-0.0.1-r265.ebuild new file mode 100644 index 0000000000..b85c31b04c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installer/chromeos-installer-0.0.1-r265.ebuild @@ -0,0 +1,83 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="3933b7af319b131d958803261fd318ab1964b9a1" +CROS_WORKON_TREE="e5c05be79112b34348527a8b17d8b287d91a9140" +CROS_WORKON_PROJECT="chromiumos/platform/installer" +CROS_WORKON_LOCALNAME="installer" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon cros-debug cros-au + +DESCRIPTION="Chrome OS Installer" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="32bit_au cros_host" + +DEPEND=" + chromeos-base/verity + dev-cpp/gmock + !cros_host? ( + chromeos-base/vboot_reference + )" + +# TODO(adlr): remove coreutils dep if we move to busybox +RDEPEND=" + app-admin/sudo + chromeos-base/vboot_reference + chromeos-base/vpd + dev-util/shflags + sys-apps/coreutils + sys-apps/flashrom + sys-apps/hdparm + sys-apps/rootdev + sys-apps/util-linux + sys-apps/which + sys-block/parted + sys-fs/dosfstools + sys-fs/e2fsprogs" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + # need this to get the verity headers working + append-cxxflags -I"${SYSROOT}"/usr/include/verity/ + + use 32bit_au && board_setup_32bit_au_env + + cros-workon_src_configure +} + +src_compile() { + # We don't need the installer in the sdk, just helper scripts. + use cros_host && return 0 + + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + local path + if use cros_host ; then + # Copy chromeos-* scripts to /usr/lib/installer/ on host. + path="usr/lib/installer" + else + path="usr/sbin" + dobin "${OUT}"/cros_installer + dosym ${path}/chromeos-postinst /postinst + fi + + exeinto /${path} + doexe chromeos-* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installer/chromeos-installer-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installer/chromeos-installer-9999.ebuild new file mode 100644 index 0000000000..cc06137ce3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installer/chromeos-installer-9999.ebuild @@ -0,0 +1,81 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/installer" +CROS_WORKON_LOCALNAME="installer" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon cros-debug cros-au + +DESCRIPTION="Chrome OS Installer" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="32bit_au cros_host" + +DEPEND=" + chromeos-base/verity + dev-cpp/gmock + !cros_host? ( + chromeos-base/vboot_reference + )" + +# TODO(adlr): remove coreutils dep if we move to busybox +RDEPEND=" + app-admin/sudo + chromeos-base/vboot_reference + chromeos-base/vpd + dev-util/shflags + sys-apps/coreutils + sys-apps/flashrom + sys-apps/hdparm + sys-apps/rootdev + sys-apps/util-linux + sys-apps/which + sys-block/parted + sys-fs/dosfstools + sys-fs/e2fsprogs" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + # need this to get the verity headers working + append-cxxflags -I"${SYSROOT}"/usr/include/verity/ + + use 32bit_au && board_setup_32bit_au_env + + cros-workon_src_configure +} + +src_compile() { + # We don't need the installer in the sdk, just helper scripts. + use cros_host && return 0 + + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + local path + if use cros_host ; then + # Copy chromeos-* scripts to /usr/lib/installer/ on host. + path="usr/lib/installer" + else + path="usr/sbin" + dobin "${OUT}"/cros_installer + dosym ${path}/chromeos-postinst /postinst + fi + + exeinto /${path} + doexe chromeos-* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installshim/chromeos-installshim-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installshim/chromeos-installshim-0.0.1-r1.ebuild new file mode 120000 index 0000000000..b4959dc78b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installshim/chromeos-installshim-0.0.1-r1.ebuild @@ -0,0 +1 @@ +chromeos-installshim-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installshim/chromeos-installshim-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installshim/chromeos-installshim-0.0.1.ebuild new file mode 100644 index 0000000000..117e957af8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-installshim/chromeos-installshim-0.0.1.ebuild @@ -0,0 +1,62 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Chrome OS Install Shim (meta package)" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +X86_DEPEND=" + sys-boot/syslinux +" + +# Factory installer +RDEPEND=" + x86? ( ${X86_DEPEND} ) + amd64? ( ${X86_DEPEND} ) + arm? ( + chromeos-base/u-boot-scripts + ) + app-arch/sharutils + app-crypt/trousers + app-shells/bash + app-shells/dash + chromeos-base/board-devices + chromeos-base/chromeos-auth-config + chromeos-base/chromeos-base + chromeos-base/chromeos-factoryinstall + chromeos-base/chromeos-init + chromeos-base/dev-install + chromeos-base/shill + chromeos-base/vboot_reference + net-firewall/iptables + net-misc/tlsdate + >=sys-apps/baselayout-2.0.0 + sys-apps/coreutils + sys-apps/dbus + sys-apps/flashrom + sys-apps/grep + sys-apps/mawk + sys-apps/module-init-tools + sys-apps/mosys + sys-apps/net-tools + sys-apps/pv + sys-apps/rootdev + sys-apps/sed + sys-apps/shadow + sys-apps/upstart + sys-apps/util-linux + sys-apps/which + sys-auth/pam_pwdfile + sys-fs/e2fsprogs + sys-fs/udev + sys-process/lsof + sys-process/procps + virtual/chromeos-bsp +" + +S=${WORKDIR} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/chromeos-login-0.0.5-r535.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/chromeos-login-0.0.5-r535.ebuild new file mode 100644 index 0000000000..65ba4d3a2e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/chromeos-login-0.0.5-r535.ebuild @@ -0,0 +1,114 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="0765c249a86e4e1cf8195a5436132f6909b58031" +CROS_WORKON_TREE="10a8101baed1f255a6854bc0629b29a3c9e7ad80" +CROS_WORKON_PROJECT="chromiumos/platform/login_manager" + +KEYWORDS="arm amd64 x86" + +LIBCHROME_VERS="125070" + +inherit cros-debug cros-workon cros-board multilib toolchain-funcs + +DESCRIPTION="Login manager for Chromium OS." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" + +IUSE="-asan -chromeos_keyboard -disable_login_animations -disable_webaudio + -has_diamond_key -has_hdd -highdpi -is_desktop -natural_scroll_default + -new_power_button test -touchui +X" + +RDEPEND="chromeos-base/chromeos-cryptohome + chromeos-base/chromeos-minijail + chromeos-base/metrics + dev-libs/dbus-glib + dev-libs/glib + dev-libs/nss + dev-libs/protobuf + sys-apps/util-linux" + +DEPEND="${RDEPEND} + chromeos-base/bootstat + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + >=chromeos-base/libchrome_crypto-${LIBCHROME_VERS} + chromeos-base/protofiles + chromeos-base/system_api + dev-cpp/gmock + sys-libs/glibc + test? ( dev-cpp/gtest )" + +CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})" + +src_prepare() { + if ! use X; then + epatch "${FILESDIR}"/0001-Remove-X-from-session_manager_setup.sh.patch + fi +} + +src_compile() { + tc-export CXX LD PKG_CONFIG + cros-debug-add-NDEBUG + emake login_manager || die "chromeos-login compile failed." + + # Build locale-archive for Chrome. This is a temporary workaround for + # crbug.com/116999. + # TODO(yusukes): Fix Chrome and remove the file. + mkdir -p "${T}/usr/lib64/locale" + localedef --prefix="${T}" -c -f UTF-8 -i en_US en_US.UTF-8 || die +} + +src_test() { + tc-export CXX LD PKG_CONFIG + cros-debug-add-NDEBUG + append-cppflags -DUNIT_TEST + emake tests || die "chromeos-login compile tests failed." +} + +src_install() { + into / + dosbin "${S}/keygen" + dosbin "${S}/session_manager_setup.sh" + dosbin "${S}/session_manager" + dosbin "${S}/xstart.sh" + + insinto /usr/share/dbus-1/interfaces + doins "${S}/session_manager.xml" + + insinto /etc/dbus-1/system.d + doins "${S}/SessionManager.conf" + + insinto /usr/share/dbus-1/services + doins "${S}/org.chromium.SessionManager.service" + + insinto /usr/share/misc + doins "${S}/recovery_ui.html" + + # TODO(yusukes): Fix Chrome and remove the file. See my comment above. + insinto /usr/$(get_libdir)/locale + doins "${T}/usr/lib64/locale/locale-archive" + + # For user session processes. + dodir /etc/skel/log + + # For user NSS database + diropts -m0700 + # Need to dodir each directory in order to get the opts right. + dodir /etc/skel/.pki + dodir /etc/skel/.pki/nssdb + # Yes, the created (empty) DB does work on ARM, x86 and x86_64. + nsscertutil -N -d "sql:${D}/etc/skel/.pki/nssdb" -f <(echo '') || die + + # Write a list of currently-set USE flags that session_manager_setup.sh can + # read at runtime while constructing Chrome's command line. If you need to + # use a new flag, add it to $IUSE at the top of the file and list it here. + local use_flag_file="${D}"/etc/session_manager_use_flags.txt + local flags=( ${IUSE} ) + local flag + for flag in ${flags[@]/#[-+]} ; do + usev ${flag} + done > "${use_flag_file}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/chromeos-login-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/chromeos-login-9999.ebuild new file mode 100644 index 0000000000..c2a3d6207a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/chromeos-login-9999.ebuild @@ -0,0 +1,112 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/login_manager" + +KEYWORDS="~arm ~amd64 ~x86" + +LIBCHROME_VERS="125070" + +inherit cros-debug cros-workon cros-board multilib toolchain-funcs + +DESCRIPTION="Login manager for Chromium OS." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" + +IUSE="-asan -chromeos_keyboard -disable_login_animations -disable_webaudio + -has_diamond_key -has_hdd -highdpi -is_desktop -natural_scroll_default + -new_power_button test -touchui +X" + +RDEPEND="chromeos-base/chromeos-cryptohome + chromeos-base/chromeos-minijail + chromeos-base/metrics + dev-libs/dbus-glib + dev-libs/glib + dev-libs/nss + dev-libs/protobuf + sys-apps/util-linux" + +DEPEND="${RDEPEND} + chromeos-base/bootstat + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + >=chromeos-base/libchrome_crypto-${LIBCHROME_VERS} + chromeos-base/protofiles + chromeos-base/system_api + dev-cpp/gmock + sys-libs/glibc + test? ( dev-cpp/gtest )" + +CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})" + +src_prepare() { + if ! use X; then + epatch "${FILESDIR}"/0001-Remove-X-from-session_manager_setup.sh.patch + fi +} + +src_compile() { + tc-export CXX LD PKG_CONFIG + cros-debug-add-NDEBUG + emake login_manager || die "chromeos-login compile failed." + + # Build locale-archive for Chrome. This is a temporary workaround for + # crbug.com/116999. + # TODO(yusukes): Fix Chrome and remove the file. + mkdir -p "${T}/usr/lib64/locale" + localedef --prefix="${T}" -c -f UTF-8 -i en_US en_US.UTF-8 || die +} + +src_test() { + tc-export CXX LD PKG_CONFIG + cros-debug-add-NDEBUG + append-cppflags -DUNIT_TEST + emake tests || die "chromeos-login compile tests failed." +} + +src_install() { + into / + dosbin "${S}/keygen" + dosbin "${S}/session_manager_setup.sh" + dosbin "${S}/session_manager" + dosbin "${S}/xstart.sh" + + insinto /usr/share/dbus-1/interfaces + doins "${S}/session_manager.xml" + + insinto /etc/dbus-1/system.d + doins "${S}/SessionManager.conf" + + insinto /usr/share/dbus-1/services + doins "${S}/org.chromium.SessionManager.service" + + insinto /usr/share/misc + doins "${S}/recovery_ui.html" + + # TODO(yusukes): Fix Chrome and remove the file. See my comment above. + insinto /usr/$(get_libdir)/locale + doins "${T}/usr/lib64/locale/locale-archive" + + # For user session processes. + dodir /etc/skel/log + + # For user NSS database + diropts -m0700 + # Need to dodir each directory in order to get the opts right. + dodir /etc/skel/.pki + dodir /etc/skel/.pki/nssdb + # Yes, the created (empty) DB does work on ARM, x86 and x86_64. + nsscertutil -N -d "sql:${D}/etc/skel/.pki/nssdb" -f <(echo '') || die + + # Write a list of currently-set USE flags that session_manager_setup.sh can + # read at runtime while constructing Chrome's command line. If you need to + # use a new flag, add it to $IUSE at the top of the file and list it here. + local use_flag_file="${D}"/etc/session_manager_use_flags.txt + local flags=( ${IUSE} ) + local flag + for flag in ${flags[@]/#[-+]} ; do + usev ${flag} + done > "${use_flag_file}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/files/0001-Remove-X-from-session_manager_setup.sh.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/files/0001-Remove-X-from-session_manager_setup.sh.patch new file mode 100644 index 0000000000..2cd87a0ee3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-login/files/0001-Remove-X-from-session_manager_setup.sh.patch @@ -0,0 +1,68 @@ +From f60631a94a09dc965d30bac060872fd74fe863d3 Mon Sep 17 00:00:00 2001 +From: Simon Que +Date: Sun, 24 Jun 2012 17:33:09 -0700 +Subject: [PATCH] Remove X from session_manager_setup.sh + +Change-Id: Ic6fe86997cbe9fb6e01be4939ec64edad295def8 +Signed-off-by: Simon Que +--- + session_manager_setup.sh | 29 ----------------------------- + 1 files changed, 0 insertions(+), 29 deletions(-) + +diff --git a/session_manager_setup.sh b/session_manager_setup.sh +index 308e927..9751daf 100755 +--- a/session_manager_setup.sh ++++ b/session_manager_setup.sh +@@ -4,17 +4,6 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-# Set up to start the X server ASAP, then let the startup run in the +-# background while we set up other stuff. +-XAUTH_FILE="/var/run/chromelogin.auth" +-MCOOKIE=$(mcookie) +-xauth -q -f ${XAUTH_FILE} add :0 . ${MCOOKIE} +- +-# The X server sends SIGUSR1 to its parent once it's ready to accept +-# connections. The subshell here starts X, waits for the signal, then +-# terminates once X is ready. +-( trap 'exit 0' USR1 ; xstart.sh ${XAUTH_FILE} & wait ) & +- + USE_FLAGS=$(cat /etc/session_manager_use_flags.txt) + + # Returns success if the USE flag passed as its sole parameter was defined. +@@ -101,8 +90,6 @@ export XAUTHORITY=${DATA_DIR}/.Xauthority + + mkdir -p ${DATA_DIR} && chown ${USER}:${USER} ${DATA_DIR} + mkdir -p ${HOME} && chown ${USER}:${USER} ${HOME} +-xauth -q -f ${XAUTHORITY} add :0 . ${MCOOKIE} && +- chown ${USER}:${USER} ${XAUTHORITY} + + # Old builds will have a ${LOGIN_PROFILE_DIR} that's owned by root; newer ones + # won't have this directory at all. +@@ -293,22 +280,6 @@ chown -R chronos /tmp/cgroup/cpu/chrome_renderers + # For i18n keyboard support (crbug.com/116999) + export LC_CTYPE=en_US.utf8 + +-# The subshell that started the X server will terminate once X is +-# ready. Wait here for that event before continuing. +-# +-# RED ALERT! The code from the 'wait' to the end of the script is +-# part of the boot time critical path. Every millisecond spent after +-# the wait is a millisecond longer till the login screen. +-# +-# KEEP THIS CODE PATH CLEAN! The code must be obviously fast by +-# inspection; nothing should go after the wait that isn't required +-# for correctness. +- +-wait +- +-initctl emit x-started +-bootstat x-started +- + # When X starts, it copies the contents of the framebuffer to the root + # window. We clear the framebuffer here to make sure that it doesn't flash + # back onscreen when X exits later. +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-minijail/chromeos-minijail-0.0.1-r91.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-minijail/chromeos-minijail-0.0.1-r91.ebuild new file mode 100644 index 0000000000..a54994432d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-minijail/chromeos-minijail-0.0.1-r91.ebuild @@ -0,0 +1,58 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="f65c9fed1a54659d309775b5eeee6800569b0547" +CROS_WORKON_TREE="25555f545dc61daa3c1892b328da5a34682e08c8" +CROS_WORKON_PROJECT="chromiumos/platform/minijail" + +inherit cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS helper binary for restricting privs of services." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="test" + +RDEPEND="sys-libs/libcap" +DEPEND="test? ( dev-cpp/gtest ) + test? ( dev-cpp/gmock ) + ${RDEPEND}" + +CROS_WORKON_LOCALNAME=$(basename ${CROS_WORKON_PROJECT}) + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + + # Only build the tools + emake LIBDIR=$(get_libdir) || die +} + +src_test() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + + # TODO(wad) switch to common.mk to get qemu and valgrind coverage + emake tests || die "unit tests compile failed." + + if use x86 || use amd64 ; then + ./libminijail_unittest || \ + die "libminijail unit tests failed!" + ./syscall_filter_unittest || \ + die "syscall filter unit tests failed!" + fi +} + +src_install() { + into / + dosbin minijail0 || die + dolib.so libminijail.so || die + dolib.so libminijailpreload.so || die + insinto /usr/include/chromeos + doins libminijail.h || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-minijail/chromeos-minijail-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-minijail/chromeos-minijail-9999.ebuild new file mode 100644 index 0000000000..bc2557db25 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-minijail/chromeos-minijail-9999.ebuild @@ -0,0 +1,56 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/minijail" + +inherit cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS helper binary for restricting privs of services." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +RDEPEND="sys-libs/libcap" +DEPEND="test? ( dev-cpp/gtest ) + test? ( dev-cpp/gmock ) + ${RDEPEND}" + +CROS_WORKON_LOCALNAME=$(basename ${CROS_WORKON_PROJECT}) + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + + # Only build the tools + emake LIBDIR=$(get_libdir) || die +} + +src_test() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + + # TODO(wad) switch to common.mk to get qemu and valgrind coverage + emake tests || die "unit tests compile failed." + + if use x86 || use amd64 ; then + ./libminijail_unittest || \ + die "libminijail unit tests failed!" + ./syscall_filter_unittest || \ + die "syscall filter unit tests failed!" + fi +} + +src_install() { + into / + dosbin minijail0 || die + dolib.so libminijail.so || die + dolib.so libminijailpreload.so || die + insinto /usr/include/chromeos + doins libminijail.h || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/chromeos-nfs-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/chromeos-nfs-init-0.0.1.ebuild new file mode 100644 index 0000000000..dcf56d84d1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/chromeos-nfs-init-0.0.1.ebuild @@ -0,0 +1,29 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +inherit toolchain-funcs + +DESCRIPTION="Upstart init scripts for NFS on Chromium OS" +HOMEPAGE="http://src.chromium.org" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +DEPEND="" +RDEPEND="net-fs/nfs-utils + sys-apps/upstart" +IUSE="nfs" + +src_install() { + # Install our NFS configuration files. + dodir /etc/init + install --owner=root --group=root --mode=0644 \ + "${FILESDIR}"/*.conf "${D}/etc/init/" + + dodir /etc/init/lib + install --owner=root --group=root --mode=0755 \ + "${FILESDIR}"/nfs-check-setup "${D}/etc/init/lib" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/gssd.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/gssd.conf new file mode 100644 index 0000000000..2ac5d0af1e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/gssd.conf @@ -0,0 +1,45 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# gssd - rpcsec_gss daemon + +# The rpcsec_gss protocol gives a means of using the GSS-API generic security +# API to provide security for protocols using RPC (in particular, NFS). + +# This is modified from Ubuntu's gssd.conf + +description "rpcsec_gss daemon" +author "chromium-os-dev@chromium.org" + +start on (started rpcbind + or mounting TYPE=nfs4 OPTIONS=*sec*krb5*) +stop on (stopping portmap or runlevel [06]) + +expect fork +respawn + +pre-start script + do_modprobe() { + modprobe -q "$1" || true + } + + . /etc/init/lib/nfs-check-setup + + [ "$NEED_GSSD" = "yes" ] || { stop; exit 0; } + + # we need this available; better to fail now than + # mysteriously on the first mount + if ! grep -q -E '^nfs[ ]' /etc/services; then + logger "gssd.conf: broken /etc/services, cannot find nfs" + exit 1 + fi + + do_modprobe nfs + do_modprobe nfsd + do_modprobe rpcsec_gss_krb5 + +end script + +#FIXME(sjg): Should use $OPTS_RPC_GSSD here +exec rpc.gssd diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/idmapd.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/idmapd.conf new file mode 100644 index 0000000000..b61c2ed6c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/idmapd.conf @@ -0,0 +1,50 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# idmapd - NFSv4 id <-> name mapper + +# rpc.idmapd is the NFSv4 ID <-> name mapping daemon. It provides +# functionality to the NFSv4 kernel client and server, to which it +# communicates via upcalls, by translating user and group IDs to names, and +# vice versa. + +# This is modified from Ubuntu's idmapd.conf + +description "NFSv4 id <-> name mapper" +author "chromium-os-dev@chromium.org" + +start on (local-filesystems or mounting TYPE=nfs4) +stop on runlevel [06] + +#console output + +expect fork +respawn + +env DEFAULTFILE=/etc/conf.d/nfs +env NEED_IDMAPD + +pre-start script + do_modprobe() { + modprobe -q "$1" || true + } + + . /etc/init/lib/nfs-check-setup + + [ "$NEED_IDMAPD" = "yes" ] || { stop idmapd; exit 0; } + + do_modprobe nfs + do_modprobe nfsd +end script + +script + if [ -f "$DEFAULTFILE" ]; then + . "$DEFAULTFILE" + fi + + exec rpc.idmapd $OPTS_RPC_IDMAPD + + # If it fails, make sure you have DNOTIFY support in the kernel + # modprobe configs; zgrep DNOTIFY /proc/config.gz +end script diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/nfs-check-setup b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/nfs-check-setup new file mode 100644 index 0000000000..d282632dbc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chromeos-nfs-init/files/nfs-check-setup @@ -0,0 +1,59 @@ +#!/bin/sh + +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This is used by the NFS init scripts to parse /etc/fstab, /etc/exports and +# work out which daemons we need to run. It makes more sense to have this +# common code in one place. + +# Variables set up by this script, each set to 'yes' if needed +# NEED_IDMAPD +# NEED_GSSD +# NEED_STATD + +# read in the options +DEFAULTFILE=/etc/conf.d/nfs +if [ -f "$DEFAULTFILE" ]; then + . "$DEFAULTFILE" +fi + +# Parse the fstab file, and determine whether we need idmapd and gssd. +# (The /etc/defaults settings, if any, will override our +# autodetection.) This code is partially adapted from the mountnfs.sh +# script in the sysvinit package. +if [ -f /etc/fstab ]; then + exec 9<&0 + + +chromium + + chromium-os-dev@chromium.org + Maintained by The Chromium OS Authors. + +The Chromium OS base package pulls in dependencies to build a Chromium OS system. + + Enables dependencies on X. + Enables bluetooth dependencies. + Enables firmware bootimage dependencies. + Enables coreboot. + Enables CrOS Embedded Controller. + Enables WiMax dependencies. + Enables bootchart. + Enables OpenGL ES. + + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chrontel/chrontel-0.0.1-r43.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chrontel/chrontel-0.0.1-r43.ebuild new file mode 100644 index 0000000000..8435b9e069 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chrontel/chrontel-0.0.1-r43.ebuild @@ -0,0 +1,52 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="5f4eaebcbb3850ec1d4a8c6b364b248d48b3043b" +CROS_WORKON_TREE="06c317dfeaa7f039eb8c2e5891dd36398266d12c" +CROS_WORKON_PROJECT="chromiumos/third_party/chrontel" + +inherit cros-workon + +DESCRIPTION="Chrontel CH7036 User Space Driver" +HOMEPAGE="http://www.chrontel.com" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="-bogus_screen_resizes -use_alsa_control" + +CROS_WORKON_LOCALNAME="../third_party/chrontel" + +RDEPEND="x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXrandr + media-libs/alsa-lib + media-sound/adhd" + +DEPEND="${RDEPEND}" + +src_compile() { + tc-export CC PKG_CONFIG + append-flags -DUSE_AURA + use bogus_screen_resizes && append-flags -DBOGUS_SCREEN_RESIZES + use use_alsa_control && append-flags -DUSE_ALSA_CONTROL + export CCFLAGS="$CFLAGS" + emake || die "end compile failed." +} + +src_install() { + dobin ch7036_monitor + dobin ch7036_debug + + dodir /lib/firmware/chrontel + insinto /lib/firmware/chrontel + doins fw7036.bin + + insinto /etc/init + doins chrontel.conf + + dodir /usr/share/userfeedback/etc + insinto /usr/share/userfeedback/etc + doins sys_mon_hdmi.sysinfo.lst +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/chrontel/chrontel-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chrontel/chrontel-9999.ebuild new file mode 100644 index 0000000000..b83b1d55b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/chrontel/chrontel-9999.ebuild @@ -0,0 +1,50 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/chrontel" + +inherit cros-workon + +DESCRIPTION="Chrontel CH7036 User Space Driver" +HOMEPAGE="http://www.chrontel.com" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="-bogus_screen_resizes -use_alsa_control" + +CROS_WORKON_LOCALNAME="../third_party/chrontel" + +RDEPEND="x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXrandr + media-libs/alsa-lib + media-sound/adhd" + +DEPEND="${RDEPEND}" + +src_compile() { + tc-export CC PKG_CONFIG + append-flags -DUSE_AURA + use bogus_screen_resizes && append-flags -DBOGUS_SCREEN_RESIZES + use use_alsa_control && append-flags -DUSE_ALSA_CONTROL + export CCFLAGS="$CFLAGS" + emake || die "end compile failed." +} + +src_install() { + dobin ch7036_monitor + dobin ch7036_debug + + dodir /lib/firmware/chrontel + insinto /lib/firmware/chrontel + doins fw7036.bin + + insinto /etc/init + doins chrontel.conf + + dodir /usr/share/userfeedback/etc + insinto /usr/share/userfeedback/etc + doins sys_mon_hdmi.sysinfo.lst +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/courgette-1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/courgette-1-r1.ebuild new file mode 120000 index 0000000000..0f6b24be49 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/courgette-1-r1.ebuild @@ -0,0 +1 @@ +courgette-1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/courgette-1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/courgette-1.ebuild new file mode 100644 index 0000000000..329ec480e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/courgette-1.ebuild @@ -0,0 +1,41 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="2a813cecf1b7357b1a2faf0f9e5bbb73ba9276b6" +CROS_WORKON_PROJECT="chromium/src/courgette" + +inherit cros-workon cros-debug toolchain-funcs scons-utils + +DESCRIPTION="Chrome courgette/ library extracted for use on Chrome OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]" +DEPEND="${RDEPEND}" + +src_prepare() { + cp "${FILESDIR}"/SConstruct "${S}"/ || die +} + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} + + escons +} + +src_install() { + dolib.a libcourgette.a + + insinto /usr/include/courgette + doins courgette.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/files/SConstruct b/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/files/SConstruct new file mode 100755 index 0000000000..4bffb3d495 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/courgette/files/SConstruct @@ -0,0 +1,74 @@ +# -*- python -*- + +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os +from SCons.Util import Split, CLVar + +env = Environment() + +# Keep ebuild up to date with appropriate headers, or else figure +# out how to get scons to handle header installation as well. +sources = env.Split(""" + adjustment_method.cc + adjustment_method_2.cc + assembly_program.cc + third_party/bsdiff_apply.cc + third_party/bsdiff_create.cc + crc.cc + difference_estimator.cc + disassembler.cc + disassembler_elf_32_x86.cc + disassembler_win32_x86.cc + encoded_program.cc + ensemble.cc + ensemble_apply.cc + ensemble_create.cc + memory_allocator.cc + simple_delta.cc + streams.cc + """) + +BASE_VER = os.environ.get('BASE_VER', '125070') + +env.Append( + CPPPATH=['files'], + CCFLAGS=['-g'] +) +for key in Split('CC CXX AR RANLIB LD NM'): + value = os.environ.get(key) + if value: + env[key] = Split(value) +env['PKG_CONFIG'] = os.environ.get('PKG_CONFIG', 'pkg-config') + +# Get random compiler flags. +for key in Split('CFLAGS CXXFLAGS'): + value = os.environ.get(key) + if value: + env[key] += CLVar(os.environ[key]) + +var_map = { + "CPPFLAGS" : "CCFLAGS", + "LDFLAGS" : "LINKFLAGS", +} +for env_key in var_map.keys(): + if os.environ.has_key(env_key): + scons_key = var_map[env_key] + env[scons_key] += CLVar(os.environ[env_key]) + +env['CCFLAGS'] += ['-fPIC', + '-fno-exceptions', + '-DCOURGETTE_USE_CRC_LIB', + '-I..'] + +env.ParseConfig('%s --cflags --libs libchrome-%s' % (env['PKG_CONFIG'], + BASE_VER)) + +# Fix issue with scons not passing some vars through the environment. +for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'): + if os.environ.has_key(key): + env['ENV'][key] = os.environ[key] + +env.StaticLibrary('courgette', sources) diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/crash-reporter/crash-reporter-0.0.1-r129.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crash-reporter/crash-reporter-0.0.1-r129.ebuild new file mode 100644 index 0000000000..634355de01 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crash-reporter/crash-reporter-0.0.1-r129.ebuild @@ -0,0 +1,72 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="640113066b0a717955004e702a2afefe051d36a2" +CROS_WORKON_TREE="7e911e28b8bcde9bbdf4cff52eec7ac57adc3980" +CROS_WORKON_PROJECT="chromiumos/platform/crash-reporter" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Build chromeos crash handler" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +# crash_sender uses sys-apps/findutils (for /usr/bin/find). +RDEPEND="chromeos-base/google-breakpad + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/metrics + chromeos-base/chromeos-ca-certificates + dev-cpp/gflags + dev-libs/libpcre + test? ( dev-cpp/gtest ) + net-misc/curl + sys-apps/findutils" +DEPEND="${RDEPEND}" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # TODO(benchan): Enable unit tests for arm target once + # crosbug.com/27127 is fixed. + if use arm; then + echo Skipping unit tests on arm platform + else + # TODO(mkrebs): The tests are not currently thread-safe, so + # running them in the default parallel mode results in + # failures. + emake -j1 tests + fi +} + +src_install() { + into / + dosbin "${OUT}"/crash_reporter + dosbin crash_sender + into /usr + dobin "${OUT}"/list_proxies + insinto /etc + doins crash_reporter_logs.conf + + insinto /lib/udev/rules.d + doins 99-crash-reporter.rules +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/crash-reporter/crash-reporter-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crash-reporter/crash-reporter-9999.ebuild new file mode 100644 index 0000000000..d3777b18f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crash-reporter/crash-reporter-9999.ebuild @@ -0,0 +1,70 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/crash-reporter" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Build chromeos crash handler" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +# crash_sender uses sys-apps/findutils (for /usr/bin/find). +RDEPEND="chromeos-base/google-breakpad + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/metrics + chromeos-base/chromeos-ca-certificates + dev-cpp/gflags + dev-libs/libpcre + test? ( dev-cpp/gtest ) + net-misc/curl + sys-apps/findutils" +DEPEND="${RDEPEND}" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # TODO(benchan): Enable unit tests for arm target once + # crosbug.com/27127 is fixed. + if use arm; then + echo Skipping unit tests on arm platform + else + # TODO(mkrebs): The tests are not currently thread-safe, so + # running them in the default parallel mode results in + # failures. + emake -j1 tests + fi +} + +src_install() { + into / + dosbin "${OUT}"/crash_reporter + dosbin crash_sender + into /usr + dobin "${OUT}"/list_proxies + insinto /etc + doins crash_reporter_logs.conf + + insinto /lib/udev/rules.d + doins 99-crash-reporter.rules +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cromo/cromo-0.0.1-r163.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cromo/cromo-0.0.1-r163.ebuild new file mode 100644 index 0000000000..9c4487bc2a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cromo/cromo-0.0.1-r163.ebuild @@ -0,0 +1,72 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="81b361d89386b89b17b33b9c3e47b45242c791db" +CROS_WORKON_TREE="751811205b7d37b36bced5c2b4efaf6a7312795b" +CROS_WORKON_PROJECT="chromiumos/platform/cromo" +CROS_WORKON_USE_VCSID="1" + +inherit cros-debug cros-workon toolchain-funcs multilib + +DESCRIPTION="Chromium OS modem manager" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="install_tests" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/chromeos-minijail + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + >=dev-libs/glib-2.0 + dev-libs/dbus-glib + dev-libs/dbus-c++ + dev-cpp/gflags + dev-cpp/glog + install_tests? ( dev-cpp/gtest ) + chromeos-base/libchromeos + chromeos-base/metrics +" + +DEPEND="${RDEPEND} + chromeos-base/system_api + virtual/modemmanager" + +make_flags() { + echo LIBDIR="/usr/$(get_libdir)" BASE_VER=${LIBCHROME_VERS} + use install_tests && echo INSTALL_TESTS=1 +} + +src_compile() { + tc-export CXX AR NM PKG_CONFIG + cros-debug-add-NDEBUG + emake $(make_flags) || die +} + +src_test() { + tc-export CXX AR PKG_CONFIG + cros-debug-add-NDEBUG + emake $(make_flags) tests || die "could not build tests" + if ! use x86 && ! use amd64 ; then + echo Skipping unit tests on non-x86 platform + else + for test in ./*_unittest; do + # TODO: Set up enough DBus so that the server test can work + # Alternately, run the whole thing in a VM/qemu instance + if [ ${test} == "./cromo_server_unittest" ]; then + echo "Skipping server test in host environment" + else + echo "Running ${test}" + "${test}" || die "${test} failed" + fi + done + fi +} + +src_install() { + emake $(make_flags) DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cromo/cromo-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cromo/cromo-9999.ebuild new file mode 100644 index 0000000000..0dbb43a504 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cromo/cromo-9999.ebuild @@ -0,0 +1,70 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/cromo" +CROS_WORKON_USE_VCSID="1" + +inherit cros-debug cros-workon toolchain-funcs multilib + +DESCRIPTION="Chromium OS modem manager" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="install_tests" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/chromeos-minijail + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + >=dev-libs/glib-2.0 + dev-libs/dbus-glib + dev-libs/dbus-c++ + dev-cpp/gflags + dev-cpp/glog + install_tests? ( dev-cpp/gtest ) + chromeos-base/libchromeos + chromeos-base/metrics +" + +DEPEND="${RDEPEND} + chromeos-base/system_api + virtual/modemmanager" + +make_flags() { + echo LIBDIR="/usr/$(get_libdir)" BASE_VER=${LIBCHROME_VERS} + use install_tests && echo INSTALL_TESTS=1 +} + +src_compile() { + tc-export CXX AR NM PKG_CONFIG + cros-debug-add-NDEBUG + emake $(make_flags) || die +} + +src_test() { + tc-export CXX AR PKG_CONFIG + cros-debug-add-NDEBUG + emake $(make_flags) tests || die "could not build tests" + if ! use x86 && ! use amd64 ; then + echo Skipping unit tests on non-x86 platform + else + for test in ./*_unittest; do + # TODO: Set up enough DBus so that the server test can work + # Alternately, run the whole thing in a VM/qemu instance + if [ ${test} == "./cromo_server_unittest" ]; then + echo "Skipping server test in host environment" + else + echo "Running ${test}" + "${test}" || die "${test} failed" + fi + done + fi +} + +src_install() { + emake $(make_flags) DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-devutils/cros-devutils-0.0.1-r516.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-devutils/cros-devutils-0.0.1-r516.ebuild new file mode 100644 index 0000000000..5a71aad1e9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-devutils/cros-devutils-0.0.1-r516.ebuild @@ -0,0 +1,141 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="9a6f64de2cda21ad3f173c13298a53dcb5525cc3" +CROS_WORKON_TREE="a0a8dc61fac2ae0179f836e42406c569c2e2ca84" +CROS_WORKON_PROJECT="chromiumos/platform/dev-util" +CROS_WORKON_LOCALNAME="dev" + +inherit cros-workon multilib python + +DESCRIPTION="Development utilities for ChromiumOS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="cros_host test" + +RDEPEND="cros_host? ( app-emulation/qemu-kvm ) + app-portage/gentoolkit + cros_host? ( app-shells/bash ) + !cros_host? ( !chromeos-base/gmerge ) + dev-lang/python + dev-util/shflags + cros_host? ( dev-util/crosutils ) + " +# These are all either bash / python scripts. No actual builds DEPS. +DEPEND="" + +src_install() { + # Run the devserver Makefile. + emake install DESTDIR="$D" + + dosym /build /var/lib/devserver/static/pkgroot + dosym /var/lib/devserver/static /usr/lib/devserver/static + + if ! use cros_host; then + dobin gmerge stateful_update + else + local host_tools + host_tools=( + cros_bundle_firmware + cros_choose_profile + cros_chrome_make + cros_fetch_image + cros_sign_bootstub + cros_start_vm + cros_stop_vm + cros_workon + cros_workon_make + cros_write_firmware + dump_i2c + dump_tpm + gdb_remote + gdb_x86_local + gmergefs + image_to_live.sh + strip_package + ssh_no_update + willis + ) + + dobin "${host_tools[@]/#/host/}" + + # Payload generation scripts. + dobin host/cros_generate_update_payload + dobin host/cros_generate_stateful_update_payload + + # Repo and git bash completion. + insinto /usr/share/bash-completion + newins host/repo_bash_completion repo + dosym /usr/share/bash-completion/git /etc/bash_completion.d/git + dosym /usr/share/bash-completion/repo /etc/bash_completion.d/repo + + insinto "$(python_get_sitedir)" + doins host/lib/*.py + + insinto "/usr/lib/crosutils" + doins host/lib/cros_archive.sh + fi +} + +src_test() { + cd "${S}" # Let's just run unit tests from ${S} rather than install and run. + + # Run bundle_firmware tests + pushd host/lib >/dev/null + local libfile + for libfile in *.py; do + einfo Running tests in ${libfile} + python ${libfile} --test || \ + die "Unit tests failed at ${libfile}!" + done + popd >/dev/null + + pushd host/tests >/dev/null + for ut_file in *.py; do + echo Running tests in ${ut_file} + PYTHONPATH=../lib python ${ut_file} || + die "Unit tests failed at ${ut_file}!" + done + popd >/dev/null + + local TESTS=() + if ! use cros_host; then + TESTS+=( gmerge_test.py ) + # FIXME(zbehan): import gmerge in gmerge_test.py won't work if we won't + # have the .py. + ln -sf gmerge gmerge.py + else + TESTS+=( autoupdate_unittest.py ) + TESTS+=( builder_test.py ) + TESTS+=( devserver_test.py ) + TESTS+=( common_util_unittest.py ) + TESTS+=( host/lib/cros_archive_unittest.sh ) + #FIXME(zbehan): update_test.py doesn't seem to work right now. + fi + + local test + for test in ${TESTS[@]} ; do + einfo "Running ${test}" + ./${test} || die "Failed in ${test}" + done +} + +pkg_preinst() { + # Handle pre-existing possibly problematic configurations of static + use cros_host || return 0 + if [[ -e ${ROOT}/usr/bin/static && ! -L ${ROOT}/usr/bin/static ]] ; then + einfo "/usr/bin/static detected, and is not a symlink, performing cleanup" + # Well, I don't know what else should be done about it. Moving the + # files has several issues: handling of all kinds of links, special + # files, permissions, etc. Autoremval is not a good idea, what if + # this ended up with accidental destruction of the system? + local newname="static-old-${RANDOM}" # In case this happens more than once. + mv "${ROOT}"/usr/bin/static "${ROOT}"/usr/bin/${newname} + ewarn "/usr/bin/${newname} has the previous contents of static." + ewarn "It can be safely deleted (or kept around forever)." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-devutils/cros-devutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-devutils/cros-devutils-9999.ebuild new file mode 100644 index 0000000000..615c42ad0e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-devutils/cros-devutils-9999.ebuild @@ -0,0 +1,139 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/dev-util" +CROS_WORKON_LOCALNAME="dev" + +inherit cros-workon multilib python + +DESCRIPTION="Development utilities for ChromiumOS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="cros_host test" + +RDEPEND="cros_host? ( app-emulation/qemu-kvm ) + app-portage/gentoolkit + cros_host? ( app-shells/bash ) + !cros_host? ( !chromeos-base/gmerge ) + dev-lang/python + dev-util/shflags + cros_host? ( dev-util/crosutils ) + " +# These are all either bash / python scripts. No actual builds DEPS. +DEPEND="" + +src_install() { + # Run the devserver Makefile. + emake install DESTDIR="$D" + + dosym /build /var/lib/devserver/static/pkgroot + dosym /var/lib/devserver/static /usr/lib/devserver/static + + if ! use cros_host; then + dobin gmerge stateful_update + else + local host_tools + host_tools=( + cros_bundle_firmware + cros_choose_profile + cros_chrome_make + cros_fetch_image + cros_sign_bootstub + cros_start_vm + cros_stop_vm + cros_workon + cros_workon_make + cros_write_firmware + dump_i2c + dump_tpm + gdb_remote + gdb_x86_local + gmergefs + image_to_live.sh + strip_package + ssh_no_update + willis + ) + + dobin "${host_tools[@]/#/host/}" + + # Payload generation scripts. + dobin host/cros_generate_update_payload + dobin host/cros_generate_stateful_update_payload + + # Repo and git bash completion. + insinto /usr/share/bash-completion + newins host/repo_bash_completion repo + dosym /usr/share/bash-completion/git /etc/bash_completion.d/git + dosym /usr/share/bash-completion/repo /etc/bash_completion.d/repo + + insinto "$(python_get_sitedir)" + doins host/lib/*.py + + insinto "/usr/lib/crosutils" + doins host/lib/cros_archive.sh + fi +} + +src_test() { + cd "${S}" # Let's just run unit tests from ${S} rather than install and run. + + # Run bundle_firmware tests + pushd host/lib >/dev/null + local libfile + for libfile in *.py; do + einfo Running tests in ${libfile} + python ${libfile} --test || \ + die "Unit tests failed at ${libfile}!" + done + popd >/dev/null + + pushd host/tests >/dev/null + for ut_file in *.py; do + echo Running tests in ${ut_file} + PYTHONPATH=../lib python ${ut_file} || + die "Unit tests failed at ${ut_file}!" + done + popd >/dev/null + + local TESTS=() + if ! use cros_host; then + TESTS+=( gmerge_test.py ) + # FIXME(zbehan): import gmerge in gmerge_test.py won't work if we won't + # have the .py. + ln -sf gmerge gmerge.py + else + TESTS+=( autoupdate_unittest.py ) + TESTS+=( builder_test.py ) + TESTS+=( devserver_test.py ) + TESTS+=( common_util_unittest.py ) + TESTS+=( host/lib/cros_archive_unittest.sh ) + #FIXME(zbehan): update_test.py doesn't seem to work right now. + fi + + local test + for test in ${TESTS[@]} ; do + einfo "Running ${test}" + ./${test} || die "Failed in ${test}" + done +} + +pkg_preinst() { + # Handle pre-existing possibly problematic configurations of static + use cros_host || return 0 + if [[ -e ${ROOT}/usr/bin/static && ! -L ${ROOT}/usr/bin/static ]] ; then + einfo "/usr/bin/static detected, and is not a symlink, performing cleanup" + # Well, I don't know what else should be done about it. Moving the + # files has several issues: handling of all kinds of links, special + # files, permissions, etc. Autoremval is not a good idea, what if + # this ended up with accidental destruction of the system? + local newname="static-old-${RANDOM}" # In case this happens more than once. + mv "${ROOT}"/usr/bin/static "${ROOT}"/usr/bin/${newname} + ewarn "/usr/bin/${newname} has the previous contents of static." + ewarn "It can be safely deleted (or kept around forever)." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-disks/cros-disks-0.0.1-r156.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-disks/cros-disks-0.0.1-r156.ebuild new file mode 100644 index 0000000000..a9689d0662 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-disks/cros-disks-0.0.1-r156.ebuild @@ -0,0 +1,81 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="8bc9b0296b66a1f93a34aa613cc45864450f69c6" +CROS_WORKON_TREE="6c05b98c91993c6c4921e505f83372bf87cbc5bd" +CROS_WORKON_PROJECT="chromiumos/platform/cros-disks" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Disk mounting daemon for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="arm amd64 x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +RDEPEND=" + app-arch/unrar + chromeos-base/chromeos-minijail + chromeos-base/libchromeos + chromeos-base/metrics + dev-cpp/gflags + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + sys-apps/rootdev + sys-apps/util-linux + sys-block/parted + sys-fs/avfs + sys-fs/fuse-exfat + sys-fs/ntfs3g + sys-fs/udev +" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/system_api + dev-cpp/gmock + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + exeinto /opt/google/cros-disks + doexe "${OUT}"/disks + + # Install USB device IDs file. + insinto /opt/google/cros-disks + doins usb-device-info + + # Install seccomp policy file. + newins "avfsd-seccomp-${ARCH}.policy" avfsd-seccomp.policy + + # Install upstart config file. + insinto /etc/init + doins cros-disks.conf + + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins org.chromium.CrosDisks.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-disks/cros-disks-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-disks/cros-disks-9999.ebuild new file mode 100644 index 0000000000..f63ffd79ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-disks/cros-disks-9999.ebuild @@ -0,0 +1,79 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/cros-disks" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Disk mounting daemon for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +RDEPEND=" + app-arch/unrar + chromeos-base/chromeos-minijail + chromeos-base/libchromeos + chromeos-base/metrics + dev-cpp/gflags + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + sys-apps/rootdev + sys-apps/util-linux + sys-block/parted + sys-fs/avfs + sys-fs/fuse-exfat + sys-fs/ntfs3g + sys-fs/udev +" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/system_api + dev-cpp/gmock + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + exeinto /opt/google/cros-disks + doexe "${OUT}"/disks + + # Install USB device IDs file. + insinto /opt/google/cros-disks + doins usb-device-info + + # Install seccomp policy file. + newins "avfsd-seccomp-${ARCH}.policy" avfsd-seccomp.policy + + # Install upstart config file. + insinto /etc/init + doins cros-disks.conf + + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins org.chromium.CrosDisks.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild new file mode 100644 index 0000000000..c1eea4d0bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# TODO(jsalz): Remove this ebuild; it's no longer used. + +EAPI="4" +CROS_WORKON_COMMIT="c759366a1dd3d733b12bb2edc3bae9868d38ee5b" +CROS_WORKON_TREE="46e050754b5a2f5392223d734036b7b51dde5b5b" +CROS_WORKON_PROJECT="chromiumos/platform/factory-utils" + +inherit cros-workon + +DESCRIPTION="Factory development utilities for ChromiumOS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="cros_factory_bundle" + +CROS_WORKON_LOCALNAME="factory-utils" +RDEPEND="" + +# chromeos-installer for solving "lib/chromeos-common.sh" symlink. +# vboot_reference for binary programs (ex, cgpt). +DEPEND="chromeos-base/chromeos-installer[cros_host] + chromeos-base/vboot_reference" + +src_compile() { + true +} + +src_install() { + true +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-factoryutils/cros-factoryutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-factoryutils/cros-factoryutils-9999.ebuild new file mode 100644 index 0000000000..afa2175654 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-factoryutils/cros-factoryutils-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# TODO(jsalz): Remove this ebuild; it's no longer used. + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/factory-utils" + +inherit cros-workon + +DESCRIPTION="Factory development utilities for ChromiumOS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="cros_factory_bundle" + +CROS_WORKON_LOCALNAME="factory-utils" +RDEPEND="" + +# chromeos-installer for solving "lib/chromeos-common.sh" symlink. +# vboot_reference for binary programs (ex, cgpt). +DEPEND="chromeos-base/chromeos-installer[cros_host] + chromeos-base/vboot_reference" + +src_compile() { + true +} + +src_install() { + true +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-testutils/cros-testutils-0.0.1-r210.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-testutils/cros-testutils-0.0.1-r210.ebuild new file mode 100644 index 0000000000..8bd7e697c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-testutils/cros-testutils-0.0.1-r210.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="1bf718b912cf8ea5dcbf25f04a9ef9a9204f83d1" +CROS_WORKON_TREE="7b1191682d8df182503e2c2ee948c0ecb48c5461" +CROS_WORKON_PROJECT="chromiumos/platform/crostestutils" + +inherit cros-workon + +DESCRIPTION="Host test utilities for ChromiumOS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +CROS_WORKON_LOCALNAME="crostestutils" + + +RDEPEND="app-emulation/qemu-kvm + app-portage/gentoolkit + app-shells/bash + chromeos-base/cros-devutils + dev-util/crosutils + " + +# These are all either bash / python scripts. No actual builds DEPS. +DEPEND="" + +# Use default src_compile and src_install which use Makefile. diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-testutils/cros-testutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-testutils/cros-testutils-9999.ebuild new file mode 100644 index 0000000000..54dcfc6bed --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros-testutils/cros-testutils-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/crostestutils" + +inherit cros-workon + +DESCRIPTION="Host test utilities for ChromiumOS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +CROS_WORKON_LOCALNAME="crostestutils" + + +RDEPEND="app-emulation/qemu-kvm + app-portage/gentoolkit + app-shells/bash + chromeos-base/cros-devutils + dev-util/crosutils + " + +# These are all either bash / python scripts. No actual builds DEPS. +DEPEND="" + +# Use default src_compile and src_install which use Makefile. diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild new file mode 100644 index 0000000000..3c231f54fd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild @@ -0,0 +1,65 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="a3df396f95e6f5f91adaafb2d25c981bd6c650ef" +CROS_WORKON_TREE="b21faacf6a9940571ef122363c19a1ac02595b4b" +CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit toolchain-funcs cros-debug cros-workon + +DESCRIPTION="Chrome OS platform boot mode utility" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="test valgrind" + +LIBCHROME_VERS="125070" + +RDEPEND="test? ( chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] )" + +# qemu use isn't reflected as it is copied into the target +# from the build host environment. +DEPEND="${RDEPEND} + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest ) + valgrind? ( dev-util/valgrind )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + into / + dobin "${OUT}"/cros_boot_mode + + into /usr + dolib.so "${OUT}"/libcros_boot_mode.so + + insinto /usr/include/cros_boot_mode + doins \ + active_main_firmware.h \ + bootloader_type.h \ + boot_mode.h \ + developer_switch.h \ + helpers.h \ + platform_reader.h \ + platform_switch.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros_boot_mode/cros_boot_mode-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros_boot_mode/cros_boot_mode-9999.ebuild new file mode 100644 index 0000000000..f0cbd8db3c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cros_boot_mode/cros_boot_mode-9999.ebuild @@ -0,0 +1,63 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit toolchain-funcs cros-debug cros-workon + +DESCRIPTION="Chrome OS platform boot mode utility" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test valgrind" + +LIBCHROME_VERS="125070" + +RDEPEND="test? ( chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] )" + +# qemu use isn't reflected as it is copied into the target +# from the build host environment. +DEPEND="${RDEPEND} + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest ) + valgrind? ( dev-util/valgrind )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + into / + dobin "${OUT}"/cros_boot_mode + + into /usr + dolib.so "${OUT}"/libcros_boot_mode.so + + insinto /usr/include/cros_boot_mode + doins \ + active_main_firmware.h \ + bootloader_type.h \ + boot_mode.h \ + developer_switch.h \ + helpers.h \ + platform_reader.h \ + platform_switch.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/crosh/crosh-0.0.1-r106.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crosh/crosh-0.0.1-r106.ebuild new file mode 100644 index 0000000000..d0abae2fe3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crosh/crosh-0.0.1-r106.ebuild @@ -0,0 +1,37 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="780e3546a6c0bff4dbb92b5851a18968dfef2f5f" +CROS_WORKON_TREE="8d74f9d4855eb6e358a143174eb4a646c9367408" +CROS_WORKON_PROJECT="chromiumos/platform/crosh" + +inherit cros-workon + +DESCRIPTION="Chrome OS command-line shell" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="app-admin/sudo + chromeos-base/vboot_reference + chromeos-base/workarounds + net-misc/iputils + net-misc/openssh + net-wireless/iw + sys-apps/net-tools + x11-terms/rxvt-unicode +" +DEPEND="" + +src_install() { + dobin crosh + dobin crosh-dev + dobin crosh-usb + dobin inputrc.crosh + dobin network_diagnostics +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/crosh/crosh-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crosh/crosh-9999.ebuild new file mode 100644 index 0000000000..b5f1f0233a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/crosh/crosh-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/crosh" + +inherit cros-workon + +DESCRIPTION="Chrome OS command-line shell" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="app-admin/sudo + chromeos-base/vboot_reference + chromeos-base/workarounds + net-misc/iputils + net-misc/openssh + net-wireless/iw + sys-apps/net-tools + x11-terms/rxvt-unicode +" +DEPEND="" + +src_install() { + dobin crosh + dobin crosh-dev + dobin crosh-usb + dobin inputrc.crosh + dobin network_diagnostics +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cypress-tools/cypress-tools-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cypress-tools/cypress-tools-0.0.1-r7.ebuild new file mode 100644 index 0000000000..809bba7d9f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cypress-tools/cypress-tools-0.0.1-r7.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="5a70d590af8ae7211ab0a3ce69433cb3d9ffa144" +CROS_WORKON_TREE="4614c03641dd88053b2bab281ab385ddfac73551" +CROS_WORKON_PROJECT="chromiumos/third_party/cypress-tools" +inherit toolchain-funcs cros-workon + +DESCRIPTION="Cypress APA Trackpad Firmware Update Utility" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="" + +RDEPEND="" +DEPEND="" + +CROS_WORKON_LOCALNAME=../third_party/cypress-tools +CROS_WORKON_SUBDIR= + +src_compile() { + tc-export CC + emake || die "Compile failed" +} + +src_install() { + into / + dosbin cyapa_fw_update + + insinto /opt/google/touchpad/cyapa + doins images/CYTRA* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/cypress-tools/cypress-tools-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cypress-tools/cypress-tools-9999.ebuild new file mode 100644 index 0000000000..8a6fb4e543 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/cypress-tools/cypress-tools-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/cypress-tools" +inherit toolchain-funcs cros-workon + +DESCRIPTION="Cypress APA Trackpad Firmware Update Utility" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="" + +RDEPEND="" +DEPEND="" + +CROS_WORKON_LOCALNAME=../third_party/cypress-tools +CROS_WORKON_SUBDIR= + +src_compile() { + tc-export CC + emake || die "Compile failed" +} + +src_install() { + into / + dosbin cyapa_fw_update + + insinto /opt/google/touchpad/cyapa + doins images/CYTRA* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/dev-install-0.0.1-r418.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/dev-install-0.0.1-r418.ebuild new file mode 100644 index 0000000000..5f4bc6e963 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/dev-install-0.0.1-r418.ebuild @@ -0,0 +1,97 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# This ebuild file installs the developer installer package. It: +# + Copies dev_install. +# + Copies some config files for emerge: make.defaults and make.conf. +# + Generates a list of packages installed (in base images). +# dev_install downloads and bootstraps emerge in base images without +# modifying the root filesystem. + +EAPI="4" +CROS_WORKON_COMMIT="9a6f64de2cda21ad3f173c13298a53dcb5525cc3" +CROS_WORKON_TREE="a0a8dc61fac2ae0179f836e42406c569c2e2ca84" +CROS_WORKON_PROJECT="chromiumos/platform/dev-util" +CROS_WORKON_LOCALNAME="dev" +SRCDIR="${CROS_WORKON_SRCROOT}/src/platform/${CROS_WORKON_LOCALNAME}/dev-install" + +inherit cros-workon + +DESCRIPTION="Chromium OS Developer Packages installer" +HOMEPAGE="http://www.chromium.org/chromium-os" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="app-arch/tar + sys-apps/coreutils + sys-apps/grep + sys-apps/portage + sys-apps/sed" +# TODO(arkaitzr): remove dependency on tar if it's gonna be removed from the +# base image. Also modify dev_install. +RDEPEND="app-arch/tar + net-misc/curl + sys-apps/coreutils" + +S=${WORKDIR} + +src_unpack() { + local pkg pkgs BOARD="${BOARD:-${SYSROOT##/build/}}" + + pkgs=( + # Generate a list of packages that go into the base image. These + # packages will be assumed to be installed by emerge in the target. + chromeos + + # Get the list of the packages needed to bootstrap emerge. + portage + + # Get the list of dev and test packages. + chromeos-dev + chromeos-test + ) + einfo "Ignore warnings below related to LD_PRELOAD/libsandbox.so" + for pkg in ${pkgs[@]} ; do + emerge-${BOARD} \ + --pretend --quiet --emptytree --ignore-default-opts \ + --root-deps=rdeps ${pkg} | \ + egrep -o ' [[:alnum:]-]+/[^[:space:]/]+\b' | \ + tr -d ' ' > ${pkg}.packages & + done + wait + # No virtual packages in package.provided. + grep -v "virtual/" chromeos.packages > package.provided + + python "${FILESDIR}"/filter.py || die + + # Add the board specific binhost repository. + sed -e "s|BOARD|${BOARD}|g" "${SRCDIR}/repository.conf" > repository.conf + + # Add dhcp to the list of packages installed since its installation will not + # complete (can not add dhcp group since /etc is not writeable). Bootstrap it + # instead. + grep "net-misc/dhcp-" chromeos-dev.packages >> package.provided + grep "net-misc/dhcp-" chromeos-dev.packages >> bootstrap.packages +} + +src_install() { + cd "${SRCDIR}" + exeinto /usr/bin + doexe dev_install + + insinto /etc/portage + doins "${S}"/{bootstrap.packages,repository.conf} + + insinto /etc/portage/make.profile + doins "${S}"/package.{installable,provided} make.{conf,defaults} + + insinto /etc/env.d + doins 99devinstall + + # Python will be installed in /usr/local after running dev_install. + dosym "/usr/local/bin/python2.6" "/usr/bin/python" +} + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/dev-install-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/dev-install-9999.ebuild new file mode 100644 index 0000000000..379b959516 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/dev-install-9999.ebuild @@ -0,0 +1,95 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# This ebuild file installs the developer installer package. It: +# + Copies dev_install. +# + Copies some config files for emerge: make.defaults and make.conf. +# + Generates a list of packages installed (in base images). +# dev_install downloads and bootstraps emerge in base images without +# modifying the root filesystem. + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/dev-util" +CROS_WORKON_LOCALNAME="dev" +SRCDIR="${CROS_WORKON_SRCROOT}/src/platform/${CROS_WORKON_LOCALNAME}/dev-install" + +inherit cros-workon + +DESCRIPTION="Chromium OS Developer Packages installer" +HOMEPAGE="http://www.chromium.org/chromium-os" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND="app-arch/tar + sys-apps/coreutils + sys-apps/grep + sys-apps/portage + sys-apps/sed" +# TODO(arkaitzr): remove dependency on tar if it's gonna be removed from the +# base image. Also modify dev_install. +RDEPEND="app-arch/tar + net-misc/curl + sys-apps/coreutils" + +S=${WORKDIR} + +src_unpack() { + local pkg pkgs BOARD="${BOARD:-${SYSROOT##/build/}}" + + pkgs=( + # Generate a list of packages that go into the base image. These + # packages will be assumed to be installed by emerge in the target. + chromeos + + # Get the list of the packages needed to bootstrap emerge. + portage + + # Get the list of dev and test packages. + chromeos-dev + chromeos-test + ) + einfo "Ignore warnings below related to LD_PRELOAD/libsandbox.so" + for pkg in ${pkgs[@]} ; do + emerge-${BOARD} \ + --pretend --quiet --emptytree --ignore-default-opts \ + --root-deps=rdeps ${pkg} | \ + egrep -o ' [[:alnum:]-]+/[^[:space:]/]+\b' | \ + tr -d ' ' > ${pkg}.packages & + done + wait + # No virtual packages in package.provided. + grep -v "virtual/" chromeos.packages > package.provided + + python "${FILESDIR}"/filter.py || die + + # Add the board specific binhost repository. + sed -e "s|BOARD|${BOARD}|g" "${SRCDIR}/repository.conf" > repository.conf + + # Add dhcp to the list of packages installed since its installation will not + # complete (can not add dhcp group since /etc is not writeable). Bootstrap it + # instead. + grep "net-misc/dhcp-" chromeos-dev.packages >> package.provided + grep "net-misc/dhcp-" chromeos-dev.packages >> bootstrap.packages +} + +src_install() { + cd "${SRCDIR}" + exeinto /usr/bin + doexe dev_install + + insinto /etc/portage + doins "${S}"/{bootstrap.packages,repository.conf} + + insinto /etc/portage/make.profile + doins "${S}"/package.{installable,provided} make.{conf,defaults} + + insinto /etc/env.d + doins 99devinstall + + # Python will be installed in /usr/local after running dev_install. + dosym "/usr/local/bin/python2.6" "/usr/bin/python" +} + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/files/filter.py b/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/files/filter.py new file mode 100755 index 0000000000..46e309f200 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/dev-install/files/filter.py @@ -0,0 +1,29 @@ +#!/usr/bin/python +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Filter out all the packages that are already in chromeos. +cros_pkgs = set(open('chromeos.packages', 'r').readlines()) +port_pkgs = set(open('portage.packages', 'r').readlines()) + +boot_pkgs = port_pkgs - cros_pkgs +f = open('bootstrap.packages', 'w') +f.write(''.join(boot_pkgs)) +f.close() + +# After bootstrapping the package will be assumed +# to be installed by emerge. +prov_pkgs = [x for x in boot_pkgs if not x.startswith('virtual/')] +f = open('package.provided', 'a') +f.write(''.join(prov_pkgs)) +f.close() + +# Make a list of the packages that can be installed. Those packages +# are in chromeos-dev or chromeos-test and not chromeos. +dev_pkgs = set(open('chromeos-dev.packages', 'r').readlines()) +test_pkgs = set(open('chromeos-test.packages', 'r').readlines()) +inst_pkgs = (dev_pkgs | test_pkgs) - cros_pkgs +f = open('package.installable', 'w') +f.write(''.join(inst_pkgs)) +f.close() diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ec-utils/ec-utils-0.0.1-r959.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ec-utils/ec-utils-0.0.1-r959.ebuild new file mode 100644 index 0000000000..f9efa0927d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ec-utils/ec-utils-0.0.1-r959.ebuild @@ -0,0 +1,55 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="6e29f8091d9da763cd39b7ea61eefb5c35b94606" +CROS_WORKON_TREE="7312bc4c61477f0041b02dbca07a3029707e9d46" +CROS_WORKON_PROJECT="chromiumos/platform/ec" +CROS_WORKON_LOCALNAME="../platform/ec" + +inherit cros-workon toolchain-funcs cros-board + +DESCRIPTION="Chrome OS EC Utility" + +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +set_board() { + export BOARD=$(get_current_board_with_variant) + if [[ ! -d board/${BOARD} ]] ; then + ewarn "${BOARD} does not use Chrome EC. Setting BOARD=bds." + BOARD=bds + fi +} + +src_compile() { + tc-export AR CC RANLIB + # In platform/ec Makefile, it uses "CC" to specify target chipset and + # "HOSTCC" to compile the utility program because it assumes developers + # want to run the utility from same host (build machine). + # In this ebuild file, we only build utility + # and we may want to build it so it can + # be executed on target devices (i.e., arm/x86/amd64), not the build + # host (BUILDCC, amd64). So we need to override HOSTCC by target "CC". + export HOSTCC="$CC" + set_board + emake utils +} + +src_install() { + set_board + dosbin "build/$BOARD/util/ectool" + if [[ -d board/${BOARD}/userspace/etc/init ]] ; then + insinto /etc/init + doins board/${BOARD}/userspace/etc/init/*.conf + fi + if [[ -d board/${BOARD}/userspace/usr/share/ec ]] ; then + insinto /usr/share/ec + doins board/${BOARD}/userspace/usr/share/ec/* + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ec-utils/ec-utils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ec-utils/ec-utils-9999.ebuild new file mode 100644 index 0000000000..5b0d6b4b72 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ec-utils/ec-utils-9999.ebuild @@ -0,0 +1,53 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/ec" +CROS_WORKON_LOCALNAME="../platform/ec" + +inherit cros-workon toolchain-funcs cros-board + +DESCRIPTION="Chrome OS EC Utility" + +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +set_board() { + export BOARD=$(get_current_board_with_variant) + if [[ ! -d board/${BOARD} ]] ; then + ewarn "${BOARD} does not use Chrome EC. Setting BOARD=bds." + BOARD=bds + fi +} + +src_compile() { + tc-export AR CC RANLIB + # In platform/ec Makefile, it uses "CC" to specify target chipset and + # "HOSTCC" to compile the utility program because it assumes developers + # want to run the utility from same host (build machine). + # In this ebuild file, we only build utility + # and we may want to build it so it can + # be executed on target devices (i.e., arm/x86/amd64), not the build + # host (BUILDCC, amd64). So we need to override HOSTCC by target "CC". + export HOSTCC="$CC" + set_board + emake utils +} + +src_install() { + set_board + dosbin "build/$BOARD/util/ectool" + if [[ -d board/${BOARD}/userspace/etc/init ]] ; then + insinto /etc/init + doins board/${BOARD}/userspace/etc/init/*.conf + fi + if [[ -d board/${BOARD}/userspace/usr/share/ec ]] ; then + insinto /usr/share/ec + doins board/${BOARD}/userspace/usr/share/ec/* + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/factorytest-init/factorytest-init-0.0.1-r27.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/factorytest-init/factorytest-init-0.0.1-r27.ebuild new file mode 100644 index 0000000000..0505cd3e9a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/factorytest-init/factorytest-init-0.0.1-r27.ebuild @@ -0,0 +1,73 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="62389179a09d15127728024b82a74ccf07db3dfe" +CROS_WORKON_TREE="1e8ef6aa3f78d3b5b4088235cf08bb6b66568e45" +CROS_WORKON_PROJECT="chromiumos/platform/factory_test_init" + +inherit cros-workon + +DESCRIPTION="Upstart jobs for the Chrome OS factory test image" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="" + +RDEPEND="chromeos-base/chromeos-init + sys-apps/coreutils + sys-apps/module-init-tools + sys-apps/upstart + sys-process/procps + " + +CROS_WORKON_LOCALNAME="factory_test_init" + +src_install() { + dodir /etc/init + insinto /etc/init + doins factory.conf + doins factorylog.conf +} + +modify_upstart() { + local upstart_file="$1" + local new_rules="$2" + local upstart_path="${ROOT}/etc/init/${upstart_file}" + + if [ ! -f "$upstart_path" ]; then + ewarn "Ignore non-exist upstart file: ${upstart_file}" + return + fi + + grep -q "^start on " "${upstart_path}" || + die "Unknown format in upstart file: ${upstart_file}" + + sed -i "s/^start on .*/start on $new_rules/" "${upstart_path}" || + die "Failed to modify upstart file: ${upstart_file}" +} + +disable_upstart() { + modify_upstart "$1" "never" +} + +pkg_postinst() { + # Create factory test image tags + touch "${ROOT}/root/.factory_test" + touch "${ROOT}/root/.leave_firmware_alone" + + disable_upstart "ui.conf" + disable_upstart "update-engine.conf" + disable_upstart "htpdate.conf" + disable_upstart "laptop-mode-boot.conf" + disable_upstart "laptop-mode-resume.conf" + disable_upstart "powerd.conf" + + modify_upstart "boot-complete.conf" "started boot-services" + modify_upstart "chrontel.conf" "factory-ui-started" + modify_upstart "tegra-devices.conf" "starting factory" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/factorytest-init/factorytest-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/factorytest-init/factorytest-init-9999.ebuild new file mode 100644 index 0000000000..7d8e8c8459 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/factorytest-init/factorytest-init-9999.ebuild @@ -0,0 +1,71 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/factory_test_init" + +inherit cros-workon + +DESCRIPTION="Upstart jobs for the Chrome OS factory test image" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND="" + +RDEPEND="chromeos-base/chromeos-init + sys-apps/coreutils + sys-apps/module-init-tools + sys-apps/upstart + sys-process/procps + " + +CROS_WORKON_LOCALNAME="factory_test_init" + +src_install() { + dodir /etc/init + insinto /etc/init + doins factory.conf + doins factorylog.conf +} + +modify_upstart() { + local upstart_file="$1" + local new_rules="$2" + local upstart_path="${ROOT}/etc/init/${upstart_file}" + + if [ ! -f "$upstart_path" ]; then + ewarn "Ignore non-exist upstart file: ${upstart_file}" + return + fi + + grep -q "^start on " "${upstart_path}" || + die "Unknown format in upstart file: ${upstart_file}" + + sed -i "s/^start on .*/start on $new_rules/" "${upstart_path}" || + die "Failed to modify upstart file: ${upstart_file}" +} + +disable_upstart() { + modify_upstart "$1" "never" +} + +pkg_postinst() { + # Create factory test image tags + touch "${ROOT}/root/.factory_test" + touch "${ROOT}/root/.leave_firmware_alone" + + disable_upstart "ui.conf" + disable_upstart "update-engine.conf" + disable_upstart "htpdate.conf" + disable_upstart "laptop-mode-boot.conf" + disable_upstart "laptop-mode-resume.conf" + disable_upstart "powerd.conf" + + modify_upstart "boot-complete.conf" "started boot-services" + modify_upstart "chrontel.conf" "factory-ui-started" + modify_upstart "tegra-devices.conf" "starting factory" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/flimflam-test/flimflam-test-0.0.1-r405.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/flimflam-test/flimflam-test-0.0.1-r405.ebuild new file mode 100644 index 0000000000..9aa93ce122 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/flimflam-test/flimflam-test-0.0.1-r405.ebuild @@ -0,0 +1,35 @@ + +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.43.ebuild,v 1.1 2009/10/05 12:22:24 dagger Exp $ + +EAPI="2" +CROS_WORKON_COMMIT="4cfa9dca3676465bf2ea35eeaf71a2f241e94161" +CROS_WORKON_TREE="93ba80236f878c56dd1c6b62ddc2944bae584962" +CROS_WORKON_PROJECT="chromiumos/platform/flimflam" + +inherit autotools cros-workon toolchain-funcs + +DESCRIPTION="flimflam's test scripts" +HOMEPAGE="http://connman.net" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="chromeos-base/shill + dev-lang/python + dev-python/dbus-python + dev-python/pygobject + net-dns/dnsmasq + sys-apps/iproute2" + +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="../third_party/flimflam" + +src_install() { + exeinto /usr/lib/flimflam/test + doexe test/* || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/flimflam-test/flimflam-test-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/flimflam-test/flimflam-test-9999.ebuild new file mode 100644 index 0000000000..7024a09dcb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/flimflam-test/flimflam-test-9999.ebuild @@ -0,0 +1,33 @@ + +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.43.ebuild,v 1.1 2009/10/05 12:22:24 dagger Exp $ + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/platform/flimflam" + +inherit autotools cros-workon toolchain-funcs + +DESCRIPTION="flimflam's test scripts" +HOMEPAGE="http://connman.net" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="chromeos-base/shill + dev-lang/python + dev-python/dbus-python + dev-python/pygobject + net-dns/dnsmasq + sys-apps/iproute2" + +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="../third_party/flimflam" + +src_install() { + exeinto /usr/lib/flimflam/test + doexe test/* || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gestures/gestures-0.0.1-r384.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gestures/gestures-0.0.1-r384.ebuild new file mode 100644 index 0000000000..ca024029dd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gestures/gestures-0.0.1-r384.ebuild @@ -0,0 +1,53 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="c1f56165b1dfce5fd30f4d69d7889e6562a9bb7e" +CROS_WORKON_TREE="1b27f1efcb7c69fbcae6dfbed1b19fc052f275d6" +CROS_WORKON_PROJECT="chromiumos/platform/gestures" +CROS_WORKON_USE_VCSID=1 + +inherit toolchain-funcs multilib cros-debug cros-workon + +DESCRIPTION="Gesture recognizer library" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libevdev + dev-cpp/gflags + sys-fs/udev + x11-libs/pixman" +DEPEND="dev-cpp/gtest + x11-libs/libXi + ${RDEPEND}" + +src_compile() { + tc-export CXX + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} + + emake clean # TODO(adlr): remove when a better solution exists + emake +} + +src_test() { + emake test + + if ! use x86 && ! use amd64 ; then + einfo "Skipping tests on non-x86 platform..." + else + ./test || die + fi +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gestures/gestures-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gestures/gestures-9999.ebuild new file mode 100644 index 0000000000..d6eae705c7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gestures/gestures-9999.ebuild @@ -0,0 +1,51 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/gestures" +CROS_WORKON_USE_VCSID=1 + +inherit toolchain-funcs multilib cros-debug cros-workon + +DESCRIPTION="Gesture recognizer library" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libevdev + dev-cpp/gflags + sys-fs/udev + x11-libs/pixman" +DEPEND="dev-cpp/gtest + x11-libs/libXi + ${RDEPEND}" + +src_compile() { + tc-export CXX + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} + + emake clean # TODO(adlr): remove when a better solution exists + emake +} + +src_test() { + emake test + + if ! use x86 && ! use amd64 ; then + einfo "Skipping tests on non-x86 platform..." + else + ./test || die + fi +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gmerge/gmerge-0.0.1-r563.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gmerge/gmerge-0.0.1-r563.ebuild new file mode 100644 index 0000000000..31754c8476 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gmerge/gmerge-0.0.1-r563.ebuild @@ -0,0 +1,43 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="9a6f64de2cda21ad3f173c13298a53dcb5525cc3" +CROS_WORKON_TREE="a0a8dc61fac2ae0179f836e42406c569c2e2ca84" +CROS_WORKON_PROJECT="chromiumos/platform/dev-util" +CROS_WORKON_LOCALNAME="dev" + +inherit cros-workon + +DESCRIPTION="A util for installing packages using the CrOS dev server" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="app-shells/bash + dev-lang/python + dev-util/shflags + sys-apps/portage" +DEPEND="${RDEPEND}" + +CHROMEOS_PROFILE="/usr/local/portage/chromiumos/profiles/targets/chromeos" + +src_install() { + # Install tools from platform/dev into /usr/local/bin + into /usr/local + dobin gmerge stateful_update crdev + + # Setup package.provided so that gmerge will know what packages to ignore. + # - $ROOT/etc/portage/profile/package.provided contains compiler tools and + # and is setup by setup_board. We know that that file will be present in + # $ROOT because the initial compile of packages takes place in + # /build/$BOARD. + # - $CHROMEOS_PROFILE/package.provided contains packages that we don't + # want to install to the device. + insinto /usr/local/etc/make.profile/package.provided + newins "${SYSROOT}"/etc/portage/profile/package.provided compiler + newins "${CHROMEOS_PROFILE}"/package.provided chromeos +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gmerge/gmerge-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gmerge/gmerge-9999.ebuild new file mode 100644 index 0000000000..98fe0f82b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gmerge/gmerge-9999.ebuild @@ -0,0 +1,41 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/dev-util" +CROS_WORKON_LOCALNAME="dev" + +inherit cros-workon + +DESCRIPTION="A util for installing packages using the CrOS dev server" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="app-shells/bash + dev-lang/python + dev-util/shflags + sys-apps/portage" +DEPEND="${RDEPEND}" + +CHROMEOS_PROFILE="/usr/local/portage/chromiumos/profiles/targets/chromeos" + +src_install() { + # Install tools from platform/dev into /usr/local/bin + into /usr/local + dobin gmerge stateful_update crdev + + # Setup package.provided so that gmerge will know what packages to ignore. + # - $ROOT/etc/portage/profile/package.provided contains compiler tools and + # and is setup by setup_board. We know that that file will be present in + # $ROOT because the initial compile of packages takes place in + # /build/$BOARD. + # - $CHROMEOS_PROFILE/package.provided contains packages that we don't + # want to install to the device. + insinto /usr/local/etc/make.profile/package.provided + newins "${SYSROOT}"/etc/portage/profile/package.provided compiler + newins "${CHROMEOS_PROFILE}"/package.provided chromeos +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi-cromo-plugin/gobi-cromo-plugin-1.0.1-r52.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi-cromo-plugin/gobi-cromo-plugin-1.0.1-r52.ebuild new file mode 100644 index 0000000000..cf3aa2bae7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi-cromo-plugin/gobi-cromo-plugin-1.0.1-r52.ebuild @@ -0,0 +1,68 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +EAPI=2 +CROS_WORKON_COMMIT="cbcca0a2284e37f6a56f465421bf63b53167f235" +CROS_WORKON_TREE="e6b68499152fa7301c97b86b3d0b4112f2d42fb2" +CROS_WORKON_PROJECT="chromiumos/platform/gobi-cromo-plugin" +CROS_WORKON_USE_VCSID="1" + +inherit cros-debug cros-workon toolchain-funcs multilib + +DESCRIPTION="Cromo plugin to control Qualcomm Gobi modems" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="install_tests internal" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/cromo + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + dev-cpp/glog + dev-libs/dbus-c++ + chromeos-base/metrics + chromeos-base/gobi3k-sdk + || ( + !internal? ( chromeos-base/gobi3k-lib-bin ) + chromeos-base/gobi3k-lib + ) + install_tests? ( dev-cpp/gmock dev-cpp/gtest ) +" +DEPEND="${RDEPEND} + dev-cpp/gmock + dev-cpp/gtest + virtual/modemmanager +" + +cr_make() { + emake \ + LIBDIR=/usr/$(get_libdir) \ + BASE_VER=${LIBCHROME_VERS} \ + $(use install_tests && echo INSTALL_TESTS=1) \ + "$@" || die +} + +src_compile() { + tc-export CXX LD CC + cros-debug-add-NDEBUG + cr_make +} + +mkqcqmirules() { + rule="ACTION==\"add|change\", SUBSYSTEM==\"QCQMI\", KERNEL==\"qcqmi[0-9]*\"" + rule="$rule, OWNER=\"cromo\"" + rule="$rule, GROUP=\"cromo\"" + echo "$rule" +} + +src_install() { + cr_make DESTDIR="${D}" install + # The qualcomm makefile for gobi-cromo-plugin seems to stick its own + # rules into this directory, which I don't think is right - I believe + # /lib/udev/rules.d belongs to udev and /etc/udev/rules.d is for distro + # stuff. Ah well. + mkqcqmirules > "${D}/lib/udev/rules.d/76-cromo-gobi-permissions.rules" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi-cromo-plugin/gobi-cromo-plugin-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi-cromo-plugin/gobi-cromo-plugin-9999.ebuild new file mode 100644 index 0000000000..53feb0c680 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi-cromo-plugin/gobi-cromo-plugin-9999.ebuild @@ -0,0 +1,66 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/gobi-cromo-plugin" +CROS_WORKON_USE_VCSID="1" + +inherit cros-debug cros-workon toolchain-funcs multilib + +DESCRIPTION="Cromo plugin to control Qualcomm Gobi modems" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="install_tests internal" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/cromo + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + dev-cpp/glog + dev-libs/dbus-c++ + chromeos-base/metrics + chromeos-base/gobi3k-sdk + || ( + !internal? ( chromeos-base/gobi3k-lib-bin ) + chromeos-base/gobi3k-lib + ) + install_tests? ( dev-cpp/gmock dev-cpp/gtest ) +" +DEPEND="${RDEPEND} + dev-cpp/gmock + dev-cpp/gtest + virtual/modemmanager +" + +cr_make() { + emake \ + LIBDIR=/usr/$(get_libdir) \ + BASE_VER=${LIBCHROME_VERS} \ + $(use install_tests && echo INSTALL_TESTS=1) \ + "$@" || die +} + +src_compile() { + tc-export CXX LD CC + cros-debug-add-NDEBUG + cr_make +} + +mkqcqmirules() { + rule="ACTION==\"add|change\", SUBSYSTEM==\"QCQMI\", KERNEL==\"qcqmi[0-9]*\"" + rule="$rule, OWNER=\"cromo\"" + rule="$rule, GROUP=\"cromo\"" + echo "$rule" +} + +src_install() { + cr_make DESTDIR="${D}" install + # The qualcomm makefile for gobi-cromo-plugin seems to stick its own + # rules into this directory, which I don't think is right - I believe + # /lib/udev/rules.d belongs to udev and /etc/udev/rules.d is for distro + # stuff. Ah well. + mkqcqmirules > "${D}/lib/udev/rules.d/76-cromo-gobi-permissions.rules" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi3k-sdk/gobi3k-sdk-1.0.1-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi3k-sdk/gobi3k-sdk-1.0.1-r16.ebuild new file mode 100644 index 0000000000..aaab7eeb17 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi3k-sdk/gobi3k-sdk-1.0.1-r16.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +CROS_WORKON_COMMIT="b69d8f1d905b7db5296b5ff76d731ef88c79ef55" +CROS_WORKON_TREE="9ebc2b4fd3dfd75430562a5238a2df9218966fdc" +CROS_WORKON_PROJECT="chromiumos/third_party/gobi3k-sdk" +CROS_WORKON_LOCALNAME=../third_party/gobi3k-sdk +inherit cros-workon toolchain-funcs + +DESCRIPTION="SDK for Qualcomm Gobi 3000 modems" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +# TODO(jglasgow): remove realpath dependency +RDEPEND=" + || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) +" + +src_configure() { + tc-export LD CXX CC OBJCOPY AR +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi3k-sdk/gobi3k-sdk-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi3k-sdk/gobi3k-sdk-9999.ebuild new file mode 100644 index 0000000000..1062a59a8b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/gobi3k-sdk/gobi3k-sdk-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +CROS_WORKON_PROJECT="chromiumos/third_party/gobi3k-sdk" +CROS_WORKON_LOCALNAME=../third_party/gobi3k-sdk +inherit cros-workon toolchain-funcs + +DESCRIPTION="SDK for Qualcomm Gobi 3000 modems" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +# TODO(jglasgow): remove realpath dependency +RDEPEND=" + || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) +" + +src_configure() { + tc-export LD CXX CC OBJCOPY AR +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/files/chromeos-version.sh new file mode 100755 index 0000000000..fa970952bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/files/chromeos-version.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +"$1"/configure --version | awk '{print $NF; exit}' diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/google-breakpad-1084-r52.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/google-breakpad-1084-r52.ebuild new file mode 100644 index 0000000000..533d53704f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/google-breakpad-1084-r52.ebuild @@ -0,0 +1,93 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="232fb3ad52342305e55b3a1d51632a9bd52d18cc" +CROS_WORKON_TREE="cc72c3a2e2d1746bb31faf70937fc427ad6a57aa" +CROS_WORKON_PROJECT="chromiumos/platform/google-breakpad" + +inherit autotools cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Google crash reporting" +HOMEPAGE="http://code.google.com/p/google-breakpad" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="" + +RDEPEND="net-misc/curl" +DEPEND="${RDEPEND}" + +src_prepare() { + eautoreconf + if ! tc-is-cross-compiler; then + einfo "Creating a separate 32b src directory" + mkdir ../work32 + cp -a . ../work32 + mv ../work32 . + fi +} + +src_configure() { + #TODO(raymes): Uprev breakpad so this isn't necessary. See + # (crosbug.com/14275). + [ "$ARCH" = "arm" ] && append-cflags "-marm" && append-cxxflags "-marm" + + # We purposefully disable optimizations due to optimizations causing + # src/processor code to crash (minidump_stackwalk) as well as tests + # to fail. See + # http://code.google.com/p/google-breakpad/issues/detail?id=400. + append-flags "-O0" + + tc-export CC CXX LD PKG_CONFIG + + econf + + if ! tc-is-cross-compiler; then + einfo "Running 32b configuration" + cd work32 || die "chdir failed" + append-flags "-m32" + econf + filter-flags "-m32" + fi +} + +src_compile() { + tc-export CC CXX PKG_CONFIG + emake + + if ! tc-is-cross-compiler; then + cd work32 || die "chdir failed" + einfo "Building dump_syms and minidump-2-core with -m32" + emake src/tools/linux/dump_syms/dump_syms \ + src/tools/linux/md2core/minidump-2-core + fi +} + +src_test() { + emake check +} + +src_install() { + tc-export CXX PKG_CONFIG + emake DESTDIR="${D}" install + insinto /usr/include/google-breakpad/client/linux/handler + doins src/client/linux/handler/*.h + insinto /usr/include/google-breakpad/client/linux/crash_generation + doins src/client/linux/crash_generation/*.h + insinto /usr/include/google-breakpad/common/linux + doins src/common/linux/*.h + insinto /usr/include/google-breakpad/processor + doins src/processor/*.h + dobin src/tools/linux/core2md/core2md \ + src/tools/linux/md2core/minidump-2-core \ + src/tools/linux/dump_syms/dump_syms \ + src/tools/linux/symupload/sym_upload \ + src/tools/linux/symupload/minidump_upload + if ! tc-is-cross-compiler; then + newbin work32/src/tools/linux/dump_syms/dump_syms dump_syms.32 + newbin work32/src/tools/linux/md2core/minidump-2-core \ + minidump-2-core.32 + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/google-breakpad-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/google-breakpad-9999.ebuild new file mode 100644 index 0000000000..67afc9f4ce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/google-breakpad/google-breakpad-9999.ebuild @@ -0,0 +1,91 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/google-breakpad" + +inherit autotools cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Google crash reporting" +HOMEPAGE="http://code.google.com/p/google-breakpad" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="" + +RDEPEND="net-misc/curl" +DEPEND="${RDEPEND}" + +src_prepare() { + eautoreconf + if ! tc-is-cross-compiler; then + einfo "Creating a separate 32b src directory" + mkdir ../work32 + cp -a . ../work32 + mv ../work32 . + fi +} + +src_configure() { + #TODO(raymes): Uprev breakpad so this isn't necessary. See + # (crosbug.com/14275). + [ "$ARCH" = "arm" ] && append-cflags "-marm" && append-cxxflags "-marm" + + # We purposefully disable optimizations due to optimizations causing + # src/processor code to crash (minidump_stackwalk) as well as tests + # to fail. See + # http://code.google.com/p/google-breakpad/issues/detail?id=400. + append-flags "-O0" + + tc-export CC CXX LD PKG_CONFIG + + econf + + if ! tc-is-cross-compiler; then + einfo "Running 32b configuration" + cd work32 || die "chdir failed" + append-flags "-m32" + econf + filter-flags "-m32" + fi +} + +src_compile() { + tc-export CC CXX PKG_CONFIG + emake + + if ! tc-is-cross-compiler; then + cd work32 || die "chdir failed" + einfo "Building dump_syms and minidump-2-core with -m32" + emake src/tools/linux/dump_syms/dump_syms \ + src/tools/linux/md2core/minidump-2-core + fi +} + +src_test() { + emake check +} + +src_install() { + tc-export CXX PKG_CONFIG + emake DESTDIR="${D}" install + insinto /usr/include/google-breakpad/client/linux/handler + doins src/client/linux/handler/*.h + insinto /usr/include/google-breakpad/client/linux/crash_generation + doins src/client/linux/crash_generation/*.h + insinto /usr/include/google-breakpad/common/linux + doins src/common/linux/*.h + insinto /usr/include/google-breakpad/processor + doins src/processor/*.h + dobin src/tools/linux/core2md/core2md \ + src/tools/linux/md2core/minidump-2-core \ + src/tools/linux/dump_syms/dump_syms \ + src/tools/linux/symupload/sym_upload \ + src/tools/linux/symupload/minidump_upload + if ! tc-is-cross-compiler; then + newbin work32/src/tools/linux/dump_syms/dump_syms dump_syms.32 + newbin work32/src/tools/linux/md2core/minidump-2-core \ + minidump-2-core.32 + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/hard-host-depends/hard-host-depends-0.0.1-r145.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/hard-host-depends/hard-host-depends-0.0.1-r145.ebuild new file mode 120000 index 0000000000..fdabb0fbff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/hard-host-depends/hard-host-depends-0.0.1-r145.ebuild @@ -0,0 +1 @@ +hard-host-depends-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild new file mode 100644 index 0000000000..0386c560c5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -0,0 +1,244 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="List of packages that are needed on the buildhost (meta package)" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +# Pull in any site-specific or private-overlay-specific packages needed on the +# host. +RDEPEND="${RDEPEND} + virtual/hard-host-depends-bsp + " + +# Needed to run setup crossdev, run build scripts, and make a bootable image. +RDEPEND="${RDEPEND} + app-arch/lzop + app-arch/pigz + app-admin/sudo + dev-embedded/cbootimage + dev-embedded/tegrarcm + dev-embedded/u-boot-tools + dev-util/ccache + dev-util/crosutils + >=sys-apps/dtc-1.3.0-r5 + sys-boot/bootstub + sys-boot/grub + sys-boot/syslinux + sys-devel/crossdev + sys-fs/dosfstools + " + +# Host dependencies for building cross-compiled packages. +RDEPEND="${RDEPEND} + app-admin/eselect-opengl + app-admin/eselect-mesa + app-arch/cabextract + >=app-arch/pbzip2-1.1.1-r1 + app-arch/rpm2targz + app-arch/sharutils + app-arch/unzip + app-crypt/nss + app-emulation/qemu-kvm + !app-emulation/qemu-user + app-i18n/ibus + app-text/texi2html + chromeos-base/google-breakpad + chromeos-base/chromeos-base + chromeos-base/chromeos-installer + chromeos-base/cros-devutils[cros_host] + chromeos-base/cros-factoryutils + chromeos-base/cros-testutils + dev-lang/python + dev-db/m17n-contrib + dev-db/m17n-db + dev-lang/closure-compiler-bin + dev-lang/nasm + dev-lang/swig + dev-lang/yasm + dev-libs/dbus-c++ + dev-libs/dbus-glib + >=dev-libs/glib-2.26.1 + dev-libs/libgcrypt + dev-libs/libxslt + dev-libs/libyaml + dev-libs/m17n-lib + dev-libs/protobuf + dev-python/cherrypy + dev-python/ctypesgen + dev-python/dbus-python + dev-python/imaging + dev-python/m2crypto + dev-python/mako + dev-python/netifaces + dev-python/pygobject + dev-python/pygtk + dev-python/pyinotify + dev-python/pyopenssl + dev-python/python-daemon + dev-python/pyudev + dev-python/pyusb + dev-python/setproctitle + dev-python/ws4py + dev-util/cmake + dev-util/gob + dev-util/gdbus-codegen + dev-util/gperf + dev-util/gtk-doc + dev-util/hdctools + >=dev-util/gtk-doc-am-1.13 + >=dev-util/intltool-0.30 + dev-util/scons + >=dev-vcs/git-1.7.2 + dev-vcs/subversion[-dso] + >=media-libs/freetype-2.2.1 + media-libs/mesa + net-misc/gsutil + sys-apps/usbutils + !sys-apps/nih-dbus-tool + =sys-devel/automake-1.10* + sys-devel/clang + sys-fs/sshfs-fuse + sys-fs/udev + sys-libs/libnih + sys-power/iasl + x11-apps/mkfontdir + x11-apps/xcursorgen + x11-apps/xkbcomp + x11-libs/gtk+ + >=x11-misc/util-macros-1.2 + " + +# Various fonts are needed in order to generate messages for the +# chromeos-initramfs package. +RDEPEND="${RDEPEND} + chromeos-base/chromeos-fonts + " + +# Host dependencies for building chromium. +# Intermediate executables built for the host, then run to generate data baked +# into chromium, need these packages to be present in the host environment in +# order to successfully build. +# See: http://codereview.chromium.org/7550002/ +RDEPEND="${RDEPEND} + dev-libs/atk + dev-libs/glib + media-libs/fontconfig + media-libs/freetype + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXtst + x11-libs/pango + " + +# Host dependencies that create usernames/groups we need to pull over to target. +RDEPEND="${RDEPEND} + sys-apps/dbus + " + +# Host dependencies that are needed by mod_image_for_test. +RDEPEND="${RDEPEND} + sys-process/lsof + " + +# Useful utilities for developers. +RDEPEND="${RDEPEND} + app-arch/zip + app-portage/eclass-manpages + app-portage/gentoolkit + app-portage/portage-utils + app-editors/qemacs + app-editors/vim + dev-util/perf + sys-apps/pv + app-shells/bash-completion + sys-devel/smatch + " + +# Host dependencies that are needed for unit tests +RDEPEND="${RDEPEND} + x11-misc/xkeyboard-config + " + +# Host dependencies that are needed for autotests. +RDEPEND="${RDEPEND} + dev-util/dejagnu + " + +# Host dependencies that are needed for media applications (ex, mplayer) used in +# factory. +RDEPEND="${RDEPEND} + media-video/ffmpeg + " + +# Host dependencies that are needed to create and sign images +RDEPEND="${RDEPEND} + >=chromeos-base/vboot_reference-1.0-r174 + chromeos-base/verity + sys-apps/mosys + sys-fs/libfat + " + +# Host dependency used by the chromeos-base/root-certificates ebuild +RDEPEND="${RDEPEND} + >=app-misc/ca-certificates-20090709-r6 + " + +# Host dependencies that are needed for delta_generator. +RDEPEND="${RDEPEND} + chromeos-base/update_engine + " + +# Host dependencies to run unit tests within the chroot +RDEPEND="${RDEPEND} + dev-cpp/gflags + dev-python/mock + dev-python/mox + dev-python/unittest2 + " + +# Host dependencies for running pylint within the chroot +RDEPEND="${RDEPEND} + dev-python/pylint + " + +# Host dependencies to scp binaries from the binary component server +RDEPEND="${RDEPEND} + chromeos-base/ssh-known-hosts + chromeos-base/ssh-root-dot-dir + net-misc/openssh + net-misc/wget + " + +# Host dependencies that are needed for chromite/bin/upload_package_status +RDEPEND="${RDEPEND} + dev-python/gdata + " + +# Host dependencies for taking to dev boards +RDEPEND="${RDEPEND} + dev-embedded/smdk-dltool + " + +# Host dependencies for HWID processing +RDEPEND="${RDEPEND} + dev-python/pyyaml + " + +# Tools for working with compiler generated profile information +# (such as coverage analysis in common.mk) +RDEPEND="${RDEPEND} + dev-util/lcov + " + +# Uninstall these packages. +RDEPEND="${RDEPEND} + !net-misc/dhcpcd + " diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/files/0001-chgrp-dev-input-devices-to-chronos-for-DRM.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/files/0001-chgrp-dev-input-devices-to-chronos-for-DRM.patch new file mode 100644 index 0000000000..47bb7a1f82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/files/0001-chgrp-dev-input-devices-to-chronos-for-DRM.patch @@ -0,0 +1,37 @@ +From 24033d5d486074f17df237e098508852102d52b8 Mon Sep 17 00:00:00 2001 +From: Simon Que +Date: Fri, 20 Apr 2012 16:23:59 -0700 +Subject: [PATCH] chgrp /dev/input devices to chronos for DRM + +Since chrome runs as chronos, this patch will let chrome access +/dev/input devices. + +Change-Id: Ia6f61edcf9aaad8cf20a99e0a73c21add764a155 +Signed-off-by: Simon Que +--- + mouse_added | 1 + + touchpad_added | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/mouse_added b/mouse_added +index be901f3..7b94797 100755 +--- a/mouse_added ++++ b/mouse_added +@@ -6,4 +6,5 @@ + # Log all calls, with arguments, to /var/log/messages + logger "$0" "$@" "$DEVNAME" + ++chgrp chronos /dev/input/event* /dev/input/m* + /opt/google/mouse/mousecontrol add & +diff --git a/touchpad_added b/touchpad_added +index f2fc2a7..10a7714 100755 +--- a/touchpad_added ++++ b/touchpad_added +@@ -6,4 +6,5 @@ + # Log all calls, with arguments, to /var/log/messages + logger "$0" "$@" "$DEVNAME" + ++chgrp chronos /dev/input/event* /dev/input/m* + /opt/google/touchpad/tpcontrol add & +-- +1.7.3.4 diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/inputcontrol-0.0.1-r56.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/inputcontrol-0.0.1-r56.ebuild new file mode 100644 index 0000000000..b60a228e00 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/inputcontrol-0.0.1-r56.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +CROS_WORKON_COMMIT="355e71f1ad4d4f609874af507a8af665cb5eaf33" +CROS_WORKON_TREE="3d9f2153a67e76765e864412e7a62fde8bf91fba" +CROS_WORKON_PROJECT="chromiumos/platform/inputcontrol" + +inherit cros-workon + +DESCRIPTION="A collection of utilities for configuring input devices" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="+X" + +RDEPEND="app-arch/gzip + x11-apps/xinput" +DEPEND="${RDEPEND}" + +src_prepare() { + if ! use X; then + epatch "${FILESDIR}"/0001-chgrp-dev-input-devices-to-chronos-for-DRM.patch + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/inputcontrol-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/inputcontrol-9999.ebuild new file mode 100644 index 0000000000..7c3684c8e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/inputcontrol/inputcontrol-9999.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +CROS_WORKON_PROJECT="chromiumos/platform/inputcontrol" + +inherit cros-workon + +DESCRIPTION="A collection of utilities for configuring input devices" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+X" + +RDEPEND="app-arch/gzip + x11-apps/xinput" +DEPEND="${RDEPEND}" + +src_prepare() { + if ! use X; then + epatch "${FILESDIR}"/0001-chgrp-dev-input-devices-to-chronos-for-DRM.patch + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/internal/internal-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/internal/internal-0.0.1.ebuild new file mode 100644 index 0000000000..78cb79d217 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/internal/internal-0.0.1.ebuild @@ -0,0 +1,14 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI="2" + +DESCRIPTION="This package is for hooking up your internal overlays" +LICENSE="BSD" +HOMEPAGE="http://src.chromium.org" +SLOT="0" +KEYWORDS="x86 amd64 arm" + +DEPEND="" +RDEPEND="" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ixchariot/ixchariot-7.10.4.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ixchariot/ixchariot-7.10.4.ebuild new file mode 100644 index 0000000000..0464740439 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ixchariot/ixchariot-7.10.4.ebuild @@ -0,0 +1,17 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Placeholder for Ixia IxChariot Endpoint for Chrome OS." +LICENSE="Proprietary" +SRC_URI="" +SLOT="0" +KEYWORDS="x86 amd64 arm" +IUSE="" +DEPEND="" + +# This file is a placeholder for an IxChariot Endpoint, which is distributed in +# binary form with a restrictive license. License holders can put the binary +# into a private overlay. + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/SConstruct-125070 b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/SConstruct-125070 new file mode 100755 index 0000000000..81a7ad19e9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/SConstruct-125070 @@ -0,0 +1,225 @@ +# -*- python -*- + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os + +# This block will most likely need updating whenever libchrome gets updated. +# The order of the libs below doesn't matter (as scons will take care of +# building things in the required order). The split between them is purely +# to reduce over linking of 3rd party libraries. i.e. 'core' should require +# only the C library (and glib), and all other 3rd party libraries should +# get a unique 'xxx' name. +base_name = 'base' +base_libs = [ + { + 'name' : 'core', + 'sources' : """ + at_exit.cc + atomicops_internals_x86_gcc.cc + base_switches.cc + callback_internal.cc + command_line.cc + debug/alias.cc + debug/debugger.cc + debug/debugger_posix.cc + debug/stack_trace.cc + debug/stack_trace_posix.cc + environment.cc + file_descriptor_shuffle.cc + file_path.cc + json/json_reader.cc + json/json_writer.cc + json/string_escape.cc + lazy_instance.cc + location.cc + logging.cc + memory/ref_counted.cc + memory/ref_counted_memory.cc + memory/singleton.cc + memory/weak_ptr.cc + message_pump.cc + message_pump_default.cc + metrics/histogram.cc + pickle.cc + platform_file.cc + platform_file_posix.cc + profiler/alternate_timer.cc + profiler/tracked_time.cc + safe_strerror_posix.cc + string16.cc + string_number_conversions.cc + string_piece.cc + stringprintf.cc + string_split.cc + string_util.cc + synchronization/condition_variable_posix.cc + synchronization/lock.cc + synchronization/lock_impl_posix.cc + synchronization/waitable_event_posix.cc + sys_info_posix.cc + sys_string_conversions_posix.cc + third_party/dmg_fp/dtoa.cc + third_party/dmg_fp/g_fmt.cc + third_party/dynamic_annotations/dynamic_annotations.c + third_party/icu/icu_utf.cc + third_party/nspr/prtime.cc + threading/non_thread_safe_impl.cc + threading/platform_thread_posix.cc + threading/thread_checker_impl.cc + threading/thread_collision_warner.cc + threading/thread_local_posix.cc + threading/thread_local_storage_posix.cc + threading/thread_restrictions.cc + time.cc + time_posix.cc + tracked_objects.cc + utf_string_conversions.cc + utf_string_conversion_utils.cc + values.cc + vlog.cc + """, + 'libs' : 'pthread rt', + 'pc_libs' : '', + }, + { + 'name' : 'glib', + 'sources' : """ + debug/trace_event.cc + debug/trace_event_impl.cc + file_util.cc + file_util_posix.cc + message_pump_glib.cc + process_posix.cc + process_util.cc + process_util_linux.cc + process_util_posix.cc + rand_util.cc + rand_util_posix.cc + scoped_temp_dir.cc + """, + 'libs' : '', + 'pc_libs' : 'glib-2.0', + }, + { + 'name' : 'event', + 'sources' : """ + message_loop.cc + message_loop_proxy.cc + message_loop_proxy_impl.cc + message_pump_libevent.cc + pending_task.cc + task_runner.cc + threading/post_task_and_reply_impl.cc + threading/thread.cc + tracking_info.cc + """, + 'libs' : 'event base-glib-${bslot}', + 'pc_libs' : 'glib-2.0', + }, + { + 'name' : 'dl', + 'sources' : """ + native_library_posix.cc + """, + 'libs' : 'dl', + 'pc_libs' : '', + }, +] + +env = Environment() + +BASE_VER = os.environ.get('BASE_VER', '0') +PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config') + +env.Append( + CPPPATH=['files'], + CCFLAGS=['-g'] +) +for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'): + value = os.environ.get(key) + if value: + env[key] = Split(value) + +env['CCFLAGS'] += ['-fPIC', + '-fno-exceptions', + '-Wall', + '-Werror', + '-DOS_CHROMEOS=1', + '-DTOOLKIT_VIEWS=1', + '-DUSE_AURA=1', + '-DUSE_SYSTEM_LIBEVENT=1', + '-I..'] + +# Fix issue with scons not passing some vars through the environment. +for key in Split('PKG_CONFIG SYSROOT'): + if os.environ.has_key(key): + env['ENV'][key] = os.environ[key] + +all_base_libs = [] +all_pc_libs = '' +all_libs = [] +all_scons_libs = [] + +# Build all the shared libraries. +for lib in base_libs: + pc_libs = lib['pc_libs'].replace('${bslot}', BASE_VER) + all_pc_libs += ' ' + pc_libs + + libs = Split(lib['libs'].replace('${bslot}', BASE_VER)) + all_libs += libs + + name = '%s-%s-%s' % (base_name, lib['name'], BASE_VER) + all_base_libs += [name] + corename = '%s-core-%s' % (base_name, BASE_VER) + # Automatically link the sub-libs against the main core lib. + # This is to keep from having to explicitly mention it in the + # table above (i.e. lazy). + if name != corename: + libs += [corename] + + e = env.Clone() + e.Append( + LIBS = Split(libs), + LIBPATH = ['.'], + LINKFLAGS = ['-Wl,--as-needed', '-Wl,-z,defs', + '-Wl,-soname,lib%s.so' % name], + ) + if pc_libs: + e.ParseConfig(PKG_CONFIG + ' --cflags --libs %s' % pc_libs) + all_scons_libs += [ e.SharedLibrary(name, Split(lib['sources'])) ] + + +# Build the random text files (pkg-config and linker script). + +def lib_list(libs): + return ' '.join(['-l' + l for l in libs]) + +subst_dict = { + '@BSLOT@' : BASE_VER, + '@PRIVATE_PC@' : all_pc_libs, + '@BASE_LIBS@' : lib_list(all_base_libs), + '@LIBS@' : lib_list(all_libs), +} +env = Environment(tools = ['textfile'], SUBST_DICT = subst_dict) + +env.Substfile('libchrome-%s.pc' % BASE_VER, + [Value(""" +prefix=/usr +includedir=${prefix}/include +bslot=@BSLOT@ + +Name: libchrome +Description: chrome base library +Version: ${bslot} +Requires: +Requires.private: glib-2.0 @PRIVATE_PC@ +Libs: -lbase-${bslot} +Libs.private: @BASE_LIBS@ @LIBS@ +Cflags: -I${includedir}/base-${bslot} -Wno-c++11-extensions +""")]) + +env.Substfile('libbase-%s.so' % BASE_VER, + [Value('GROUP ( AS_NEEDED ( @BASE_LIBS@ ) )')]) diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-gcc-4_7.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-gcc-4_7.patch new file mode 100644 index 0000000000..99be8382f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-gcc-4_7.patch @@ -0,0 +1,21 @@ +--- a/time_posix.cc.orig 2012-05-22 17:04:50.252715756 -0700 ++++ b/time_posix.cc 2012-05-22 17:04:52.742723993 -0700 +@@ -34,7 +34,7 @@ struct timespec TimeDelta::ToTimeSpec() + } + struct timespec result = + {seconds, +- microseconds * Time::kNanosecondsPerMicrosecond}; ++ static_cast(microseconds * Time::kNanosecondsPerMicrosecond)}; + return result; + } + +--- a/message_pump_libevent.cc.orig 2012-05-30 16:51:53.954509506 -0700 ++++ a/message_pump_libevent.cc 2012-05-30 16:52:04.654541674 -0700 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "base/auto_reset.h" + #include "base/compiler_specific.h" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-headers.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-headers.patch new file mode 100644 index 0000000000..afc7a9fc9a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-headers.patch @@ -0,0 +1,34 @@ +message_loop.h pulls in a lot of other headers (glib/x11/etc...) that these +files don't care about, so simplify that + +--- a/synchronization/waitable_event_posix.cc ++++ b/synchronization/waitable_event_posix.cc +@@ -2,11 +2,14 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++#include ++ + #include "base/synchronization/waitable_event.h" + + #include "base/synchronization/condition_variable.h" + #include "base/synchronization/lock.h" +-#include "base/message_loop.h" ++#include "base/logging.h" + + // ----------------------------------------------------------------------------- + // A WaitableEvent on POSIX is implemented as a wait-list. Currently we don't +--- a/tracked_objects.cc ++++ b/tracked_objects.cc +@@ -5,9 +5,9 @@ + #include "base/tracked_objects.h" + + #include ++#include + + #include "base/format_macros.h" +-#include "base/message_loop.h" + #include "base/profiler/alternate_timer.h" + #include "base/stringprintf.h" + #include "base/third_party/valgrind/memcheck.h" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-no-X.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-no-X.patch new file mode 100644 index 0000000000..ce84ff685d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-no-X.patch @@ -0,0 +1,15 @@ +none of the consumers in our tree want a GUI message pump (gtk or X or anything +else), but rather just want a glib message pump. so change the UI define to go +straight to glib. this lets us avoid gtk/X completely in our packages. + +--- a/message_loop.cc ++++ b/message_loop.cc +@@ -153,7 +153,7 @@ MessageLoop::MessageLoop(Type type) + #define MESSAGE_PUMP_UI NULL + #define MESSAGE_PUMP_IO NULL + #elif defined(OS_POSIX) // POSIX but not MACOSX. +-#define MESSAGE_PUMP_UI new base::MessagePumpForUI() ++#define MESSAGE_PUMP_UI new base::MessagePumpGlib() + #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() + #else + #error Not implemented diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-x32.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-x32.patch new file mode 100644 index 0000000000..cc4318dfe7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/base-125070-x32.patch @@ -0,0 +1,86 @@ +OS_NACL defines this because it is really x32. but we can't use that +define with OS_CHROMEOS, so we have to check the compiler define. + +https://codereview.chromium.org/12180007/ + +--- a/atomicops.h ++++ b/atomicops.h +@@ -39,7 +39,7 @@ + #ifdef ARCH_CPU_64_BITS + // We need to be able to go between Atomic64 and AtomicWord implicitly. This + // means Atomic64 and AtomicWord should be the same type on 64-bit. +-#if defined(OS_NACL) ++#if defined(OS_NACL) || defined(__ILP32__) + // NaCl's intptr_t is not actually 64-bits on 64-bit! + // http://code.google.com/p/nativeclient/issues/detail?id=1162 + typedef int64_t Atomic64; + +this is in upstream nspr already + +https://codereview.chromium.org/12186005/ + +--- a/third_party/nspr/prcpucfg_linux.h ++++ b/third_party/nspr/prcpucfg_linux.h +@@ -233,6 +233,53 @@ + + #elif defined(__x86_64__) + ++#ifdef __ILP32__ ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#else ++ + #define IS_LITTLE_ENDIAN 1 + #undef IS_BIG_ENDIAN + #define IS_64 +@@ -277,6 +324,8 @@ + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#endif ++ + #elif defined(__mc68000__) + + #undef IS_LITTLE_ENDIAN diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/build_config.h-125070 b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/build_config.h-125070 new file mode 100644 index 0000000000..7784bb6289 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/build_config.h-125070 @@ -0,0 +1,143 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This file adds defines about the platform we're currently building on. +// Operating System: +// OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) +// Compiler: +// COMPILER_MSVC / COMPILER_GCC +// Processor: +// ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64) +// ARCH_CPU_32_BITS / ARCH_CPU_64_BITS + +#ifndef BUILD_BUILD_CONFIG_H_ +#define BUILD_BUILD_CONFIG_H_ + +// A set of macros to use for platform detection. +#if defined(__APPLE__) +#define OS_MACOSX 1 +#elif defined(ANDROID) +#define OS_ANDROID 1 +#elif defined(__native_client__) +#define OS_NACL 1 +#elif defined(__linux__) +#define OS_LINUX 1 +// Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined. +#if !defined(TOOLKIT_VIEWS) +#define TOOLKIT_GTK +#endif +#elif defined(_WIN32) +#define OS_WIN 1 +#define TOOLKIT_VIEWS 1 +#elif defined(__FreeBSD__) +#define OS_FREEBSD 1 +#define TOOLKIT_GTK +#elif defined(__OpenBSD__) +#define OS_OPENBSD 1 +#define TOOLKIT_GTK +#elif defined(__sun) +#define OS_SOLARIS 1 +#define TOOLKIT_GTK +#else +#error Please add support for your platform in build/build_config.h +#endif + +#if defined(USE_OPENSSL) && defined(USE_NSS) +#error Cannot use both OpenSSL and NSS +#endif + +// For access to standard BSD features, use OS_BSD instead of a +// more specific macro. +#if defined(OS_FREEBSD) || defined(OS_OPENBSD) +#define OS_BSD 1 +#endif + +// For access to standard POSIXish features, use OS_POSIX instead of a +// more specific macro. +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ + defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ + defined(OS_NACL) +#define OS_POSIX 1 +#endif + +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ + !defined(OS_NACL) +#define USE_X11 1 // Use X for graphics. +#endif + +// Use tcmalloc +#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC) +#define USE_TCMALLOC 1 +#endif + +// Compiler detection. +#if defined(__GNUC__) +#define COMPILER_GCC 1 +#elif defined(_MSC_VER) +#define COMPILER_MSVC 1 +#else +#error Please add support for your compiler in build/build_config.h +#endif + +// Processor architecture detection. For more info on what's defined, see: +// http://msdn.microsoft.com/en-us/library/b0084kay.aspx +// http://www.agner.org/optimize/calling_conventions.pdf +// or with gcc, run: "echo | gcc -E -dM -" +#if defined(_M_X64) || defined(__x86_64__) +#define ARCH_CPU_X86_FAMILY 1 +#define ARCH_CPU_X86_64 1 +#define ARCH_CPU_64_BITS 1 +#define ARCH_CPU_LITTLE_ENDIAN 1 +#elif defined(_M_IX86) || defined(__i386__) +#define ARCH_CPU_X86_FAMILY 1 +#define ARCH_CPU_X86 1 +#define ARCH_CPU_32_BITS 1 +#define ARCH_CPU_LITTLE_ENDIAN 1 +#elif defined(__ARMEL__) +#define ARCH_CPU_ARM_FAMILY 1 +#define ARCH_CPU_ARMEL 1 +#define ARCH_CPU_32_BITS 1 +#define ARCH_CPU_LITTLE_ENDIAN 1 +#define WCHAR_T_IS_UNSIGNED 1 +#elif defined(__pnacl__) +#define ARCH_CPU_32_BITS 1 +#else +#error Please add support for your architecture in build/build_config.h +#endif + +// Type detection for wchar_t. +#if defined(OS_WIN) +#define WCHAR_T_IS_UTF16 +#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ + defined(__WCHAR_MAX__) && \ + (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff) +#define WCHAR_T_IS_UTF32 +#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ + defined(__WCHAR_MAX__) && \ + (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff) +// On Posix, we'll detect short wchar_t, but projects aren't guaranteed to +// compile in this mode (in particular, Chrome doesn't). This is intended for +// other projects using base who manage their own dependencies and make sure +// short wchar works for them. +#define WCHAR_T_IS_UTF16 +#else +#error Please add support for your compiler in build/build_config.h +#endif + +#if defined(OS_CHROMEOS) +// Single define to trigger whether CrOS fonts have BCI on. +// In that case font sizes/deltas should be adjusted. +//define CROS_FONTS_USING_BCI +#endif + +#if defined(OS_ANDROID) +// The compiler thinks std::string::const_iterator and "const char*" are +// equivalent types. +#define STD_STRING_ITERATOR_IS_CHAR_POINTER +// The compiler thinks base::string16::const_iterator and "char16*" are +// equivalent types. +#define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER +#endif + +#endif // BUILD_BUILD_CONFIG_H_ diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/gtest_include_path_fixup.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/gtest_include_path_fixup.patch new file mode 100644 index 0000000000..aa1d4b5788 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/files/gtest_include_path_fixup.patch @@ -0,0 +1,12 @@ +diff -Naur libchrome-55729-orig/files/base/gtest_prod_util.h libchrome-55729/files/base/gtest_prod_util.h +--- libchrome-55729-orig/files/base/gtest_prod_util.h 2010-08-11 13:51:24.000000000 -0700 ++++ libchrome-55729/files/base/gtest_prod_util.h 2010-08-11 14:08:20.000000000 -0700 +@@ -6,7 +6,7 @@ + #define BASE_GTEST_PROD_UTIL_H_ + #pragma once + +-#include "testing/gtest/include/gtest/gtest_prod.h" ++#include "gtest/gtest_prod.h" + + // This is a wrapper for gtest's FRIEND_TEST macro that friends + // test with all possible prefixes. This is very helpful when changing the test diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/libchrome-125070-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/libchrome-125070-r6.ebuild new file mode 100644 index 0000000000..de2bc2cf70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome/libchrome-125070-r6.ebuild @@ -0,0 +1,85 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# Note: the ${PV} should represent the overall svn rev number of the +# chromium tree that we're extracting from rather than the svn rev of +# the last change actually made to the base subdir. This way packages +# from other locations (like libchrome_crypto) can be coordinated. + +# XXX: Based on the above logic, this particular version should have +# been labeled as rev 125116 since that is what the LKGR we were +# using (19.0.1061.0) was pegged to. Oh well, not a biggie; +# we'll fix it in the next rev bump. + +EAPI="4" +CROS_WORKON_COMMIT="51d55aa18d4b8b3b137c69ea2aa7db1a82d52079" +CROS_WORKON_PROJECT="chromium/src/base" +CROS_WORKON_GIT_SUFFIX="-${PV}" + +inherit cros-workon cros-debug toolchain-funcs scons-utils + +DESCRIPTION="Chrome base/ library extracted for use on Chrome OS" +HOMEPAGE="http://dev.chromium.org/chromium-os/packages/libchrome" +SRC_URI="" + +LICENSE="BSD" +SLOT="${PV}" +KEYWORDS="amd64 arm x86" +IUSE="cros_host" + +RDEPEND="dev-libs/glib + dev-libs/libevent + dev-libs/nss" +DEPEND="${RDEPEND} + dev-cpp/gtest + cros_host? ( dev-util/scons )" + +src_prepare() { + ln -s "${S}" "${WORKDIR}/base" &> /dev/null + + mkdir -p "${WORKDIR}/build" + cp -p "${FILESDIR}/build_config.h-${SLOT}" "${WORKDIR}/build/build_config.h" || die + + cp -p "${FILESDIR}/SConstruct-${SLOT}" "${S}/SConstruct" || die + epatch "${FILESDIR}"/gtest_include_path_fixup.patch + + epatch "${FILESDIR}"/base-125070-headers.patch + epatch "${FILESDIR}"/base-125070-no-X.patch + epatch "${FILESDIR}"/base-125070-gcc-4_7.patch + epatch "${FILESDIR}"/base-125070-x32.patch +} + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + + BASE_VER=${SLOT} escons +} + +src_install() { + dolib.so libbase*-${SLOT}.so + + local d header_dirs=( + third_party/icu + third_party/nspr + third_party/valgrind + third_party/dynamic_annotations + . + debug + json + memory + synchronization + threading + ) + for d in "${header_dirs[@]}" ; do + insinto /usr/include/base-${SLOT}/base/${d} + doins ${d}/*.h + done + + insinto /usr/include/base-${SLOT}/build + doins "${WORKDIR}"/build/build_config.h + + insinto /usr/$(get_libdir)/pkgconfig + doins libchrome-${SLOT}.pc +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/files/SConstruct b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/files/SConstruct new file mode 100755 index 0000000000..e229f47b6c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/files/SConstruct @@ -0,0 +1,65 @@ +# -*- python -*- +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os +import SCons.Util + +PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config') +BASE_VER = os.environ['BASE_VER'] +libchrome = 'chrome-%s' % BASE_VER + +env = Environment() + +# Keep ebuild up to date with appropriate headers, or else figure +# out how to get scons to handle header installation as well. +sources = env.Split(""" + nss_util.cc + rsa_private_key.cc + rsa_private_key_nss.cc + signature_creator_nss.cc + signature_verifier_nss.cc + symmetric_key_nss.cc + """) + +env.Append( + CCFLAGS=['-g'] +) +for key in Split('CC CXX AR RANLIB LD NM CFLAGS CXXFLAGS CCFLAGS'): + value = os.environ.get(key) + if value: + env[key] = Split(value) + +if os.environ.has_key('CPPFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) +if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + +env['CCFLAGS'] += ['-fPIC', + '-fno-exceptions', + '-Wall', + '-Werror', + '-DOS_CHROMEOS', + '-DUSE_NSS', + '-DUSE_SYSTEM_LIBEVENT', + '-I..'] + +# Fix issue with scons not passing some vars through the environment. +for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'): + if os.environ.has_key(key): + env['ENV'][key] = os.environ[key] + +# glib, nss environment +env.ParseConfig('%s --cflags --libs nss lib%s' % (PKG_CONFIG, libchrome)) + +env.StaticLibrary('chrome_crypto', sources) + +# We don't actually install the shared lib. The point of this is to verify +# all the necessary objects are compiled and the symbols used are available. +# Otherwise we might not find out until building something else against the +# static library. +env.Append( + LINKFLAGS = ['-Wl,--as-needed', '-Wl,-z,defs'], +) +env.SharedLibrary('chrome_crypto', sources) diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/files/memory_annotation.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/files/memory_annotation.patch new file mode 100644 index 0000000000..d004cc282e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/files/memory_annotation.patch @@ -0,0 +1,12 @@ +diff -Naur libchrome-55729-orig/files/base/crypto/rsa_private_key_nss.cc libchrome-55729-ann/files/base/crypto/rsa_private_key_nss.cc +--- libchrome-55729-orig/files/crypto/rsa_private_key_nss.cc 2010-08-11 13:51:24.000000000 -0700 ++++ libchrome-55729-ann/files/crypto/rsa_private_key_nss.cc 2010-08-11 15:46:36.000000000 -0700 +@@ -10,7 +10,7 @@ + + #include + +-#include "base/debug/leak_annotations.h" ++#define ANNOTATE_SCOPED_MEMORY_LEAK ; + #include "base/logging.h" + #include "base/memory/scoped_ptr.h" + #include "base/string_util.h" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/libchrome_crypto-125070.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/libchrome_crypto-125070.ebuild new file mode 100644 index 0000000000..aa1a178320 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchrome_crypto/libchrome_crypto-125070.ebuild @@ -0,0 +1,48 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# See logic for ${PV} behavior in the libchrome ebuild. + +# XXX: Yes, this hits svn rev 125110 instead of rev 125070, but +# that is correct. See above note. + +EAPI="4" +CROS_WORKON_COMMIT="dee4850a6eb7f90c236846ad9beebed23df76d4f" +CROS_WORKON_PROJECT="chromium/src/crypto" + +inherit cros-workon cros-debug toolchain-funcs scons-utils + +DESCRIPTION="Chrome crypto/ library extracted for use on Chrome OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="chromeos-base/libchrome:${PV}[cros-debug=] + dev-libs/nss" +DEPEND="${RDEPEND} + dev-cpp/gtest" + +src_prepare() { + ln -s "${S}" "${WORKDIR}/crypto" &> /dev/null + cp -p "${FILESDIR}/SConstruct" "${S}" || die + epatch "${FILESDIR}/memory_annotation.patch" +} + +src_compile() { + tc-export AR CXX PKG_CONFIG RANLIB + cros-debug-add-NDEBUG + + BASE_VER=${PV} escons || die +} + +src_install() { + dolib.a libchrome_crypto.a + + insinto /usr/include/crypto + doins nss_util{,_internal}.h rsa_private_key.h \ + signature_{creator,verifier}.h crypto_export.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchromeos/libchromeos-0.0.1-r152.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchromeos/libchromeos-0.0.1-r152.ebuild new file mode 100644 index 0000000000..efe260e462 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchromeos/libchromeos-0.0.1-r152.ebuild @@ -0,0 +1,88 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="f4ecd4c82cf85c0c34bbd6db1af645758491dc36" +CROS_WORKON_TREE="0e93b9386777f1606fb731bee338820c54d6b9b9" +CROS_WORKON_PROJECT="chromiumos/platform/libchromeos" +CROS_WORKON_LOCALNAME="../common" # FIXME: HACK + +LIBCHROME_VERS=( 125070 ) + +inherit toolchain-funcs cros-debug cros-workon scons-utils + +DESCRIPTION="Chrome OS base library." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="cros_host test" + +LIBCHROME_DEPEND=$( + printf \ + 'chromeos-base/libchrome:%s[cros-debug=] ' \ + ${LIBCHROME_VERS[@]} +) +RDEPEND="${LIBCHROME_DEPEND} + dev-libs/dbus-c++ + dev-libs/dbus-glib + dev-libs/openssl + dev-libs/protobuf" + +DEPEND="${RDEPEND} + chromeos-base/protofiles + test? ( dev-cpp/gtest ) + cros_host? ( dev-util/scons )" + +cr_scons() { + local v=$1; shift + BASE_VER=${v} escons -C ${v} -Y "${S}" "$@" +} + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + + local v + mkdir -p ${LIBCHROME_VERS[@]} + for v in ${LIBCHROME_VERS[@]} ; do + cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so + done +} + +src_test() { + local v + for v in ${LIBCHROME_VERS[@]} ; do + cr_scons ${v} unittests libpolicy_unittest + if ! use x86 && ! use amd64 ; then + ewarn "Skipping unit tests on non-x86 platform" + else + ./${v}/unittests || die "libchromeos-${v} failed" + ./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed" + fi + done +} + +src_install() { + local v + insinto /usr/$(get_libdir)/pkgconfig + for v in ${LIBCHROME_VERS[@]} ; do + dolib.so ${v}/lib{chromeos,policy}*-${v}.so + doins ${v}/libchromeos-${v}.pc + done + + insinto /usr/include/chromeos + doins chromeos/*.h + + insinto /usr/include/chromeos/dbus + doins chromeos/dbus/*.h + + insinto /usr/include/chromeos/glib + doins chromeos/glib/*.h + + insinto /usr/include/policy + doins chromeos/policy/*.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchromeos/libchromeos-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchromeos/libchromeos-9999.ebuild new file mode 100644 index 0000000000..adbcd3e7e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libchromeos/libchromeos-9999.ebuild @@ -0,0 +1,86 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/libchromeos" +CROS_WORKON_LOCALNAME="../common" # FIXME: HACK + +LIBCHROME_VERS=( 125070 ) + +inherit toolchain-funcs cros-debug cros-workon scons-utils + +DESCRIPTION="Chrome OS base library." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="cros_host test" + +LIBCHROME_DEPEND=$( + printf \ + 'chromeos-base/libchrome:%s[cros-debug=] ' \ + ${LIBCHROME_VERS[@]} +) +RDEPEND="${LIBCHROME_DEPEND} + dev-libs/dbus-c++ + dev-libs/dbus-glib + dev-libs/openssl + dev-libs/protobuf" + +DEPEND="${RDEPEND} + chromeos-base/protofiles + test? ( dev-cpp/gtest ) + cros_host? ( dev-util/scons )" + +cr_scons() { + local v=$1; shift + BASE_VER=${v} escons -C ${v} -Y "${S}" "$@" +} + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + + local v + mkdir -p ${LIBCHROME_VERS[@]} + for v in ${LIBCHROME_VERS[@]} ; do + cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so + done +} + +src_test() { + local v + for v in ${LIBCHROME_VERS[@]} ; do + cr_scons ${v} unittests libpolicy_unittest + if ! use x86 && ! use amd64 ; then + ewarn "Skipping unit tests on non-x86 platform" + else + ./${v}/unittests || die "libchromeos-${v} failed" + ./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed" + fi + done +} + +src_install() { + local v + insinto /usr/$(get_libdir)/pkgconfig + for v in ${LIBCHROME_VERS[@]} ; do + dolib.so ${v}/lib{chromeos,policy}*-${v}.so + doins ${v}/libchromeos-${v}.pc + done + + insinto /usr/include/chromeos + doins chromeos/*.h + + insinto /usr/include/chromeos/dbus + doins chromeos/dbus/*.h + + insinto /usr/include/chromeos/glib + doins chromeos/glib/*.h + + insinto /usr/include/policy + doins chromeos/policy/*.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libevdev/libevdev-0.0.1-r32.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libevdev/libevdev-0.0.1-r32.ebuild new file mode 100644 index 0000000000..3eb5beeee6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libevdev/libevdev-0.0.1-r32.ebuild @@ -0,0 +1,36 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="7e45cb20612dfa1c3fee74c070684c737ea76f2b" +CROS_WORKON_TREE="b597299516c97f3fa4787b1e31680cb87ec57c58" +CROS_WORKON_PROJECT="chromiumos/platform/libevdev" +CROS_WORKON_USE_VCSID=1 +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit toolchain-funcs multilib cros-debug cros-workon + +DESCRIPTION="evdev userspace library" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_install() { + emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libevdev/libevdev-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libevdev/libevdev-9999.ebuild new file mode 100755 index 0000000000..2a8242c6ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libevdev/libevdev-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/libevdev" +CROS_WORKON_USE_VCSID=1 +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit toolchain-funcs multilib cros-debug cros-workon + +DESCRIPTION="evdev userspace library" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_install() { + emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/files/function_visibility2.patch b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/files/function_visibility2.patch new file mode 100644 index 0000000000..1e6a2cbc10 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/files/function_visibility2.patch @@ -0,0 +1,10 @@ +--- src.orig/lib/crypto/crypto_scrypt.h 2012-03-08 10:45:35.002167384 -0800 ++++ src/lib/crypto/crypto_scrypt.h 2012-03-08 10:46:39.194396363 -0800 +@@ -40,6 +40,7 @@ + * + * Return 0 on success; or -1 on error. + */ ++__attribute__ ((visibility("default"))) + int crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t, uint64_t, + uint32_t, uint32_t, uint8_t *, size_t); + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/libscrypt-1.1.6-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/libscrypt-1.1.6-r6.ebuild new file mode 100644 index 0000000000..5ef9a4691a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/libscrypt-1.1.6-r6.ebuild @@ -0,0 +1,41 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="a5d8376cbae6da1130144305cfcfe8b22e9fa444" +CROS_WORKON_TREE="2690e048f807a2fce12bcc3129c5f6e9209de11e" +CROS_WORKON_PROJECT="chromiumos/third_party/libscrypt" + +inherit cros-workon autotools + +DESCRIPTION="Scrypt key derivation library" +HOMEPAGE="http://www.tarsnap.com/scrypt.html" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="static-libs" + +RDEPEND="dev-libs/openssl" +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="../third_party/libscrypt" + +src_prepare() { + epatch function_visibility.patch + epatch "${FILESDIR}"/function_visibility2.patch + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + emake install DESTDIR="${D}" || die + + insinto /usr/include/scrypt + doins src/lib/scryptenc/scryptenc.h || die + doins src/lib/crypto/crypto_scrypt.h || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/libscrypt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/libscrypt-9999.ebuild new file mode 100644 index 0000000000..5b1150961e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/libscrypt/libscrypt-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/libscrypt" + +inherit cros-workon autotools + +DESCRIPTION="Scrypt key derivation library" +HOMEPAGE="http://www.tarsnap.com/scrypt.html" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static-libs" + +RDEPEND="dev-libs/openssl" +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="../third_party/libscrypt" + +src_prepare() { + epatch function_visibility.patch + epatch "${FILESDIR}"/function_visibility2.patch + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + emake install DESTDIR="${D}" || die + + insinto /usr/include/scrypt + doins src/lib/scryptenc/scryptenc.h || die + doins src/lib/crypto/crypto_scrypt.h || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/memento_softwareupdate/memento_softwareupdate-0.0.1-r39.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/memento_softwareupdate/memento_softwareupdate-0.0.1-r39.ebuild new file mode 100644 index 0000000000..fd9359a479 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/memento_softwareupdate/memento_softwareupdate-0.0.1-r39.ebuild @@ -0,0 +1,45 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="8b5bc501aff6e23c3b59727e72c74b5c978ea358" +CROS_WORKON_TREE="21159049de65a064cc6e0afdb528d955ee1112a8" +CROS_WORKON_PROJECT="chromiumos/platform/memento_softwareupdate" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS Memento Updater" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="" +RDEPEND="app-arch/gzip + app-shells/bash + dev-libs/openssl + dev-util/shflags + dev-util/xxd + net-misc/wget + sys-apps/coreutils + sys-apps/util-linux" + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + CCFLAGS="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" +} + +src_install() { + exeinto /opt/google/memento_updater + doexe \ + find_omaha.sh \ + memento_updater.sh \ + memento_updater_logging.sh \ + ping_omaha.sh \ + software_update.sh \ + split_write +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/memento_softwareupdate/memento_softwareupdate-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/memento_softwareupdate/memento_softwareupdate-9999.ebuild new file mode 100644 index 0000000000..7b3c0c3bdd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/memento_softwareupdate/memento_softwareupdate-9999.ebuild @@ -0,0 +1,43 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/memento_softwareupdate" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS Memento Updater" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND="" +RDEPEND="app-arch/gzip + app-shells/bash + dev-libs/openssl + dev-util/shflags + dev-util/xxd + net-misc/wget + sys-apps/coreutils + sys-apps/util-linux" + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + CCFLAGS="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" +} + +src_install() { + exeinto /opt/google/memento_updater + doexe \ + find_omaha.sh \ + memento_updater.sh \ + memento_updater_logging.sh \ + ping_omaha.sh \ + software_update.sh \ + split_write +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/metrics/metrics-0.0.1-r83.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/metrics/metrics-0.0.1-r83.ebuild new file mode 100644 index 0000000000..4edd8f3b27 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/metrics/metrics-0.0.1-r83.ebuild @@ -0,0 +1,65 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="b8faf3aea5f50260b658acfe615ebfdf3128becd" +CROS_WORKON_TREE="028567b168176acb7724c0a04da17674f53480f7" +CROS_WORKON_PROJECT="chromiumos/platform/metrics" + +inherit cros-debug cros-workon + +DESCRIPTION="Chrome OS Metrics Collection Utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-cpp/gflags + dev-libs/dbus-glib + >=dev-libs/glib-2.0 + sys-apps/dbus + sys-apps/rootdev + " +DEPEND="${RDEPEND} + dev-cpp/gmock + dev-cpp/gtest + " + +src_compile() { + tc-export CXX AR PKG_CONFIG + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} + emake +} + +src_test() { + tc-export CXX AR PKG_CONFIG + cros-debug-add-NDEBUG + emake tests + if ! use x86 && ! use amd64 ; then + elog "Skipping unit tests on non-x86 platform" + else + for test in ./*_test; do + # Always test the shared object we just built by + # adding . to the library path. + LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH} \ + "${test}" ${GTEST_ARGS} || die "${test} failed" + done + fi +} + +src_install() { + dobin metrics_{client,daemon} syslog_parser.sh + + dolib.so libmetrics.so + + insinto /usr/include/metrics + doins c_metrics_library.h metrics_library{,_mock}.h timer{,_mock}.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/metrics/metrics-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/metrics/metrics-9999.ebuild new file mode 100644 index 0000000000..a4738eaab0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/metrics/metrics-9999.ebuild @@ -0,0 +1,63 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/metrics" + +inherit cros-debug cros-workon + +DESCRIPTION="Chrome OS Metrics Collection Utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-cpp/gflags + dev-libs/dbus-glib + >=dev-libs/glib-2.0 + sys-apps/dbus + sys-apps/rootdev + " +DEPEND="${RDEPEND} + dev-cpp/gmock + dev-cpp/gtest + " + +src_compile() { + tc-export CXX AR PKG_CONFIG + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} + emake +} + +src_test() { + tc-export CXX AR PKG_CONFIG + cros-debug-add-NDEBUG + emake tests + if ! use x86 && ! use amd64 ; then + elog "Skipping unit tests on non-x86 platform" + else + for test in ./*_test; do + # Always test the shared object we just built by + # adding . to the library path. + LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH} \ + "${test}" ${GTEST_ARGS} || die "${test} failed" + done + fi +} + +src_install() { + dobin metrics_{client,daemon} syslog_parser.sh + + dolib.so libmetrics.so + + insinto /usr/include/metrics + doins c_metrics_library.h metrics_library{,_mock}.h timer{,_mock}.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/minifakedns/minifakedns-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/minifakedns/minifakedns-0.0.1-r9.ebuild new file mode 100644 index 0000000000..25ca9e3085 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/minifakedns/minifakedns-0.0.1-r9.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# TODO(msb): move this ebuild to net-dns/minifakedns +EAPI=2 +CROS_WORKON_COMMIT="6184bea119dea53da539727fe8c2a116f98cef24" +CROS_WORKON_TREE="efb76b27f1af4db93b7c8d48910de14400fbbd37" +CROS_WORKON_PROJECT="chromiumos/third_party/minifakedns" + +inherit python cros-workon + +DESCRIPTION="Minimal python dns server" +HOMEPAGE="http://code.activestate.com/recipes/491264-mini-fake-dns-server/" +LICENSE="PSF" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="dev-lang/python" + +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="../third_party/miniFakeDns" + +src_install() { + insinto "$(python_get_sitedir)" + doins "src/miniFakeDns.py" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/minifakedns/minifakedns-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/minifakedns/minifakedns-9999.ebuild new file mode 100644 index 0000000000..7ca0926cfa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/minifakedns/minifakedns-9999.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# TODO(msb): move this ebuild to net-dns/minifakedns +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/minifakedns" + +inherit python cros-workon + +DESCRIPTION="Minimal python dns server" +HOMEPAGE="http://code.activestate.com/recipes/491264-mini-fake-dns-server/" +LICENSE="PSF" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="dev-lang/python" + +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="../third_party/miniFakeDns" + +src_install() { + insinto "$(python_get_sitedir)" + doins "src/miniFakeDns.py" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/mobile-providers/mobile-providers-0.0.1-r23.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mobile-providers/mobile-providers-0.0.1-r23.ebuild new file mode 100644 index 0000000000..3ab9ec41f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mobile-providers/mobile-providers-0.0.1-r23.ebuild @@ -0,0 +1,50 @@ +EAPI="2" +CROS_WORKON_COMMIT="0ea1424b1c05a992baafb1cf8ba5d2dbcdc5e51a" +CROS_WORKON_TREE="a49d61e48b2f7469de35b6adffdbfefdae842690" +CROS_WORKON_PROJECT="chromiumos/third_party/mobile-broadband-provider-info" + +inherit autotools cros-workon + +DESCRIPTION="Database of mobile broadband service providers (with local modifications)" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="tools" + +RDEPEND="!net-misc/mobile-broadband-provider-info + >=dev-libs/glib-2.0" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9" + +CROS_WORKON_LOCALNAME="../third_party/mobile-broadband-provider-info" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf $(use_enable tools) +} + +src_compile() { + xmllint --valid --noout serviceproviders.xml || \ + die "XML document is not well-formed or is not valid" + emake clean-generic || die "emake clean failed" + emake || die "emake failed" +} + +src_test() { + emake check || die "building tests failed" + if use x86 || use amd64 ; then + gtester --verbose src/mobile_provider_unittest + else + echo "Skipping tests on non-x86 platform..." + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/mobile-providers/mobile-providers-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mobile-providers/mobile-providers-9999.ebuild new file mode 100644 index 0000000000..5732bb4bc9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mobile-providers/mobile-providers-9999.ebuild @@ -0,0 +1,48 @@ +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/third_party/mobile-broadband-provider-info" + +inherit autotools cros-workon + +DESCRIPTION="Database of mobile broadband service providers (with local modifications)" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="tools" + +RDEPEND="!net-misc/mobile-broadband-provider-info + >=dev-libs/glib-2.0" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9" + +CROS_WORKON_LOCALNAME="../third_party/mobile-broadband-provider-info" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf $(use_enable tools) +} + +src_compile() { + xmllint --valid --noout serviceproviders.xml || \ + die "XML document is not well-formed or is not valid" + emake clean-generic || die "emake clean failed" + emake || die "emake failed" +} + +src_test() { + emake check || die "building tests failed" + if use x86 || use amd64 ; then + gtester --verbose src/mobile_provider_unittest + else + echo "Skipping tests on non-x86 platform..." + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/files/modem-diagnostics b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/files/modem-diagnostics new file mode 100644 index 0000000000..0368424335 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/files/modem-diagnostics @@ -0,0 +1,55 @@ +#!/bin/sh +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +. /usr/share/misc/shflags + +DEFAULT_IF=eth0 +DEFAULT_IF_IP=169.254.18.10 +DEFAULT_DEV=/dev/ttyUSB0 + +DEFINE_boolean 'configure_interface' true\ + 'Configure an interface to export data over' +DEFINE_string 'export_interface' $DEFAULT_IF 'Interface to configure' +DEFINE_string 'export_interface_ip' $DEFAULT_IF_IP \ + 'IP address to configure export_interface to' +DEFINE_string 'export_device' $DEFAULT_DEV 'Device to export' + +FLAGS "$@" || exit $? +eval set -- "${FLAGS_ARGV}" + +set -e +if [ -z "$1" -o "$1" = "--help" -o "$1" = "help" ] ; then + cat 2>&1 <&1 Configuring $FLAGS_export_interface to $FLAGS_export_interface_ip + sudo /sbin/ifconfig $FLAGS_export_interface $FLAGS_export_interface_ip +fi + +REMOTE_IP="$1" + +echo 2>&1 Connecting $FLAGS_export_device to $REMOTE_IP +sudo stty -F $FLAGS_export_device raw +sudo socat -xdd TCP:$REMOTE_IP:2500 GOPEN:$FLAGS_export_device diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/files/qpst_setup b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/files/qpst_setup new file mode 100644 index 0000000000..5283967163 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/files/qpst_setup @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Quick helper script for cellular certification as the cert labs have +# found use of modem-diagnostics cumbersome. Don't want to massively +# change modem-diagnostics so as to break anything that relies on the +# defaults therein. IP configuration here matches documentation sent to +# modem vendors and cert labs, where applicable. + +LOCAL_IP=192.168.1.11 +REMOTE_IP=192.168.1.10 +NETMASK=255.255.255.0 +LOCAL_INTERFACE=eth1 +MODEM_DIAG_PORT=/dev/ttyUSB1 + +stop powerd +sleep 3 +stop modemmanager +sleep 3 +ifconfig $LOCAL_INTERFACE $LOCAL_IP netmask $NETMASK +iptables -P INPUT ACCEPT +iptables -P OUTPUT ACCEPT +sleep 2 +modem-diagnostics --noconfigure_interface --export_interface \ + $LOCAL_INTERFACE --export_device $MODEM_DIAG_PORT $REMOTE_IP diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/modem-diagnostics-0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/modem-diagnostics-0.1-r7.ebuild new file mode 100644 index 0000000000..e5cf822db9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-diagnostics/modem-diagnostics-0.1-r7.ebuild @@ -0,0 +1,23 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can +# be found in the LICENSE file. + +EAPI="4" + +DESCRIPTION="Convenience script for testing attached cell modems" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="dev-util/shflags + net-misc/socat" +DEPEND="" + +S=${WORKDIR} + +src_install() { + dobin "${FILESDIR}"/modem-diagnostics + dobin "${FILESDIR}"/qpst_setup +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-utilities/modem-utilities-0.0.1-r30.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-utilities/modem-utilities-0.0.1-r30.ebuild new file mode 100644 index 0000000000..0d3ff41fcf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-utilities/modem-utilities-0.0.1-r30.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="a11a495ee6460f66e64a9091cdaf6dd88ce18e9e" +CROS_WORKON_TREE="ca43c1f4b7bbe4516527e2a97306664ebdc89e8e" +CROS_WORKON_PROJECT="chromiumos/platform/modem-utilities" + +inherit cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Chromium OS modem utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +RDEPEND=" + sys-apps/dbus +" + +DEPEND="${RDEPEND}" + +src_compile() { + cros-debug-add-NDEBUG + emake || die "Failed to compile" +} + +src_install() { + emake DESTDIR=${D} install || die "Install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-utilities/modem-utilities-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-utilities/modem-utilities-9999.ebuild new file mode 100644 index 0000000000..d9053dd56a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/modem-utilities/modem-utilities-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/modem-utilities" + +inherit cros-debug cros-workon toolchain-funcs + +DESCRIPTION="Chromium OS modem utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=" + sys-apps/dbus +" + +DEPEND="${RDEPEND}" + +src_compile() { + cros-debug-add-NDEBUG + emake || die "Failed to compile" +} + +src_install() { + emake DESTDIR=${D} install || die "Install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/mtpd/mtpd-0.0.1-r65.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mtpd/mtpd-0.0.1-r65.ebuild new file mode 100644 index 0000000000..e1caa3f46e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mtpd/mtpd-0.0.1-r65.ebuild @@ -0,0 +1,70 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="7313deef1bb6e4188bd1714acb6fc4c2be835be1" +CROS_WORKON_TREE="1a482c50c1630fbafafba77541365711208b2c78" +CROS_WORKON_PROJECT="chromiumos/platform/mtpd" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="MTP daemon for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +RDEPEND=" + chromeos-base/libchromeos + dev-cpp/gflags + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + dev-libs/protobuf + media-libs/libmtp + sys-fs/udev +" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/system_api + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + exeinto /opt/google/mtpd + doexe "${OUT}"/mtpd + + # Install seccomp policy file. + insinto /opt/google/mtpd + newins "mtpd-seccomp-${ARCH}.policy" mtpd-seccomp.policy + + # Install upstart config file. + insinto /etc/init + doins mtpd.conf + + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins org.chromium.Mtpd.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/mtpd/mtpd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mtpd/mtpd-9999.ebuild new file mode 100644 index 0000000000..a53bbcb09e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/mtpd/mtpd-9999.ebuild @@ -0,0 +1,68 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/mtpd" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="MTP daemon for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +LIBCHROME_VERS="125070" + +RDEPEND=" + chromeos-base/libchromeos + dev-cpp/gflags + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + dev-libs/protobuf + media-libs/libmtp + sys-fs/udev +" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/system_api + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + exeinto /opt/google/mtpd + doexe "${OUT}"/mtpd + + # Install seccomp policy file. + insinto /opt/google/mtpd + newins "mtpd-seccomp-${ARCH}.policy" mtpd-seccomp.policy + + # Install upstart config file. + insinto /etc/init + doins mtpd.conf + + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins org.chromium.Mtpd.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/permission_broker/permission_broker-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/permission_broker/permission_broker-0.0.1-r2.ebuild new file mode 100644 index 0000000000..19dc4ac60c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/permission_broker/permission_broker-0.0.1-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="e7d0813602a7a8c67ebd957e7575b3050179f621" +CROS_WORKON_TREE="b9bc9b0b7a16498f6c3ed97218ad1c764bdca2bb" +CROS_WORKON_PROJECT="chromiumos/platform/permission_broker" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Permission Broker for Chromium OS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/metrics + dev-cpp/gflags + dev-cpp/glog + dev-libs/glib + dev-libs/libusb + sys-fs/udev" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/system_api + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Run tests if we're on x86 + if use arm ; then + echo Skipping tests on non-x86 platform... + else + cros-workon_src_test + fi +} + +src_install() { + # Built binaries + pushd "${OUT}" >/dev/null + dobin permission_broker + popd >/dev/null + + # Install upstart configuration + insinto /etc/init + doins permission_broker.conf + + # DBus configuration + insinto /etc/dbus-1/system.d + doins dbus/org.chromium.PermissionBroker.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/permission_broker/permission_broker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/permission_broker/permission_broker-9999.ebuild new file mode 100644 index 0000000000..c6329ab593 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/permission_broker/permission_broker-9999.ebuild @@ -0,0 +1,67 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/permission_broker" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Permission Broker for Chromium OS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/metrics + dev-cpp/gflags + dev-cpp/glog + dev-libs/glib + dev-libs/libusb + sys-fs/udev" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/system_api + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Run tests if we're on x86 + if use arm ; then + echo Skipping tests on non-x86 platform... + else + cros-workon_src_test + fi +} + +src_install() { + # Built binaries + pushd "${OUT}" >/dev/null + dobin permission_broker + popd >/dev/null + + # Install upstart configuration + insinto /etc/init + doins permission_broker.conf + + # DBus configuration + insinto /etc/dbus-1/system.d + doins dbus/org.chromium.PermissionBroker.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/power_manager/power_manager-0.0.1-r725.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/power_manager/power_manager-0.0.1-r725.ebuild new file mode 100644 index 0000000000..4f8ab7ed16 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/power_manager/power_manager-0.0.1-r725.ebuild @@ -0,0 +1,125 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="36a59f7588accf4767d3cbf9e3cc76d749171c78" +CROS_WORKON_TREE="8d385de24291e4e27eaa166f65bcbd7ebe5362f7" +CROS_WORKON_PROJECT="chromiumos/platform/power_manager" +CROS_WORKON_USE_VCSID="1" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon eutils toolchain-funcs + +DESCRIPTION="Power Manager for Chromium OS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="-new_power_button test -lockvt -nocrit -is_desktop -als" +IUSE="${IUSE} -has_keyboard_backlight -stay_awake_with_headphones -touch_device" + +LIBCHROME_VERS="125070" + +RDEPEND="app-misc/ddccontrol + chromeos-base/metrics + dev-cpp/gflags + dev-cpp/glog + dev-libs/dbus-glib + dev-libs/glib + dev-libs/protobuf + media-sound/adhd + sys-fs/udev" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/system_api + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure + + export USE_NEW_POWER_BUTTON=$(usex new_power_button y "") + export USE_LOCKVT=$(usex lockvt y "") + export USE_IS_DESKTOP=$(usex is_desktop y "") + export USE_ALS=$(usex als y "") + export USE_HAS_KEYBOARD_BACKLIGHT=$(usex has_keyboard_backlight y "") + export USE_STAY_AWAKE_WITH_HEADPHONES=$(usex stay_awake_with_headphones y "") + export USE_TOUCH_DEVICE=$(usex touch_device y "") +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Run tests if we're on x86 + if use arm ; then + echo Skipping tests on non-x86 platform... + else + cros-workon_src_test + fi +} + +src_install() { + # Built binaries + pushd "${OUT}" >/dev/null + dobin powerd/powerd + dobin powerd/powerd_setuid_helper + dobin tools/backlight_dbus_tool + dobin tools/backlight-tool + dobin tools/power_state_tool + dobin tools/power-supply-info + dobin tools/powerd_dbus_suspend + dobin tools/suspend_delay_sample + dobin tools/memory_suspend_test + popd >/dev/null + + fowners root:power /usr/bin/powerd_setuid_helper + fperms 4750 /usr/bin/powerd_setuid_helper + + # Scripts + dobin scripts/debug_sleep_quickly + dobin scripts/powerd_suspend + dobin scripts/send_metrics_on_resume + dobin scripts/set_short_powerd_timeouts + dobin scripts/suspend_stress_test + + insinto /usr/share/power_manager + doins config/* + # If is a desktop system, shorten the react_ms, and bring in the + # lock_ms to off_ms + react_ms + if use is_desktop; then + react="usr/share/power_manager/react_ms" + plugged_off="usr/share/power_manager/plugged_off_ms" + lock="usr/share/power_manager/lock_ms" + echo "10000" > "${D}/${react}" + plugged_off_ms=$(cat "${D}/${plugged_off}") + echo "$(($plugged_off_ms + 10000))" > "${D}/${lock}" + fi + + insinto /etc/dbus-1/system.d + doins dbus/org.chromium.PowerManager.conf + + # Install udev rule to set usb hid devices to wake the system. + exeinto /lib/udev + doexe udev/usb-hid-wake.sh + + insinto /lib/udev/rules.d + doins udev/99-usb-hid-wake.rules + + # Nocrit disables low battery suspend percent by setting it to 0 + if use nocrit; then + crit="usr/share/power_manager/low_battery_suspend_percent" + if [ ! -e "${D}/${crit}" ]; then + die "low_battery_suspend_percent config file missing" + fi + echo "0" > "${D}/${crit}" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/power_manager/power_manager-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/power_manager/power_manager-9999.ebuild new file mode 100644 index 0000000000..e064cfa510 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/power_manager/power_manager-9999.ebuild @@ -0,0 +1,123 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/power_manager" +CROS_WORKON_USE_VCSID="1" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon eutils toolchain-funcs + +DESCRIPTION="Power Manager for Chromium OS" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="-new_power_button test -lockvt -nocrit -is_desktop -als" +IUSE="${IUSE} -has_keyboard_backlight -stay_awake_with_headphones -touch_device" + +LIBCHROME_VERS="125070" + +RDEPEND="app-misc/ddccontrol + chromeos-base/metrics + dev-cpp/gflags + dev-cpp/glog + dev-libs/dbus-glib + dev-libs/glib + dev-libs/protobuf + media-sound/adhd + sys-fs/udev" + +DEPEND="${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/system_api + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure + + export USE_NEW_POWER_BUTTON=$(usex new_power_button y "") + export USE_LOCKVT=$(usex lockvt y "") + export USE_IS_DESKTOP=$(usex is_desktop y "") + export USE_ALS=$(usex als y "") + export USE_HAS_KEYBOARD_BACKLIGHT=$(usex has_keyboard_backlight y "") + export USE_STAY_AWAKE_WITH_HEADPHONES=$(usex stay_awake_with_headphones y "") + export USE_TOUCH_DEVICE=$(usex touch_device y "") +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + # Run tests if we're on x86 + if use arm ; then + echo Skipping tests on non-x86 platform... + else + cros-workon_src_test + fi +} + +src_install() { + # Built binaries + pushd "${OUT}" >/dev/null + dobin powerd/powerd + dobin powerd/powerd_setuid_helper + dobin tools/backlight_dbus_tool + dobin tools/backlight-tool + dobin tools/power_state_tool + dobin tools/power-supply-info + dobin tools/powerd_dbus_suspend + dobin tools/suspend_delay_sample + dobin tools/memory_suspend_test + popd >/dev/null + + fowners root:power /usr/bin/powerd_setuid_helper + fperms 4750 /usr/bin/powerd_setuid_helper + + # Scripts + dobin scripts/debug_sleep_quickly + dobin scripts/powerd_suspend + dobin scripts/send_metrics_on_resume + dobin scripts/set_short_powerd_timeouts + dobin scripts/suspend_stress_test + + insinto /usr/share/power_manager + doins config/* + # If is a desktop system, shorten the react_ms, and bring in the + # lock_ms to off_ms + react_ms + if use is_desktop; then + react="usr/share/power_manager/react_ms" + plugged_off="usr/share/power_manager/plugged_off_ms" + lock="usr/share/power_manager/lock_ms" + echo "10000" > "${D}/${react}" + plugged_off_ms=$(cat "${D}/${plugged_off}") + echo "$(($plugged_off_ms + 10000))" > "${D}/${lock}" + fi + + insinto /etc/dbus-1/system.d + doins dbus/org.chromium.PowerManager.conf + + # Install udev rule to set usb hid devices to wake the system. + exeinto /lib/udev + doexe udev/usb-hid-wake.sh + + insinto /lib/udev/rules.d + doins udev/99-usb-hid-wake.rules + + # Nocrit disables low battery suspend percent by setting it to 0 + if use nocrit; then + crit="usr/share/power_manager/low_battery_suspend_percent" + if [ ! -e "${D}/${crit}" ]; then + die "low_battery_suspend_percent config file missing" + fi + echo "0" > "${D}/${crit}" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/files/policy_reader b/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/files/policy_reader new file mode 100755 index 0000000000..c0b1fad67a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/files/policy_reader @@ -0,0 +1,44 @@ +#!/bin/bash +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +TMP_DIR="/tmp" +PROTO_DIR="/usr/local/share/protofiles" +PROTO_FILE="/var/lib/whitelist/policy" + +# Extracts a field from the protobuf and unescapes it. This function takes two +# parameters: $1 is the field name without a trailing colon and $2 is the file +# where the input data is. This file must be in $TMP_DIR. The output is the +# raw unsecaped string. +function extract_protobuf_field() { + protobuf_field=$(grep "$1:" "$TMP_DIR/$2" | \ + sed "s/^$1: \"\(.*\)\"$/\1/;s/%/%%/g") + printf "$protobuf_field" +} + +# Decodes the policy blob and prints it to the screen. +function decode_policy() { + # Decode the wrapper protobuf. + protoc --decode=enterprise_management.PolicyFetchResponse \ + -I "$PROTO_DIR" \ + "$PROTO_DIR/device_management_backend.proto" > \ + "$TMP_DIR/decoded_policy_response" + + # Decode the payload protobuf. + extract_protobuf_field "policy_data" "decoded_policy_response" | \ + protoc --decode=enterprise_management.PolicyData \ + -I "$PROTO_DIR" \ + "$PROTO_DIR/device_management_backend.proto" > \ + "$TMP_DIR/policy_response_payload" + + # And the wrapped device policy data interpreted as device policy. + extract_protobuf_field "policy_value" "policy_response_payload" | \ + protoc --decode=enterprise_management.ChromeDeviceSettingsProto \ + -I "$PROTO_DIR" \ + "$PROTO_DIR/chrome_device_policy.proto" + + rm "$TMP_DIR/decoded_policy_response" "$TMP_DIR/policy_response_payload" +} + +cat "$PROTO_FILE" | decode_policy diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/protofiles-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/protofiles-0.0.1-r11.ebuild new file mode 100644 index 0000000000..411a7b4d69 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/protofiles-0.0.1-r11.ebuild @@ -0,0 +1,41 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# This project checks out the proto files from the read only repository +# linked to the src/chrome/browser/policy/proto directory of the Chromium +# project. It is not cros-work-able if changes to the protobufs are needed +# these should be done in the Chromium repository. + +EGIT_REPO_SERVER="http://git.chromium.org" +EGIT_REPO_URI="${EGIT_REPO_SERVER}/chromium/src/chrome/browser/policy/proto.git" +EGIT_PROJECT="proto" +EGIT_COMMIT="18f481b411ea0a861f0879af2065effce0e1fe6c" + +EAPI="2" +inherit git + +DESCRIPTION="Protobuf installer for the device policy proto definitions." +HOMEPAGE="http://chromium.org" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="!<=chromeos-base/chromeos-chrome-16.0.886.0_rc-r1 + !=chromeos-base/chromeos-chrome-16.0.882.0_alpha-r1" +RDEPEND="${DEPEND}" + +src_prepare() { + cp "${FILESDIR}"/policy_reader "${S}" +} + +src_install() { + insinto /usr/include/proto + doins "${S}"/*.proto || die "Can not install protobuf files." + insinto /usr/share/protofiles + doins "${S}"/chrome_device_policy.proto + doins "${S}"/device_management_backend.proto + dobin "${S}"/policy_reader +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/recover-duts/recover-duts-0.0.1-r60.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/recover-duts/recover-duts-0.0.1-r60.ebuild new file mode 100644 index 0000000000..5ec03d5f30 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/recover-duts/recover-duts-0.0.1-r60.ebuild @@ -0,0 +1,41 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="1bf718b912cf8ea5dcbf25f04a9ef9a9204f83d1" +CROS_WORKON_TREE="7b1191682d8df182503e2c2ee948c0ecb48c5461" +CROS_WORKON_PROJECT="chromiumos/platform/crostestutils" + +inherit cros-workon + +DESCRIPTION="Test tool that recovers bricked Chromium OS test devices" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +CROS_WORKON_LOCALNAME="crostestutils" + + +RDEPEND=" +chromeos-base/chromeos-init +dev-lang/python +" + +# These are all either bash / python scripts. No actual builds DEPS. +DEPEND="" + +# Use default src_compile and src_install which use Makefile. + +src_install() { + pushd "${S}/recover_duts" || die + exeinto "/usr/bin" + doexe recover_duts.py + + pushd "hooks" || die + dodir /usr/bin/hooks + exeinto /usr/bin/hooks + doexe * + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/recover-duts/recover-duts-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/recover-duts/recover-duts-9999.ebuild new file mode 100644 index 0000000000..b4ed2def14 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/recover-duts/recover-duts-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/crostestutils" + +inherit cros-workon + +DESCRIPTION="Test tool that recovers bricked Chromium OS test devices" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +CROS_WORKON_LOCALNAME="crostestutils" + + +RDEPEND=" +chromeos-base/chromeos-init +dev-lang/python +" + +# These are all either bash / python scripts. No actual builds DEPS. +DEPEND="" + +# Use default src_compile and src_install which use Makefile. + +src_install() { + pushd "${S}/recover_duts" || die + exeinto "/usr/bin" + doexe recover_duts.py + + pushd "hooks" || die + dodir /usr/bin/hooks + exeinto /usr/bin/hooks + doexe * + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68.crt new file mode 100644 index 0000000000..bdb64746e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD +VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw +NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU +cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg +Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821 ++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw +Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo +aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy +2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7 +7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P +BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL +VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk +VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl +j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355 +e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u +G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/04:83:ED:33:99:AC:36:08:05:87:22:ED:BC:5E:46:00:E3:BE:F9:D7.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/04:83:ED:33:99:AC:36:08:05:87:22:ED:BC:5E:46:00:E3:BE:F9:D7.crt new file mode 100644 index 0000000000..e077900012 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/04:83:ED:33:99:AC:36:08:05:87:22:ED:BC:5E:46:00:E3:BE:F9:D7.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE +BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl +IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd +BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx +OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0 +eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz +ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI +wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd +tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8 +i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf +Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw +gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF +lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF +UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF +BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM +//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW +XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2 +lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn +iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67 +nfhmqA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/05:63:B8:63:0D:62:D7:5A:BB:C8:AB:1E:4B:DF:B5:A8:99:B2:4D:43.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/05:63:B8:63:0D:62:D7:5A:BB:C8:AB:1E:4B:DF:B5:A8:99:B2:4D:43.crt new file mode 100644 index 0000000000..4e1efe2db0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/05:63:B8:63:0D:62:D7:5A:BB:C8:AB:1E:4B:DF:B5:A8:99:B2:4D:43.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw +IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx +MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL +ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO +9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy +UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW +/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy +oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf +GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF +66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq +hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc +EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn +SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i +8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe ++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/10:1D:FA:3F:D5:0B:CB:BB:9B:B5:60:0C:19:55:A4:1A:F4:73:3A:04.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/10:1D:FA:3F:D5:0B:CB:BB:9B:B5:60:0C:19:55:A4:1A:F4:73:3A:04.crt new file mode 100644 index 0000000000..e736ddf42a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/10:1D:FA:3F:D5:0B:CB:BB:9B:B5:60:0C:19:55:A4:1A:F4:73:3A:04.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE +ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g +Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w +HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh +bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt +vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P +jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca +C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth +vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6 +22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV +HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v +dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN +BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR +EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw +MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y +nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR +iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6.crt new file mode 100644 index 0000000000..ae10af622e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV +UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv +cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl +IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy +dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1 +EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc +cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw +EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj +055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA +ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f +j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0 +xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa +t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/16:D4:24:FE:96:10:E1:75:19:AF:23:2B:B6:87:74:E2:41:44:BE:6E.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/16:D4:24:FE:96:10:E1:75:19:AF:23:2B:B6:87:74:E2:41:44:BE:6E.crt new file mode 100644 index 0000000000..71a8de8560 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/16:D4:24:FE:96:10:E1:75:19:AF:23:2B:B6:87:74:E2:41:44:BE:6E.crt @@ -0,0 +1,38 @@ +-----BEGIN CERTIFICATE----- +MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQI +EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1 +Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg +Qi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJ +KoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNzUwWhcNMjUxMjI3MDEwNzUw +WjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9u +YTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENM +QVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwgZ8w +DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO6AAPYaZC6tasiDsYun7o/ZttvNG7uGBiJ2MwwSbUhW +YdLcgiViL5/SaTBlA0IjWLxH3GvWdV0XPOH/8lhneaDBgbHUVqLyjRGZ/fZ98cfEXgIqmuJKtROK +AP2Md4bm15T1IHUuDky/dMQ/gT6DtKM4Ninn6Cr1jIhBqoCm42zvAgMBAAGjggRTMIIETzAdBgNV +HQ4EFgQUHp9XUEe2YZM50yz82l09BXW3mQIwggFGBgNVHSMEggE9MIIBOYAUHp9XUEe2YZM50yz8 +2l09BXW3mQKhggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2Vydmlj +ZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0G +A1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQ +UyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNA +bWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsG +AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB +FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcw +GgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBC +BglghkgBhvhCAQ0ENRYzQ0xBU0VBMyBDQSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3 +dy5pcHMuZXMvMCkGCWCGSAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7Bglg +hkgBhvhCAQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMy5jcmww +QAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2b2NhdGlvbkNMQVNF +QTMuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdh +bENMQVNFQTMuaHRtbD8wOwYJYIZIAYb4QgEIBC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIv +cG9saWN5Q0xBU0VBMy5odG1sMHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lw +czIwMDIvaXBzMjAwMkNMQVNFQTMuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz +MjAwMi9pcHMyMDAyQ0xBU0VBMy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUFBzABhhNodHRw +Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAEo9IEca2on0eisxeewBwMwB9dbB/MjD +81ACUZBYKp/nNQlbMAqBACVHr9QPDp5gJqiVp4MI3y2s6Q73nMify5NF8bpqxmdRSmlPa/59Cy9S +KcJQrSRE7SOzSMtEQMEDlQwKeAYSAfWRMS1Jjbs/RU4s4OjNtckUFQzjB4ObJnXv +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/1F:49:14:F7:D8:74:95:1D:DD:AE:02:C0:BE:FD:3A:2D:82:75:51:85.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/1F:49:14:F7:D8:74:95:1D:DD:AE:02:C0:BE:FD:3A:2D:82:75:51:85.crt new file mode 100644 index 0000000000..4ef80f100a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/1F:49:14:F7:D8:74:95:1D:DD:AE:02:C0:BE:FD:3A:2D:82:75:51:85.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT +EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx +OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM +aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg +DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij +KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K +DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv +BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp +p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8 +nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX +MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM +Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz +uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT +BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj +YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 +aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB +BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD +VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4 +ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE +AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV +qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s +hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z +POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2 +Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp +8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC +bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu +g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p +vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr +qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/21:FC:BD:8E:7F:6C:AF:05:1B:D1:B3:43:EC:A8:E7:61:47:F2:0F:8A.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/21:FC:BD:8E:7F:6C:AF:05:1B:D1:B3:43:EC:A8:E7:61:47:F2:0F:8A.crt new file mode 100644 index 0000000000..2e5b2e50a9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/21:FC:BD:8E:7F:6C:AF:05:1B:D1:B3:43:EC:A8:E7:61:47:F2:0F:8A.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE +ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx +NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu +ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j +xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL +znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc +5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6 +otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI +AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM +VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM +MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC +AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe +UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G +CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m +gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+ +2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb +O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU +Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/23:88:C9:D3:71:CC:9E:96:3D:FF:7D:3C:A7:CE:FC:D6:25:EC:19:0D.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/23:88:C9:D3:71:CC:9E:96:3D:FF:7D:3C:A7:CE:FC:D6:25:EC:19:0D.crt new file mode 100644 index 0000000000..241c3b4283 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/23:88:C9:D3:71:CC:9E:96:3D:FF:7D:3C:A7:CE:FC:D6:25:EC:19:0D.crt @@ -0,0 +1,37 @@ +-----BEGIN CERTIFICATE----- +MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE +BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL +EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0 +MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz +dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT +GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG +d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N +oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc +QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ +PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb +MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG +IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD +VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3 +LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A +dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn +AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA +4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg +AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA +egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6 +Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO +PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv +c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h +cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw +IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT +WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV +MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER +MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp +Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal +HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT +nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE +aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a +86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK +yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB +S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/23:E5:94:94:51:95:F2:41:48:03:B4:D5:64:D2:A3:A3:F5:D8:8B:8C.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/23:E5:94:94:51:95:F2:41:48:03:B4:D5:64:D2:A3:A3:F5:D8:8B:8C.crt new file mode 100644 index 0000000000..3db7b4b500 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/23:E5:94:94:51:95:F2:41:48:03:B4:D5:64:D2:A3:A3:F5:D8:8B:8C.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT +DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs +dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE +AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j +b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV +BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u +c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG +A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0 +ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl +/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7 +1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR +MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J +GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ +GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/25:01:90:19:CF:FB:D9:99:1C:B7:68:25:74:8D:94:5F:30:93:95:42.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/25:01:90:19:CF:FB:D9:99:1C:B7:68:25:74:8D:94:5F:30:93:95:42.crt new file mode 100644 index 0000000000..6f511badbc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/25:01:90:19:CF:FB:D9:99:1C:B7:68:25:74:8D:94:5F:30:93:95:42.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK +ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy +MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb +BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7 +Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb +WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH +KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP ++Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/ +MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E +FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY +v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj +0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj +VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395 +nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA +pKnXwiJPZ9d37CAFYd4= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/27:96:BA:E6:3F:18:01:E2:77:26:1B:A0:D7:77:70:02:8F:20:EE:E4.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/27:96:BA:E6:3F:18:01:E2:77:26:1B:A0:D7:77:70:02:8F:20:EE:E4.crt new file mode 100644 index 0000000000..69cbd1aa9e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/27:96:BA:E6:3F:18:01:E2:77:26:1B:A0:D7:77:70:02:8F:20:EE:E4.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY +VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG +A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g +RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD +ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv +2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32 +qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j +YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY +vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O +BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o +atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu +MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG +A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim +PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt +I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ +HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI +Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b +vZ8= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/2A:B6:28:48:5E:78:FB:F3:AD:9E:79:10:DD:6B:DF:99:72:2C:96:E5.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/2A:B6:28:48:5E:78:FB:F3:AD:9E:79:10:DD:6B:DF:99:72:2C:96:E5.crt new file mode 100644 index 0000000000..32328fa507 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/2A:B6:28:48:5E:78:FB:F3:AD:9E:79:10:DD:6B:DF:99:72:2C:96:E5.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU +cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ +BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l +dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu +nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i +d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG +Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw +HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G +A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G +A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4 +JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL ++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao +GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9 +Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H +EufOX1362KqxMy3ZdvJOOjMMK7MtkAY= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/31:7A:2A:D0:7F:2B:33:5E:F5:A1:C3:4E:4B:57:E8:B7:D8:F1:FC:A6.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/31:7A:2A:D0:7F:2B:33:5E:F5:A1:C3:4E:4B:57:E8:B7:D8:F1:FC:A6.crt new file mode 100644 index 0000000000..228d3445ca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/31:7A:2A:D0:7F:2B:33:5E:F5:A1:C3:4E:4B:57:E8:B7:D8:F1:FC:A6.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp +b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh +bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw +MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0 +d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg +UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0 +LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC +CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf +ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ +SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV +UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8 +W9ViH0Pd +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96.crt new file mode 100644 index 0000000000..f70cc35b77 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG +EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx +CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ +cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN +b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9 +nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge +RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt +tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI +hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K +Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN +NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa +Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG +1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9.crt new file mode 100644 index 0000000000..b97542a301 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe +QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i +ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx +NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt +YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg +MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw +ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J +1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O +by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl +6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c +8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/ +BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j +aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B +Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj +aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y +ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh +bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA +PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y +gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ +PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4 +IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes +t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/33:A3:35:C2:3C:E8:03:4B:04:E1:3D:E5:C4:8E:79:1A:EB:8C:32:04.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/33:A3:35:C2:3C:E8:03:4B:04:E1:3D:E5:C4:8E:79:1A:EB:8C:32:04.crt new file mode 100644 index 0000000000..abb28abcfe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/33:A3:35:C2:3C:E8:03:4B:04:E1:3D:E5:C4:8E:79:1A:EB:8C:32:04.crt @@ -0,0 +1,38 @@ +-----BEGIN CERTIFICATE----- +MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQI +EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1 +Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg +Qi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJ +KoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNTMyWhcNMjUxMjI3MDEwNTMy +WjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9u +YTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENM +QVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwgZ8w +DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsw19zQVL01Tp/FTILq0VA8R5j8m2mdd81u4D/u6zJf +X5/S0HnllXNEITLgCtud186Nq1KLK3jgm1t99P1tCeWu4WwdByOgF9H5fahGRpEiqLJpxq339fWU +oTCUvQDMRH/uxJ7JweaPCjbB/SQ9AaD1e+J8eGZDi09Z8pvZ+kmzAgMBAAGjggRTMIIETzAdBgNV +HQ4EFgQUZyaW56G/2LUDnf473P7yiuYV3TAwggFGBgNVHSMEggE9MIIBOYAUZyaW56G/2LUDnf47 +3P7yiuYV3TChggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2Vydmlj +ZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0G +A1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQ +UyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNA +bWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsG +AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB +FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcw +GgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBC +BglghkgBhvhCAQ0ENRYzQ0xBU0VBMSBDQSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3 +dy5pcHMuZXMvMCkGCWCGSAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7Bglg +hkgBhvhCAQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMS5jcmww +QAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2b2NhdGlvbkNMQVNF +QTEuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdh +bENMQVNFQTEuaHRtbD8wOwYJYIZIAYb4QgEIBC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIv +cG9saWN5Q0xBU0VBMS5odG1sMHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lw +czIwMDIvaXBzMjAwMkNMQVNFQTEuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz +MjAwMi9pcHMyMDAyQ0xBU0VBMS5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUFBzABhhNodHRw +Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAH66iqyAAIQVCtWYUQxkxZwCWINmyq0e +B81+atqAB98DNEock8RLWCA1NnHtogo1EqWmZaeFaQoO42Hu6r4okzPV7Oi+xNtff6j5YzHIa5bi +KcJboOeXNp13XjFr/tOn2yrb25aLH2betgPAK7N41lUH5Y85UN4HI3LmvSAUS7SG +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7.crt new file mode 100644 index 0000000000..0d731c5e3a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP +U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw +HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP +U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw +8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM +DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX +5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd +DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2 +JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw +DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g +0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a +mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ +s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ +6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi +FL39vmwLAw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79.crt new file mode 100644 index 0000000000..3a329e3acc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79.crt @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN +R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0 +MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg +SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0 +DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17 +j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q +JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a +QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2 +WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP +20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn +ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC +SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG +8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2 ++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E +BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z +dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ +4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+ +mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq +A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg +Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP +pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d +FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp +gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm +X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/37:F7:6D:E6:07:7C:90:C5:B1:3E:93:1A:B7:41:10:B4:F2:E4:9A:27.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/37:F7:6D:E6:07:7C:90:C5:B1:3E:93:1A:B7:41:10:B4:F2:E4:9A:27.crt new file mode 100644 index 0000000000..e9d55876fe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/37:F7:6D:E6:07:7C:90:C5:B1:3E:93:1A:B7:41:10:B4:F2:E4:9A:27.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG +U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw +NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh +IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3 +/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT +dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG +f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P +tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH +nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT +XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt +0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI +cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph +Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx +EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH +llpwrN9M +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/39:21:C1:15:C1:5D:0E:CA:5C:CB:5B:C4:F0:7D:21:D8:05:0B:56:6A.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/39:21:C1:15:C1:5D:0E:CA:5C:CB:5B:C4:F0:7D:21:D8:05:0B:56:6A.crt new file mode 100644 index 0000000000..6d3aeef59d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/39:21:C1:15:C1:5D:0E:CA:5C:CB:5B:C4:F0:7D:21:D8:05:0B:56:6A.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG +A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg +T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG +v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z +DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh +sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP +8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T +AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z +o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf +GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF +VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft +3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g +Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds +sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B.crt new file mode 100644 index 0000000000..423f16d6e5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG +EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH +bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg +MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg +Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx +YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ +bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g +8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV +HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi +0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud +EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn +oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA +MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+ +OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn +CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5 +3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc +f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3C:71:D7:0E:35:A5:DA:A8:B2:E3:81:2D:C3:67:74:17:F5:99:0D:F3.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3C:71:D7:0E:35:A5:DA:A8:B2:E3:81:2D:C3:67:74:17:F5:99:0D:F3.crt new file mode 100644 index 0000000000..ef925299f8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3C:71:D7:0E:35:A5:DA:A8:B2:E3:81:2D:C3:67:74:17:F5:99:0D:F3.crt @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIGBzCCBO+gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMCRVMxDzANBgNVBAgT +Bk1hZHJpZDEPMA0GA1UEBxMGTWFkcmlkMS8wLQYDVQQKEyZJUFMgQ2VydGlmaWNhdGlvbiBBdXRo +b3JpdHkgcy5sLiBpcHNDQTEOMAwGA1UECxMFaXBzQ0ExHTAbBgNVBAMTFGlwc0NBIEdsb2JhbCBD +QSBSb290MSEwHwYJKoZIhvcNAQkBFhJnbG9iYWwwMUBpcHNjYS5jb20wHhcNMDkwOTA3MTQzODQ0 +WhcNMjkxMjI1MTQzODQ0WjCBsjELMAkGA1UEBhMCRVMxDzANBgNVBAgTBk1hZHJpZDEPMA0GA1UE +BxMGTWFkcmlkMS8wLQYDVQQKEyZJUFMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgcy5sLiBpcHND +QTEOMAwGA1UECxMFaXBzQ0ExHTAbBgNVBAMTFGlwc0NBIEdsb2JhbCBDQSBSb290MSEwHwYJKoZI +hvcNAQkBFhJnbG9iYWwwMUBpcHNjYS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCn78yAMLCRJE+waPjDyi0VOFVYguI4Y7D3o5Jvg7iwXrCMrFSxd9BQ4JezkK2Ksx85K0VW96ri +33yy7G9TL5rL0OZmy8kT6HLitM0xV4cStZPo+nLO6kfyjLSwY9cEALdkNjmX6JXxiPlxDQMnjGHP +CIOWT4PFTuhc+AZw8QKqHB6pyKp+513NjTwUb2fQG6kjSIshKDqKTOYRMfkhLrJnZsYpbpSTz0CW +/LA9v7K0k79WcbalQYewWLVZIyhJuJj5UB4tFSgLTKxJ0YSpm5rnclS3ONDbyf6pc9VtEM2Odev+ +l/2APPy02Ej0mUYLiBSkti7bTGD0IcFsgJUU1a/VAgMBAAGjggIkMIICIDAdBgNVHQ4EFgQUFaaW +gLEVSzHDwpz25xMLS/MYzYYwgd8GA1UdIwSB1zCB1IAUFaaWgLEVSzHDwpz25xMLS/MYzYahgbik +gbUwgbIxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBAcTBk1hZHJpZDEvMC0G +A1UEChMmSVBTIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IHMubC4gaXBzQ0ExDjAMBgNVBAsTBWlw +c0NBMR0wGwYDVQQDExRpcHNDQSBHbG9iYWwgQ0EgUm9vdDEhMB8GCSqGSIb3DQEJARYSZ2xvYmFs +MDFAaXBzY2EuY29tggEAMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMEcGA1UdJQRAMD4GCCsG +AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwoD +BDAdBgNVHREEFjAUgRJnbG9iYWwwMUBpcHNjYS5jb20wHQYDVR0SBBYwFIESZ2xvYmFsMDFAaXBz +Y2EuY29tMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9jcmxnbG9iYWwwMS5pcHNjYS5jb20vY3Js +L2NybGdsb2JhbDAxLmNybDA4BggrBgEFBQcBAQQsMCowKAYIKwYBBQUHMAGGHGh0dHA6Ly9jcmxn +bG9iYWwwMS5pcHNjYS5jb20wDQYJKoZIhvcNAQEFBQADggEBABj0rv6AD47Bd2+iWkdInyNVoVNr ++V2nMKUkvkMv+MHRV/k+LIAlzEapNvNJWx32fNdjs00+ePantAJ3+HkNPmrLGGC4/QCvDN1U41SP +Ij3zEG8RDbUeeo0nzAi4W8O4Gl8rp2A/ABz3D1xCZmSehxKAcIng+lcoDk4fEC/ZBYC2gC8cafD2 +tmU0BW/K2T741F03Mse4K8z/c5MAceAByKpDvanxzvqA+fFDEpGmZeVgB01HuisvBPZKhSmIZRDJ +slNinGybYFwaG9OuxR1ymQb/BcyGJnO01FQF3R5rADu3iejjkQIgEuvv6f4KKSOBI6MA2nDMkl83 +I9AcezVcA3o= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3E:2B:F7:F2:03:1B:96:F3:8C:E6:C4:D8:A8:5D:3E:2D:58:47:6A:0F.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3E:2B:F7:F2:03:1B:96:F3:8C:E6:C4:D8:A8:5D:3E:2D:58:47:6A:0F.crt new file mode 100644 index 0000000000..9b871eeeea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/3E:2B:F7:F2:03:1B:96:F3:8C:E6:C4:D8:A8:5D:3E:2D:58:47:6A:0F.crt @@ -0,0 +1,38 @@ +-----BEGIN CERTIFICATE----- +MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN +U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu +ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0 +NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk +LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg +U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y +o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/ +Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d +eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt +2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z +6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ +osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/ +untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc +UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT +37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE +FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0 +Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj +YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH +AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw +Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg +U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5 +LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl +cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh +cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT +dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC +AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh +3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm +vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk +fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3 +fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ +EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq +yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl +1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/ +lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro +g14= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/40:54:DA:6F:1C:3F:40:74:AC:ED:0F:EC:CD:DB:79:D1:53:FB:90:1D.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/40:54:DA:6F:1C:3F:40:74:AC:ED:0F:EC:CD:DB:79:D1:53:FB:90:1D.crt new file mode 100644 index 0000000000..82ba95f8a0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/40:54:DA:6F:1C:3F:40:74:AC:ED:0F:EC:CD:DB:79:D1:53:FB:90:1D.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG +EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT +MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha +MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE +CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI +DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa +pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow +GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy +MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu +Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy +dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU +CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2 +5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t +Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq +nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs +vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3 +oKfN5XozNmr6mis= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/41:78:AB:4C:BF:CE:7B:41:02:AC:DA:C4:93:3E:6F:F5:0D:CF:71:5C.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/41:78:AB:4C:BF:CE:7B:41:02:AC:DA:C4:93:3E:6F:F5:0D:CF:71:5C.crt new file mode 100644 index 0000000000..cd02422833 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/41:78:AB:4C:BF:CE:7B:41:02:AC:DA:C4:93:3E:6F:F5:0D:CF:71:5C.crt @@ -0,0 +1,38 @@ +-----BEGIN CERTIFICATE----- +MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVTMRIwEAYDVQQI +EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1 +Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg +Qi02MDkyOTQ1MjEuMCwGA1UECxMlSVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTEuMCwGA1UEAxMlSVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqG +SIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMDE0NFoXDTI1MTIyNzAxMDE0NFow +ggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmEx +LjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoU +Imlwc0BtYWlsLmlwcy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFT +RTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTMgQ2VydGlm +aWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkq +hkiG9w0BAQEFAAOBjQAwgYkCgYEAqxf+DrDGaBtT8FK+n/ra+osTBLsBjzLZH49NzjaY2uQARIwo +2BNEKqRrThckQpzTiKRBgtYj+4vJhuW5qYIF3PHeH+AMmVWY8jjsbJ0gA8DvqqPGZARRLXgNo9Ko +OtYkTOmWehisEyMiG3zoMRGzXwmqMHBxRiVrSXGAK5UBsh8CAwEAAaOCBEowggRGMB0GA1UdDgQW +BBS4k/8uy9wsjqLnev42USGjmFsMNDCCAUQGA1UdIwSCATswggE3gBS4k/8uy9wsjqLnev42USGj +mFsMNKGCARqkggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE +BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBz +LmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMS4wLAYDVQQL +EyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0Eg +Q0xBU0UzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5p +cHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMB +BggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYB +BAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0R +BBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBBBglghkgB +hvhCAQ0ENBYyQ0xBU0UzIENBIENlcnRpZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5l +cy8wKQYJYIZIAYb4QgECBBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIB +BAQtFitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMuY3JsMD8GCWCGSAGG ++EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25DTEFTRTMuaHRtbD8w +PAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFMy5o +dG1sPzA6BglghkgBhvhCAQgELRYraHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFT +RTMuaHRtbDBzBgNVHR8EbDBqMDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIw +MDJDTEFTRTMuY3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy +Q0xBU0UzLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5l +cy8wDQYJKoZIhvcNAQEFBQADgYEAF2VcmZVDAyevJuXr0LMXI/dDqsfwfewPxqmurpYPdikc4gYt +fibFPPqhwYHOU7BC0ZdXGhd+pFFhxu7pXu8Fuuu9D6eSb9ijBmgpjnn1/7/5p6/ksc7C0YBCJwUE +NPjDfxZ4IwwHJPJGR607VNCv1TGyr33I6unUVtkOE7LFRVA= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/43:9E:52:5F:5A:6A:47:C3:2C:EB:C4:5C:63:ED:39:31:7C:E5:F4:DF.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/43:9E:52:5F:5A:6A:47:C3:2C:EB:C4:5C:63:ED:39:31:7C:E5:F4:DF.crt new file mode 100644 index 0000000000..20f2fa71ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/43:9E:52:5F:5A:6A:47:C3:2C:EB:C4:5C:63:ED:39:31:7C:E5:F4:DF.crt @@ -0,0 +1,38 @@ +-----BEGIN CERTIFICATE----- +MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVTMRIwEAYDVQQI +EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1 +Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg +Qi02MDkyOTQ1MjEuMCwGA1UECxMlSVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTEuMCwGA1UEAxMlSVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqG +SIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAwNTkzOFoXDTI1MTIyNzAwNTkzOFow +ggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmEx +LjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoU +Imlwc0BtYWlsLmlwcy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFT +RTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTEgQ2VydGlm +aWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkq +hkiG9w0BAQEFAAOBjQAwgYkCgYEA4FEnpwvdr9G5Q1uCN0VWcu+atsIS7ywSzHb5BlmvXSHU0lq4 +oNTzav3KaY1mSPd05u42veiWkXWmcSjK5yISMmmwPh5r9FBSYmL9Yzt9fuzuOOpi9GyocY3h6YvJ +P8a1zZRCb92CRTzo3wno7wpVqVZHYUxJZHMQKD/Kvwn/xi8CAwEAAaOCBEowggRGMB0GA1UdDgQW +BBTrsxl588GlHKzcuh9morKbadB4CDCCAUQGA1UdIwSCATswggE3gBTrsxl588GlHKzcuh9morKb +adB4CKGCARqkggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE +BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBz +LmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMS4wLAYDVQQL +EyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0Eg +Q0xBU0UxIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5p +cHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMB +BggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYB +BAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0R +BBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBBBglghkgB +hvhCAQ0ENBYyQ0xBU0UxIENBIENlcnRpZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5l +cy8wKQYJYIZIAYb4QgECBBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIB +BAQtFitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEuY3JsMD8GCWCGSAGG ++EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25DTEFTRTEuaHRtbD8w +PAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFMS5o +dG1sPzA6BglghkgBhvhCAQgELRYraHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFT +RTEuaHRtbDBzBgNVHR8EbDBqMDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIw +MDJDTEFTRTEuY3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy +Q0xBU0UxLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5l +cy8wDQYJKoZIhvcNAQEFBQADgYEAK9Dr/drIyllq2tPMMi7JVBuKYn4VLenZMdMu9Ccj/1urxUq2 +ckCuU3T0vAW0xtnIyXf7t/k0f3gA+Nak5FI/LEpjV4F1Wo7ojPsCwJTGKbqz3Bzosq/SLmJbGqmO +DszFV0VRFOlOHIilkfSj945RyKm+hjM+5i9Ibq9UkE6tsSU= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4A:65:D5:F4:1D:EF:39:B8:B8:90:4A:4A:D3:64:81:33:CF:C7:A1:D1.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4A:65:D5:F4:1D:EF:39:B8:B8:90:4A:4A:D3:64:81:33:CF:C7:A1:D1.crt new file mode 100644 index 0000000000..224c1dadbe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4A:65:D5:F4:1D:EF:39:B8:B8:90:4A:4A:D3:64:81:33:CF:C7:A1:D1.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS +R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg +TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw +MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu +Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi +BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP +9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc +rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC +oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V +p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E +FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w +gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj +YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm +aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm +4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj +Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL +DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw +pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H +RR3B7Hzs/Sk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4D:23:78:EC:91:95:39:B5:00:7F:75:8F:03:3B:21:1E:C5:4D:8B:CF.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4D:23:78:EC:91:95:39:B5:00:7F:75:8F:03:3B:21:1E:C5:4D:8B:CF.crt new file mode 100644 index 0000000000..0edfbd3248 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4D:23:78:EC:91:95:39:B5:00:7F:75:8F:03:3B:21:1E:C5:4D:8B:CF.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU +cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx +CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ +IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx +64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3 +KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o +L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR +wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU +MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE +BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y +azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD +ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG +GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X +dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze +RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB +iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5.crt new file mode 100644 index 0000000000..bef88a6ec5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE +BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO +ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk +IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB +yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln +biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh +dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz +j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD +Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/ +Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r +fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/ +BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv +Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy +aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG +SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+ +X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE +KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC +Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE +ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/50:30:06:09:1D:97:D4:F5:AE:39:F7:CB:E7:92:7D:7D:65:2D:34:31.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/50:30:06:09:1D:97:D4:F5:AE:39:F7:CB:E7:92:7D:7D:65:2D:34:31.crt new file mode 100644 index 0000000000..ea35e6f591 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/50:30:06:09:1D:97:D4:F5:AE:39:F7:CB:E7:92:7D:7D:65:2D:34:31.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u +ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp +bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV +BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx +NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3 +d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl +MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u +ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL +Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr +hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW +nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi +VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ +KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy +T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf +zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT +J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e +nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/58:11:9F:0E:12:82:87:EA:50:FD:D9:87:45:6F:4F:78:DC:FA:D6:D4.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/58:11:9F:0E:12:82:87:EA:50:FD:D9:87:45:6F:4F:78:DC:FA:D6:D4.crt new file mode 100644 index 0000000000..ca388d8856 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/58:11:9F:0E:12:82:87:EA:50:FD:D9:87:45:6F:4F:78:DC:FA:D6:D4.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE +BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl +IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ +BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa +MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w +HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy +dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys +raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo +wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA +9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv +33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud +DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9 +BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD +LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3 +DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft +Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0 +I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx +EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP +DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9.crt new file mode 100644 index 0000000000..68076951fa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE +BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG +A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH +bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD +VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw +IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5 +IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9 +Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg +Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD +d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ +/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R +LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ +KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm +MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4 ++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa +hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY +okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5D:98:9C:DB:15:96:11:36:51:65:64:1B:56:0F:DB:EA:2A:C2:3E:F1.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5D:98:9C:DB:15:96:11:36:51:65:64:1B:56:0F:DB:EA:2A:C2:3E:F1.crt new file mode 100644 index 0000000000..925ea066bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5D:98:9C:DB:15:96:11:36:51:65:64:1B:56:0F:DB:EA:2A:C2:3E:F1.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE +BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl +IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzAp +BgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5 +WhcNMTkwNzA5MTg1NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5T +YWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBB +cHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz+5Gh5DZVhawGNFug +mliy+LUPBXeDrjKxdpJo7CNKyXY/45y2N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4Cj +DUeJT1FxL+78P/m4FoCHiZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXu +Ozr0hAReYFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1axwi +P8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6gyN7igEL66S/ozjIE +j3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8w +HQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPhahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9j +cmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0G +CSqGSIb3DQEBBQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y +IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6LzsQCv4AdRWOOTK +RIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4ZSfP1FMa8Kxun08FDAOBp4Qp +xFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qMYEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAq +DbUMo2s/rn9X9R+WfN9v3YIwLGUbQErNaLly7HF27FSOH4UMAWr6pjisH8SE +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:3A:FC:0A:8B:64:F6:86:67:34:74:DF:7E:A9:A2:FE:F9:FA:7A:51.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:3A:FC:0A:8B:64:F6:86:67:34:74:DF:7E:A9:A2:FE:F9:FA:7A:51.crt new file mode 100644 index 0000000000..6e10c83131 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:3A:FC:0A:8B:64:F6:86:67:34:74:DF:7E:A9:A2:FE:F9:FA:7A:51.crt @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG +EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy +dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4 +MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln +aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC +IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM +MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF +NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe +AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC +b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn +7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN +cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp +WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5 +haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY +MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw +HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j +BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9 +MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn +jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ +MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H +VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl +vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl +OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3 +1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq +nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy +x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW +NY6E0F/6MBr1mmz0DlP5OlvRHA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6.crt new file mode 100644 index 0000000000..056d671b48 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li +ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4 +MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD +ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA ++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW +0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL +AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin +89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT +8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2 +MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G +A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO +lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi +5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2 +hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T +X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW +WL1WMRJOEcgh4LMRkWXbtKaIOM5V +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25.crt new file mode 100644 index 0000000000..81c8a7de5b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw +KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw +MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ +MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu +Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t +Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS +OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3 +MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ +NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe +h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB +Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY +JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ +V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp +myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK +mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe +vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/60:D6:89:74:B5:C2:65:9E:8A:0F:C1:88:7C:88:D2:46:69:1B:18:2C.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/60:D6:89:74:B5:C2:65:9E:8A:0F:C1:88:7C:88:D2:46:69:1B:18:2C.crt new file mode 100644 index 0000000000..6ed516f930 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/60:D6:89:74:B5:C2:65:9E:8A:0F:C1:88:7C:88:D2:46:69:1B:18:2C.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD +VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE +Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy +MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI +EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT +STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2 +TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW +So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy +HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd +frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ +tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB +egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC +iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK +q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q +MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg +Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI +lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF +0mBWWg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/62:52:DC:40:F7:11:43:A2:2F:DE:9E:F7:34:8E:06:42:51:B1:81:18.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/62:52:DC:40:F7:11:43:A2:2F:DE:9E:F7:34:8E:06:42:51:B1:81:18.crt new file mode 100644 index 0000000000..d5ab68cb04 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/62:52:DC:40:F7:11:43:A2:2F:DE:9E:F7:34:8E:06:42:51:B1:81:18.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK +ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla +Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u +by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x +wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL +kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ +89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K +Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P +NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq +hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+ +GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg +GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/ +0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS +qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B.crt new file mode 100644 index 0000000000..ef78191e6b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE +BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG +A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1 +dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb +MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD +T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH ++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww +xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV +4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA +1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI +rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k +b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC +AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP +OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/ +RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc +IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN ++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/69:BD:8C:F4:9C:D3:00:FB:59:2E:17:93:CA:55:6A:F3:EC:AA:35:FB.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/69:BD:8C:F4:9C:D3:00:FB:59:2E:17:93:CA:55:6A:F3:EC:AA:35:FB.crt new file mode 100644 index 0000000000..74533433af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/69:BD:8C:F4:9C:D3:00:FB:59:2E:17:93:CA:55:6A:F3:EC:AA:35:FB.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp +b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh +bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw +MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0 +d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg +UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0 +LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td +3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H +BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs +3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF +V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r +on+jjBXu +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/6B:2F:34:AD:89:58:BE:62:FD:B0:6B:5C:CE:BB:9D:D9:4F:4E:39:F3.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/6B:2F:34:AD:89:58:BE:62:FD:B0:6B:5C:CE:BB:9D:D9:4F:4E:39:F3.crt new file mode 100644 index 0000000000..7a10e9b6e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/6B:2F:34:AD:89:58:BE:62:FD:B0:6B:5C:CE:BB:9D:D9:4F:4E:39:F3.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy +IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN +MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg +VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw +JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC +qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv +xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw +ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O +gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j +BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG +1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy +vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3 +ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT +ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a +7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1.crt new file mode 100644 index 0000000000..60d878ec55 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe +QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i +ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx +NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp +cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn +MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC +AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU +xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH +NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW +DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV +d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud +EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v +cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P +AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh +bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD +VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz +aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi +fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD +L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN +UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n +ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1 +erfutGWaIZDgqtCYvDi1czyL+Nw= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/70:17:9B:86:8C:00:A4:FA:60:91:52:22:3F:9F:3E:32:BD:E0:05:62.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/70:17:9B:86:8C:00:A4:FA:60:91:52:22:3F:9F:3E:32:BD:E0:05:62.crt new file mode 100644 index 0000000000..53c95a4d1d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/70:17:9B:86:8C:00:A4:FA:60:91:52:22:3F:9F:3E:32:BD:E0:05:62.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG +EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug +QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2 +WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm +VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv +bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL +F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b +RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0 +TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI +/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs +GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG +MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc +CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW +YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz +zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu +YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt +398znM/jra6O1I7mT1GvFpLgXPYHDw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:20:74:41:72:9C:DD:92:EC:79:31:D8:23:10:8D:C2:81:92:E2:BB.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:20:74:41:72:9C:DD:92:EC:79:31:D8:23:10:8D:C2:81:92:E2:BB.crt new file mode 100644 index 0000000000..6270355b57 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:20:74:41:72:9C:DD:92:EC:79:31:D8:23:10:8D:C2:81:92:E2:BB.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE +BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN +OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy +dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR +5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ +Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO +YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e +e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME +CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ +YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t +L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD +P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R +TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+ +7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW +//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 +l7+ijrRU +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:2C:31:92:E6:07:E4:24:EB:45:49:54:2B:E1:BB:C5:3E:61:74:E2.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:2C:31:92:E6:07:E4:24:EB:45:49:54:2B:E1:BB:C5:3E:61:74:E2.crt new file mode 100644 index 0000000000..252ea0ef72 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:2C:31:92:E6:07:E4:24:EB:45:49:54:2B:E1:BB:C5:3E:61:74:E2.crt @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx +FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5 +IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow +XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz +IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94 +f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol +hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA +TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah +WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf +Tqj/ZA1k +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:54:53:5C:24:A3:A7:58:20:7E:3E:3E:D3:24:F8:16:FB:21:16:49.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:54:53:5C:24:A3:A7:58:20:7E:3E:3E:D3:24:F8:16:FB:21:16:49.crt new file mode 100644 index 0000000000..6c0507faf5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:54:53:5C:24:A3:A7:58:20:7E:3E:3E:D3:24:F8:16:FB:21:16:49.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIID5jCCAs6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMxHTAbBgNVBAoT +FEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNhIE9ubGluZSBJbmMuMTcwNQYD +VQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAy +MDUyOTA2MDAwMFoXDTM3MTEyMDE1MDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wg +VGltZSBXYXJuZXIgSW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMu +QU9MIFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAJnej8Mlo2k06AX3dLm/WpcZuS+U0pPlLYnKhHw/EEMbjIt8 +hFj4JHxIzyr9wBXZGH6EGhfT257XyuTZ16pYUYfw8ItITuLCxFlpMGK2MKKMCxGZYTVtfu/FsRkG +IBKOQuHfD5YQUqjPnF+VFNivO3ULMSAfRC+iYkGzuxgh28pxPIzstrkNn+9R7017EvILDOGsQI93 +f7DKeHEMXRZxcKLXwjqFzQ6axOAAsNUl6twr5JQtOJyJQVdkKGUZHLZEtMgxa44Be3ZZJX8VHIQI +fHNlIAqhBC4aMqiaILGcLCFZ5/vP7nAtCMpjPiybkxlqpMKX/7eGV4iFbJ4VFitNLLMCAwEAAaNj +MGEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUoTYwFsuGkABFgFOxj8jYPXy+XxIwHwYDVR0j +BBgwFoAUoTYwFsuGkABFgFOxj8jYPXy+XxIwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUA +A4IBAQCKIBilvrMvtKaEAEAwKfq0FHNMeUWn9nDg6H5kHgqVfGphwu9OH77/yZkfB2FK4V1Mza3u +0FIy2VkyvNp5ctZ7CegCgTXTCt8RHcl5oIBN/lrXVtbtDyqvpxh1MwzqwWEFT2qaifKNuZ8u77Bf +WgDrvq2g+EQFZ7zLBO+eZMXpyD8Fv8YvBxzDNnGGyjhmSs3WuEvGbKeXO/oTLW4jYYehY0KswsuX +n2Fozy1MBJ3XJU8KDk2QixhWqJNIV9xvrr2eZ1d3iVCzvhGbRWeDhhmH05i9CBoWH1iCC+GWaQVL +juyDUTEH1dSf/1l7qG6Fz9NLqUmwX7A5KGgOc90lmt4S +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE.crt new file mode 100644 index 0000000000..2fe40ef982 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG +EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr +IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx +MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu +MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx +jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT +aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT +crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc +/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB +AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv +bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA +A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q +4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/ +GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv +wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD +ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/75:E0:AB:B6:13:85:12:27:1C:04:F8:5F:DD:DE:38:E4:B7:24:2E:FE.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/75:E0:AB:B6:13:85:12:27:1C:04:F8:5F:DD:DE:38:E4:B7:24:2E:FE.crt new file mode 100644 index 0000000000..4c5774466c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/75:E0:AB:B6:13:85:12:27:1C:04:F8:5F:DD:DE:38:E4:B7:24:2E:FE.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv +YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh +bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT +aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln +bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6 +ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp +s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN +S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL +TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C +ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E +FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i +YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN +BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp +9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu +01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7 +9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 +TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/79:98:A3:08:E1:4D:65:85:E6:C2:1E:15:3A:71:9F:BA:5A:D3:4A:D9.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/79:98:A3:08:E1:4D:65:85:E6:C2:1E:15:3A:71:9F:BA:5A:D3:4A:D9.crt new file mode 100644 index 0000000000..a631bd72bb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/79:98:A3:08:E1:4D:65:85:E6:C2:1E:15:3A:71:9F:BA:5A:D3:4A:D9.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF +bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP +MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 +acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx +MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg +U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB +TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC +aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX +yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i +Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ +8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4 +W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME +BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46 +sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE +q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy +B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY +nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/7E:78:4A:10:1C:82:65:CC:2D:E1:F1:6D:47:B4:40:CA:D9:0A:19:45.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/7E:78:4A:10:1C:82:65:CC:2D:E1:F1:6D:47:B4:40:CA:D9:0A:19:45.crt new file mode 100644 index 0000000000..b3fe176162 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/7E:78:4A:10:1C:82:65:CC:2D:E1:F1:6D:47:B4:40:CA:D9:0A:19:45.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp +bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx +HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds +b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV +PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN +qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn +hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j +BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs +MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN +I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY +NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/80:1D:62:D0:7B:44:9D:5C:5C:03:5C:98:EA:61:FA:44:3C:2A:58:FE.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/80:1D:62:D0:7B:44:9D:5C:5C:03:5C:98:EA:61:FA:44:3C:2A:58:FE.crt new file mode 100644 index 0000000000..179c6cbd10 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/80:1D:62:D0:7B:44:9D:5C:5C:03:5C:98:EA:61:FA:44:3C:2A:58:FE.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u +ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp +bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV +BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx +NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3 +d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl +MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u +ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL +Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr +hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW +nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi +VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC +AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER +gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B +AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo +oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS +o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z +2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX +OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/80:25:EF:F4:6E:70:C8:D4:72:24:65:84:FE:40:3B:8A:8D:6A:DB:F5.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/80:25:EF:F4:6E:70:C8:D4:72:24:65:84:FE:40:3B:8A:8D:6A:DB:F5.crt new file mode 100644 index 0000000000..596b41c053 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/80:25:EF:F4:6E:70:C8:D4:72:24:65:84:FE:40:3B:8A:8D:6A:DB:F5.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy +IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw +MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 +c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE +AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W +yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo +6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ +uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk +2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB +7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 +Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU +cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i +SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE +O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8 +yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9 +IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal +092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc +5A== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/81:96:8B:3A:EF:1C:DC:70:F5:FA:32:69:C2:92:A3:63:5B:D1:23:D3.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/81:96:8B:3A:EF:1C:DC:70:F5:FA:32:69:C2:92:A3:63:5B:D1:23:D3.crt new file mode 100644 index 0000000000..6d7fe14417 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/81:96:8B:3A:EF:1C:DC:70:F5:FA:32:69:C2:92:A3:63:5B:D1:23:D3.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE +ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy +MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs +IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA +A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE +NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i +o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo +BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0 +dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw +IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY +MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM +BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB +ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq +kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4 +RbyhkwS7hp86W0N6w4pl +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/83:8E:30:F7:7F:DD:14:AA:38:5E:D1:45:00:9C:0E:22:36:49:4F:AA.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/83:8E:30:F7:7F:DD:14:AA:38:5E:D1:45:00:9C:0E:22:36:49:4F:AA.crt new file mode 100644 index 0000000000..e72611d3cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/83:8E:30:F7:7F:DD:14:AA:38:5E:D1:45:00:9C:0E:22:36:49:4F:AA.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDXDCCAsWgAwIBAgICA+owDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQI +EwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig +U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBD +bGFzcyAyIENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05 +ODAzMDkxMTU5NTlaFw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFt +YnVyZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9yIFNlY3Vy +aXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3Mg +MiBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVAdHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZI +hvcNAQEBBQADgY0AMIGJAoGBANo46O0yAClxgwENv4wB3NrGrTmkqYov1YtcaF9QxmL1Zr3KkSLs +qh1R1z2zUbKDTl3LSbDwTFXlay3HhQswHJJOgtTKAu33b77c4OMUuAVT8pr0VotanoWT0bSCVq5N +u6hLVxa8/vhYnvgpjbB7zXjJT6yLZwzxnPv8V5tXXE8NAgMBAAGjazBpMA8GA1UdEwEB/wQFMAMB +Af8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3LnRydXN0Y2VudGVy +LmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0GCSqGSIb3DQEBBAUAA4GBAIRS+yjf +/x91AbwBvgRWl2p0QiQxg/lGsQaKic+WLDO/jLVfenKhhQbOhvgFjuj5Jcrag4wGrOs2bYWRNAQ2 +9ELw+HkuCkhcq8xRT3h2oNmsGb0q0WkEKJHKNhAngFdb0lz1wlurZIFjdFH0l7/NEij3TWZ/p/Ac +ASZ4smZHcFFk +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:37:1C:A6:E5:50:14:3D:CE:28:03:47:1B:DE:3A:09:E8:F8:77:0F.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:37:1C:A6:E5:50:14:3D:CE:28:03:47:1B:DE:3A:09:E8:F8:77:0F.crt new file mode 100644 index 0000000000..75c6bfb79a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:37:1C:A6:E5:50:14:3D:CE:28:03:47:1B:DE:3A:09:E8:F8:77:0F.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT +MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy +eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz +dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT +MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy +eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz +dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO +FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71 +lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB +MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT +1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD +Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:A4:08:C0:9C:19:3E:5D:51:58:7D:CD:D6:13:30:FD:8C:DE:37:BF.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:A4:08:C0:9C:19:3E:5D:51:58:7D:CD:D6:13:30:FD:8C:DE:37:BF.crt new file mode 100644 index 0000000000..e415696111 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:A4:08:C0:9C:19:3E:5D:51:58:7D:CD:D6:13:30:FD:8C:DE:37:BF.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT +RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG +A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5 +MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G +A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS +b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5 +bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI +KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY +AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK +Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV +jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV +HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr +E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy +zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8 +rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G +dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU +Cm26OWMohpLzGITY+9HPBVZkVw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:B5:FF:67:9B:0C:79:96:1F:C8:6E:44:22:00:46:13:DB:17:92:84.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:B5:FF:67:9B:0C:79:96:1F:C8:6E:44:22:00:46:13:DB:17:92:84.crt new file mode 100644 index 0000000000..3c1545a781 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/85:B5:FF:67:9B:0C:79:96:1F:C8:6E:44:22:00:46:13:DB:17:92:84.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG +A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg +T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en +fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8 +f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO +qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN +RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0 +gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn +6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid +FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6 +Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj +B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op +aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY +T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p ++DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg +JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy +zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO +ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh +1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf +GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff +Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP +cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:81:C2:5A:96:BD:C2:FB:4C:65:06:4F:F9:39:0B:26:04:8A:0E:01.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:81:C2:5A:96:BD:C2:FB:4C:65:06:4F:F9:39:0B:26:04:8A:0E:01.crt new file mode 100644 index 0000000000..90a8a453ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:81:C2:5A:96:BD:C2:FB:4C:65:06:4F:F9:39:0B:26:04:8A:0E:01.crt @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UE +ChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5 +MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuH +nEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0 +zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvV +iGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBde +dObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO +3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB +5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5k +ay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBm +cmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZp +Y2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4x +LjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEM +MAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYm +aHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy +MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647 ++RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6 +NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4 +A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYsc +A+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9 +AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1 +AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11.crt new file mode 100644 index 0000000000..008e3d3bc2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG +EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy +dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe +BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX +OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t +DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH +GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b +01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH +ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/ +BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj +aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ +KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu +SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf +mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ +nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR +3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:9F:4B:EE:05:DF:98:58:3B:E3:60:D6:33:E7:0D:3F:FE:98:71:AF.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:9F:4B:EE:05:DF:98:58:3B:E3:60:D6:33:E7:0D:3F:FE:98:71:AF.crt new file mode 100644 index 0000000000..1238e8e135 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/87:9F:4B:EE:05:DF:98:58:3B:E3:60:D6:33:E7:0D:3F:FE:98:71:AF.crt @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT +CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV +BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg +VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD +VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv +bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg +VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB +iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S +o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr +1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV +HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ +RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh +dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0 +ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv +c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg +YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh +c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz +Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA +bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl +IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2 +YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj +cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM +43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR +stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/8C:F4:27:FD:79:0C:3A:D1:66:06:8D:E8:1E:57:EF:BB:93:22:72:D4.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/8C:F4:27:FD:79:0C:3A:D1:66:06:8D:E8:1E:57:EF:BB:93:22:72:D4.crt new file mode 100644 index 0000000000..2e23a60555 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/8C:F4:27:FD:79:0C:3A:D1:66:06:8D:E8:1E:57:EF:BB:93:22:72:D4.crt @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50 +cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs +IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz +dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy +NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu +dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt +dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0 +aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T +RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN +cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW +wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1 +U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0 +jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN +BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/ +jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ +Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v +1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R +nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH +VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81.crt new file mode 100644 index 0000000000..8af5a82e10 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE +BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2 +aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3 +MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg +SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv +KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT +FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs +oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ +1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc +q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K +aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p +afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF +AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE +uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX +xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89 +jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH +z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/93:E6:AB:22:03:03:B5:23:28:DC:DA:56:9E:BA:E4:D1:D1:CC:FB:65.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/93:E6:AB:22:03:03:B5:23:28:DC:DA:56:9E:BA:E4:D1:D1:CC:FB:65.crt new file mode 100644 index 0000000000..35bb0890ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/93:E6:AB:22:03:03:B5:23:28:DC:DA:56:9E:BA:E4:D1:D1:CC:FB:65.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV +BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN +MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl +bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv +MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX +x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3 +E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5 +OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j +sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj +YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF +BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD +ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv +m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R +OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx +x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023 +tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74.crt new file mode 100644 index 0000000000..b996337f52 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74.crt @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg +Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG +A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz +MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL +Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0 +IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u +sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql +HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID +AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW +M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF +NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/99:A6:9B:E6:1A:FE:88:6B:4D:2B:82:00:7C:B8:54:FC:31:7E:15:39.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/99:A6:9B:E6:1A:FE:88:6B:4D:2B:82:00:7C:B8:54:FC:31:7E:15:39.crt new file mode 100644 index 0000000000..7d3ea4f2c8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/99:A6:9B:E6:1A:FE:88:6B:4D:2B:82:00:7C:B8:54:FC:31:7E:15:39.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV +BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg +cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl +ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG +A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi +eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p +dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ +aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5 +gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw +ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw +CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l +dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF +bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu +dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw +NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow +HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA +BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN +Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9 +n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9B:AA:E5:9F:56:EE:21:CB:43:5A:BE:25:93:DF:A7:F0:40:D1:1D:CB.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9B:AA:E5:9F:56:EE:21:CB:43:5A:BE:25:93:DF:A7:F0:40:D1:1D:CB.crt new file mode 100644 index 0000000000..6fcc67d922 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9B:AA:E5:9F:56:EE:21:CB:43:5A:BE:25:93:DF:A7:F0:40:D1:1D:CB.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT +BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X +DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3 +aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG +9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644 +N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm ++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH +6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu +MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h +qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5 +FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs +ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc +celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X +CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB +tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0 +cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P +4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F +kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L +3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx +/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa +DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP +e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu +WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ +DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub +DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11.crt new file mode 100644 index 0000000000..1742e4423b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC +R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE +ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix +GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR +Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo +b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X +4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni +wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG +FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA +U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9F:C7:96:E8:F8:52:4F:86:3A:E1:49:6D:38:12:42:10:5F:1B:78:F5.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9F:C7:96:E8:F8:52:4F:86:3A:E1:49:6D:38:12:42:10:5F:1B:78:F5.crt new file mode 100644 index 0000000000..7c3c02e9ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/9F:C7:96:E8:F8:52:4F:86:3A:E1:49:6D:38:12:42:10:5F:1B:78:F5.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDXDCCAsWgAwIBAgICA+swDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQI +EwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig +U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBD +bGFzcyAzIENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05 +ODAzMDkxMTU5NTlaFw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFt +YnVyZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9yIFNlY3Vy +aXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3Mg +MyBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVAdHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZI +hvcNAQEBBQADgY0AMIGJAoGBALa0wTUFLg2N7KBAahwOJ6ZQkmtQGwfeLud2zODa/ISoXoxjaitN +2U4CdhHBC/KNecoAtvGwDtf7pBc9r6tpepYnv68zoZoqWarEtTcI8hKlMbZD9TKWcSgoq40oht+7 +7uMMfTDWw1Krj10nnGvAo+cFa1dJRLNu6mTP0o56UHd3AgMBAAGjazBpMA8GA1UdEwEB/wQFMAMB +Af8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3LnRydXN0Y2VudGVy +LmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0GCSqGSIb3DQEBBAUAA4GBABY9xs3B +u4VxhUafPiCPUSiZ7C1FIWMjWwS7TJC4iJIETb19AaM/9uzO8d7+feXhPrvGq14L3T2WxMup1Pkm +5gZOngylerpuw3yCGdHHsbHD2w2Om0B8NwvxXej9H5CIpQ5ON2QhqE6NtJ/x3kit1VYYUimLRzQS +CdS7kjXvD9s0 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A8:98:5D:3A:65:E5:E5:C4:B2:D7:D6:6D:40:C6:DD:2F:B1:9C:54:36.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A8:98:5D:3A:65:E5:E5:C4:B2:D7:D6:6D:40:C6:DD:2F:B1:9C:54:36.crt new file mode 100644 index 0000000000..3fdb770554 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A8:98:5D:3A:65:E5:E5:C4:B2:D7:D6:6D:40:C6:DD:2F:B1:9C:54:36.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw +HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw +MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3 +dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn +TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5 +BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H +4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y +7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB +o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm +8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF +BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr +EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt +tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886 +UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A9:62:8F:4B:98:A9:1B:48:35:BA:D2:C1:46:32:86:BB:66:64:6A:8C.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A9:62:8F:4B:98:A9:1B:48:35:BA:D2:C1:46:32:86:BB:66:64:6A:8C.crt new file mode 100644 index 0000000000..db101a280a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A9:62:8F:4B:98:A9:1B:48:35:BA:D2:C1:46:32:86:BB:66:64:6A:8C.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT +GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp +Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA +ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL +MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT +OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2 +ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V +j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH +lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf +3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8 +NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww +KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG +AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud +DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD +ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq +u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf +wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm +7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG +VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A9:E9:78:08:14:37:58:88:F2:05:19:B0:6D:2B:0D:2B:60:16:90:7D.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A9:E9:78:08:14:37:58:88:F2:05:19:B0:6D:2B:0D:2B:60:16:90:7D.crt new file mode 100644 index 0000000000..c646e741a3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/A9:E9:78:08:14:37:58:88:F2:05:19:B0:6D:2B:0D:2B:60:16:90:7D.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN +R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw +MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j +LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/ +NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k +LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA +Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b +HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH +K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7 +srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh +ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL +OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC +x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF +H4z1Ir+rzoPz4iIprn2DQKi6bA== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AB:48:F3:33:DB:04:AB:B9:C0:72:DA:5B:0C:C1:D0:57:F0:36:9B:46.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AB:48:F3:33:DB:04:AB:B9:C0:72:DA:5B:0C:C1:D0:57:F0:36:9B:46.crt new file mode 100644 index 0000000000..251fb2bb5f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AB:48:F3:33:DB:04:AB:B9:C0:72:DA:5B:0C:C1:D0:57:F0:36:9B:46.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE +ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy +MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs +IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA +A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD +VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS +xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo +BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0 +dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw +IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY +MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM +BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB +AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi +up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1 +mPnHfxsb1gYgAlihw6ID +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AC:ED:5F:65:53:FD:25:CE:01:5F:1F:7A:48:3B:6A:74:9F:61:78:C6.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AC:ED:5F:65:53:FD:25:CE:01:5F:1F:7A:48:3B:6A:74:9F:61:78:C6.crt new file mode 100644 index 0000000000..9bcc087385 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AC:ED:5F:65:53:FD:25:CE:01:5F:1F:7A:48:3B:6A:74:9F:61:78:C6.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI +EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6 +dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j +ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX +DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH +EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD +VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz +cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM +D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ +z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC +/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7 +tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6 +4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG +A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC +Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv +bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu +IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn +LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0 +ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz +IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh +IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu +b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh +bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg +Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp +bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5 +ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP +ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB +CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr +KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM +8CgHrTwXZoi1/baI +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AD:7E:1C:28:B0:64:EF:8F:60:03:40:20:14:C3:D0:E3:37:0E:B5:8A.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AD:7E:1C:28:B0:64:EF:8F:60:03:40:20:14:C3:D0:E3:37:0E:B5:8A.crt new file mode 100644 index 0000000000..a732c65f37 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AD:7E:1C:28:B0:64:EF:8F:60:03:40:20:14:C3:D0:E3:37:0E:B5:8A.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc +U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo +MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG +A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG +SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY +bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ +JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm +epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN +F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF +MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f +hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo +bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs +afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM +PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl +xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD +KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3 +QBFGmh95DmK/D5fs4C8fF5Q= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AE:50:83:ED:7C:F4:5C:BC:8F:61:C6:21:FE:68:5D:79:42:21:15:6E.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AE:50:83:ED:7C:F4:5C:BC:8F:61:C6:21:FE:68:5D:79:42:21:15:6E.crt new file mode 100644 index 0000000000..b8dd7675cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/AE:50:83:ED:7C:F4:5C:BC:8F:61:C6:21:FE:68:5D:79:42:21:15:6E.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy +IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw +MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 +c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE +AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw +IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2 +xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ +Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u +SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB +7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 +Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU +cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i +SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G +dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ +KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj +TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP +JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk +vQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97.crt new file mode 100644 index 0000000000..90b4589c04 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw +EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3 +MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI +Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q +XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH +GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p +ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg +DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf +Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ +tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ +BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J +SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA +hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+ +ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu +PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY +1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw +WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B1:BC:96:8B:D4:F4:9D:62:2A:A8:9A:81:F2:15:01:52:A4:1D:82:9C.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B1:BC:96:8B:D4:F4:9D:62:2A:A8:9A:81:F2:15:01:52:A4:1D:82:9C.crt new file mode 100644 index 0000000000..e0885addbc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B1:BC:96:8B:D4:F4:9D:62:2A:A8:9A:81:F2:15:01:52:A4:1D:82:9C.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx +GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds +b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV +BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD +VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa +DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc +THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb +Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP +c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX +gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF +AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj +Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG +j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH +hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC +X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B3:1E:B1:B7:40:E3:6C:84:02:DA:DC:37:D4:4D:F5:D4:67:49:52:F9.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B3:1E:B1:B7:40:E3:6C:84:02:DA:DC:37:D4:4D:F5:D4:67:49:52:F9.crt new file mode 100644 index 0000000000..f8df1234d6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B3:1E:B1:B7:40:E3:6C:84:02:DA:DC:37:D4:4D:F5:D4:67:49:52:F9.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV +BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw +b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG +A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0 +MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu +MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu +Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v +dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz +A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww +Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68 +j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN +rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw +DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1 +MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH +hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA +A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM +Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa +v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS +W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0 +tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B4:35:D4:E1:11:9D:1C:66:90:A7:49:EB:B3:94:BD:63:7B:A7:82:B7.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B4:35:D4:E1:11:9D:1C:66:90:A7:49:EB:B3:94:BD:63:7B:A7:82:B7.crt new file mode 100644 index 0000000000..e873c799b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B4:35:D4:E1:11:9D:1C:66:90:A7:49:EB:B3:94:BD:63:7B:A7:82:B7.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF +bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP +MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg +QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN +MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr +dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G +A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls +acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe +LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI +x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g +QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr +5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB +AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G +A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt +Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4 +Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+ +hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P +9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5 +UrbnBEI= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B8:01:86:D1:EB:9C:86:A5:41:04:CF:30:54:F3:4C:52:B7:E5:58:C6.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B8:01:86:D1:EB:9C:86:A5:41:04:CF:30:54:F3:4C:52:B7:E5:58:C6.crt new file mode 100644 index 0000000000..3219bebc4e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/B8:01:86:D1:EB:9C:86:A5:41:04:CF:30:54:F3:4C:52:B7:E5:58:C6.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE +BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj +dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx +HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg +U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu +IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx +foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE +zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs +AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry +xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud +EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap +oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC +AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc +/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt +qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n +nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz +8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/C8:C2:5F:16:9E:F8:50:74:D5:BE:E8:CD:A2:D4:3C:AE:E7:5F:D2:57.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/C8:C2:5F:16:9E:F8:50:74:D5:BE:E8:CD:A2:D4:3C:AE:E7:5F:D2:57.crt new file mode 100644 index 0000000000..5141677198 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/C8:C2:5F:16:9E:F8:50:74:D5:BE:E8:CD:A2:D4:3C:AE:E7:5F:D2:57.crt @@ -0,0 +1,38 @@ +-----BEGIN CERTIFICATE----- +MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARwxCzAJBgNVBAYTAkVTMRIwEAYDVQQI +EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1 +Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg +Qi02MDkyOTQ1MjEzMDEGA1UECxMqSVBTIENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTMwMQYDVQQDEypJUFMgQ0EgQ2hhaW5lZCBDQXMgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczAeFw0wMTEyMjkwMDUzNThaFw0yNTEy +MjcwMDUzNThaMIIBHDELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJ +QmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBzLmwu +MSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMTMwMQYDVQQLEypJ +UFMgQ0EgQ2hhaW5lZCBDQXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMzAxBgNVBAMTKklQUyBD +QSBDaGFpbmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3DQEJARYPaXBz +QG1haWwuaXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcVpJJspQgvJhPUOtopKdJ +C7/SMejHT8KGC/po/UNaivNgkjWZOLtNA1IhW/A3mTXhQSCBhYEFcYGdtJUZqV92NC5jNzVXjrQf +Qj8VXOF6wV8TGDIxya2+o8eDZh65nAQTy2nBBt4wBrszo7Uf8I9vzv+W6FS+ZoCua9tBhDaiPQID +AQABo4IEQzCCBD8wHQYDVR0OBBYEFKGtMbH5PuEXpsirNPxShwkeYlJBMIIBTgYDVR0jBIIBRTCC +AUGAFKGtMbH5PuEXpsirNPxShwkeYlJBoYIBJKSCASAwggEcMQswCQYDVQQGEwJFUzESMBAGA1UE +CBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBw +dWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g +IEItNjA5Mjk0NTIxMzAxBgNVBAsTKklQUyBDQSBDaGFpbmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1 +dGhvcml0eTEzMDEGA1UEAxMqSVBTIENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0aG9y +aXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNV +HQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUF +BwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGC +NwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud +EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ2hhaW5lZCBDQSBDZXJ0aWZp +Y2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCGSAGG+EIBAgQcFhpodHRwOi8v +d3d3Lmlwcy5lcy9pcHMyMDAyLzA3BglghkgBhvhCAQQEKhYoaHR0cDovL3d3dy5pcHMuZXMvaXBz +MjAwMi9pcHMyMDAyQ0FDLmNybDA8BglghkgBhvhCAQMELxYtaHR0cDovL3d3dy5pcHMuZXMvaXBz +MjAwMi9yZXZvY2F0aW9uQ0FDLmh0bWw/MDkGCWCGSAGG+EIBBwQsFipodHRwOi8vd3d3Lmlwcy5l +cy9pcHMyMDAyL3JlbmV3YWxDQUMuaHRtbD8wNwYJYIZIAYb4QgEIBCoWKGh0dHA6Ly93d3cuaXBz +LmVzL2lwczIwMDIvcG9saWN5Q0FDLmh0bWwwbQYDVR0fBGYwZDAuoCygKoYoaHR0cDovL3d3dy5p +cHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0FDLmNybDAyoDCgLoYsaHR0cDovL3d3d2JhY2suaXBzLmVz +L2lwczIwMDIvaXBzMjAwMkNBQy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUFBzABhhNodHRw +Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAERyMJ1WWKJBGyi3leGmGpVfp3hAK+/b +lkr8THFj2XOVvQLiogbHvpcqk4A0hgP63Ng9HgfNHnNDJGD1HWHc3JagvPsd4+cSACczAsDAK1M9 +2GsDgaPb1pOVIO/Tln4mkImcJpvNb2ar7QMiRDjMWb2f2/YHogF/JsRj9SVCXmK9 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/C8:EC:8C:87:92:69:CB:4B:AB:39:E9:8D:7E:57:67:F3:14:95:73:9D.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/C8:EC:8C:87:92:69:CB:4B:AB:39:E9:8D:7E:57:67:F3:14:95:73:9D.crt new file mode 100644 index 0000000000..1f67056548 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/C8:EC:8C:87:92:69:CB:4B:AB:39:E9:8D:7E:57:67:F3:14:95:73:9D.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV +UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv +cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl +IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy +dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS +tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM +8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW +Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX +Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA +j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt +mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm +fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd +RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG +UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CA:3A:FB:CF:12:40:36:4B:44:B2:16:20:88:80:48:39:19:93:7C:F7.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CA:3A:FB:CF:12:40:36:4B:44:B2:16:20:88:80:48:39:19:93:7C:F7.crt new file mode 100644 index 0000000000..4a0462352a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CA:3A:FB:CF:12:40:36:4B:44:B2:16:20:88:80:48:39:19:93:7C:F7.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT +EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx +ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM +aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6 +XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk +lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB +lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy +lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt +66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn +wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh +D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy +BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie +J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud +DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU +a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT +ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv +Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3 +UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm +VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK ++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW +IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1 +WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X +f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II +4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8 +VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CB:A1:C5:F8:B0:E3:5E:B8:B9:45:12:D3:F9:34:A2:E9:06:10:D3:36.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CB:A1:C5:F8:B0:E3:5E:B8:B9:45:12:D3:F9:34:A2:E9:06:10:D3:36.crt new file mode 100644 index 0000000000..1de49de8c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CB:A1:C5:F8:B0:E3:5E:B8:B9:45:12:D3:F9:34:A2:E9:06:10:D3:36.crt @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT +AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg +LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w +HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+ +U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh +IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN +yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU +2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3 +4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP +2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm +8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf +HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa +Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK +5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b +czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g +ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF +BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug +cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf +AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX +EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v +/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3 +MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4 +3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk +eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f +/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h +RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU +Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D.crt new file mode 100644 index 0000000000..e745bca601 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU +cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw +CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO +ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6 +54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr +oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1 +Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui +GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w +HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD +AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT +RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw +HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt +ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph +iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr +mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj +ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D1:EB:23:A4:6D:17:D6:8F:D9:25:64:C2:F1:F1:60:17:64:D8:E3:49.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D1:EB:23:A4:6D:17:D6:8F:D9:25:64:C2:F1:F1:60:17:64:D8:E3:49.crt new file mode 100644 index 0000000000..a6d71da547 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D1:EB:23:A4:6D:17:D6:8F:D9:25:64:C2:F1:F1:60:17:64:D8:E3:49.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS +R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg +TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw +MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl +c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG +C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs +i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW +Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH +Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK +Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f +BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl +cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz +LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm +7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz +Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z +8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C +12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D2:32:09:AD:23:D3:14:23:21:74:E4:0D:7F:9D:62:13:97:86:63:3A.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D2:32:09:AD:23:D3:14:23:21:74:E4:0D:7F:9D:62:13:97:86:63:3A.crt new file mode 100644 index 0000000000..e352e832cb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D2:32:09:AD:23:D3:14:23:21:74:E4:0D:7F:9D:62:13:97:86:63:3A.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE +ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 +MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT +B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB +nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR +fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW +8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG +A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE +CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG +A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS +spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB +Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961 +zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB +BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95 +70+sB3c4 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D4:DE:20:D0:5E:66:FC:53:FE:1A:50:88:2C:78:DB:28:52:CA:E4:74.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D4:DE:20:D0:5E:66:FC:53:FE:1A:50:88:2C:78:DB:28:52:CA:E4:74.crt new file mode 100644 index 0000000000..8f19d0e688 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D4:DE:20:D0:5E:66:FC:53:FE:1A:50:88:2C:78:DB:28:52:CA:E4:74.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE +ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li +ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC +SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs +dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME +uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB +UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C +G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9 +XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr +l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI +VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB +BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh +cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5 +hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa +Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H +RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D8:C5:38:8A:B7:30:1B:1B:6E:D4:7A:E6:45:25:3A:6F:9F:1A:27:61.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D8:C5:38:8A:B7:30:1B:1B:6E:D4:7A:E6:45:25:3A:6F:9F:1A:27:61.crt new file mode 100644 index 0000000000..6dbde743d9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/D8:C5:38:8A:B7:30:1B:1B:6E:D4:7A:E6:45:25:3A:6F:9F:1A:27:61.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw +EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN +MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp +c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq +t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C +jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg +vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF +ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR +AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend +jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO +peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR +7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi +GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64 +OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov +L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm +5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr +44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf +Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m +Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp +mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk +vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf +KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br +NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj +viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DA:40:18:8B:91:89:A3:ED:EE:AE:DA:97:FE:2F:9D:F5:B7:D1:8A:41.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DA:40:18:8B:91:89:A3:ED:EE:AE:DA:97:FE:2F:9D:F5:B7:D1:8A:41.crt new file mode 100644 index 0000000000..d9a3a9d5a7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DA:40:18:8B:91:89:A3:ED:EE:AE:DA:97:FE:2F:9D:F5:B7:D1:8A:41.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB +LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE +ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz +IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ +1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a +IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk +MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW +Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF +AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5 +lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+ +KpYrtWKmpj29f5JZzVoqgrI3eQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13.crt new file mode 100644 index 0000000000..defc549f39 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK +ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X +DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1 +cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT +rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9 +UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy +xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d +utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T +AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ +MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug +dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE +GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw +RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS +fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12.crt new file mode 100644 index 0000000000..de04de4410 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK +Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw +MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j +LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo +BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet +8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc +T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU +vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD +AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk +DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q +zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4 +d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2 +mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p +XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm +Mw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DE:3F:40:BD:50:93:D3:9B:6C:60:F6:DA:BC:07:62:01:00:89:76:C9.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DE:3F:40:BD:50:93:D3:9B:6C:60:F6:DA:BC:07:62:01:00:89:76:C9.crt new file mode 100644 index 0000000000..bb3579beb9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/DE:3F:40:BD:50:93:D3:9B:6C:60:F6:DA:BC:07:62:01:00:89:76:C9.crt @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE +ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz +MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp +cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD +EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk +J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL +F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL +YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen +AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w +PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y +ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7 +MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj +YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs +ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh +Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW +Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu +BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw +FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6 +tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo +fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul +LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x +gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi +5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi +5nrQNiOKSnQ2+Q== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E0:AB:05:94:20:72:54:93:05:60:62:02:36:70:F7:CD:2E:FC:66:66.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E0:AB:05:94:20:72:54:93:05:60:62:02:36:70:F7:CD:2E:FC:66:66.crt new file mode 100644 index 0000000000..265c473ce7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E0:AB:05:94:20:72:54:93:05:60:62:02:36:70:F7:CD:2E:FC:66:66.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UE +BhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQK +ExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBE +aXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkB +FhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1 +OVowgc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUg +VG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp +b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEo +MCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEF +AAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+G +jZ4X9560ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6 +hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq +hkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmICSLGpmODA/eZd9iy5Ri4XWPz1HP7 +bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGHIPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoF +EsmvcsPcJX6kTY4XpeCHf+GaWuFg3GQjPEIuTQ== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E1:9F:E3:0E:8B:84:60:9E:80:9B:17:0D:72:A8:C5:BA:6E:14:09:BD.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E1:9F:E3:0E:8B:84:60:9E:80:9B:17:0D:72:A8:C5:BA:6E:14:09:BD.crt new file mode 100644 index 0000000000..7a2be81c3f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E1:9F:E3:0E:8B:84:60:9E:80:9B:17:0D:72:A8:C5:BA:6E:14:09:BD.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS +R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg +TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw +MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h +bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw +IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7 +3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y +/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6 +juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS +ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud +DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp +ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl +cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw +uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 +pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA +BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l +R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O +9y5Xt5hwXsjEeLBi +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E3:92:51:2F:0A:CF:F5:05:DF:F6:DE:06:7F:75:37:E1:65:EA:57:4B.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E3:92:51:2F:0A:CF:F5:05:DF:F6:DE:06:7F:75:37:E1:65:EA:57:4B.crt new file mode 100644 index 0000000000..91e7ec7f85 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E3:92:51:2F:0A:CF:F5:05:DF:F6:DE:06:7F:75:37:E1:65:EA:57:4B.crt @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT +CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV +BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD +KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ +BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6 +dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j +ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB +jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z +W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63 +euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw +DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN +RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn +YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB +IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i +aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0 +ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs +ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo +dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y +emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k +IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ +UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg +YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2 +xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW +gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E5:DF:74:3C:B6:01:C4:9B:98:43:DC:AB:8C:E8:6A:81:10:9F:E4:8E.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E5:DF:74:3C:B6:01:C4:9B:98:43:DC:AB:8C:E8:6A:81:10:9F:E4:8E.crt new file mode 100644 index 0000000000..1fd9cf85c4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E5:DF:74:3C:B6:01:C4:9B:98:43:DC:AB:8C:E8:6A:81:10:9F:E4:8E.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp +b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh +bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy +MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0 +d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg +UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0 +LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi +GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm +DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG +lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX +icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP +Orf1LXLI +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79.crt new file mode 100644 index 0000000000..982d47e5cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79.crt @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN +R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1 +MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu +Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP +ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t +JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e +RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs +7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d +8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V +qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga +Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB +Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu +KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08 +ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0 +XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB +hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc +aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2 +qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL +oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK +xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF +KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2 +DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK +xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU +p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI +P/rmMuGNG2+k5o7Y+SlIis5z/iw= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E7:B4:F6:9D:61:EC:90:69:DB:7E:90:A7:40:1A:3C:F4:7D:4F:E8:EE.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E7:B4:F6:9D:61:EC:90:69:DB:7E:90:A7:40:1A:3C:F4:7D:4F:E8:EE.crt new file mode 100644 index 0000000000..cf9d3e4772 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/E7:B4:F6:9D:61:EC:90:69:DB:7E:90:A7:40:1A:3C:F4:7D:4F:E8:EE.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM +F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw +NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN +MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl +bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD +VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1 +iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13 +i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8 +bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB +K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB +AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu +cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm +lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB +i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww +GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg +Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI +K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0 +bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj +qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es +E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ +tylv2G0xffX8oRAHh84vWdw+WNs= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/F4:8B:11:BF:DE:AB:BE:94:54:20:71:E6:41:DE:6B:BE:88:2B:40:B9.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/F4:8B:11:BF:DE:AB:BE:94:54:20:71:E6:41:DE:6B:BE:88:2B:40:B9.crt new file mode 100644 index 0000000000..cef27b7ae0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/F4:8B:11:BF:DE:AB:BE:94:54:20:71:E6:41:DE:6B:BE:88:2B:40:B9.crt @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG +EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X +DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv +dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN +w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5 +BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O +1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO +htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov +J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7 +Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t +B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB +O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8 +lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV +HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2 +09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ +TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj +Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2 +Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU +D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz +DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk +Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk +7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ +CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy ++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/F9:CD:0E:2C:DA:76:24:C1:8F:BD:F0:F0:AB:B6:45:B8:F7:FE:D5:7A.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/F9:CD:0E:2C:DA:76:24:C1:8F:BD:F0:F0:AB:B6:45:B8:F7:FE:D5:7A.crt new file mode 100644 index 0000000000..0c07542456 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/F9:CD:0E:2C:DA:76:24:C1:8F:BD:F0:F0:AB:B6:45:B8:F7:FE:D5:7A.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE +AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w +NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD +QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs +49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH +7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB +kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1 +9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw +AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t +U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA +j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC +AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a +BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp +FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP +51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz +OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw== +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/FC:21:9A:76:11:2F:76:C1:C5:08:83:3C:9A:2F:A2:BA:84:AC:08:7A.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/FC:21:9A:76:11:2F:76:C1:C5:08:83:3C:9A:2F:A2:BA:84:AC:08:7A.crt new file mode 100644 index 0000000000..d3de659268 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/FC:21:9A:76:11:2F:76:C1:C5:08:83:3C:9A:2F:A2:BA:84:AC:08:7A.crt @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIF5jCCA86gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMxHTAbBgNVBAoT +FEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNhIE9ubGluZSBJbmMuMTcwNQYD +VQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAy +MDUyOTA2MDAwMFoXDTM3MDkyODIzNDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wg +VGltZSBXYXJuZXIgSW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMu +QU9MIFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZI +hvcNAQEBBQADggIPADCCAgoCggIBALQ3WggWmRToVbEbJGv8x4vmh6mJ7ouZzU9AhqS2TcnZsdw8 +TQ2FTBVsRotSeJ/4I/1n9SQ6aF3Q92RhQVSji6UI0ilbm2BPJoPRYxJWSXakFsKlnUWsi4SVqBax +7J/qJBrvuVdcmiQhLE0OcR+mrF1FdAOYxFSMFkpBd4aVdQxHAWZg/BXxD+r1FHjHDtdugRxev17n +OirYlxcwfACtCJ0zr7iZYYCLqJV+FNwSbKTQ2O9ASQI2+W6p1h2WVgSysy0WVoaP2SBXgM1nEG2w +TPDaRrbqJS5Gr42whTg0ixQmgiusrpkLjhTXUr2eacOGAgvqdnUxCc4zGSGFQ+aJLZ8lN2fxI2rS +AG2X+Z/nKcrdH9cG6rjJuQkhn8g/BsXS6RJGAE57COtCPStIbp1n3UsC5ETzkxmlJ85per5n0/xQ +pCyrw2u544BMzwVhSyvcG7mm0tCq9Stz+86QNZ8MUhy/XCFhEVsVS6kkUfykXPcXnbDS+gfpj1bk +GoxoigTTfFrjnqKhynFbotSg5ymFXQNoKk/SBtc9+cMDLz9l+WceR0DTYw/j1Y75hauXTLPXJuuW +CpTehTacyH+BCQJJKg71ZDIMgtG6aoIbs0t0EfOMd9afv9w3pKdVBC/UMejTRrkDfNoSTllkt1Ex +MVCgyhwn2RAurda9EGYrw7AiShJbAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE +FE9pbQN+nZ8HGEO8txBO1b+pxCAoMB8GA1UdIwQYMBaAFE9pbQN+nZ8HGEO8txBO1b+pxCAoMA4G +A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAO/Ouyuguh4X7ZVnnrREUpVe8WJ8kEle7 ++z802u6teio0cnAxa8cZmIDJgt43d15Ui47y6mdPyXSEkVYJ1eV6moG2gcKtNuTxVBFT8zRFASbI +5Rq8NEQh3q0l/HYWdyGQgJhXnU7q7C+qPBR7V8F+GBRn7iTGvboVsNIYvbdVgaxTwOjdaRITQrcC +tQVBynlQboIOcXKTRuidDV29rs4prWPVVRaAMCf/drr3uNZK49m1+VLQTkCpx+XCMseqdiThawVQ +68W/ClTluUI8JPu3B5wwn3la5uBAUhX0/Kr0VvlEl4ftDmVyXr4m+02kLQgH3thcoNyBM5kYJRF3 +p+v9WAksmWsbivNSPxpNSGDxoPYzAlOL7SUJuA0t7Zdz7NeWH45gDtoQmy8YJPamTQr5O8t1wswv +ziRpyQoijlmn94IM19drNZxDAGrElWe6nEXLuA4399xOAU++CrYD062KRffaJ00psUjf5BHklka9 +bAI+1lHIlRcBFanyqqryvy9lG2/QuRqT9Y41xICHPpQvZuTpqP9BnHAqTyo5GJUefvthATxRCC4o +GKQWDzH9OmwjkyB24f0HhdFbP9IcczLd+rn4jM8Ch3qaluTtT4mNU0OrDhPAARW0eTjb/G49nlG2 +uBOLZ8/5fNkiHfZdxRwBL5joeiQYvITX+txyW/fBOmg= +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/FE:B8:C4:32:DC:F9:76:9A:CE:AE:3D:D8:90:8F:FD:28:86:65:64:7D.crt b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/FE:B8:C4:32:DC:F9:76:9A:CE:AE:3D:D8:90:8F:FD:28:86:65:64:7D.crt new file mode 100644 index 0000000000..494787d2fd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/files/chromeos-certs/FE:B8:C4:32:DC:F9:76:9A:CE:AE:3D:D8:90:8F:FD:28:86:65:64:7D.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc +U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh +dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE +BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl +Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO +/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX +WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z +ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4 +bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK +9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG +SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm +iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG +Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW +mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW +T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490 +-----END CERTIFICATE----- diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/root-certificates-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/root-certificates-0.0.1-r1.ebuild new file mode 100644 index 0000000000..0b165a29da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/root-certificates/root-certificates-0.0.1-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Chromium OS CA Certificates PEM files" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +# This package cannot co-exist in the build target with +# app-misc/ca-certificates because of file conflicts. Moreover, +# this package is a replacement for ca-certificates, so generally +# the two packages should not co-exist in any event. +# +# For maxiumum confusion, we depend on app-misc/ca-certificates from +# the build host for the "update-ca-certificates" script. That +# dependency must be specified in chromeos-base/hard-host-depends, +# as there's no way with Portage to specify that dependency here (as +# of this writing, at any rate). +RDEPEND="!app-misc/ca-certificates" +DEPEND="$RDEPEND + dev-libs/openssl" + +# Because this ebuild has no source package, "${S}" doesn't get +# automatically created. The compile phase depends on "${S}" to +# exist, so we make sure "${S}" refers to a real directory. +# +# The problem is apparently an undocumented feature of EAPI 4; +# earlier versions of EAPI don't require this. +S="${WORKDIR}" + +# N.B. The cert files are in ${FILESDIR}, not a separate source +# code repo. If you add or delete a cert file, you'll need to bump +# the revision number for this ebuild manually. +src_install() { + insinto /usr/share/ca-certificates + doins "${FILESDIR}"/chromeos-certs/*.crt + + # Create required inputs to the update-ca-certificates script. + dodir /etc/ssl/certs + dodir /etc/ca-certificates/update.d + ( + cd "${D}"/usr/share/ca-certificates + find * -name '*.crt' | sort + ) > "${D}"/etc/ca-certificates.conf + + update-ca-certificates --root "${D}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/saft/saft-0.0.1-r57.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/saft/saft-0.0.1-r57.ebuild new file mode 100644 index 0000000000..f96a99c96f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/saft/saft-0.0.1-r57.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="58a9879010fef161d9ec8711da589e2881bd94bf" +CROS_WORKON_TREE="9d192a93916cf24651a867191fa0c24fc6ee0e4a" +CROS_WORKON_PROJECT="chromiumos/platform/saft" + +inherit cros-workon + +DESCRIPTION="ChromeOS SAFT installer" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="chromeos-base/vboot_reference + virtual/chromeos-firmware" + +src_install() { + exeinto /usr/sbin/firmware/saft + doexe *.{py,sh} +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/saft/saft-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/saft/saft-9999.ebuild new file mode 100644 index 0000000000..084e64f889 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/saft/saft-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/saft" + +inherit cros-workon + +DESCRIPTION="ChromeOS SAFT installer" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="chromeos-base/vboot_reference + virtual/chromeos-firmware" + +src_install() { + exeinto /usr/sbin/firmware/saft + doexe *.{py,sh} +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/files/tty-serial.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/files/tty-serial.conf new file mode 100644 index 0000000000..33418d08ba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/files/tty-serial.conf @@ -0,0 +1,8 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +start on starting boot-services +stop on stopping boot-services + +respawn +exec /sbin/agetty 115200 %PORT% linux diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/serial-tty-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/serial-tty-0.0.1-r4.ebuild new file mode 120000 index 0000000000..829c222d2c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/serial-tty-0.0.1-r4.ebuild @@ -0,0 +1 @@ +serial-tty-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/serial-tty-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/serial-tty-0.0.1.ebuild new file mode 100644 index 0000000000..870fdfd9b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/serial-tty/serial-tty-0.0.1.ebuild @@ -0,0 +1,43 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit cros-serialuser + +DESCRIPTION="Init script to run agetty on the serial port" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND=" + !chromeos-base/tegra-debug + !chromeos-base/serial-sac-tty +" +RDEPEND=" + ${DEPEND} + sys-apps/upstart +" + +# Because this ebuild has no source package, "${S}" doesn't get +# automatically created. The compile phase depends on "${S}" to +# exist, so we make sure "${S}" refers to a real directory. +# +# The problem is apparently an undocumented feature of EAPI 4; +# earlier versions of EAPI don't require this. +S="${WORKDIR}" + +# To compile, just replace %PORT% in our conf file with the port provided +# by cros-serialuser... +src_compile() { + sed -e "s|%PORT%|$(get_serial_name)|" \ + "${FILESDIR}"/tty-serial.conf \ + > tty-serial.conf || die +} + +src_install() { + insinto /etc/init + doins tty-serial.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/shill/shill-0.0.1-r1052.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/shill/shill-0.0.1-r1052.ebuild new file mode 100644 index 0000000000..3820e10f8c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/shill/shill-0.0.1-r1052.ebuild @@ -0,0 +1,101 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="d73783fb016a4c9d7d8644db83c8caeb447b0063" +CROS_WORKON_TREE="e68fbfeee03d9d1e0e4a248b13d7081eaaacf317" +CROS_WORKON_PROJECT="chromiumos/platform/shill" + +inherit cros-debug cros-workon toolchain-funcs multilib + +DESCRIPTION="Shill Connection Manager for Chromium OS" +HOMEPAGE="http://src.chromium.org" +LICENSE="BSD" +SLOT="0" +IUSE="test" +KEYWORDS="amd64 arm x86" + +RDEPEND="chromeos-base/bootstat + chromeos-base/chromeos-minijail + !=chromeos-base/mobile-providers-0.0.1-r12 + chromeos-base/vpn-manager + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + dev-libs/libnl:3 + dev-libs/nss + dev-libs/protobuf + net-dialup/ppp + net-dns/c-ares + net-misc/dhcpcd + net-misc/openvpn + net-wireless/wpa_supplicant[dbus]" + +DEPEND="${RDEPEND} + chromeos-base/system_api + chromeos-base/wimax_manager + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest ) + virtual/modemmanager" + +make_flags() { + echo LIBDIR="/usr/$(get_libdir)" +} + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + + emake $(make_flags) shill shims +} + +src_test() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + + # Build tests + emake $(make_flags) shill_unittest + + # Run tests if we're on x86 + if ! use x86 && ! use amd64 ; then + echo Skipping tests on non-x86/amd64 platform... + else + for ut in shill ; do + "${S}/${ut}_unittest" \ + ${GTEST_ARGS} || die "${ut}_unittest failed" + done + fi +} + +src_install() { + dobin bin/ff_debug + dobin bin/mm_debug + dobin bin/set_apn + dobin bin/set_arpgw + dobin bin/shill_login_user + dobin bin/shill_logout_user + dobin bin/wpa_debug + dobin shill + local shims_dir="/usr/$(get_libdir)/shill/shims" + exeinto "${shims_dir}" + doexe build/shims/net-diags-upload + doexe build/shims/nss-get-cert + doexe build/shims/openvpn-script + doexe build/shims/set-apn-helper + doexe build/shims/shill-pppd-plugin.so + insinto "${shims_dir}" + doins build/shims/wpa_supplicant.conf + insinto /etc + doins shims/nsswitch.conf + dosym /var/run/shill/resolv.conf /etc/resolv.conf + insinto /etc/dbus-1/system.d + doins shims/org.chromium.flimflam.conf + insinto /usr/share/shill + doins data/cellular_operator_info + # Install introspection XML + insinto /usr/share/dbus-1/interfaces + doins dbus_bindings/org.chromium.flimflam.*.xml +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/shill/shill-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/shill/shill-9999.ebuild new file mode 100644 index 0000000000..28c42305ca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/shill/shill-9999.ebuild @@ -0,0 +1,99 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/shill" + +inherit cros-debug cros-workon toolchain-funcs multilib + +DESCRIPTION="Shill Connection Manager for Chromium OS" +HOMEPAGE="http://src.chromium.org" +LICENSE="BSD" +SLOT="0" +IUSE="test" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND="chromeos-base/bootstat + chromeos-base/chromeos-minijail + !=chromeos-base/mobile-providers-0.0.1-r12 + chromeos-base/vpn-manager + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + dev-libs/libnl:3 + dev-libs/nss + dev-libs/protobuf + net-dialup/ppp + net-dns/c-ares + net-misc/dhcpcd + net-misc/openvpn + net-wireless/wpa_supplicant[dbus]" + +DEPEND="${RDEPEND} + chromeos-base/system_api + chromeos-base/wimax_manager + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest ) + virtual/modemmanager" + +make_flags() { + echo LIBDIR="/usr/$(get_libdir)" +} + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + + emake $(make_flags) shill shims +} + +src_test() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + + # Build tests + emake $(make_flags) shill_unittest + + # Run tests if we're on x86 + if ! use x86 && ! use amd64 ; then + echo Skipping tests on non-x86/amd64 platform... + else + for ut in shill ; do + "${S}/${ut}_unittest" \ + ${GTEST_ARGS} || die "${ut}_unittest failed" + done + fi +} + +src_install() { + dobin bin/ff_debug + dobin bin/mm_debug + dobin bin/set_apn + dobin bin/set_arpgw + dobin bin/shill_login_user + dobin bin/shill_logout_user + dobin bin/wpa_debug + dobin shill + local shims_dir="/usr/$(get_libdir)/shill/shims" + exeinto "${shims_dir}" + doexe build/shims/net-diags-upload + doexe build/shims/nss-get-cert + doexe build/shims/openvpn-script + doexe build/shims/set-apn-helper + doexe build/shims/shill-pppd-plugin.so + insinto "${shims_dir}" + doins build/shims/wpa_supplicant.conf + insinto /etc + doins shims/nsswitch.conf + dosym /var/run/shill/resolv.conf /etc/resolv.conf + insinto /etc/dbus-1/system.d + doins shims/org.chromium.flimflam.conf + insinto /usr/share/shill + doins data/cellular_operator_info + # Install introspection XML + insinto /usr/share/dbus-1/interfaces + doins dbus_bindings/org.chromium.flimflam.*.xml +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/smogcheck/smogcheck-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/smogcheck/smogcheck-0.0.1-r4.ebuild new file mode 100644 index 0000000000..2f8535e8c9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/smogcheck/smogcheck-0.0.1-r4.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +CROS_WORKON_COMMIT="a059101ec8a50baa6f13d35844e13910f6baf167" +CROS_WORKON_TREE="bfb5a8712813658b24525efbc94c8dc46380afff" +CROS_WORKON_PROJECT="chromiumos/platform/smogcheck" +inherit toolchain-funcs cros-debug cros-workon + +DESCRIPTION="TPM SmogCheck library" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +IUSE="" +KEYWORDS="amd64 arm x86" + +RDEPEND="" +DEPEND="${RDEPEND} + sys-kernel/linux-headers" + +src_compile() { + tc-export CC + cros-debug-add-NDEBUG + + emake clean + emake || die "Smogcheck compile failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/smogcheck/smogcheck-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/smogcheck/smogcheck-9999.ebuild new file mode 100644 index 0000000000..be68219839 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/smogcheck/smogcheck-9999.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +CROS_WORKON_PROJECT="chromiumos/platform/smogcheck" +inherit toolchain-funcs cros-debug cros-workon + +DESCRIPTION="TPM SmogCheck library" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +IUSE="" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND="" +DEPEND="${RDEPEND} + sys-kernel/linux-headers" + +src_compile() { + tc-export CC + cros-debug-add-NDEBUG + + emake clean + emake || die "Smogcheck compile failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/files/ssh_known_hosts b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/files/ssh_known_hosts new file mode 100644 index 0000000000..ae6270c4ce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/files/ssh_known_hosts @@ -0,0 +1,4 @@ +[git.chromium.org]:6222 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnpMqy+POoe0kuCL00MFMEI3dJuoGU971N9LxJv9glnXPaXgV1scRjDJ2dAxIN8xi7+L4iymt0m7Ibg7eQUfWK90csub2xo8mltQg2XQCdV7QqUGcdidZsC7oZk8wIq7whS9rwC0F9yXmjLHyAp4nHAE2eqbVk8FOGsHkZdHI9wAo8T305Nh9cbmo2PlUAyJXGFo4eY4ZYo5lRlGMYMf3dTEyZ8XUrSQQVbjjkmexm/T7KZMBmt4BfGjauy2b9pmjmCpZIDlt4nLSAcpmXPAe8Uv3zTsZOXYhS2UgjB0QbLOZzRoOqPkl3lqXumUSiYWwOfu7vj82Y5MwT8v5KBxBOQ== +[gerrit.chromium.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCfRn+J+e9mU0c4bxFD8v2rhhd3O9WPk435xEtG9FD8a8fOnIubJcpObvQJhfSgYkxVUQOKk97V8b2eGjf72AGBhDQVJMiaLQc8ZGomeNlK/7cWjkJFDoIKQHilHQidz/pgZc/Pu+7Tl2emVGd6425QRK1h47CYtT9IUPt3Jtdv4w== +[gerrit-int.chromium.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCfdDDvb5HD7hDOtSZPJRg2NkBVnVWRVX4UB+QTDT37rha7rw0k/ZY8GOyT2AlaTiZcufszvFHdPwgCBhSSJscGNizrm1Ne48EpPm+GK4gHQAidKS4+nw1xleZki8qt7D99v/WwOaphuBbWUaupS1Mq36UXikSWdyqPJRVbw7VCpQ== +[gerrit-int.chromium.org]:29419 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCfdDDvb5HD7hDOtSZPJRg2NkBVnVWRVX4UB+QTDT37rha7rw0k/ZY8GOyT2AlaTiZcufszvFHdPwgCBhSSJscGNizrm1Ne48EpPm+GK4gHQAidKS4+nw1xleZki8qt7D99v/WwOaphuBbWUaupS1Mq36UXikSWdyqPJRVbw7VCpQ== diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/ssh-known-hosts-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/ssh-known-hosts-0.0.1-r2.ebuild new file mode 120000 index 0000000000..be4cfc06df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/ssh-known-hosts-0.0.1-r2.ebuild @@ -0,0 +1 @@ +ssh-known-hosts-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/ssh-known-hosts-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/ssh-known-hosts-0.0.1.ebuild new file mode 100644 index 0000000000..7c732f3c1d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-known-hosts/ssh-known-hosts-0.0.1.ebuild @@ -0,0 +1,20 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="SSH known_hosts file" +HOMEPAGE="http://src.chromium.org" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="net-misc/openssh" + +src_install() { + insinto /etc/ssh + doins ${FILESDIR}/ssh_known_hosts || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-root-dot-dir/ssh-root-dot-dir-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-root-dot-dir/ssh-root-dot-dir-0.0.1.ebuild new file mode 100644 index 0000000000..967bed4a2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/ssh-root-dot-dir/ssh-root-dot-dir-0.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="SSH /root/.ssh directory" +HOMEPAGE="http://src.chromium.org" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_install() { + # This directory is needed to prevent ssh/scp from trying to create + # it and failing inside the ebuild sandbox. + keepdir /root/.ssh +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/system_api/system_api-0.0.1-r199.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/system_api/system_api-0.0.1-r199.ebuild new file mode 100644 index 0000000000..290adca3c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/system_api/system_api-0.0.1-r199.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="f1fccbe00f2e161da74ccb2776ab9d961b15259d" +CROS_WORKON_TREE="f4692489193b90154b01d3bf5de0603ef15cac4e" +CROS_WORKON_PROJECT="chromiumos/platform/system_api" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS system API (D-Bus service names, etc.)" +HOMEPAGE="http://www.chromium.org/" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# Likewise, block libchromeos-0.0.1-r78 or older, that installs +# dbus/service_constants.h. TODO(satorux): Remove this after a month. +RDEPEND="!<=chromeos-base/libchromeos-0.0.1-r78" + +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})" + +src_install() { + insinto /usr/include/chromeos/dbus + doins -r dbus/* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/system_api/system_api-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/system_api/system_api-9999.ebuild new file mode 100644 index 0000000000..63ee12f1d1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/system_api/system_api-9999.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/system_api" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Chrome OS system API (D-Bus service names, etc.)" +HOMEPAGE="http://www.chromium.org/" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +# Likewise, block libchromeos-0.0.1-r78 or older, that installs +# dbus/service_constants.h. TODO(satorux): Remove this after a month. +RDEPEND="!<=chromeos-base/libchromeos-0.0.1-r78" + +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})" + +src_install() { + insinto /usr/include/chromeos/dbus + doins -r dbus/* +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/files/chromeos-version.sh new file mode 100755 index 0000000000..11283f4ca6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/files/chromeos-version.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +exec sed -nr "/version=/{s:.*='(.*)'.*:\1:;p}" "$1/setup.py" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/touchbot-1.0-r18.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/touchbot-1.0-r18.ebuild new file mode 100644 index 0000000000..1d731320fe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/touchbot-1.0-r18.ebuild @@ -0,0 +1,17 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="b28003cbdca7543825f14c30a748390e855ef703" +CROS_WORKON_TREE="40e371afcf914e281d4611a6fcbe40a972a2ee25" +CROS_WORKON_PROJECT="chromiumos/platform/touchbot" +CROS_WORKON_LOCALNAME="touchbot" + +inherit cros-workon distutils + +DESCRIPTION="Suite of control scripts for the Touchbot" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/touchbot-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/touchbot-9999.ebuild new file mode 100644 index 0000000000..ada7be2fc5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/touchbot/touchbot-9999.ebuild @@ -0,0 +1,15 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/touchbot" +CROS_WORKON_LOCALNAME="touchbot" + +inherit cros-workon distutils + +DESCRIPTION="Suite of control scripts for the Touchbot" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-check/tpm-check-0.0.1-r700.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-check/tpm-check-0.0.1-r700.ebuild new file mode 100644 index 0000000000..dbc43304d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-check/tpm-check-0.0.1-r700.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="3e9cf90442632bed695ac0552a76ca0d1154f799" +CROS_WORKON_TREE="8b768b506c41afc82139df72f689917b51d7cbb2" +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-workon autotest + +DESCRIPTION="tpm check test" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +IUSE_TESTS=" + +tests_hardware_TPMCheck +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=vboot_reference + +# path from root of repo +AUTOTEST_CLIENT_SITE_TESTS=autotest/client diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-check/tpm-check-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-check/tpm-check-9999.ebuild new file mode 100644 index 0000000000..9b5cefaca8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-check/tpm-check-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-workon autotest + +DESCRIPTION="tpm check test" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +IUSE_TESTS=" + +tests_hardware_TPMCheck +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=vboot_reference + +# path from root of repo +AUTOTEST_CLIENT_SITE_TESTS=autotest/client diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-firmware-tests/tpm-firmware-tests-0.0.1-r718.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-firmware-tests/tpm-firmware-tests-0.0.1-r718.ebuild new file mode 100644 index 0000000000..a024785066 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-firmware-tests/tpm-firmware-tests-0.0.1-r718.ebuild @@ -0,0 +1,40 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="3e9cf90442632bed695ac0552a76ca0d1154f799" +CROS_WORKON_TREE="8b768b506c41afc82139df72f689917b51d7cbb2" +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-workon autotest + +DESCRIPTION="TPM firmware tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" +DEPEND="app-crypt/trousers + chromeos-base/tpm" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +IUSE_TESTS=" + +tests_hardware_TPMFirmware + +tests_hardware_TPMFirmwareServer +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=vboot_reference + +# path from root of repo +AUTOTEST_CLIENT_SITE_TESTS=autotest/client + +function src_compile { + # for Makefile + export VBOOT_DIR=${WORKDIR}/${P} + export MINIMAL=1 # Makefile requires this for cross-compiling + autotest_src_compile +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-firmware-tests/tpm-firmware-tests-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-firmware-tests/tpm-firmware-tests-9999.ebuild new file mode 100644 index 0000000000..d2d59a29e8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm-firmware-tests/tpm-firmware-tests-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-workon autotest + +DESCRIPTION="TPM firmware tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" +DEPEND="app-crypt/trousers + chromeos-base/tpm" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +IUSE_TESTS=" + +tests_hardware_TPMFirmware + +tests_hardware_TPMFirmwareServer +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=vboot_reference + +# path from root of repo +AUTOTEST_CLIENT_SITE_TESTS=autotest/client + +function src_compile { + # for Makefile + export VBOOT_DIR=${WORKDIR}/${P} + export MINIMAL=1 # Makefile requires this for cross-compiling + autotest_src_compile +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm/tpm-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm/tpm-0.0.1-r7.ebuild new file mode 100644 index 0000000000..29cc3c6602 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm/tpm-0.0.1-r7.ebuild @@ -0,0 +1,42 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI="2" +CROS_WORKON_COMMIT="1814ad708d10f34ad8f03d3a067d72bc32782e3c" +CROS_WORKON_TREE="c131259845e91d4cd0fd8001c0598d49f59c4b7d" +CROS_WORKON_PROJECT="chromiumos/platform/tpm" + +inherit cros-workon autotools +inherit cros-workon base +inherit cros-workon eutils +inherit cros-workon linux-info + +DESCRIPTION="Various TPM tools" +LICENSE="BSD" +HOMEPAGE="http://www.chromium.org/" +SLOT="0" +KEYWORDS="amd64 arm x86" + +DEPEND="app-crypt/trousers" + +CROS_WORKON_LOCALNAME="../third_party/tpm" + +src_compile() { + if tc-is-cross-compiler ; then + tc-getCC + tc-getCXX + tc-getAR + tc-getRANLIB + tc-getLD + tc-getNM + export PKG_CONFIG_PATH="${ROOT}/usr/lib/pkgconfig/" + export CCFLAGS="$CFLAGS" + fi + (cd nvtool; emake) || die emake failed +} + +src_install() { + exeinto /usr/bin + doexe nvtool/tpm-nvtool +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm/tpm-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm/tpm-9999.ebuild new file mode 100644 index 0000000000..8833f44621 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm/tpm-9999.ebuild @@ -0,0 +1,40 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/platform/tpm" + +inherit cros-workon autotools +inherit cros-workon base +inherit cros-workon eutils +inherit cros-workon linux-info + +DESCRIPTION="Various TPM tools" +LICENSE="BSD" +HOMEPAGE="http://www.chromium.org/" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND="app-crypt/trousers" + +CROS_WORKON_LOCALNAME="../third_party/tpm" + +src_compile() { + if tc-is-cross-compiler ; then + tc-getCC + tc-getCXX + tc-getAR + tc-getRANLIB + tc-getLD + tc-getNM + export PKG_CONFIG_PATH="${ROOT}/usr/lib/pkgconfig/" + export CCFLAGS="$CFLAGS" + fi + (cd nvtool; emake) || die emake failed +} + +src_install() { + exeinto /usr/bin + doexe nvtool/tpm-nvtool +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm_lite/tpm_lite-0.0.1-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm_lite/tpm_lite-0.0.1-r8.ebuild new file mode 100644 index 0000000000..9ea71680d9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm_lite/tpm_lite-0.0.1-r8.ebuild @@ -0,0 +1,36 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI="2" +CROS_WORKON_COMMIT="066c7f963b3ef733716251b666e0af0afd03b4fe" +CROS_WORKON_TREE="e1d7a6d5d9b3eb03d183c7ec73a33c77c53edd2b" +CROS_WORKON_PROJECT="chromiumos/platform/tpm_lite" + +inherit cros-workon autotools +inherit cros-workon base +inherit cros-workon eutils + +DESCRIPTION="TPM Light Command Library testsuite" +LICENSE="GPL-2" +HOMEPAGE="http://www.chromium.org/" +SLOT="0" +KEYWORDS="amd64 arm x86" + +DEPEND="app-crypt/trousers" + +CROS_WORKON_LOCALNAME="tpm_lite" + +src_compile() { + pushd src + tc-export CC CXX LD AR RANLIB NM + emake cross USE_TPM_EMULATOR=0 || die emake failed + popd +} + +src_install() { + pushd src + dobin testsuite/tpmtest_* + dolib tlcl/libtlcl.a + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm_lite/tpm_lite-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm_lite/tpm_lite-9999.ebuild new file mode 100644 index 0000000000..52c10119ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/tpm_lite/tpm_lite-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/platform/tpm_lite" + +inherit cros-workon autotools +inherit cros-workon base +inherit cros-workon eutils + +DESCRIPTION="TPM Light Command Library testsuite" +LICENSE="GPL-2" +HOMEPAGE="http://www.chromium.org/" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND="app-crypt/trousers" + +CROS_WORKON_LOCALNAME="tpm_lite" + +src_compile() { + pushd src + tc-export CC CXX LD AR RANLIB NM + emake cross USE_TPM_EMULATOR=0 || die emake failed + popd +} + +src_install() { + pushd src + dobin testsuite/tpmtest_* + dolib tlcl/libtlcl.a + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/files/boot.scr b/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/files/boot.scr new file mode 100644 index 0000000000..1599a5d134 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/files/boot.scr @@ -0,0 +1,2 @@ +setenv kernelpart ${KERNEL_PART} +setenv rootpart ${ROOT_PART} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/u-boot-scripts-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/u-boot-scripts-0.0.1-r5.ebuild new file mode 120000 index 0000000000..2e75cdc441 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/u-boot-scripts-0.0.1-r5.ebuild @@ -0,0 +1 @@ +u-boot-scripts-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/u-boot-scripts-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/u-boot-scripts-0.0.1.ebuild new file mode 100644 index 0000000000..ac7bdb7fc1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/u-boot-scripts/u-boot-scripts-0.0.1.ebuild @@ -0,0 +1,27 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Tegra2 boot scripts" + +LICENSE="BCD" +SLOT="0" +KEYWORDS="arm" +IUSE="" + +src_compile() { + BASE="${FILESDIR}"/boot.scr + sed 's/\${KERNEL_PART}/2/g;s/\${ROOT_PART}/3/g' "$BASE" >boot-A.scr || die + sed 's/\${KERNEL_PART}/4/g;s/\${ROOT_PART}/5/g' "$BASE" >boot-B.scr || die + + for script in boot-{A,B}.scr; do + mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ + -n $script -d $script $script.uimg >/dev/null || die + done +} + +src_install() { + insinto /boot + doins boot-{A,B}.scr.uimg || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/uboot-env/uboot-env-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/uboot-env/uboot-env-0.0.1-r5.ebuild new file mode 100644 index 0000000000..5ff74e3646 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/uboot-env/uboot-env-0.0.1-r5.ebuild @@ -0,0 +1,21 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="108ebbfac4d13d11e1940216434c368384ee0c0b" +CROS_WORKON_TREE="5e354d36805a844694bf48c110c287067494722e" +CROS_WORKON_PROJECT="chromiumos/platform/uboot-env" + +inherit cros-workon + +DESCRIPTION="Python script to read/write u-boot environment" +SLOT="0" +KEYWORDS="arm x86" +IUSE="" + +DEPEND=">=dev-lang/python-2.5" +RDEPEND="${DEPEND}" + +src_install() { + dobin ${S}/uboot-env.py || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/uboot-env/uboot-env-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/uboot-env/uboot-env-9999.ebuild new file mode 100644 index 0000000000..aceff4ecc7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/uboot-env/uboot-env-9999.ebuild @@ -0,0 +1,19 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/uboot-env" + +inherit cros-workon + +DESCRIPTION="Python script to read/write u-boot environment" +SLOT="0" +KEYWORDS="~arm ~x86" +IUSE="" + +DEPEND=">=dev-lang/python-2.5" +RDEPEND="${DEPEND}" + +src_install() { + dobin ${S}/uboot-env.py || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/update_engine/update_engine-0.0.1-r361.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/update_engine/update_engine-0.0.1-r361.ebuild new file mode 100644 index 0000000000..1d088cf90c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/update_engine/update_engine-0.0.1-r361.ebuild @@ -0,0 +1,97 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="50c6063bf22ea1776579fda55402ce34b4c21daa" +CROS_WORKON_TREE="bb8510cb7d96ac37c6e2407ce9b4b3006a11b0f4" +CROS_WORKON_PROJECT="chromiumos/platform/update_engine" + +inherit toolchain-funcs cros-debug cros-workon scons-utils + +DESCRIPTION="Chrome OS Update Engine" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="cros_host -delta_generator" + +LIBCHROME_VERS="125070" + +RDEPEND="app-arch/bzip2 + chromeos-base/chromeos-ca-certificates + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/metrics + chromeos-base/vboot_reference + chromeos-base/verity + dev-cpp/gflags + dev-libs/glib + dev-libs/libpcre + dev-libs/libxml2 + dev-libs/openssl + dev-libs/protobuf + dev-util/bsdiff + net-misc/curl + sys-apps/rootdev + sys-fs/e2fsprogs + sys-libs/e2fsprogs-libs" +DEPEND="chromeos-base/system_api + dev-cpp/gmock + dev-cpp/gtest + dev-libs/dbus-glib + cros_host? ( dev-util/scons ) + sys-fs/udev + ${RDEPEND}" + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + export BASE_VER=${LIBCHROME_VERS} + + escons +} + +src_test() { + UNITTESTS_BINARY=update_engine_unittests + TARGETS="${UNITTESTS_BINARY} test_http_server delta_generator" + escons ${TARGETS} + + if ! use x86 && ! use amd64 ; then + einfo "Skipping tests on non-x86 platform..." + else + # We need to set PATH so that the `openssl` in the target + # sysroot gets executed instead of the host one (which is + # compiled differently). http://crosbug.com/27683 + PATH="$SYSROOT/usr/bin:$PATH" \ + "./${UNITTESTS_BINARY}" --gtest_filter='-*.RunAsRoot*' \ + && einfo "./${UNITTESTS_BINARY} (unprivileged) succeeded" \ + || die "./${UNITTESTS_BINARY} (unprivileged) failed, retval=$?" + sudo LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PATH="$SYSROOT/usr/bin:$PATH" \ + "./${UNITTESTS_BINARY}" --gtest_filter='*.RunAsRoot*' \ + && einfo "./${UNITTESTS_BINARY} (root) succeeded" \ + || die "./${UNITTESTS_BINARY} (root) failed, retval=$?" + fi +} + +src_install() { + dosbin update_engine + dobin update_engine_client + + use delta_generator && dobin delta_generator + + insinto /usr/share/dbus-1/services + doins org.chromium.UpdateEngine.service + + insinto /etc/dbus-1/system.d + doins UpdateEngine.conf + + insinto /lib/udev/rules.d + doins 99-gpio-dutflag.rules + + insinto /usr/include/chromeos/update_engine + doins update_engine.dbusserver.h + doins update_engine.dbusclient.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/update_engine/update_engine-9999.ebuild new file mode 100644 index 0000000000..089a3552f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/update_engine/update_engine-9999.ebuild @@ -0,0 +1,95 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/update_engine" + +inherit toolchain-funcs cros-debug cros-workon scons-utils + +DESCRIPTION="Chrome OS Update Engine" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="cros_host -delta_generator" + +LIBCHROME_VERS="125070" + +RDEPEND="app-arch/bzip2 + chromeos-base/chromeos-ca-certificates + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + chromeos-base/metrics + chromeos-base/vboot_reference + chromeos-base/verity + dev-cpp/gflags + dev-libs/glib + dev-libs/libpcre + dev-libs/libxml2 + dev-libs/openssl + dev-libs/protobuf + dev-util/bsdiff + net-misc/curl + sys-apps/rootdev + sys-fs/e2fsprogs + sys-libs/e2fsprogs-libs" +DEPEND="chromeos-base/system_api + dev-cpp/gmock + dev-cpp/gtest + dev-libs/dbus-glib + cros_host? ( dev-util/scons ) + sys-fs/udev + ${RDEPEND}" + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + cros-debug-add-NDEBUG + export CCFLAGS="$CFLAGS" + export BASE_VER=${LIBCHROME_VERS} + + escons +} + +src_test() { + UNITTESTS_BINARY=update_engine_unittests + TARGETS="${UNITTESTS_BINARY} test_http_server delta_generator" + escons ${TARGETS} + + if ! use x86 && ! use amd64 ; then + einfo "Skipping tests on non-x86 platform..." + else + # We need to set PATH so that the `openssl` in the target + # sysroot gets executed instead of the host one (which is + # compiled differently). http://crosbug.com/27683 + PATH="$SYSROOT/usr/bin:$PATH" \ + "./${UNITTESTS_BINARY}" --gtest_filter='-*.RunAsRoot*' \ + && einfo "./${UNITTESTS_BINARY} (unprivileged) succeeded" \ + || die "./${UNITTESTS_BINARY} (unprivileged) failed, retval=$?" + sudo LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PATH="$SYSROOT/usr/bin:$PATH" \ + "./${UNITTESTS_BINARY}" --gtest_filter='*.RunAsRoot*' \ + && einfo "./${UNITTESTS_BINARY} (root) succeeded" \ + || die "./${UNITTESTS_BINARY} (root) failed, retval=$?" + fi +} + +src_install() { + dosbin update_engine + dobin update_engine_client + + use delta_generator && dobin delta_generator + + insinto /usr/share/dbus-1/services + doins org.chromium.UpdateEngine.service + + insinto /etc/dbus-1/system.d + doins UpdateEngine.conf + + insinto /lib/udev/rules.d + doins 99-gpio-dutflag.rules + + insinto /usr/include/chromeos/update_engine + doins update_engine.dbusserver.h + doins update_engine.dbusclient.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/userfeedback/userfeedback-0.0.1-r81.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/userfeedback/userfeedback-0.0.1-r81.ebuild new file mode 100644 index 0000000000..b57afa743b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/userfeedback/userfeedback-0.0.1-r81.ebuild @@ -0,0 +1,40 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_COMMIT="be13c42c801e18096f357684dc2a2848a4bf5162" +CROS_WORKON_TREE="f209555c63c55fe03d652edfb83c61d912c54f16" +CROS_WORKON_PROJECT="chromiumos/platform/userfeedback" + +inherit cros-workon + +DESCRIPTION="Log scripts used by userfeedback to report cros system information" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="chromeos-base/chromeos-init + chromeos-base/modem-utilities + chromeos-base/vboot_reference + media-libs/fontconfig + sys-apps/mosys + sys-apps/net-tools + sys-apps/pciutils + sys-apps/usbutils + x11-apps/setxkbmap" + +DEPEND="" + +src_install() { + exeinto /usr/share/userfeedback/scripts + doexe scripts/* || die "Could not copy scripts" + + insinto /usr/share/userfeedback/etc + doins etc/* || die "Could not copy etc" + + insinto /etc/init + doins init/* || die "Could not copy init" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/userfeedback/userfeedback-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/userfeedback/userfeedback-9999.ebuild new file mode 100644 index 0000000000..ca412403ea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/userfeedback/userfeedback-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/platform/userfeedback" + +inherit cros-workon + +DESCRIPTION="Log scripts used by userfeedback to report cros system information" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="chromeos-base/chromeos-init + chromeos-base/modem-utilities + chromeos-base/vboot_reference + media-libs/fontconfig + sys-apps/mosys + sys-apps/net-tools + sys-apps/pciutils + sys-apps/usbutils + x11-apps/setxkbmap" + +DEPEND="" + +src_install() { + exeinto /usr/share/userfeedback/scripts + doexe scripts/* || die "Could not copy scripts" + + insinto /usr/share/userfeedback/etc + doins etc/* || die "Could not copy etc" + + insinto /etc/init + doins init/* || die "Could not copy init" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-config/vboot_reference-config-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-config/vboot_reference-config-0.0.1-r2.ebuild new file mode 100644 index 0000000000..4e737b916b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-config/vboot_reference-config-0.0.1-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# +# Determine which systems must use the old (v2) preamble header format, and +# create a config file forcing that format for those systems. +# +# This is only needed to provide backward compatibility for already-shipping +# systems. + +EAPI="4" + +inherit cros-board + +DESCRIPTION="Chrome OS verified boot tools config" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# These are the ONLY systems that should require v2. All others should adapt +# to the new format. +OLD_BOARDS=( + lumpy + lumpy64 + stumpy + stumpy64 + tegra2 + x86-alex + x86-alex32 + x86-mario + x86-mario64 + x86-zgb + x86-zgb32 +) + +S=${WORKDIR} + +src_compile() { + local b + + b=$(get_current_board_no_variant) + mkdir -p "config" + if has "${b}" "${OLD_BOARDS[@]}" ; then + fmt=2 + else + fmt=3 + fi + printf -- '--format\n%s\n' "${fmt}" > "config/vbutil_firmware.options" + printf -- '--format\n%s\n' "${fmt}" > "config/vbutil_kernel.options" +} + +src_install() { + insinto /usr/share/vboot/config + doins config/vbutil_{firmware,kernel}.options +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-tests/vboot_reference-tests-0.0.1-r718.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-tests/vboot_reference-tests-0.0.1-r718.ebuild new file mode 100644 index 0000000000..2674d6f9e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-tests/vboot_reference-tests-0.0.1-r718.ebuild @@ -0,0 +1,36 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="3e9cf90442632bed695ac0552a76ca0d1154f799" +CROS_WORKON_TREE="8b768b506c41afc82139df72f689917b51d7cbb2" +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-workon autotest + +DESCRIPTION="vboot tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 arm amd64" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +IUSE_TESTS=" + +tests_firmware_VbootCrypto +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=vboot_reference + +# path from root of repo +AUTOTEST_CLIENT_SITE_TESTS=autotest/client + +function src_compile { + # for Makefile + export VBOOT_SRC_DIR=${WORKDIR}/${P} + autotest_src_compile +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-tests/vboot_reference-tests-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-tests/vboot_reference-tests-9999.ebuild new file mode 100644 index 0000000000..7d88acec3e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference-tests/vboot_reference-tests-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-workon autotest + +DESCRIPTION="vboot tests" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~arm ~amd64" + +# Enable autotest by default. +IUSE="${IUSE} +autotest" + +IUSE_TESTS=" + +tests_firmware_VbootCrypto +" + +IUSE="${IUSE} ${IUSE_TESTS}" + +CROS_WORKON_LOCALNAME=vboot_reference + +# path from root of repo +AUTOTEST_CLIENT_SITE_TESTS=autotest/client + +function src_compile { + # for Makefile + export VBOOT_SRC_DIR=${WORKDIR}/${P} + autotest_src_compile +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference/vboot_reference-1.0-r825.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference/vboot_reference-1.0-r825.ebuild new file mode 100644 index 0000000000..7c089eb09b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference/vboot_reference-1.0-r825.ebuild @@ -0,0 +1,201 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="3e9cf90442632bed695ac0552a76ca0d1154f799" +CROS_WORKON_TREE="8b768b506c41afc82139df72f689917b51d7cbb2" +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-debug cros-workon cros-au + +DESCRIPTION="Chrome OS verified boot tools" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="32bit_au minimal rbtest tpmtests cros_host" + +LIBCHROME_VERS="125070" + +RDEPEND="app-crypt/trousers + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + !minimal? ( dev-libs/libyaml ) + dev-libs/glib + dev-libs/openssl + sys-apps/util-linux" +DEPEND="${RDEPEND} + dev-cpp/gflags + dev-cpp/gtest" + +# We need the config in place before we run, but don't need to rebuild this +# package every time. +RDEPEND="${RDEPEND} + !cros_host? ( chromeos-base/vboot_reference-config )" + +_src_compile_main() { + mkdir "${S}"/build-main + tc-export CC AR CXX PKG_CONFIG + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} + # Vboot reference knows the flags to use + unset CFLAGS + emake BUILD="${S}"/build-main \ + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) all + unset CC AR CXX +} + +_src_compile_au() { + mkdir "${S}"/build-au + if use 32bit_au ; then + AU_TARGETS="libcgpt_cc libdump_kernel_config" + einfo "Building 32-bit AU_TARGETS: ${AU_TARGETS}" + board_setup_32bit_au_env + else + AU_TARGETS="libcgpt_cc libdump_kernel_config cgptmanager_tests" + einfo "Building native AU_TARGETS: ${AU_TARGETS}" + fi + tc-export CC AR CXX PKG_CONFIG + emake BUILD="${S}"/build-au/ \ + CC="${CC}" \ + CXX="${CXX}" \ + ARCH=$(tc-arch) MINIMAL=$(usev minimal) \ + ${AU_TARGETS} + use 32bit_au && board_teardown_32bit_au_env +} + +src_compile() { + _src_compile_main + _src_compile_au +} + +src_test() { + emake BUILD="${S}"/build-main \ + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) runtests +} + +src_install() { + local dst_dir + + if use minimal ; then + # Installing on the target. Cherry pick programs generated + # by src_compile in the source tree build-main/ subdirectory + einfo "Installing target programs" + local progs='utility/dump_kernel_config' + progs+=' utility/crossystem' + progs+=' utility/dev_sign_file' + progs+=' utility/dumpRSAPublicKey' + progs+=' utility/tpm_init_temp_fix' + progs+=' utility/tpmc' + progs+=' utility/vbutil_key' + progs+=' utility/vbutil_keyblock' + progs+=' utility/vbutil_kernel' + progs+=' utility/vbutil_firmware' + progs+=' utility/vbutil_what_keys' + progs+=' utility/gbb_utility' + progs+=' utility/dump_fmap' + progs+=' utility/dev_debug_vboot' + progs+=' utility/enable_dev_usb_boot' + progs+=' cgpt/cgpt' + + into /usr + for prog in ${progs}; do + dobin build-main/"${prog}" + done + + einfo "Installing TPM tools" + exeinto /usr/sbin + doexe "utility/tpm-nvsize" + doexe "utility/chromeos-tpm-recovery" + + einfo "Installing boot tools" + exeinto /sbin + doexe build-main/utility/mount-encrypted + + einfo "Installing dev tools" + dst_dir='/usr/share/vboot/bin' + local src_dir='scripts/image_signing' + dodir "${dst_dir}" + exeinto "${dst_dir}" + doexe "${src_dir}/common_minimal.sh" + doexe "${src_dir}/resign_firmwarefd.sh" + doexe "${src_dir}/make_dev_firmware.sh" + doexe "${src_dir}/make_dev_ssd.sh" + doexe "${src_dir}/set_gbb_flags.sh" + + # TODO(hungte) Since we now install all keyset into + # /usr/share/vboot/devkeys, maybe SAFT does not need to install + # its own keys anymore. + einfo "Installing keys for SAFT" + local keys_to_install='recovery_kernel_data_key.vbprivk' + keys_to_install+=' firmware.keyblock ' + keys_to_install+=' firmware_data_key.vbprivk' + keys_to_install+=' kernel_subkey.vbpubk' + keys_to_install+=' kernel_data_key.vbprivk' + + dst_dir='/usr/sbin/firmware/saft' + dodir "${dst_dir}" + insinto "${dst_dir}" + for key in ${keys_to_install}; do + doins "tests/devkeys/${key}" + done + else + # Installing on host. + emake BUILD="${S}"/build-main \ + DESTDIR="${D}/usr/bin" install + # EC firmware needs to compile directly from source + dodir /usr/src/vboot + insinto /usr/src/vboot + doins -r firmware/include firmware/lib + fi + if use rbtest; then + emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" -C tests \ + install-rbtest + fi + if use tpmtests; then + into /usr + # copy files starting with tpmtest, but skip .d files. + dobin "${S}"/build-main/tests/tpm_lite/tpmtest*[^.]? + dobin "${S}"/build-main/utility/tpm_set_readsrkpub + fi + + # Install devkeys to /usr/share/vboot/devkeys + # (shared by host and target) + einfo "Installing devkeys" + dst_dir='/usr/share/vboot/devkeys' + dodir "${dst_dir}" + insinto "${dst_dir}" + doins tests/devkeys/* + + einfo "Installing header files and libraries" + + # Install firmware/include to /build/${BOARD}/usr/include/vboot + local dst_dir='/usr/include/vboot' + dodir "${dst_dir}" + insinto "${dst_dir}" + doins -r firmware/include/* + for arch in $(ls firmware/arch/); do + insinto "${dst_dir}"/arch/"${arch}" + doins firmware/arch/"${arch}"/include/biosincludes.h + done + + insinto /usr/include/vboot/ + doins "utility/include/kernel_blob.h" + doins "utility/include/dump_kernel_config.h" + doins "cgpt/CgptManager.h" + doins "firmware/lib/cgptlib/include/gpt.h" + + # Install static library needed by install programs. + # we need board_setup_32bit_au_env again so dolib.a installs to the + # correct location + use 32bit_au && board_setup_32bit_au_env + + einfo "Installing dump_kernel_config library" + dolib.a build-au/libdump_kernel_config.a + + einfo "Installing C++ version of cgpt static library:libcgpt-cc.a" + dolib.a build-au/cgpt/libcgpt-cc.a + + use 32bit_au && board_teardown_32bit_au_env +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference/vboot_reference-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference/vboot_reference-9999.ebuild new file mode 100644 index 0000000000..f23a678a0d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vboot_reference/vboot_reference-9999.ebuild @@ -0,0 +1,199 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-debug cros-workon cros-au + +DESCRIPTION="Chrome OS verified boot tools" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="32bit_au minimal rbtest tpmtests cros_host" + +LIBCHROME_VERS="125070" + +RDEPEND="app-crypt/trousers + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + !minimal? ( dev-libs/libyaml ) + dev-libs/glib + dev-libs/openssl + sys-apps/util-linux" +DEPEND="${RDEPEND} + dev-cpp/gflags + dev-cpp/gtest" + +# We need the config in place before we run, but don't need to rebuild this +# package every time. +RDEPEND="${RDEPEND} + !cros_host? ( chromeos-base/vboot_reference-config )" + +_src_compile_main() { + mkdir "${S}"/build-main + tc-export CC AR CXX PKG_CONFIG + cros-debug-add-NDEBUG + export BASE_VER=${LIBCHROME_VERS} + # Vboot reference knows the flags to use + unset CFLAGS + emake BUILD="${S}"/build-main \ + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) all + unset CC AR CXX +} + +_src_compile_au() { + mkdir "${S}"/build-au + if use 32bit_au ; then + AU_TARGETS="libcgpt_cc libdump_kernel_config" + einfo "Building 32-bit AU_TARGETS: ${AU_TARGETS}" + board_setup_32bit_au_env + else + AU_TARGETS="libcgpt_cc libdump_kernel_config cgptmanager_tests" + einfo "Building native AU_TARGETS: ${AU_TARGETS}" + fi + tc-export CC AR CXX PKG_CONFIG + emake BUILD="${S}"/build-au/ \ + CC="${CC}" \ + CXX="${CXX}" \ + ARCH=$(tc-arch) MINIMAL=$(usev minimal) \ + ${AU_TARGETS} + use 32bit_au && board_teardown_32bit_au_env +} + +src_compile() { + _src_compile_main + _src_compile_au +} + +src_test() { + emake BUILD="${S}"/build-main \ + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) runtests +} + +src_install() { + local dst_dir + + if use minimal ; then + # Installing on the target. Cherry pick programs generated + # by src_compile in the source tree build-main/ subdirectory + einfo "Installing target programs" + local progs='utility/dump_kernel_config' + progs+=' utility/crossystem' + progs+=' utility/dev_sign_file' + progs+=' utility/dumpRSAPublicKey' + progs+=' utility/tpm_init_temp_fix' + progs+=' utility/tpmc' + progs+=' utility/vbutil_key' + progs+=' utility/vbutil_keyblock' + progs+=' utility/vbutil_kernel' + progs+=' utility/vbutil_firmware' + progs+=' utility/vbutil_what_keys' + progs+=' utility/gbb_utility' + progs+=' utility/dump_fmap' + progs+=' utility/dev_debug_vboot' + progs+=' utility/enable_dev_usb_boot' + progs+=' cgpt/cgpt' + + into /usr + for prog in ${progs}; do + dobin build-main/"${prog}" + done + + einfo "Installing TPM tools" + exeinto /usr/sbin + doexe "utility/tpm-nvsize" + doexe "utility/chromeos-tpm-recovery" + + einfo "Installing boot tools" + exeinto /sbin + doexe build-main/utility/mount-encrypted + + einfo "Installing dev tools" + dst_dir='/usr/share/vboot/bin' + local src_dir='scripts/image_signing' + dodir "${dst_dir}" + exeinto "${dst_dir}" + doexe "${src_dir}/common_minimal.sh" + doexe "${src_dir}/resign_firmwarefd.sh" + doexe "${src_dir}/make_dev_firmware.sh" + doexe "${src_dir}/make_dev_ssd.sh" + doexe "${src_dir}/set_gbb_flags.sh" + + # TODO(hungte) Since we now install all keyset into + # /usr/share/vboot/devkeys, maybe SAFT does not need to install + # its own keys anymore. + einfo "Installing keys for SAFT" + local keys_to_install='recovery_kernel_data_key.vbprivk' + keys_to_install+=' firmware.keyblock ' + keys_to_install+=' firmware_data_key.vbprivk' + keys_to_install+=' kernel_subkey.vbpubk' + keys_to_install+=' kernel_data_key.vbprivk' + + dst_dir='/usr/sbin/firmware/saft' + dodir "${dst_dir}" + insinto "${dst_dir}" + for key in ${keys_to_install}; do + doins "tests/devkeys/${key}" + done + else + # Installing on host. + emake BUILD="${S}"/build-main \ + DESTDIR="${D}/usr/bin" install + # EC firmware needs to compile directly from source + dodir /usr/src/vboot + insinto /usr/src/vboot + doins -r firmware/include firmware/lib + fi + if use rbtest; then + emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" -C tests \ + install-rbtest + fi + if use tpmtests; then + into /usr + # copy files starting with tpmtest, but skip .d files. + dobin "${S}"/build-main/tests/tpm_lite/tpmtest*[^.]? + dobin "${S}"/build-main/utility/tpm_set_readsrkpub + fi + + # Install devkeys to /usr/share/vboot/devkeys + # (shared by host and target) + einfo "Installing devkeys" + dst_dir='/usr/share/vboot/devkeys' + dodir "${dst_dir}" + insinto "${dst_dir}" + doins tests/devkeys/* + + einfo "Installing header files and libraries" + + # Install firmware/include to /build/${BOARD}/usr/include/vboot + local dst_dir='/usr/include/vboot' + dodir "${dst_dir}" + insinto "${dst_dir}" + doins -r firmware/include/* + for arch in $(ls firmware/arch/); do + insinto "${dst_dir}"/arch/"${arch}" + doins firmware/arch/"${arch}"/include/biosincludes.h + done + + insinto /usr/include/vboot/ + doins "utility/include/kernel_blob.h" + doins "utility/include/dump_kernel_config.h" + doins "cgpt/CgptManager.h" + doins "firmware/lib/cgptlib/include/gpt.h" + + # Install static library needed by install programs. + # we need board_setup_32bit_au_env again so dolib.a installs to the + # correct location + use 32bit_au && board_setup_32bit_au_env + + einfo "Installing dump_kernel_config library" + dolib.a build-au/libdump_kernel_config.a + + einfo "Installing C++ version of cgpt static library:libcgpt-cc.a" + dolib.a build-au/cgpt/libcgpt-cc.a + + use 32bit_au && board_teardown_32bit_au_env +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/verity/verity-0.0.1-r71.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/verity/verity-0.0.1-r71.ebuild new file mode 100644 index 0000000000..68ce5c6e50 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/verity/verity-0.0.1-r71.ebuild @@ -0,0 +1,62 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="e5627e7a2506fdd93f3b6edf48c76b68bfe75326" +CROS_WORKON_TREE="8f459ef16b87c47cb26400078c2ae353cb41455b" +CROS_WORKON_PROJECT="chromiumos/platform/dm-verity" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon cros-au + +DESCRIPTION="File system integrity image generator for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="32bit_au test valgrind splitdebug" + +RDEPEND="" + +# qemu use isn't reflected as it is copied into the target +# from the build host environment. +DEPEND="${RDEPEND} + dev-cpp/gtest + dev-cpp/gmock + 32bit_au? ( + dev-cpp/gtest32 + dev-cpp/gmock32 + ) + valgrind? ( dev-util/valgrind )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + use 32bit_au && board_setup_32bit_au_env + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + cros-workon_src_test +} + +src_install() { + dolib.a "${OUT}"/libdm-bht.a + insinto /usr/include/verity + doins dm-bht.h dm-bht-userspace.h + insinto /usr/include/verity + cd include + doins -r linux asm asm-generic crypto + cd .. + into / + dobin "${OUT}"/verity-static + dosym verity-static bin/verity +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/verity/verity-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/verity/verity-9999.ebuild new file mode 100644 index 0000000000..4d04fdc57f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/verity/verity-9999.ebuild @@ -0,0 +1,60 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/dm-verity" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon cros-au + +DESCRIPTION="File system integrity image generator for Chromium OS" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="32bit_au test valgrind splitdebug" + +RDEPEND="" + +# qemu use isn't reflected as it is copied into the target +# from the build host environment. +DEPEND="${RDEPEND} + dev-cpp/gtest + dev-cpp/gmock + 32bit_au? ( + dev-cpp/gtest32 + dev-cpp/gmock32 + ) + valgrind? ( dev-util/valgrind )" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + use 32bit_au && board_setup_32bit_au_env + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + cros-workon_src_test +} + +src_install() { + dolib.a "${OUT}"/libdm-bht.a + insinto /usr/include/verity + doins dm-bht.h dm-bht-userspace.h + insinto /usr/include/verity + cd include + doins -r linux asm asm-generic crypto + cd .. + into / + dobin "${OUT}"/verity-static + dosym verity-static bin/verity +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpd/vpd-0.0.1-r56.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpd/vpd-0.0.1-r56.ebuild new file mode 100644 index 0000000000..a7d4f135ee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpd/vpd-0.0.1-r56.ebuild @@ -0,0 +1,40 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="fe05a089c7681d90220abfea268ff439278976d6" +CROS_WORKON_TREE="06f71f0505ed3bc1a5cec68639fab3a4d16dd167" +CROS_WORKON_PROJECT="chromiumos/platform/vpd" + +inherit cros-workon + +DESCRIPTION="ChromeOS vital product data utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +# util-linux is for libuuid. +DEPEND="sys-apps/util-linux" +# shflags for dump_vpd_log. +RDEPEND="sys-apps/flashrom + dev-util/shflags" + +src_compile() { + tc-export CC + emake all +} + +src_install() { + # This target list should be architecture specific + # (no ACPI stuff on ARM for instance) + dosbin vpd vpd_s util/dump_vpd_log +} + +# disabled due to buildbot failure +#src_test() { +# emake test || die "test failed." +#} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpd/vpd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpd/vpd-9999.ebuild new file mode 100644 index 0000000000..03940afa38 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpd/vpd-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/vpd" + +inherit cros-workon + +DESCRIPTION="ChromeOS vital product data utilities" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +# util-linux is for libuuid. +DEPEND="sys-apps/util-linux" +# shflags for dump_vpd_log. +RDEPEND="sys-apps/flashrom + dev-util/shflags" + +src_compile() { + tc-export CC + emake all +} + +src_install() { + # This target list should be architecture specific + # (no ACPI stuff on ARM for instance) + dosbin vpd vpd_s util/dump_vpd_log +} + +# disabled due to buildbot failure +#src_test() { +# emake test || die "test failed." +#} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpn-manager/vpn-manager-0.0.1-r50.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpn-manager/vpn-manager-0.0.1-r50.ebuild new file mode 100644 index 0000000000..3f298e1234 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpn-manager/vpn-manager-0.0.1-r50.ebuild @@ -0,0 +1,57 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="bcfc17cf4f4ad7f90b365abada1e3991bfe02a5a" +CROS_WORKON_TREE="482758b2628f6cce1913020b920b5ca0bd88c7fc" +CROS_WORKON_PROJECT="chromiumos/platform/vpn-manager" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon multilib + +DESCRIPTION="VPN tools" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-cpp/gflags + dev-libs/openssl + net-dialup/xl2tpd + net-misc/strongswan[cisco,nat-transport]" +DEPEND="${RDEPEND} + dev-cpp/gtest" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure + export LIBDIR="/usr/$(get_libdir)" +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + if ! use x86 && ! use amd64 ; then + echo Skipping unit tests on non-x86 platform + else + cros-workon_src_test + fi +} + +src_install() { + dosbin "${OUT}"/l2tpipsec_vpn + exeinto /usr/libexec/l2tpipsec_vpn + doexe "bin/pluto_updown" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpn-manager/vpn-manager-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpn-manager/vpn-manager-9999.ebuild new file mode 100644 index 0000000000..e457e76e89 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/vpn-manager/vpn-manager-9999.ebuild @@ -0,0 +1,55 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/vpn-manager" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon multilib + +DESCRIPTION="VPN tools" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +LIBCHROME_VERS="125070" + +RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/libchromeos + dev-cpp/gflags + dev-libs/openssl + net-dialup/xl2tpd + net-misc/strongswan[cisco,nat-transport]" +DEPEND="${RDEPEND} + dev-cpp/gtest" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure + export LIBDIR="/usr/$(get_libdir)" +} + +src_compile() { + cros-workon_src_compile +} + +src_test() { + if ! use x86 && ! use amd64 ; then + echo Skipping unit tests on non-x86 platform + else + cros-workon_src_test + fi +} + +src_install() { + dosbin "${OUT}"/l2tpipsec_vpn + exeinto /usr/libexec/l2tpipsec_vpn + doexe "bin/pluto_updown" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/wimax_manager/wimax_manager-0.0.1-r59.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/wimax_manager/wimax_manager-0.0.1-r59.ebuild new file mode 100644 index 0000000000..18185eaf38 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/wimax_manager/wimax_manager-0.0.1-r59.ebuild @@ -0,0 +1,77 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="0b9ac7ec74ba38ffa42d7f04b5c739fb5e001187" +CROS_WORKON_TREE="4ebbad4742c5c0ec59e6499688750fc6a15c2790" +CROS_WORKON_PROJECT="chromiumos/platform/wimax_manager" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Chromium OS WiMAX Manager" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="gdmwimax test" + +LIBCHROME_VERS="125070" + +RDEPEND="gdmwimax? ( + chromeos-base/libchromeos + chromeos-base/metrics + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + dev-libs/protobuf +)" + +DEPEND="gdmwimax? ( + ${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/system_api + net-wireless/gdmwimax + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest ) +)" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + use gdmwimax || return 0 + cros-workon_src_compile +} + +src_test() { + use gdmwimax || return 0 + + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + # Install D-Bus introspection XML files. + insinto /usr/share/dbus-1/interfaces + doins dbus_bindings/org.chromium.WiMaxManager*.xml + + # Skip the rest of the files unless USE=gdmwimax is specified. + use gdmwimax || return 0 + + # Install daemon executable. + dosbin "${OUT}"/wimax-manager + + # Install upstart config file. + insinto /etc/init + doins wimax_manager.conf + + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins dbus_bindings/org.chromium.WiMaxManager.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/wimax_manager/wimax_manager-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/wimax_manager/wimax_manager-9999.ebuild new file mode 100644 index 0000000000..2e3af325b6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/wimax_manager/wimax_manager-9999.ebuild @@ -0,0 +1,75 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/wimax_manager" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-debug cros-workon + +DESCRIPTION="Chromium OS WiMAX Manager" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gdmwimax test" + +LIBCHROME_VERS="125070" + +RDEPEND="gdmwimax? ( + chromeos-base/libchromeos + chromeos-base/metrics + dev-libs/dbus-c++ + >=dev-libs/glib-2.30 + dev-libs/protobuf +)" + +DEPEND="gdmwimax? ( + ${RDEPEND} + chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] + chromeos-base/system_api + net-wireless/gdmwimax + test? ( dev-cpp/gmock ) + test? ( dev-cpp/gtest ) +)" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + use gdmwimax || return 0 + cros-workon_src_compile +} + +src_test() { + use gdmwimax || return 0 + + # Needed for `cros_run_unit_tests`. + cros-workon_src_test +} + +src_install() { + # Install D-Bus introspection XML files. + insinto /usr/share/dbus-1/interfaces + doins dbus_bindings/org.chromium.WiMaxManager*.xml + + # Skip the rest of the files unless USE=gdmwimax is specified. + use gdmwimax || return 0 + + # Install daemon executable. + dosbin "${OUT}"/wimax-manager + + # Install upstart config file. + insinto /etc/init + doins wimax_manager.conf + + # Install D-Bus config file. + insinto /etc/dbus-1/system.d + doins dbus_bindings/org.chromium.WiMaxManager.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/workarounds/workarounds-0.0.1-r55.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/workarounds/workarounds-0.0.1-r55.ebuild new file mode 100644 index 0000000000..57336599e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/workarounds/workarounds-0.0.1-r55.ebuild @@ -0,0 +1,24 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="dbeca8c08f614a88ca74e9135e8085b1b75b6df3" +CROS_WORKON_TREE="e6347aff50d20225de76678985458117532d95ba" +CROS_WORKON_PROJECT="chromiumos/platform/workarounds" + +inherit cros-workon + +DESCRIPTION="Chrome OS workarounds utilities." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +KEYWORDS="amd64 arm x86" +SLOT="0" +IUSE="" + +RDEPEND="" + +src_install() { + dobin crosh-workarounds + dobin generate_logs +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/workarounds/workarounds-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/workarounds/workarounds-9999.ebuild new file mode 100644 index 0000000000..24af6fb94a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/workarounds/workarounds-9999.ebuild @@ -0,0 +1,22 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/platform/workarounds" + +inherit cros-workon + +DESCRIPTION="Chrome OS workarounds utilities." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" +IUSE="" + +RDEPEND="" + +src_install() { + dobin crosh-workarounds + dobin generate_logs +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/20-mouse.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/20-mouse.conf new file mode 100644 index 0000000000..68ed69216f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/20-mouse.conf @@ -0,0 +1,27 @@ +Section "InputClass" + Identifier "generic mouse for Chromium OS" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + # Map mouse vertical scroll wheel to buttons 8 and 9. + # These scroll button events are only used for mice and processed slightly + # differently in Chrome than buttons 4 and 5, which are used for trackpad + # scrolling. + # Unfortunately, this disables mouse wheel scrolling in the crosh shell. + Option "ButtonMapping" "1 2 3 8 9" + # 3-Button Mouse emulation, while useful for copy/paste, causes mouse + # clicks to miss their targets when the mouse is moving quickly. + # This is particularly noticeable on quick click+drags. + Option "Emulate3Buttons" "false" + Option "AccelerationProfile" "8" # Chromium accel profile + Option "VelocityScale" "1" + Option "ConstantDeceleration" "1000" + Option "Evdev Wheel Button Acceleration" "0" + Option "Evdev Wheel Axes Acceleration" "1" + # Some mice expose Absolute axes, which take precedence over relative, + # which causes all axes valuator labels to be absolute. E.g., we get + # ABS_X instead of REL_X for horizontal movement. This is especially + # bad for scroll wheel activity, b/c Chrome looks for specific + # relative valuators for that; if absolute valuators are used, scroll + # wheel won't work. + Option "IgnoreAbsoluteAxes" "true" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/20-touchscreen.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/20-touchscreen.conf new file mode 100644 index 0000000000..9f5b08a282 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/20-touchscreen.conf @@ -0,0 +1,7 @@ +Section "InputClass" + Identifier "non-core touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Option "SendCoreEvents" "false" +EndSection + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-alex.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-alex.conf new file mode 100644 index 0000000000..fa90051d54 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-alex.conf @@ -0,0 +1,16 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad alex" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Option "Pressure Calibration Offset" "-42.2" + Option "Pressure Calibration Slope" "1.61" + Option "Tap Minimum Pressure" "15.0" + Option "Input Queue Max Delay" "0.026" + Option "Fling Stop Timeout" "0.04" + # Bounds overrides: + Option "Active Area Left" "1265" + Option "Active Area Right" "5678" + Option "Active Area Top" "1165" + Option "Active Area Bottom" "4689" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-amd64-generic.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-amd64-generic.conf new file mode 120000 index 0000000000..de9bbe7fa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-amd64-generic.conf @@ -0,0 +1 @@ +50-touchpad-cmt-generic.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-arm-generic.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-arm-generic.conf new file mode 120000 index 0000000000..de9bbe7fa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-arm-generic.conf @@ -0,0 +1 @@ +50-touchpad-cmt-generic.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-butterfly.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-butterfly.conf new file mode 100644 index 0000000000..5d03ec084a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-butterfly.conf @@ -0,0 +1,34 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad butterfly" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + # Disable some causes of delay + Option "IIR b0" "1" + Option "IIR b1" "0" + Option "IIR b2" "0" + Option "IIR b3" "0" + Option "IIR a1" "0" + Option "IIR a2" "0" + Option "IIR Distance Threshold" "1000" + Option "Input Queue Delay" "0" +EndSection + +Section "InputClass" + Identifier "touchpad butterfly cyapa" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + MatchProduct "cyapa" + Option "Pressure Calibration Offset" "-7.20313156370106" + Option "Pressure Calibration Slope" "3.95266938056467" + # Extra filters for Cyapa + Option "Box Width" "1.0" + Option "Sensor Jump Filter Enable" "1" + Option "Sensor Jump Min Dist Move" "0.9" + Option "Sensor Jump Similar Multiplier Move" "1.5" + Option "Sensor Jump Min Dist Non-Move" "0.3" + Option "Adjust IIR History On Warp" "1" + Option "Max Allowed Pressure Change Per Sec" "4000" + Option "Max Hysteresis Pressure Per Sec" "4000" +EndSection + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-daisy.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-daisy.conf new file mode 100644 index 0000000000..c4ab558473 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-daisy.conf @@ -0,0 +1,28 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad daisy" + MatchIsTouchpad "on" + MatchProduct "Cypress APA Trackpad (cyapa)" + MatchDevicePath "/dev/input/event*" + Option "Pressure Calibration Offset" "-1.73338827637399" + Option "Pressure Calibration Slope" "2.06326787767144" + # Disable some causes of delay on daisy + Option "IIR b0" "1" + Option "IIR b1" "0" + Option "IIR b2" "0" + Option "IIR b3" "0" + Option "IIR a1" "0" + Option "IIR a2" "0" + Option "IIR Distance Threshold" "1000" + Option "Input Queue Delay" "0" + # Extra filters for Daisy + Option "Box Width" "1.0" + Option "Sensor Jump Filter Enable" "1" + Option "Sensor Jump Min Dist Non-Move" "0.3" + Option "Sensor Jump Min Dist Move" "0.9" + Option "Sensor Jump Similar Multiplier Move" "1.5" + Option "Split Merge Max Movement" "6.5" + Option "Merge Max Ratio" "0.5" + Option "Max Allowed Pressure Change Per Sec" "4000" + Option "Max Hysteresis Pressure Per Sec" "4000" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-elan.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-elan.conf new file mode 100644 index 0000000000..0db82f6598 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-elan.conf @@ -0,0 +1,8 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad elan" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Option "Horizontal Resolution" "33" + Option "Vertical Resolution" "33" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-generic.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-generic.conf new file mode 100644 index 0000000000..1d160e074d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-generic.conf @@ -0,0 +1 @@ +# no special configuration for generic boards \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-kiev.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-kiev.conf new file mode 120000 index 0000000000..de9bbe7fa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-kiev.conf @@ -0,0 +1 @@ +50-touchpad-cmt-generic.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-link.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-link.conf new file mode 100644 index 0000000000..256fb202dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-link.conf @@ -0,0 +1,46 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad link" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + # Disable some causes of delay + Option "IIR b0" "1" + Option "IIR b1" "0" + Option "IIR b2" "0" + Option "IIR b3" "0" + Option "IIR a1" "0" + Option "IIR a2" "0" + Option "IIR Distance Threshold" "1000" + Option "Input Queue Delay" "0" +EndSection + +Section "InputClass" + Identifier "touchpad link cyapa" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + MatchProduct "cyapa" + Option "Pressure Calibration Offset" "-5.2469650828279" + Option "Pressure Calibration Slope" "1.7398671681412" + # Extra filters for Cyapa + Option "Box Width" "1.0" + Option "Sensor Jump Filter Enable" "1" +EndSection + +Section "InputClass" + Identifier "touchpad link atmel" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + MatchProduct "Atmel" + Option "Pressure Calibration Offset" "-15.369282490859" + Option "Pressure Calibration Slope" "1.3219851012421" + # TODO(clchiou): Calibrate bias on X-axis + Option "Touchpad Device Output Bias on X-Axis" "26.68917773528923" + Option "Touchpad Device Output Bias on Y-Axis" "26.68917773528923" + # We see lots of pressure changes under normal use, so raise thresholds + Option "Max Allowed Pressure Change Per Sec" "100000.0" + Option "Max Hysteresis Pressure Per Sec" "100000.0" + Option "Fling Buffer Suppress Zero Length Scrolls" "1" + # People complain that light tap clicks don't register + Option "Tap Minimum Pressure" "21.0" + Option "Box Width" "0.3" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-lumpy.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-lumpy.conf new file mode 100644 index 0000000000..56d7575e15 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-lumpy.conf @@ -0,0 +1,43 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad lumpy" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + # Disable some causes of delay + Option "IIR b0" "1" + Option "IIR b1" "0" + Option "IIR b2" "0" + Option "IIR b3" "0" + Option "IIR a1" "0" + Option "IIR a2" "0" + Option "IIR Distance Threshold" "1000" + Option "Input Queue Delay" "0" +EndSection + +Section "InputClass" + Identifier "touchpad lumpy cyapa" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + MatchProduct "cyapa" + Option "Pressure Calibration Offset" "-4.0418716653545" + Option "Pressure Calibration Slope" "1.9403694168841" + # Extra filters for Cyapa + Option "Box Width" "1.0" + Option "Sensor Jump Filter Enable" "1" + Option "Non-linearity correction data file" "/usr/share/gestures/lumpy_linearity.dat" +EndSection + +Section "InputClass" + Identifier "touchpad lumpy atmel" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + MatchProduct "Atmel" + Option "Pressure Calibration Offset" "-15.369282490859" + Option "Pressure Calibration Slope" "1.3219851012421" + # TODO(clchiou): Calibrate bias on X-axis + Option "Touchpad Device Output Bias on X-Axis" "26.68917773528923" + Option "Touchpad Device Output Bias on Y-Axis" "26.68917773528923" + # We see lots of pressure changes under normal use, so raise thresholds + Option "Max Allowed Pressure Change Per Sec" "100000.0" + Option "Max Hysteresis Pressure Per Sec" "100000.0" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-lumpy32.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-lumpy32.conf new file mode 120000 index 0000000000..82c26c5406 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-lumpy32.conf @@ -0,0 +1 @@ +50-touchpad-cmt-lumpy.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-mario.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-mario.conf new file mode 100644 index 0000000000..78cfe0f192 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-mario.conf @@ -0,0 +1,27 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad mario" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Option "Pressure Calibration Offset" "-23.2" + Option "Pressure Calibration Slope" "1.21" + # Bounds overrides: + Option "Active Area Left" "1217" + Option "Active Area Right" "5733" + Option "Active Area Top" "1061" + Option "Active Area Bottom" "4798" + # Palm overrides: + Option "Palm Min Distance" "5.0" + Option "Palm Pressure" "235.0" + # SemiMT overrides: + Option "SemiMT Correcting Filter Enable" "1" + # Scroll Stationary Finger Distance overrides: + Option "Scroll Stationary Finger Max Distance" "20.0" + # Tapping Finger Min Separation Distance overrides: + Option "Tap Min Separation" "0.0" + # Max Pressure Change overrides: + Option "Max Allowed Pressure Change Per Sec" "2200.0" + Option "Max Hysteresis Pressure Per Sec" "1200.0" + # Double Fling Buffer Depth due to 2x Interpolation + Option "Fling Buffer Depth" "6" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-parrot.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-parrot.conf new file mode 100644 index 0000000000..abfd1771f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-parrot.conf @@ -0,0 +1,32 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad parrot" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + # Disable some causes of delay + Option "IIR b0" "1" + Option "IIR b1" "0" + Option "IIR b2" "0" + Option "IIR b3" "0" + Option "IIR a1" "0" + Option "IIR a2" "0" + Option "IIR Distance Threshold" "1000" + Option "Input Queue Delay" "0" +EndSection + +Section "InputClass" + Identifier "touchpad parrot cyapa" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + MatchProduct "cyapa" + Option "Pressure Calibration Offset" "-13.034105833098" + Option "Pressure Calibration Slope" "1.847199617737" + # Extra filters for Cyapa + Option "Box Width" "1.0" + Option "Sensor Jump Filter Enable" "1" + Option "Merge Max Ratio" "0.63" + Option "Split Merge Max Movement" "7.1" + Option "Max Allowed Pressure Change Per Sec" "4000" + Option "Max Hysteresis Pressure Per Sec" "4000" +EndSection + diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-stout.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-stout.conf new file mode 100644 index 0000000000..eda0751c00 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-stout.conf @@ -0,0 +1,20 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad stout" + MatchIsTouchpad "on" + MatchProduct "SynPS/2 Synaptics TouchPad" + MatchDevicePath "/dev/input/event*" + Option "Pressure Calibration Offset" "-46.5105265656204" + Option "Pressure Calibration Slope" "1.5272358063547" + # Bounds overrides: + Option "Active Area Left" "1176" + Option "Active Area Right" "5767" + Option "Active Area Top" "413" + Option "Active Area Bottom" "5534" + # Resolution overrides: + Option "Vertical Resolution" "160" + Option "Horizontal Resolution" "62" + # Reduce palm detection edge zone + Option "Tap Exclusion Border Width" "1" + Option "Palm Edge Zone Width" "2" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-stumpy.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-stumpy.conf new file mode 120000 index 0000000000..de9bbe7fa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-stumpy.conf @@ -0,0 +1 @@ +50-touchpad-cmt-generic.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-tegra2_aebl.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-tegra2_aebl.conf new file mode 100644 index 0000000000..83ec7b9479 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-tegra2_aebl.conf @@ -0,0 +1,8 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad aebl" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Option "Pressure Calibration Offset" "-19.1" + Option "Pressure Calibration Slope" "2.53" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-tegra2_kaen.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-tegra2_kaen.conf new file mode 100644 index 0000000000..b73587c870 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-tegra2_kaen.conf @@ -0,0 +1,8 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad kaen" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Option "Pressure Calibration Offset" "-11.2" + Option "Pressure Calibration Slope" "1.68" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x32-generic.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x32-generic.conf new file mode 120000 index 0000000000..de9bbe7fa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x32-generic.conf @@ -0,0 +1 @@ +50-touchpad-cmt-generic.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-alex.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-alex.conf new file mode 120000 index 0000000000..71302322d9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-alex.conf @@ -0,0 +1 @@ +50-touchpad-cmt-alex.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-generic.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-generic.conf new file mode 120000 index 0000000000..de9bbe7fa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-generic.conf @@ -0,0 +1 @@ +50-touchpad-cmt-generic.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-mario.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-mario.conf new file mode 120000 index 0000000000..becf38599e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-mario.conf @@ -0,0 +1 @@ +50-touchpad-cmt-mario.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-zgb.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-zgb.conf new file mode 120000 index 0000000000..585bcee3a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-zgb.conf @@ -0,0 +1 @@ +50-touchpad-cmt-zgb.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-zgb32.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-zgb32.conf new file mode 120000 index 0000000000..585bcee3a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-x86-zgb32.conf @@ -0,0 +1 @@ +50-touchpad-cmt-zgb.conf \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-zgb.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-zgb.conf new file mode 100644 index 0000000000..e5168ac24b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt-zgb.conf @@ -0,0 +1,16 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad zgb" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Option "Pressure Calibration Offset" "-54.6" + Option "Pressure Calibration Slope" "2.01" + Option "Tap Minimum Pressure" "15.0" + Option "Input Queue Max Delay" "0.026" + Option "Fling Stop Timeout" "0.04" + # Bounds overrides: + Option "Active Area Left" "1265" + Option "Active Area Right" "5678" + Option "Active Area Top" "1103" + Option "Active Area Bottom" "4754" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt.conf new file mode 100644 index 0000000000..5b9a0c6c30 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-cmt.conf @@ -0,0 +1,50 @@ +# Configure touchpads to use Chromium Multitouch (cmt) X input driver +Section "InputClass" + Identifier "touchpad" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "cmt" + Option "AccelerationProfile" "-1" + Option "Scroll Buttons" "0" + Option "Scroll Axes" "1" + Option "Scroll X Out Scale" "1.25" + Option "Scroll Y Out Scale" "1.25" +EndSection + +Section "InputClass" + Identifier "CMT for Apple Magic Trackpad" + MatchUSBID "05ac:030e" + MatchDevicePath "/dev/input/event*" +# We are using raw touch major value as pressure value, so set the Palm +# pressure threshold high. + Option "Palm Pressure" "1000" + Option "Compute Surface Area From Pressure" "0" + # TODO(clchiou): Calibrate bias on X-axis + Option "Touchpad Device Output Bias on X-Axis" "-283.3226025266607" + Option "Touchpad Device Output Bias on Y-Axis" "-283.3226025266607" + Option "Max Allowed Pressure Change Per Sec" "100000.0" + Option "Max Hysteresis Pressure Per Sec" "100000.0" +EndSection + +Section "InputClass" + Identifier "CMT for Stantum" + MatchDevicePath "/dev/input/event*" + MatchProduct "MTP_USB_Controller" + Driver "cmt" + Option "SendCoreEvents" "On" + Option "IIR b0" "1" + Option "IIR b1" "0" + Option "IIR b2" "0" + Option "IIR b3" "0" + Option "IIR a1" "0" + Option "IIR a2" "0" + Option "IIR Distance Threshold" "1000" + Option "Input Queue Delay" "0" + Option "Horizontal Resolution" "10" + Option "Vertical Resolution" "10" + Option "Two Finger Scroll Distance Thresh" "0.5" + Option "Pressure Calibration Offset" "1.0" + Option "Pressure Calibration Slope" "15.0" + Option "Max Allowed Pressure Change Per Sec" "100000.0" + Option "Max Hysteresis Pressure Per Sec" "100000.0" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-synaptics-mario.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-synaptics-mario.conf new file mode 100644 index 0000000000..00cd9d2a2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-synaptics-mario.conf @@ -0,0 +1,32 @@ +# Configure touchpads to use xf86-input-synaptics X input driver +Section "InputClass" + Identifier "touchpad" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "synaptics" + Option "MinSpeed" "1.0" + Option "MaxSpeed" "2.0" + Option "AccelFactor" "0.045" + Option "HorizScrollDelta" "6" + Option "VertScrollDelta" "18" + Option "HorizEdgeScroll" "0" + Option "VertEdgeScroll" "0" + Option "TapButton1" "1" + Option "TapButton2" "3" + Option "TapButton3" "2" + Option "MaxTapTime" "180" + Option "FingerLow" "40" + Option "FingerHigh" "43" + Option "EmulateTwoFingerMinZ" "32" + Option "VertTwoFingerScroll" "1" + # Horizontal scrolling is disabled for now as it interferes w/ vertical. + Option "HorizTwoFingerScroll" "0" + # The resolutions were balanced for the Dell Latitudes + Option "HorizResolution" "75" + Option "VertResolution" "108" + # Disable non-linear motion region at trackpad edges + Option "AreaLeftEdge" "1375" + Option "AreaRightEdge" "5550" + Option "AreaTopEdge" "1250" + Option "AreaBottomEdge" "4600" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-synaptics.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-synaptics.conf new file mode 100644 index 0000000000..5f63af23a3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-synaptics.conf @@ -0,0 +1,27 @@ +# Configure touchpads to use xf86-input-synaptics X input driver +Section "InputClass" + Identifier "touchpad" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "synaptics" + Option "MinSpeed" "0.4" + Option "MaxSpeed" "1.0" + Option "AccelFactor" "0.0035" + Option "HorizScrollDelta" "6" + Option "VertScrollDelta" "18" + Option "HorizEdgeScroll" "0" + Option "VertEdgeScroll" "0" + Option "TapButton1" "1" + Option "TapButton2" "3" + Option "TapButton3" "2" + Option "MaxTapTime" "180" + Option "FingerLow" "40" + Option "FingerHigh" "43" + Option "EmulateTwoFingerMinZ" "32" + Option "VertTwoFingerScroll" "1" + # Horizontal scrolling is disabled for now as it interferes w/ vertical. + Option "HorizTwoFingerScroll" "0" + # The resolutions were balanced for the Dell Latitudes + Option "HorizResolution" "75" + Option "VertResolution" "108" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-syntp.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-syntp.conf new file mode 100644 index 0000000000..65522acd03 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/50-touchpad-syntp.conf @@ -0,0 +1,7 @@ +# Configure Synaptics X input driver (SynTPEnh) +Section "InputClass" + Identifier "touchpad" + Driver "syntp" + MatchDevicePath "/dev/serio_raw*" + MatchIsTouchpad "on" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/exynos.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/exynos.conf new file mode 100644 index 0000000000..76e54226d3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/exynos.conf @@ -0,0 +1,20 @@ +Section "Device" + Identifier "Mali FBDEV" + Driver "armsoc" + Option "fbdev" "/dev/fb0" + Option "Fimg2DExa" "false" + Option "DRI2" "true" + Option "DRI2_PAGE_FLIP" "false" + Option "DRI2_WAIT_VSYNC" "true" +# Option "Fimg2DExaSolid" "false" +# Option "Fimg2DExaCopy" "false" +# Option "Fimg2DExaComposite" "false" + Option "SWcursorLCD" "false" +# Option "Debug" "true" +EndSection + +Section "Screen" + Identifier "DefaultScreen" + Device "Mali FBDEV" + DefaultDepth 24 +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/tegra.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/tegra.conf new file mode 100644 index 0000000000..0b69847189 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/tegra.conf @@ -0,0 +1,52 @@ +Section "Device" + Identifier "Tegra" + Driver "tegra" + +# OverlayDepth is a 32-bit integer which is used to control overlay +# stacking order. The overlay with the lowest depth is in front of +# all others. This value has meaning only when multiple overlays are +# present on a display. This value can range between 0 & 255 (both values +# inclusive). The default being 255. + +# Option "OverlayDepth" "0" + +# OverlayCombineMode determines how the X overlay is combined with the +# overlay behind it during scanout. Available modes are: Opaque +# (default), SourceAlphaBlend, and PremultSourceAlphaBlend. This +# value has meaning only when an external process has created a +# display which is behind the X server. + +# Option "OverlayCombineMode" "PremultSourceAlphaBlend" + +# ARGBHWCursor controls whether the X driver uses an overlay to +# display 32-bit "true-color" cursors, or whether such cursors are +# emulated in software. Valid values are "true" to enable hardware +# cursors, and "false" (default) to disable them. + + Option "ARGBHWCursor" "true" + +# Set the maximum number of pixmap caches used by the X driver. +# Valid values are 0 through 16 (default) +# A value of 0 disables the use of the caches for pixmaps. +# To use less memory, but still retain performance, the recommendation +# is to use one pixmap heap, set a small size, and limit the size +# of the surfaces that utilizes the pixmap cache. +# Option "PixmapCacheMaxHeaps" "1" + +# Set the size of each pixmap cache, in bytes. +# Valid values are 64 KiB though 64 MiB. Up to +# "PixmapCacheMaxHeaps" (see above) will be allocated +# if necessary. The default value is 8 MiB. +# Option "PixmapCacheSize" "65536" + +# Set the maximum size for a surface that uses +# the pixmap cache. If a surface exceeds this size +# it will be allocated as a separate allocation, outside +# the pixmap cache. +# The default value is the same as "PixmapCacheSize" +# Option "PixmapCacheMaxSurfaceSize" "4096" + +# Use monitor section with identifier LVDS for output named LVDS-1 +# Option "monitor-LVDS-1" "LVDS" +# Option "monitor-HDMI-1" "HDMI" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/xorg.conf b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/xorg.conf new file mode 100644 index 0000000000..98db92cb91 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/files/xorg.conf @@ -0,0 +1,35 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Section "ServerFlags" + Option "DontZap" "false" + + # Disable DPMS timeouts. + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" + + # Disable screen saver timeout. + Option "BlankTime" "0" +EndSection + +Section "Monitor" + Identifier "DefaultMonitor" +EndSection + +Section "Device" + Identifier "DefaultDevice" + Option "monitor-LVDS1" "DefaultMonitor" +EndSection + +Section "Screen" + Identifier "DefaultScreen" + Monitor "DefaultMonitor" + Device "DefaultDevice" +EndSection + +Section "ServerLayout" + Identifier "DefaultLayout" + Screen "DefaultScreen" +EndSection diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/xorg-conf-0.0.5-r95.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/xorg-conf-0.0.5-r95.ebuild new file mode 120000 index 0000000000..0aa29ac5ee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/xorg-conf-0.0.5-r95.ebuild @@ -0,0 +1 @@ +xorg-conf-0.0.5.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/xorg-conf-0.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/xorg-conf-0.0.5.ebuild new file mode 100644 index 0000000000..031a9ec38c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/xorg-conf/xorg-conf-0.0.5.ebuild @@ -0,0 +1,60 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# NOTE: This ebuild could be overridden in an overlay to provide a +# board-specific xorg.conf as necessary. + +EAPI=4 +inherit cros-board + +DESCRIPTION="Board specific xorg configuration file." + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="cmt elan -exynos synaptics -tegra" + +S=${WORKDIR} + +src_install() { + insinto /etc/X11 + if ! use tegra; then + doins "${FILESDIR}/xorg.conf" + fi + + insinto /etc/X11/xorg.conf.d + if use tegra; then + doins "${FILESDIR}/tegra.conf" + elif use exynos; then + doins "${FILESDIR}/exynos.conf" + fi + + # Since syntp does not use evdev (/dev/input/event*) device nodes, + # its .conf snippet can be installed alongside one of the + # evdev-compatible xf86-input-* touchpad drivers. + if use synaptics; then + doins "${FILESDIR}/50-touchpad-syntp.conf" + fi + + if use cros_host; then + # Install all cmt files when installing on the host + doins "${FILESDIR}"/*.conf + elif use cmt; then + # install the cmt config file matching the current board + doins "${FILESDIR}/50-touchpad-cmt.conf" + + local board=$(get_current_board_no_variant) + doins "${FILESDIR}/50-touchpad-cmt-${board}.conf" + + # install cmt config file for elan, which is not a board + if use elan; then + doins "${FILESDIR}/50-touchpad-cmt-elan.conf" + fi + elif use board_use_mario; then + doins "${FILESDIR}/50-touchpad-synaptics-mario.conf" + else + doins "${FILESDIR}/50-touchpad-synaptics.conf" + fi + doins "${FILESDIR}/20-mouse.conf" + doins "${FILESDIR}/20-touchscreen.conf" +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..12364a8a0c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST=http://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/chrome-27.05.11.033811/packages/ diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-PREFLIGHT_BINHOST.conf new file mode 100644 index 0000000000..a6664e1fd2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-PREFLIGHT_BINHOST.conf @@ -0,0 +1 @@ +PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-generic/paladin-R26-3658.0.0-rc3/packages/ https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/x86-generic/paladin-R26-3658.0.0-rc3/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-TOT_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-TOT_CHROME_BINHOST.conf new file mode 100644 index 0000000000..c03d854246 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/amd64-TOT_CHROME_BINHOST.conf @@ -0,0 +1 @@ +TOT_CHROME_BINHOST="http://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/chrome-26.05.11.214444/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/sdk_version.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/sdk_version.conf new file mode 100644 index 0000000000..52cd3777a7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/host/sdk_version.conf @@ -0,0 +1,3 @@ +SDK_LATEST_VERSION="2013.02.04.030956" +BOOTSTRAP_LATEST_VERSION="2010.03.09" +TC_PATH="2013/02/%(target)s-2013.02.04.030956.tar.xz" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..8d76bcd7b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/chrome-1738.0.0-rc1/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf new file mode 100644 index 0000000000..1dc624f430 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf @@ -0,0 +1 @@ +PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/paladin-1742.0.0-rc8/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..d7f86364d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-generic/chrome-R26-3657.0.0-rc1/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf new file mode 100644 index 0000000000..79ea678de4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf @@ -0,0 +1 @@ +PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-generic/paladin-R26-3658.0.0-rc3/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..2baa44d596 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/chrome-1415.0.0-rc1/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf new file mode 100644 index 0000000000..efacf05304 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf @@ -0,0 +1 @@ +PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/binary-1415.0.0-rc7/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm.conf new file mode 100644 index 0000000000..0fe0aee273 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/arm.conf @@ -0,0 +1,3 @@ +# Deprecated. TODO(davidjames): Remove this file once everybody has run +# build_packages. +PORTAGE_BINHOST="$PORTAGE_BINHOST $FULL_BINHOST" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..76809384af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/daisy/chrome-R26-3657.0.0-rc1/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..1daf254955 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/chrome-R23-2768.0.0-rc2/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf new file mode 100644 index 0000000000..2dc36b6dc7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf @@ -0,0 +1 @@ +PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/paladin-R23-2768.0.0-rc8/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..0415ad850b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-R26-3657.0.0-rc1/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf new file mode 100644 index 0000000000..18d4722c86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf @@ -0,0 +1 @@ +PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/paladin-R26-3658.0.0-rc3/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf new file mode 100644 index 0000000000..563d041f49 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf @@ -0,0 +1 @@ +TOT_CHROME_BINHOST="http://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-14.09.11.105729/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf new file mode 100644 index 0000000000..cbdf29574a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf @@ -0,0 +1 @@ +LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic_aura/chrome-1713.0.0-rc3/packages/" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86.conf b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86.conf new file mode 100644 index 0000000000..0a397acabb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/binhost/target/x86.conf @@ -0,0 +1,6 @@ +# Deprecated. TODO(davidjames): Remove this file once everybody has run +# build_packages. +source x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf +source x86-generic-PREFLIGHT_BINHOST.conf +PORTAGE_BINHOST="$PORTAGE_BINHOST $PREFLIGHT_BINHOST $FULL_BINHOST" +PORTAGE_BINHOST="$PORTAGE_BINHOST $LATEST_RELEASE_CHROME_BINHOST" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/.bash_profile b/sdk_container/src/third_party/coreos-overlay/chromeos/config/.bash_profile new file mode 100644 index 0000000000..2da80632aa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/.bash_profile @@ -0,0 +1,9 @@ +# /etc/skel/.bash_profile + +# This file is sourced by bash for login shells. The following line +# runs your .bashrc and is recommended by the bash info pages. +[[ -f ~/.bashrc ]] && . ~/.bashrc + +# Chromium OS build environment settings +export CROS_WORKON_SRCROOT="/home/${USER}/trunk" +export PORTAGE_USERNAME="${USER}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/.bashrc b/sdk_container/src/third_party/coreos-overlay/chromeos/config/.bashrc new file mode 100644 index 0000000000..7cd730a2a1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/.bashrc @@ -0,0 +1,26 @@ +# /etc/skel/.bashrc +# +# This file is sourced by all *interactive* bash shells on startup, +# including some apparently interactive shells such as scp and rcp +# that can't tolerate any output. So make sure this doesn't display +# anything or bad things will happen ! + + +# Test for an interactive shell. There is no need to set anything +# past this point for scp and rcp, and it's important to refrain from +# outputting anything in those cases. +if [[ $- != *i* ]] ; then + # Shell is non-interactive. Be done now! + return +fi + + +# Chromium OS interactive shell settings + +# Settings necessary for both users and automation belong in bash_profile, +# while user-specific and site-specific settings belong in ~/.cros_chrootrc +# outside the chroot. + +export PS1="(cros-chroot) ${PS1}" +[[ -f /usr/share/crosutils/bash_completion ]] && + . /usr/share/crosutils/bash_completion diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/chromeos_version.sh b/sdk_container/src/third_party/coreos-overlay/chromeos/config/chromeos_version.sh new file mode 100755 index 0000000000..abd180aa08 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/chromeos_version.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# ChromeOS version information +# +# This file is usually sourced by other build scripts, but can be run +# directly to see what it would do. + +############################################################################# +# SET VERSION NUMBERS +############################################################################# +# Release Build number. +# Increment by 1 for every release build. +export CHROMEOS_BUILD=3658 + +# Release Branch number. +# Increment by 1 for every release build on a branch. +# Reset to 0 when increasing release build number. +export CHROMEOS_BRANCH=0 + +# Patch number. +# Increment by 1 in case a non-scheduled branch release build is necessary. +# Reset to 0 when increasing branch number. +export CHROMEOS_PATCH=0 + +# Major version for Chrome. +export CHROME_BRANCH=26 + +# Official builds must set CHROMEOS_OFFICIAL=1. +if [ ${CHROMEOS_OFFICIAL:-0} -ne 1 ] && [ "${USER}" != "chrome-bot" ]; then + # For developer builds, overwrite CHROMEOS_VERSION_PATCH with a date string + # for use by auto-updater. + export CHROMEOS_PATCH=$(date +%Y_%m_%d_%H%M) +fi + +# Version string. Not indentied to appease bash. +export CHROMEOS_VERSION_STRING=\ +"${CHROMEOS_BUILD}.${CHROMEOS_BRANCH}"\ +".${CHROMEOS_PATCH}" + +# Set CHROME values (Used for releases) to pass to chromeos-chrome-bin ebuild +# URL to chrome archive +export CHROME_BASE= +# export CHROME_VERSION from incoming value or NULL and let ebuild default +export CHROME_VERSION="$CHROME_VERSION" + +# Print (and remember) version info. +echo "ChromeOS version information:" +env | egrep '^CHROMEOS_VERSION|CHROME_' | sed 's/^/ /' diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/app-admin/sudo b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/app-admin/sudo new file mode 100644 index 0000000000..992679bc6b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/app-admin/sudo @@ -0,0 +1,2 @@ +PKG_INSTALL_MASK+=" /etc/pam.d/sudo" +INSTALL_MASK+=" /etc/pam.d/sudo" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-cpp/gmock b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-cpp/gmock new file mode 100644 index 0000000000..4b1016e9cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-cpp/gmock @@ -0,0 +1,6 @@ +# The autoconf code needs to be migrated from AC_PATH_PROG to +# AC_PATH_TOOL. http://code.google.com/p/googlemock/issues/detail?id=150 +cros_pre_src_configure_gtest_config() { + [[ $(cros_target) != "board_sysroot" ]] && return 0 + export ac_cv_path_GTEST_CONFIG=${CROS_BUILD_BOARD_BIN}/${CHOST}-gtest-config +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-libs/glib b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-libs/glib new file mode 100644 index 0000000000..e4c0bc402a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-libs/glib @@ -0,0 +1,12 @@ +export glib_cv_have_qsort_r=yes + +# The following ac_cv_alignof_* work around an issue in AC_CHECK_ALIGNOF, +# which fails under cross-compilation with newer gcc. +# See http://lists.gnu.org/archive/html/bug-autoconf/2012-09/msg00001.html +# for more details. +# +# TODO(benchan,vapier): Remove the workaround after the AC_CHECK_ALIGNOF +# issue is fixed. +export ac_cv_alignof_guint32=4 +export ac_cv_alignof_guint64=8 +export ac_cv_alignof_unsigned_long=8 diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-util/dialog b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-util/dialog new file mode 100644 index 0000000000..299e72433e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/dev-util/dialog @@ -0,0 +1,7 @@ +# The CF_NCURSES_CONFIG m4 helper from ncurses needs to be migrated from +# AC_PATH_PROGS to AC_CHECK_TOOLS. But that'll take a while to filter +# throughout the ecosystem ... +cros_pre_src_configure_ncurses_config() { + [[ $(cros_target) != "board_sysroot" ]] && return 0 + export ac_cv_path_NCURSES_CONFIG=${CROS_BUILD_BOARD_BIN}/${CHOST}-ncurses5-config +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/gnome-base/libglade b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/gnome-base/libglade new file mode 100644 index 0000000000..d71cedaa42 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/gnome-base/libglade @@ -0,0 +1,8 @@ +# The libglade code is old and uses a pkg-config search which +# does not respect --host, so force it ourselves. +export ac_cv_path_PKG_CONFIG=${PKG_CONFIG} + +# The current version of pango is old and does not build w/out +# the deprecated glib macros, so make sure we undo that when +# building glade. +export CPPFLAGS+=" -UG_DISABLE_DEPRECATED" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/media-sound/alsa-utils b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/media-sound/alsa-utils new file mode 100644 index 0000000000..33acac24ed --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/media-sound/alsa-utils @@ -0,0 +1,7 @@ +# ncurses5_config needs to be set for cross compiling on arm +# Version 1.0.26 should use pkg-config for ncurses, so we can +# drop this workaround when we upgrade. +cros_pre_src_configure_ncurses_config() { + [[ $(cros_target) != "board_sysroot" ]] && return 0 + export ncurses5_config=${ROOT}usr/bin/ncurses5-config +} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/net-misc/openssh b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/net-misc/openssh new file mode 100644 index 0000000000..f2b6e78792 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/net-misc/openssh @@ -0,0 +1,11 @@ +# We install these with our chromeos-base package. +if [[ $(cros_target) != "cros_host" ]] ; then + openssh_mask=" + /etc/ssh/ssh_config + /etc/ssh/sshd_config + /usr/lib*/misc/ssh-keysign + " + PKG_INSTALL_MASK+=" ${openssh_mask}" + INSTALL_MASK+=" ${openssh_mask}" + unset openssh_mask +fi diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/baselayout b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/baselayout new file mode 100644 index 0000000000..9b6472384e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/baselayout @@ -0,0 +1,6 @@ +PKG_INSTALL_MASK+=" /etc/sysctl.conf" +INSTALL_MASK+=" /etc/sysctl.conf" + +# Don't filter out /etc/init.d/functions.sh +PKG_INSTALL_MASK=${PKG_INSTALL_MASK/\/etc\/init.d} +INSTALL_MASK=${INSTALL_MASK/\/etc\/init.d} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/busybox b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/busybox new file mode 100644 index 0000000000..e02063bc6f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/busybox @@ -0,0 +1,5 @@ +# savedconfig by default saves the currently generated config into +# /etc/portage/savedconfig. However we want to avoid placing it here +# so that every re-emerge will pick up the configs from +# chromeos-base/busybox-config +INSTALL_MASK+=" /etc/portage/savedconfig" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/util-linux b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/util-linux new file mode 100644 index 0000000000..cfe4f9605d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-apps/util-linux @@ -0,0 +1,35 @@ +# Punt setarch as we don't use it anywhere. +util_linux_mask=" + /usr/bin/i386 + /usr/bin/x86_64 + /usr/bin/linux32 + /usr/bin/linux64 + /usr/bin/setarch +" + +# Punt support for filesystems we don't care about. +util_linux_mask+=" + /sbin/fsck.bfs + /sbin/fsck.cramfs + /sbin/fsck.minix + /sbin/mkfs.bfs + /sbin/mkfs.cramfs + /sbin/mkfs.minix +" + +# Punt esoteric programs. +util_linux_mask+=" + /sbin/raw + /usr/bin/cytune + /usr/bin/ddate + /usr/bin/isosize + /usr/sbin/fdformat + /usr/sbin/tunelp +" + +if [[ $(cros_target) != "cros_host" ]] ; then + util_linux_mask+=" /usr/bin/unshare" +fi + +PKG_INSTALL_MASK+=" ${util_linux_mask}" +INSTALL_MASK+=" ${util_linux_mask}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-boot/grub b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-boot/grub new file mode 100644 index 0000000000..97fb8b8383 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-boot/grub @@ -0,0 +1,14 @@ +PKG_INSTALL_MASK+=" /etc/grub.d/00_header + /etc/grub.d/10_linux + /etc/grub.d/30_os-prober + /etc/grub.d/40_custom + /etc/grub.d/README + /lib64/grub/grub-mkconfig_lib + /lib64/grub/update-grub_lib" +INSTALL_MASK+=" /etc/grub.d/00_header + /etc/grub.d/10_linux + /etc/grub.d/30_os-prober + /etc/grub.d/40_custom + /etc/grub.d/README + /lib64/grub/grub-mkconfig_lib + /lib64/grub/update-grub_lib" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-devel/libtool b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-devel/libtool new file mode 100644 index 0000000000..47d205fa5f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-devel/libtool @@ -0,0 +1,4 @@ +# Remove the *.la masking since libtool's autoconf detection code +# relies on its existence. +INSTALL_MASK=${INSTALL_MASK/\/usr\/lib\*\/\*.la} +PKG_INSTALL_MASK=${PKG_INSTALL_MASK/\/usr\/lib\*\/\*.la} diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-libs/e2fsprogs-libs b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-libs/e2fsprogs-libs new file mode 100644 index 0000000000..b312ac96b1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/env/sys-libs/e2fsprogs-libs @@ -0,0 +1,12 @@ +# Remove all the build-time helpers leaving just the libraries. +# Not like we can execute them anyways for the target. +if [[ $(cros_target) != "cros_host" ]] ; then + e2fsprogs_mask=" + /usr/bin + /usr/share/et + /usr/share/ss + " + PKG_INSTALL_MASK+=" ${e2fsprogs_mask}" + INSTALL_MASK+=" ${e2fsprogs_mask}" + unset e2fsprogs_mask +fi diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.amd64-host new file mode 100644 index 0000000000..a328811782 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.amd64-host @@ -0,0 +1,63 @@ +# See "man make.conf" for the available options. + +ACCEPT_KEYWORDS="amd64" +CHOST="x86_64-pc-linux-gnu" +CFLAGS="-O2 -pipe" +LDFLAGS="-Wl,-O2 -Wl,--as-needed" +FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect + -ebuild-locks parallel-install sandbox -strict userfetch userpriv + usersandbox -unknown-features-warn" + +# Since our portage comes from version control, we redirect distfiles +DISTDIR="/var/lib/portage/distfiles" + +PORTDIR="/usr/local/portage/stable" + +# We initialize PORTDIR_OVERLAY here to clobber any redefinitions elsewhere. +# This has to be the first overlay so crossdev finds the correct gcc and +# glibc ebuilds. +PORTDIR_OVERLAY=" + /usr/local/portage/crossdev + /usr/local/portage/chromiumos +" + +# Adding packages to the @world set causes people more trouble than it's +# worth in our setup -- we rarely have people add custom packages outside +# of the ChromiumOS set. You can use "--select" to override this. +EMERGE_DEFAULT_OPTS="--oneshot" + +# Use parallel bzip2 for portage if available +PORTAGE_BZIP2_COMMAND="pbzip2" +PORTAGE_BUNZIP2_COMMAND="pbunzip2 --ignore-trailing-garbage=1" + +# Where to store built packages. +PKGDIR="/var/lib/portage/pkgs" + +PORT_LOGDIR="/var/log/portage" + +source /usr/local/portage/chromiumos/chromeos/binhost/host/amd64-PREFLIGHT_BINHOST.conf +FULL_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-host/chroot-2013.02.04.030956/packages/" +PORTAGE_BINHOST="$PREFLIGHT_BINHOST $FULL_BINHOST" + +# expat needed for XML parsing in GDB, but enable globally as overhead is tiny. +USE="${USE} -cups hardened cros_host multilib pic pie -introspection expat" + +GENTOO_MIRRORS="https://commondatastorage.googleapis.com/chromeos-localmirror" +GENTOO_MIRRORS="$GENTOO_MIRRORS https://commondatastorage.googleapis.com/chromeos-mirror/gentoo" + +# Remove all .la files for non-plugin libraries. +# Remove Gentoo init files since we use upstart. +# Remove logrotate.d files since we don't use logrotate. +INSTALL_MASK=" + /usr/lib*/*.la + /etc/init.d /etc/conf.d + /etc/logrotate.d +" +PKG_INSTALL_MASK="${INSTALL_MASK}" + +# This is used by profiles/base/profile.bashrc to figure out that we +# are targeting the cros-sdk (in all its various modes). It should +# be utilized nowhere else! +CROS_SDK_HOST="cros-sdk-host" + +source make.conf.host_setup diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.amd64-target b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.amd64-target new file mode 100644 index 0000000000..5c8182811b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.amd64-target @@ -0,0 +1,28 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] } +source make.conf.board_setup + +ACCEPT_KEYWORDS="amd64" + +# Common settings across all board targets. +source make.conf.common + +# Recommended x86-specific USE flags. +USE="${USE} mmx sse sse2 dri hardened" + +# Recommended MARCH_TUNE, CFLAGS, etc. +MARCH_TUNE="" + +VIDEO_CARDS="intel vesa" +INPUT_DEVICES="evdev synaptics cmt" + +# Allow a board to override or define additional settings. +source make.conf.board +CFLAGS="-O2 -pipe ${MARCH_TUNE} -g" +CXXFLAGS="${CFLAGS}" + +# Allow the user to override or define additional settings. +source make.conf.user diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.arm-target b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.arm-target new file mode 100644 index 0000000000..770367157c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.arm-target @@ -0,0 +1,29 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] } +source make.conf.board_setup + +E_MACHINE=EM_ARM +ARCH=arm + +# Common settings across all board targets. +source make.conf.common + +# Recommended arm-specific USE flags. +USE="${USE} hardened" + +# Recommended MARCH_TUNE, CFLAGS, etc. +MARCH_TUNE="" + +VIDEO_CARDS="fbdev" +INPUT_DEVICES="evdev cmt" + +# Allow a board to override or define additional settings. +source make.conf.board +CFLAGS="-O2 -pipe ${MARCH_TUNE} -g" +CXXFLAGS="${CFLAGS}" + +# Allow the user to override or define additional settings. +source make.conf.user diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.common-target new file mode 100644 index 0000000000..235d4eb3d9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.common-target @@ -0,0 +1,94 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# NOTE: This assumes that the following have already been defined: +# { ROOT, ARCH, CHOST, [BOARD_OVERLAY] } + +# TODO: This will have to come from somewhere else when we support a 32-bit +# build host environment. +CBUILD=x86_64-pc-linux-gnu +HOSTCC=x86_64-pc-linux-gnu-gcc + +LDFLAGS="-Wl,-O2 -Wl,--as-needed" + +ACCEPT_KEYWORDS="${ARCH}" +USE="${ARCH} zlib bindist cros-debug -introspection cmt" + +# Be sure we don't overwrite pkgs from another sysroot. +PKGDIR=${ROOT}packages/ +PORTAGE_TMPDIR=${ROOT}tmp/ + +PORT_LOGDIR=${ROOT}tmp/portage/logs/ + +FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect + -ebuild-locks force-mirror nodoc noinfo noman parallel-install + sandbox splitdebug -strict userfetch userpriv usersandbox + -unknown-features-warn" + +PORTAGE_WORKDIR_MODE="0755" +PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/" +ELIBC="glibc" + +PORTDIR="/usr/local/portage/stable" + +PORTDIR_OVERLAY=" + /usr/local/portage/chromiumos + ${BOARD_OVERLAY} +" + +# Adding packages to the @world set causes people more trouble than it's +# worth in our setup -- we rarely have people add custom packages outside +# of the ChromiumOS set. You can use "--select" to override this. +EMERGE_DEFAULT_OPTS="--oneshot" + +# Use parallel bzip2 for portage if available +PORTAGE_BZIP2_COMMAND="pbzip2" +PORTAGE_BUNZIP2_COMMAND="pbunzip2 --ignore-trailing-garbage=1" + +FETCHCOMMAND_GS="bash -c 'BOTO_CONFIG=/home/\${PORTAGE_USERNAME}/.boto gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'" +RESUMECOMMAND_GS="bash -c 'BOTO_CONFIG=/home/\${PORTAGE_USERNAME}/.boto gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'" + +FETCHCOMMAND='curl -y 30 -f --retry 9 -L --output \${DISTDIR}/\${FILE} \${URI}' +RESUMECOMMAND='curl -y 30 -f -C - --retry 9 -L --output \${DISTDIR}/\${FILE} \${URI}' + +# Print a checkpoint message every 10MB while archiving. +PORTAGE_BINPKG_TAR_OPTS="--checkpoint=1000" + +# Since our portage comes from version control, we redirect distfiles. +DISTDIR="/var/lib/portage/distfiles-target" + +# Our chromium mirror should be more stable since we won't discard packages. +GENTOO_MIRRORS="https://commondatastorage.googleapis.com/chromeos-localmirror" +GENTOO_MIRRORS="$GENTOO_MIRRORS https://commondatastorage.googleapis.com/chromeos-mirror/gentoo" + +# Username and home directory of the shared user. +SHARED_USER_NAME="chronos" +SHARED_USER_HOME="/home/chronos/user" +SHARED_USER_PASSWD_FILE="/etc/shared_user_passwd.txt" + +# the AC_FUNC_WAIT3 macro uses runtime-checks for the function, which +# doesn't work when cross-compiling; we know that our targets have it, +# so let's tell about it to autoconf. — Flameeyes +ac_cv_func_wait3_rusage=yes + +# When building packages for the target, we need to search the target's +# sysroot for additional m4 files. The autotools.eclass uses this. +AT_SYS_M4DIR="\${SYSROOT}/usr/share/aclocal" + +# Native language support is handled inside Chrome itself. +LINGUAS="en" + +# Remove all .la files for non-plugin libraries. +# Remove Gentoo init files since we use upstart. +# Remove logrotate.d files since we don't use logrotate. +# Remove sandbox files since we don't use that in the sysroot. +# Remove bash-completion files as we don't install bash-completion. +INSTALL_MASK=" + /usr/lib*/*.la + /etc/init.d /etc/conf.d + /etc/logrotate.d + /etc/sandbox.d + /usr/share/bash-completion +" +PKG_INSTALL_MASK="${INSTALL_MASK}" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.x86-target b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.x86-target new file mode 100644 index 0000000000..16f0c0e187 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/make.conf.x86-target @@ -0,0 +1,29 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] } +source make.conf.board_setup + +# E_MACHINE=EM_X86 <- TODO: Some builds use EM_386 so comment this for now. +ARCH=x86 + +# Common settings across all board targets. +source make.conf.common + +# Recommended x86-specific USE flags. +USE="${USE} mmx sse sse2 dri hardened" + +# Recommended MARCH_TUNE, CFLAGS, etc. +MARCH_TUNE="-march=atom -mtune=atom -mfpmath=sse" + +VIDEO_CARDS="intel vesa" +INPUT_DEVICES="evdev synaptics cmt" + +# Allow a board to override or define additional settings. +source make.conf.board +CFLAGS="-O2 -pipe ${MARCH_TUNE} -g" +CXXFLAGS="${CFLAGS}" + +# Allow the user to override or define additional settings. +source make.conf.user diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/stable_versions b/sdk_container/src/third_party/coreos-overlay/chromeos/config/stable_versions new file mode 100644 index 0000000000..5ae0d04dd0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/stable_versions @@ -0,0 +1,2 @@ +stage 20100309/stage3-amd64-20100309.tar.bz2 +portage portage-20100310.tar.bz2 diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/config/sudoers b/sdk_container/src/third_party/coreos-overlay/chromeos/config/sudoers new file mode 100644 index 0000000000..4fdbf04231 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/config/sudoers @@ -0,0 +1,31 @@ +# sudoers file. +# +# This file MUST be edited with the 'visudo' command as root. +# Failure to use 'visudo' may result in syntax or file permission errors +# that prevent sudo from running. +# +# See the sudoers man page for the details on how to write a sudoers file. +# + +# Host alias specification + +# User alias specification + +# Cmnd alias specification + +# Defaults specification + +# Runas alias specification + +# User privilege specification +root ALL=(ALL) ALL + +# Uncomment to allow people in group wheel to run all commands +# %wheel ALL=(ALL) ALL + +# Same thing without a password +%wheel ALL=(ALL) NOPASSWD: ALL + +# Samples +# %users ALL=/sbin/mount /cdrom,/sbin/umount /cdrom +# %users localhost=/sbin/shutdown -h now diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/build_packages b/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/build_packages new file mode 120000 index 0000000000..c43c4e9b0c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/build_packages @@ -0,0 +1 @@ +../../../../scripts/build_packages \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/config_wrapper b/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/config_wrapper new file mode 100755 index 0000000000..921bbd03ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/config_wrapper @@ -0,0 +1,50 @@ +#!/bin/bash +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Wrap all the old style config scripts. + +# We'll be working with the env: +# argv[0]: armv7a-cros-linux-gnueabi-ncurses5-config +# CHOST: armv7a-cros-linux-gnueabi +# SYSROOT: /build/arm-generic +# See if there's a wrapper in the SYSROOT for us to execute, let's do +# that, and then filter the output for any -I/-L paths that'd screw us up. + +wrap=${0##*/} + +if [[ -z ${CHOST} ]] ; then + # Let's figure out the answer from $0. Do it piece by piece as + # we cannot assume the number of components in the target tuple + # or in the config script name. Tuples can have 1, 2, 3, or 4 + # components, and config scripts can have as many as they want + # (although most of the time, it's just 2). + parts=( ${wrap//-/ } ) + i=$(( ${#parts[@]} - 1 )) + cfg=${parts[${i}]} + while [[ $(( --i )) -ge 0 ]] ; do + cfg="${parts[${i}]}-${cfg}" + if [[ -e ${SYSROOT}/usr/bin/${cfg} ]] ; then + CHOST=${wrap%-${cfg}} + type -P ${CHOST}-gcc >/dev/null && break + unset CHOST + fi + done +else + cfg=${wrap#${CHOST}-} +fi + +if [[ -z ${CHOST} ]] || [[ -z ${SYSROOT} ]] ; then + echo "${wrap}: please set CHOST/SYSROOT in the env" 1>&2 + exit 1 +fi + +PATH="${SYSROOT}/usr/bin:${PATH}" + +# Some wrappers will dynamically figure out where they're being run from, +# and then output a full path -I/-L path based on that. So we trim any +# expanded sysroot paths that might be in the output already to avoid +# having it be -L${SYSROOT}${SYSROOT}/usr/lib. +set -o pipefail +exec ${cfg} "$@" | sed -r "s:(-[IL])(${SYSROOT})?:\1${SYSROOT}:g" diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/cros_set_lsb_release b/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/cros_set_lsb_release new file mode 100755 index 0000000000..1b7b219dcd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/chromeos/scripts/cros_set_lsb_release @@ -0,0 +1,78 @@ +#!/bin/bash + +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Script to set /etc/lsb-release on the root file system. This script is run by +# build_image inside chroot. + +readonly COMMON_SH=/usr/lib/crosutils/common.sh +if [ ! -r "${COMMON_SH}" ]; then + echo "ERROR: Run inside chroot." + exit 1 +fi + +. "${COMMON_SH}" + +# Flags +DEFINE_string board "" "The board to build an image for." +DEFINE_string root "" "The root file system to write /etc/lsb-release to." + +# Parse command line +FLAGS "$@" || exit 1 +eval set -- "${FLAGS_ARGV}" + +set -e + +ROOT_FS_DIR="$FLAGS_root" +[ -n "$ROOT_FS_DIR" ] || die "--root is required." +[ -d "$ROOT_FS_DIR" ] || die "Root FS does not exist? ($ROOT_FS_DIR)" +[ -n "${CHROMEOS_VERSION_STRING}" ] || die "chromeos_version.sh isn't sourced." + +CHROMEOS_VERSION_NAME="Chromium OS" +CHROMEOS_VERSION_AUSERVER=\ +${CHROMEOS_VERSION_AUSERVER:-"http://$(hostname --fqdn):8080/update"} +CHROMEOS_VERSION_DEVSERVER=\ +${CHROMEOS_VERSION_DEVSERVER:-"http://$(hostname --fqdn):8080"} + +# Official builds must set CHROMEOS_OFFICIAL=1. +if [ ${CHROMEOS_OFFICIAL:-0} = 1 ]; then + # Official builds (i.e., buildbot) + CHROMEOS_VERSION_TRACK="dev-channel" + CHROMEOS_VERSION_NAME="Chrome OS" + CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build) \ +${CHROMEOS_VERSION_TRACK} $FLAGS_board test" + CHROMEOS_VERSION_AUSERVER="https://tools.google.com/service/update2" + CHROMEOS_VERSION_DEVSERVER="" +elif [ "$USER" = "chrome-bot" ]; then + # Continuous builder + CHROMEOS_VERSION_TRACK="buildbot-build" + CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Continuous Build \ +- Builder: ${BUILDBOT_BUILD:-"N/A"}) $FLAGS_board" +else + # Developer hand-builds + CHROMEOS_VERSION_TRACK=${CHROMEOS_VERSION_TRACK:-"developer-build"} + CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build \ +- $USER) ${CHROMEOS_VERSION_TRACK} $FLAGS_board" +fi + +# Set google-specific version numbers: +# CHROMEOS_RELEASE_BOARD is the target board identifier. +# CHROMEOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see +# chrome/browser/chromeos/chromeos_version_loader.cc. +# CHROMEOS_RELEASE_NAME is a human readable name for the build. +# CHROMEOS_RELEASE_TRACK and CHROMEOS_RELEASE_VERSION are used by the software +# update service. +# TODO(skrul): Remove GOOGLE_RELEASE once Chromium is updated to look at +# CHROMEOS_RELEASE_VERSION for UserAgent data. +sudo_append "${ROOT_FS_DIR}/etc/lsb-release" < + + namespace testing { +- +-template +-class MockSpec; +- + namespace internal { + + template +@@ -89,7 +85,11 @@ $if i >= 1 [[ + } + + R Invoke($Aas) { +- return InvokeWith(ArgumentTuple($as)); ++ // Even though gcc and MSVC don't enforce it, 'this->' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple($as)); + } + }; + +Index: include/gmock/gmock-generated-function-mockers.h +=================================================================== +--- include/gmock/gmock-generated-function-mockers.h (revision 227) ++++ include/gmock/gmock-generated-function-mockers.h (revision 228) +@@ -42,10 +42,6 @@ + #include + + namespace testing { +- +-template +-class MockSpec; +- + namespace internal { + + template +@@ -71,7 +67,11 @@ class FunctionMocker : public + } + + R Invoke() { +- return InvokeWith(ArgumentTuple()); ++ // Even though gcc and MSVC don't enforce it, 'this->' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple()); + } + }; + +@@ -88,7 +88,11 @@ class FunctionMocker : public + } + + R Invoke(A1 a1) { +- return InvokeWith(ArgumentTuple(a1)); ++ // Even though gcc and MSVC don't enforce it, 'this->' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1)); + } + }; + +@@ -105,7 +109,11 @@ class FunctionMocker : public + } + + R Invoke(A1 a1, A2 a2) { +- return InvokeWith(ArgumentTuple(a1, a2)); ++ // Even though gcc and MSVC don't enforce it, 'this->' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2)); + } + }; + +@@ -123,7 +131,11 @@ class FunctionMocker : pu + } + + R Invoke(A1 a1, A2 a2, A3 a3) { +- return InvokeWith(ArgumentTuple(a1, a2, a3)); ++ // Even though gcc and MSVC don't enforce it, 'this->' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3)); + } + }; + +@@ -141,7 +153,11 @@ class FunctionMocker + } + + R Invoke(A1 a1, A2 a2, A3 a3, A4 a4) { +- return InvokeWith(ArgumentTuple(a1, a2, a3, a4)); ++ // Even though gcc and MSVC don't enforce it, 'this->' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4)); + } + }; + +@@ -161,7 +177,11 @@ class FunctionMocker' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5)); + } + }; + +@@ -182,7 +202,11 @@ class FunctionMocker' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6)); + } + }; + +@@ -203,7 +227,11 @@ class FunctionMocker' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7)); + } + }; + +@@ -224,7 +252,11 @@ class FunctionMocker' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8)); + } + }; + +@@ -246,7 +278,11 @@ class FunctionMocker' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9)); + } + }; + +@@ -270,7 +306,12 @@ class FunctionMocker' is required ++ // by the C++ standard [14.6.4] here, as the base class type is ++ // dependent on the template argument (and thus shouldn't be ++ // looked into when resolving InvokeWith). ++ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9, ++ a10)); + } + }; + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch new file mode 100644 index 0000000000..d28a121a47 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch @@ -0,0 +1,144 @@ +taken from upstream repo + +------------------------------------------------------------------------ +r245 | zhanyong.wan | 2009-12-02 03:36:42 -0500 (Wed, 02 Dec 2009) | 2 lines + +Fixes a C++-standard-compliance bug in gmock-printers.h. + + +Index: include/gmock/gmock-printers.h +=================================================================== +--- include/gmock/gmock-printers.h (revision 244) ++++ include/gmock/gmock-printers.h (revision 245) +@@ -434,63 +434,10 @@ inline void PrintTo(const ::std::wstring + // Overload for ::std::tr1::tuple. Needed for printing function + // arguments, which are packed as tuples. + +-typedef ::std::vector Strings; +- +-// This helper template allows PrintTo() for tuples and +-// UniversalTersePrintTupleFieldsToStrings() to be defined by +-// induction on the number of tuple fields. The idea is that +-// TuplePrefixPrinter::PrintPrefixTo(t, os) prints the first N +-// fields in tuple t, and can be defined in terms of +-// TuplePrefixPrinter. +- +-// The inductive case. +-template +-struct TuplePrefixPrinter { +- // Prints the first N fields of a tuple. +- template +- static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) { +- TuplePrefixPrinter::PrintPrefixTo(t, os); +- *os << ", "; +- UniversalPrinter::type> +- ::Print(::std::tr1::get(t), os); +- } +- +- // Tersely prints the first N fields of a tuple to a string vector, +- // one element for each field. +- template +- static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) { +- TuplePrefixPrinter::TersePrintPrefixToStrings(t, strings); +- ::std::stringstream ss; +- UniversalTersePrint(::std::tr1::get(t), &ss); +- strings->push_back(ss.str()); +- } +-}; +- +-// Base cases. +-template <> +-struct TuplePrefixPrinter<0> { +- template +- static void PrintPrefixTo(const Tuple&, ::std::ostream*) {} +- +- template +- static void TersePrintPrefixToStrings(const Tuple&, Strings*) {} +-}; +-template <> +-template +-void TuplePrefixPrinter<1>::PrintPrefixTo(const Tuple& t, ::std::ostream* os) { +- UniversalPrinter::type>:: +- Print(::std::tr1::get<0>(t), os); +-} +- + // Helper function for printing a tuple. T must be instantiated with + // a tuple type. + template +-void PrintTupleTo(const T& t, ::std::ostream* os) { +- *os << "("; +- TuplePrefixPrinter< ::std::tr1::tuple_size::value>:: +- PrintPrefixTo(t, os); +- *os << ")"; +-} ++void PrintTupleTo(const T& t, ::std::ostream* os); + + // Overloaded PrintTo() for tuples of various arities. We support + // tuples of up-to 10 fields. The following implementation works +@@ -725,6 +672,64 @@ void UniversalPrint(const T& value, ::st + UniversalPrinter::Print(value, os); + } + ++typedef ::std::vector Strings; ++ ++// This helper template allows PrintTo() for tuples and ++// UniversalTersePrintTupleFieldsToStrings() to be defined by ++// induction on the number of tuple fields. The idea is that ++// TuplePrefixPrinter::PrintPrefixTo(t, os) prints the first N ++// fields in tuple t, and can be defined in terms of ++// TuplePrefixPrinter. ++ ++// The inductive case. ++template ++struct TuplePrefixPrinter { ++ // Prints the first N fields of a tuple. ++ template ++ static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) { ++ TuplePrefixPrinter::PrintPrefixTo(t, os); ++ *os << ", "; ++ UniversalPrinter::type> ++ ::Print(::std::tr1::get(t), os); ++ } ++ ++ // Tersely prints the first N fields of a tuple to a string vector, ++ // one element for each field. ++ template ++ static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) { ++ TuplePrefixPrinter::TersePrintPrefixToStrings(t, strings); ++ ::std::stringstream ss; ++ UniversalTersePrint(::std::tr1::get(t), &ss); ++ strings->push_back(ss.str()); ++ } ++}; ++ ++// Base cases. ++template <> ++struct TuplePrefixPrinter<0> { ++ template ++ static void PrintPrefixTo(const Tuple&, ::std::ostream*) {} ++ ++ template ++ static void TersePrintPrefixToStrings(const Tuple&, Strings*) {} ++}; ++template <> ++template ++void TuplePrefixPrinter<1>::PrintPrefixTo(const Tuple& t, ::std::ostream* os) { ++ UniversalPrinter::type>:: ++ Print(::std::tr1::get<0>(t), os); ++} ++ ++// Helper function for printing a tuple. T must be instantiated with ++// a tuple type. ++template ++void PrintTupleTo(const T& t, ::std::ostream* os) { ++ *os << "("; ++ TuplePrefixPrinter< ::std::tr1::tuple_size::value>:: ++ PrintPrefixTo(t, os); ++ *os << ")"; ++} ++ + // Prints the fields of a tuple tersely to a string vector, one + // element for each field. See the comment before + // UniversalTersePrint() for how we define "tersely". + +------------------------------------------------------------------------ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/gmock-1.4.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/gmock-1.4.0-r1.ebuild new file mode 120000 index 0000000000..853713b649 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/gmock-1.4.0-r1.ebuild @@ -0,0 +1 @@ +gmock-1.4.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/gmock-1.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/gmock-1.4.0.ebuild new file mode 100644 index 0000000000..9d2b61d47c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock/gmock-1.4.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.6 2012/08/28 21:52:08 vapier Exp $ + +EAPI="4" + +inherit libtool eutils + +DESCRIPTION="Google's C++ mocking framework" +HOMEPAGE="http://code.google.com/p/googlemock/" +SRC_URI="http://googlemock.googlecode.com/files/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="static-libs" + +RDEPEND=">=dev-cpp/gtest-${PV}" +DEPEND="${RDEPEND}" + +src_unpack() { + default + # make sure we always use the system one + rm -r "${S}"/gtest/Makefile* || die +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc-4.7.patch + epatch "${FILESDIR}"/${P}-more-gcc-4.7.patch + elibtoolize +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + use static-libs || find "${ED}"/usr -name '*.la' -delete +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock32/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock32/Manifest new file mode 100644 index 0000000000..b7128de2a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock32/Manifest @@ -0,0 +1 @@ +DIST gmock-1.4.0.tar.bz2 946373 RMD160 9d43853f4abc650b8d8fe9984a6b4baddeea08ce SHA1 ecc8beec7004f36d8d4c0af5237381db4d640126 SHA256 21d37c154a7b8d7a8562b9dde82db7db0a6c188b985c4a18ff3413daae8caa8c diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock32/gmock32-1.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock32/gmock32-1.4.0.ebuild new file mode 100644 index 0000000000..c39553aeb0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gmock32/gmock32-1.4.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.5.0.ebuild,v 1.2 2011/11/11 20:12:12 vapier Exp $ + +EAPI="4" + +inherit libtool cros-au + +MY_PN=${PN%32} +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Google's C++ mocking framework" +HOMEPAGE="http://code.google.com/p/googlemock/" +SRC_URI="http://googlemock.googlecode.com/files/${MY_P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="32bit_au" +REQUIRED_USE="32bit_au" +RESTRICT="test" + +RDEPEND=">=dev-cpp/gtest32-${PV}" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + default + # make sure we always use the system one + rm -r "${S}"/gtest/Makefile* || die +} + +src_prepare() { + elibtoolize +} + +src_configure() { + board_setup_32bit_au_env + econf --disable-shared --enable-static +} + +src_install() { + dolib.a lib/.libs/libgmock{,_main}.a +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/Manifest new file mode 100644 index 0000000000..2f964b9b08 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/Manifest @@ -0,0 +1 @@ +DIST gtest-1.4.0.tar.bz2 525425 RMD160 2688f9e4c68af10a5974af91c0fe2dd551cf72c7 SHA1 d26e1a67ec08a9d6167ecf77c61961c469f448b2 SHA256 c848158f1fca599d6339b9f00e3fdee6153dc518a23c793ccf757f8aa4ad17e9 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/files/gtest-1.4.0-asneeded.patch b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/files/gtest-1.4.0-asneeded.patch new file mode 100644 index 0000000000..f8e7d004d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/files/gtest-1.4.0-asneeded.patch @@ -0,0 +1,12 @@ +diff -Naur gtest-1.4.0.orig/Makefile.am gtest-1.4.0/Makefile.am +--- gtest-1.4.0.orig/Makefile.am 2009-10-02 16:04:30.000000000 +0900 ++++ gtest-1.4.0/Makefile.am 2010-01-20 16:52:34.000000000 +0900 +@@ -305,7 +305,7 @@ + TESTS += test/gtest-unittest-api_test + check_PROGRAMS += test/gtest-unittest-api_test + test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc +-test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la ++test_gtest_unittest_api_test_LDADD = lib/libgtest.la + + TESTS += test/gtest-listener_test + check_PROGRAMS += test/gtest-listener_test diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/files/gtest-1.4.0-gcc-4.7.patch b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/files/gtest-1.4.0-gcc-4.7.patch new file mode 100644 index 0000000000..05c2700048 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/files/gtest-1.4.0-gcc-4.7.patch @@ -0,0 +1,32 @@ +fix for upstream for building with newer gcc versions + +r339 | zhanyong.wan | 2009-11-12 21:54:23 -0500 (Thu, 12 Nov 2009) | 2 lines + +...; makes gtest-param-util-generated.h conform to the C++ standard (by Zhanyong Wan). + +Index: include/gtest/internal/gtest-param-util-generated.h +=================================================================== +--- include/gtest/internal/gtest-param-util-generated.h (revision 338) ++++ include/gtest/internal/gtest-param-util-generated.h (revision 339) +@@ -53,6 +53,21 @@ + #if GTEST_HAS_PARAM_TEST + + namespace testing { ++ ++// Forward declarations of ValuesIn(), which is implemented in ++// include/gtest/gtest-param-test.h. ++template ++internal::ParamGenerator< ++ typename ::std::iterator_traits::value_type> ValuesIn( ++ ForwardIterator begin, ForwardIterator end); ++ ++template ++internal::ParamGenerator ValuesIn(const T (&array)[N]); ++ ++template ++internal::ParamGenerator ValuesIn( ++ const Container& container); ++ + namespace internal { + + // Used in the Values() function to provide polymorphic capabilities. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/gtest32-1.4.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/gtest32-1.4.0-r1.ebuild new file mode 120000 index 0000000000..310b42d882 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/gtest32-1.4.0-r1.ebuild @@ -0,0 +1 @@ +gtest32-1.4.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/gtest32-1.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/gtest32-1.4.0.ebuild new file mode 100644 index 0000000000..7d3244f820 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-cpp/gtest32/gtest32-1.4.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.1 2011/11/11 20:09:57 vapier Exp $ + +EAPI="4" +inherit autotools eutils cros-au + +MY_PN=${PN%32} +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="http://code.google.com/p/googletest/" +SRC_URI="http://googletest.googlecode.com/files/${MY_P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="32bit_au" +REQUIRED_USE="32bit_au" +RESTRICT="test" + +DEPEND="dev-lang/python" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die "sed failed" + epatch "${FILESDIR}"/${MY_P}-asneeded.patch + epatch "${FILESDIR}"/${MY_P}-gcc-4.7.patch + eautoreconf +} + +src_configure() { + board_setup_32bit_au_env + econf --disable-shared --enable-static +} + +src_install() { + dolib.a lib/.libs/libgtest{,_main}.a +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/leveldb/leveldb-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/leveldb/leveldb-0.0.1-r3.ebuild new file mode 100644 index 0000000000..51d47171b6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/leveldb/leveldb-0.0.1-r3.ebuild @@ -0,0 +1,32 @@ +# Copyright (C) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE.makefile file. + +EAPI=4 +CROS_WORKON_COMMIT="fd1218ceec51a67b42921c2a0fe4da08bd7f1a90" +CROS_WORKON_TREE="cddf50f93e1fdd9ade5b86f46b4b7a7b79b4800e" +CROS_WORKON_PROJECT="chromiumos/third_party/leveldb" + +inherit toolchain-funcs cros-debug cros-workon + +DESCRIPTION="A fast and lightweight key/value database library by Google." +HOMEPAGE="http://code.google.com/p/leveldb/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="test" + +src_compile() { + tc-export CXX OBJCOPY PKG_CONFIG STRIP + cros-debug-add-NDEBUG + emake all libmemenv.a +} + +src_install() { + insinto /usr/include/leveldb + doins include/leveldb/*.h helpers/memenv/memenv.h + dolib.a libleveldb.a libmemenv.a +} + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/leveldb/leveldb-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/leveldb/leveldb-9999.ebuild new file mode 100644 index 0000000000..b0b507f092 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/leveldb/leveldb-9999.ebuild @@ -0,0 +1,30 @@ +# Copyright (C) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE.makefile file. + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/leveldb" + +inherit toolchain-funcs cros-debug cros-workon + +DESCRIPTION="A fast and lightweight key/value database library by Google." +HOMEPAGE="http://code.google.com/p/leveldb/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +src_compile() { + tc-export CXX OBJCOPY PKG_CONFIG STRIP + cros-debug-add-NDEBUG + emake all libmemenv.a +} + +src_install() { + insinto /usr/include/leveldb + doins include/leveldb/*.h helpers/memenv/memenv.h + dolib.a libleveldb.a libmemenv.a +} + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-contrib/m17n-contrib-1.1.10-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-contrib/m17n-contrib-1.1.10-r1.ebuild new file mode 100644 index 0000000000..ddf8b7dc01 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-contrib/m17n-contrib-1.1.10-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +DESCRIPTION="Contribution database for the m17n library" +HOMEPAGE="http://www.m17n.org/m17n-lib/" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="dev-db/m17n-db" +RDEPEND="${DEPEND}" + +src_configure() { + # Since the HAVE_M17N_DB check in cofigure does not support cross + # compilation, force to skip the check. The check is redundant -- + # we already have the DEPEND=m17n-db line above. + export HAVE_M17N_DB=yes + + econf || die +} + +src_install() { + emake DESTDIR="${D}" install || die + rm -rf "${D}/usr/share/m17n/icons" || die + dodoc AUTHORS ChangeLog NEWS README || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-db/files/do-not-commit-extra-space.patch b/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-db/files/do-not-commit-extra-space.patch new file mode 100644 index 0000000000..465078a201 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-db/files/do-not-commit-extra-space.patch @@ -0,0 +1,16 @@ +Index: MIM/zh-util.mim +=================================================================== +RCS file: /cvs/m17n/m17n-db/MIM/zh-util.mim,v +retrieving revision 1.3 +diff -u -r1.3 zh-util.mim +--- MIM/zh-util.mim 11 Jul 2008 01:28:53 -0000 1.3 ++++ MIM/zh-util.mim 5 Nov 2010 07:07:48 -0000 +@@ -65,7 +65,7 @@ + ((BackSpace))) + + (commit-preedit +- ((S-\ )))) ++ ((\ )))) + + (state + (check-undo diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-db/m17n-db-1.6.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-db/m17n-db-1.6.1-r2.ebuild new file mode 100644 index 0000000000..293c0ac053 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/m17n-db/m17n-db-1.6.1-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.5.5.ebuild,v 1.1 2010/01/26 15:26:00 matsuu Exp $ + +EAPI="2" +inherit eutils + +DESCRIPTION="Database for the m17n library" +HOMEPAGE="http://www.m17n.org/m17n-lib/" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" +IUSE="" + +DEPEND="sys-devel/gettext" +RDEPEND="virtual/libintl" + +src_prepare() { + epatch "${FILESDIR}/do-not-commit-extra-space.patch" +} + +src_install() { + emake DESTDIR="${D}" install || die + rm -rf "${D}/usr/share/m17n/icons" || die + dodoc AUTHORS ChangeLog NEWS README || die + docinto FORMATS; dodoc FORMATS/* || die + docinto UNIDATA; dodoc UNIDATA/* || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/Manifest new file mode 100644 index 0000000000..64b6a7e03d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/Manifest @@ -0,0 +1,3 @@ +DIST sqlite-3.6.19.tar.gz 2942005 RMD160 119db76399eca04f21051c6ff156ccbb0c8d35b5 SHA1 1f85a324edfb42ec00bb6dbbec5a178346c950ee SHA256 7d8649c44fb97b874aa59144faaeb2356ec1fc6a8a7baa1d16e9ff5f1e097003 +DIST sqlite3.h-3.6.19.bz2 55962 RMD160 22315fc99b41b4aea0a437da82db269a81f38943 SHA1 c1d8588c3746da8c870202ac5f21d8e4164500e1 SHA256 29b5c53b260384075b2ca819ae52ee415bd968ea51d2774782da0342385b1e09 +DIST sqlite_docs_3_6_19.zip 2429959 RMD160 c210fa6c9d09e531d8679be55585c42c233042b2 SHA1 418aa0066ca64e7157d49c868d63107eadc073e0 SHA256 65e198b7dbaba193ecc4350666402fa20a46b1f3e4dd7fa3403fbb4ad15e906f diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch new file mode 100644 index 0000000000..a3e0fadf8e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch @@ -0,0 +1,25 @@ +http://www.sqlite.org/cvstrac/tktview?tn=3951 + +--- test/tkt3922.test ++++ test/tkt3922.test +@@ -36,20 +36,6 @@ + } + } {-1 integer} + } +-do_test tkt3922.2 { +- execsql { +- DELETE FROM t1; +- INSERT INTO t1 VALUES('-9223372036854775809'); +- SELECT a, typeof(a) FROM t1; +- } +-} {-9.22337203685478e+18 real} +-do_test tkt3922.3 { +- execsql { +- DELETE FROM t1; +- INSERT INTO t1 VALUES('-9223372036854776832'); +- SELECT a, typeof(a) FROM t1; +- } +-} {-9.22337203685478e+18 real} + do_test tkt3922.4 { + execsql { + DELETE FROM t1; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/sqlite-3.6.19.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/sqlite-3.6.19.ebuild new file mode 100644 index 0000000000..e47d0d7da0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/sqlite-3.6.19.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.18.ebuild,v 1.2 2009/09/18 11:34:58 arfrever Exp $ + +EAPI="2" + +inherit eutils flag-o-matic multilib versionator + +DESCRIPTION="an SQL Database Engine in a C Library" +HOMEPAGE="http://www.sqlite.org/" +DOC_BASE="$(get_version_component_range 1-3)" +DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})" +SRC_URI="http://www.sqlite.org/${P}.tar.gz + doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip ) + !tcl? ( mirror://gentoo/sqlite3.h-${PV}.bz2 )" + +LICENSE="as-is" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug doc icu +readline soundex tcl +threadsafe" +RESTRICT="!tcl? ( test )" + +RDEPEND="icu? ( dev-libs/icu ) + readline? ( sys-libs/readline ) + tcl? ( dev-lang/tcl )" +DEPEND="${RDEPEND} + doc? ( app-arch/unzip )" + +pkg_setup() { + if ! use tcl; then + ewarn "Installation of SQLite with \"tcl\" USE flag enabled provides more (TCL-unrelated) functionality." + + if use icu; then + ewarn "Support for ICU is enabled only when \"tcl\" USE flag is enabled." + fi + + ebeep 1 + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-3.6.16-tkt3922.test.patch" + + epunt_cxx +} + +src_configure() { + # Support column metadata, bug #266651 + append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA + + # Support R-trees, bug #257646 + # Avoid "./.libs/libsqlite3.so: undefined reference to `sqlite3RtreeInit'" during non-amalgamation building. + if use tcl; then + append-cppflags -DSQLITE_ENABLE_RTREE + fi + + if use icu && use tcl; then + append-cppflags -DSQLITE_ENABLE_ICU + sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" + fi + + # Support soundex, bug #143794 + use soundex && append-cppflags -DSQLITE_SOUNDEX + + econf \ + $(use_enable debug) \ + $(use_enable readline) \ + $(use_enable threadsafe) \ + $(use_enable threadsafe cross-thread-connections) \ + $(use_enable tcl) +} + +src_compile() { + use tcl || cp "${WORKDIR}/sqlite3.h-${PV}" sqlite3.h + emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed" +} + +src_test() { + if [[ "${EUID}" -ne "0" ]]; then + local test=test + use debug && test=fulltest + emake ${test} || die "some test(s) failed" + else + ewarn "The userpriv feature must be enabled to run tests." + eerror "Testsuite will not be run." + fi + + if ! use tcl; then + ewarn "You must enable the tcl USE flag if you want to run the testsuite." + eerror "Testsuite will not be run." + fi +} + +src_install() { + emake \ + DESTDIR="${D}" \ + TCLLIBDIR="/usr/$(get_libdir)/${P}" \ + install \ + || die "emake install failed" + + doman sqlite3.1 || die "doman sqlite3.1 failed" + + if use doc; then + # Naming scheme changes randomly between - and _ in releases + # http://www.sqlite.org/cvstrac/tktview?tn=3523 + dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die "dohtml failed" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.1-r26.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.1-r26.ebuild new file mode 100644 index 0000000000..8a29b1ac55 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.1-r26.ebuild @@ -0,0 +1,32 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="594d7b583de7b49d93f0fb1553d46a43c6b6f8b2" +CROS_WORKON_TREE="3c1f68b1c84462e5e30c6f8f6f354ecff67f44bd" +CROS_WORKON_PROJECT="chromiumos/third_party/cbootimage" + +inherit cros-workon + +DESCRIPTION="Utility for signing Tegra2 boot images" +HOMEPAGE="http://git.chromium.org" +SRC_URI="" +LICENSE="GPLv2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_compile() { + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin + exeinto /usr/bin + + doexe cbootimage + doexe bct_dump +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2-r1.ebuild new file mode 120000 index 0000000000..72bbd4aa79 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2-r1.ebuild @@ -0,0 +1 @@ +cbootimage-0.0.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2.ebuild new file mode 100644 index 0000000000..55b192852f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2.ebuild @@ -0,0 +1,21 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +EGIT_REPO_URI="git://nv-tegra.nvidia.com/tools/cbootimage.git" +EGIT_COMMIT="0bbfaf91d1bfdf1bebf884d100e874e4e6b16b6a" +inherit git-2 + +DESCRIPTION="Utility for signing Tegra2 boot images" +HOMEPAGE="http://nv-tegra.nvidia.com/gitweb/?p=tools/cbootimage.git" +SRC_URI="" + +LICENSE="GPLv2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_install() { + dobin cbootimage bct_dump +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-9999.ebuild new file mode 100644 index 0000000000..ee848a31e7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-9999.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/cbootimage" + +inherit cros-workon + +DESCRIPTION="Utility for signing Tegra2 boot images" +HOMEPAGE="http://git.chromium.org" +SRC_URI="" +LICENSE="GPLv2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_compile() { + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin + exeinto /usr/bin + + doexe cbootimage + doexe bct_dump +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/CHANGELOG b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/CHANGELOG new file mode 100644 index 0000000000..bffc2df647 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/CHANGELOG @@ -0,0 +1,9 @@ +getopts.patch: +- bugfix to allow programming of devices with default FTDI id:0x0403/0x6001 + to a new vid/pid. Previously, ftdi_eeprom assumed that the vid/pid in the + config file otherwise. In addition, added ability to override serial number + in config file on command line. + + Now to program board for first time: + ftdi_eeprom -v 0x403 -p 0x6001 -s 000-001 /usr/share/ftdi_eeprom/mini-servo.conf + where: inside mini-servo.conf vid/pid is 0x18d1/0x5000 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-01.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-01.conf new file mode 100644 index 0000000000..2d8f457eb7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-01.conf @@ -0,0 +1,46 @@ +vendor_id=0x18d1 +product_id=0x5000 + +max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. + +########### +# Strings # +########### +# total of these strings is <= eeprom_size - 28bytes +# for 232R ( 128B ) so 100bytes +manufacturer="Google Inc" +product="mini-servo:810-10011-00" +serial="000-00000000" #- + +########### +# Options # +########### +self_powered=true # Turn this off for bus powered +remote_wakeup=false # Turn this on for remote wakeup feature +use_serial=true # Use the serial number string + +# Avail options: BM|R|other +chip_type=R +# Avail options: +# TXDEN|PWREN|RXLED|TXLED|TXRXLED|SLEEP|CLK48|CLK24|CLK12|CLK6| +# IO_MODE|BITBANG_WR|BITBANG_RD|SPECIAL +cbus0=IO_MODE +cbus1=IO_MODE +cbus2=IO_MODE +cbus3=IO_MODE +cbus4=PWREN + +# Normally out don't have to change one of these flags +# 2010/12/21 : tbroch : deprecated in ToT for chip_type +#BM_type_chip=true # Newer chips are all BM type +in_is_isochronous=false # In Endpoint is Isochronous +out_is_isochronous=false # Out Endpoint is Isochronous +suspend_pull_downs=false # Enable suspend pull downs for lower power +change_usb_version=false # Change USB Version +usb_version=0x0200 # Only used when change_usb_version is enabled + +######## +# Misc # +######## + +filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-02.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-02.conf new file mode 100644 index 0000000000..e972bfabf3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-02.conf @@ -0,0 +1,47 @@ +vendor_id=0x18d1 +product_id=0x5000 + +max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. + +########### +# Strings # +########### +# total of these strings is <= eeprom_size - 28bytes +# for 232R ( 128B ) so 100bytes +manufacturer="Google Inc" +product="mini-servo:810-10011-01" +# serial 3-digits hand-labelled on pack of mini-servos +serial="000-000" #- + +########### +# Options # +########### +self_powered=true # Turn this off for bus powered +remote_wakeup=false # Turn this on for remote wakeup feature +use_serial=true # Use the serial number string + +# Avail options: BM|R|other +chip_type=R +# Avail options: +# TXDEN|PWREN|RXLED|TXLED|TXRXLED|SLEEP|CLK48|CLK24|CLK12|CLK6| +# IO_MODE|BITBANG_WR|BITBANG_RD|SPECIAL +cbus0=IO_MODE +cbus1=IO_MODE +cbus2=IO_MODE +cbus3=IO_MODE +cbus4=PWREN + +# Normally out don't have to change one of these flags +# 2010/12/21 : tbroch : deprecated in ToT for chip_type +#BM_type_chip=true # Newer chips are all BM type +in_is_isochronous=false # In Endpoint is Isochronous +out_is_isochronous=false # Out Endpoint is Isochronous +suspend_pull_downs=false # Enable suspend pull downs for lower power +change_usb_version=false # Change USB Version +usb_version=0x0200 # Only used when change_usb_version is enabled + +######## +# Misc # +######## + +filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-00.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-00.conf new file mode 100644 index 0000000000..505868e1f2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-00.conf @@ -0,0 +1,37 @@ +vendor_id=0x18d1 +product_id=0x5001 + +max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. + +########### +# Strings # +########### +# total of these strings is <= eeprom_size - 28bytes +manufacturer="Google Inc" +product="servo:810-10010-00" +serial="000-00000" #- + +########### +# Options # +########### +self_powered=true # Turn this off for bus powered +remote_wakeup=false # Turn this on for remote wakeup feature +use_serial=true # Use the serial number string + +# Avail options: BM|R|other +chip_type=BM + +# Normally out don't have to change one of these flags +# 2010/12/21 : tbroch : deprecated in ToT for chip_type +#BM_type_chip=true # Newer chips are all BM type +in_is_isochronous=false # In Endpoint is Isochronous +out_is_isochronous=false # Out Endpoint is Isochronous +suspend_pull_downs=false # Enable suspend pull downs for lower power +change_usb_version=false # Change USB Version +usb_version=0x0200 # Only used when change_usb_version is enabled + +######## +# Misc # +######## + +filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-01.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-01.conf new file mode 100644 index 0000000000..30e53ed591 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-01.conf @@ -0,0 +1,37 @@ +vendor_id=0x18d1 +product_id=0x5001 + +max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. + +########### +# Strings # +########### +# total of these strings is <= eeprom_size - 28bytes +manufacturer="Google Inc" +product="servo:810-10010-01" +serial="000-00000" #- + +########### +# Options # +########### +self_powered=true # Turn this off for bus powered +remote_wakeup=false # Turn this on for remote wakeup feature +use_serial=true # Use the serial number string + +# Avail options: BM|R|other +chip_type=BM + +# Normally out don't have to change one of these flags +# 2010/12/21 : tbroch : deprecated in ToT for chip_type +#BM_type_chip=true # Newer chips are all BM type +in_is_isochronous=false # In Endpoint is Isochronous +out_is_isochronous=false # Out Endpoint is Isochronous +suspend_pull_downs=false # Enable suspend pull downs for lower power +change_usb_version=false # Change USB Version +usb_version=0x0200 # Only used when change_usb_version is enabled + +######## +# Misc # +######## + +filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02a.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02a.conf new file mode 100644 index 0000000000..34057e0dc3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02a.conf @@ -0,0 +1,37 @@ +vendor_id=0x18d1 +product_id=0x5002 + +max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. + +########### +# Strings # +########### +# total of these strings is <= eeprom_size - 28bytes +manufacturer="Google Inc" +product="servo:810-10010-02" +serial="000-00000" #- + +########### +# Options # +########### +self_powered=true # Turn this off for bus powered +remote_wakeup=false # Turn this on for remote wakeup feature +use_serial=true # Use the serial number string + +# Avail options: BM|R|other +chip_type=BM + +# Normally out don't have to change one of these flags +# 2010/12/21 : tbroch : deprecated in ToT for chip_type +#BM_type_chip=true # Newer chips are all BM type +in_is_isochronous=false # In Endpoint is Isochronous +out_is_isochronous=false # Out Endpoint is Isochronous +suspend_pull_downs=false # Enable suspend pull downs for lower power +change_usb_version=false # Change USB Version +usb_version=0x0200 # Only used when change_usb_version is enabled + +######## +# Misc # +######## + +filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02b.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02b.conf new file mode 100644 index 0000000000..235d5fdbaf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02b.conf @@ -0,0 +1,37 @@ +vendor_id=0x18d1 +product_id=0x5003 + +max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. + +########### +# Strings # +########### +# total of these strings is <= eeprom_size - 28bytes +manufacturer="Google Inc" +product="servo:810-10010-02" +serial="000-00000" #- + +########### +# Options # +########### +self_powered=true # Turn this off for bus powered +remote_wakeup=false # Turn this on for remote wakeup feature +use_serial=true # Use the serial number string + +# Avail options: BM|R|other +chip_type=BM + +# Normally out don't have to change one of these flags +# 2010/12/21 : tbroch : deprecated in ToT for chip_type +#BM_type_chip=true # Newer chips are all BM type +in_is_isochronous=false # In Endpoint is Isochronous +out_is_isochronous=false # Out Endpoint is Isochronous +suspend_pull_downs=false # Enable suspend pull downs for lower power +change_usb_version=false # Change USB Version +usb_version=0x0200 # Only used when change_usb_version is enabled + +######## +# Misc # +######## + +filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/getopts.patch b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/getopts.patch new file mode 100644 index 0000000000..5a549bbfbf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/getopts.patch @@ -0,0 +1,148 @@ +diff --git a/src/main.c b/src/main.c +index 81e6e93..972cc92 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -90,6 +91,9 @@ int main(int argc, char *argv[]) + normal variables + */ + int _read = 0, _erase = 0, _flash = 0; ++ int _vendor = 0x0403, _product = 0x6011; ++ char _serial[128] = {'\0'}; ++ + unsigned char eeprom_buf[128]; + char *filename; + int size_check; +@@ -102,35 +106,68 @@ int main(int argc, char *argv[]) + printf("\nFTDI eeprom generator v%s\n", VERSION); + printf ("(c) Intra2net AG \n"); + +- if (argc != 2 && argc != 3) ++ int longval = 0; ++ struct option long_options[] = { ++ {"read-eeprom", no_argument, &_read, 1}, ++ {"erase-eeprom", no_argument, &_erase, 1}, ++ {"flash-eeprom", no_argument, &_flash, 1}, ++ {"vendor", required_argument, &longval, 'v'}, ++ {"product", required_argument, &longval, 'p'}, ++ {"serial", required_argument, &longval, 's'}, ++ {0, 0, 0, 0} ++ }; ++ ++ int option_index = 0; ++ char c; ++ while ((c = getopt_long(argc, argv, "v:p:s:", ++ long_options, &option_index)) != -1) { ++ switch (c) { ++ case 'v': ++ _vendor = strtoul(optarg, NULL, 0); ++ break; ++ case 'p': ++ _product = strtoul(optarg, NULL, 0); ++ break; ++ case 's': ++ strcpy(_serial, optarg); ++ break; ++ case 0: ++ switch (longval) { ++ case 'v': ++ _vendor = strtoul(optarg, NULL, 0); ++ break; ++ case 'p': ++ _product = strtoul(optarg, NULL, 0); ++ break; ++ case 's': ++ strcpy(_serial, optarg); ++ break; ++ default: ++ break; ++ } ++ default: ++ break; ++ } ++ } ++ ++ if (!_read & !_erase & !_flash) + { +- printf("Syntax: %s [commands] config-file\n", argv[0]); ++ printf("Syntax: %s [switches|command] config-file\n", argv[0]); + printf("Valid commands:\n"); +- printf("--read-eeprom Read eeprom and write to -filename- from config-file\n"); +- printf("--erase-eeprom Erase eeprom\n"); +- printf("--flash-eeprom Flash eeprom\n"); ++ printf("--read-eeprom Read eeprom and write to -filename- from config-file\n"); ++ printf("--erase-eeprom Erase eeprom\n"); ++ printf("--flash-eeprom Flash eeprom\n"); ++ printf("--vendor|-v Vendor id to probe for on USB\n"); ++ printf("--product|-p Product id to probe for on USB\n"); ++ printf("--serial|-s Serial string to override\n"); + exit (-1); + } + +- if (argc == 3) +- { +- if (strcmp(argv[1], "--read-eeprom") == 0) +- _read = 1; +- if (strcmp(argv[1], "--erase-eeprom") == 0) +- _erase = 1; +- if (strcmp(argv[1], "--flash-eeprom") == 0) +- _flash = 1; +- +- argc_filename = 2; +- } +- else +- { +- argc_filename = 1; +- } ++ argc_filename = optind; + + if ((fp = fopen(argv[argc_filename], "r")) == NULL) + { +- printf ("Can't open configuration file\n"); ++ printf ("Can't open configuration file %s\n", argv[argc_filename]); + exit (-1); + } + fclose (fp); +@@ -163,14 +200,16 @@ int main(int argc, char *argv[]) + eeprom.out_is_isochronous = cfg_getbool(cfg, "out_is_isochronous"); + eeprom.suspend_pull_downs = cfg_getbool(cfg, "suspend_pull_downs"); + +- eeprom.use_serial = cfg_getbool(cfg, "use_serial"); ++ eeprom.use_serial = (_serial[0] == '\0') ? ++ cfg_getbool(cfg, "use_serial") : 1; + eeprom.change_usb_version = cfg_getbool(cfg, "change_usb_version"); + eeprom.usb_version = cfg_getint(cfg, "usb_version"); + + + eeprom.manufacturer = cfg_getstr(cfg, "manufacturer"); + eeprom.product = cfg_getstr(cfg, "product"); +- eeprom.serial = cfg_getstr(cfg, "serial"); ++ eeprom.serial = (_serial[0] == '\0') ? ++ cfg_getstr(cfg, "serial") : _serial; + eeprom.high_current = cfg_getbool(cfg, "high_current"); + eeprom.cbus_function[0] = str_to_cbus(cfg_getstr(cfg, "cbus0"), 13); + eeprom.cbus_function[1] = str_to_cbus(cfg_getstr(cfg, "cbus1"), 13); +@@ -198,11 +237,12 @@ int main(int argc, char *argv[]) + } + else + { +- printf("Unable to find FTDI devices under given vendor/product id: 0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id); +- printf("Error code: %d (%s)\n", i, ftdi_get_error_string(&ftdi)); +- printf("Retrying with default FTDI id.\n"); ++ printf("Unable to find FTDI devices under given id:0x%02x/0x%02x\n", ++ eeprom.vendor_id, eeprom.product_id); + +- i = ftdi_usb_open(&ftdi, 0x0403, 0x6001); ++ printf("Error code: %d (%s)\n", i, ftdi_get_error_string(&ftdi)); ++ printf("Retrying with id:0x%02x/0x%02x\n", _vendor, _product); ++ i = ftdi_usb_open(&ftdi, _vendor, _product); + if (i != 0) + { + printf("Error: %s\n", ftdi.error_str); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.4_rc1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.4_rc1.ebuild new file mode 100644 index 0000000000..e718e1423f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.4_rc1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3.ebuild,v 1.1 2010/06/22 22:19:02 vapier Exp $ + +EAPI="2" + +inherit autotools + +DESCRIPTION="Utility to program external EEPROM for FTDI USB chips" +HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/" +# +# from HEAD 08d3572 'Support for FT232R eeprom features' +# +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="x86 amd64" +IUSE="" + +DEPEND=">=dev-embedded/libftdi-0.19 + dev-libs/confuse" + +src_prepare() { + epatch ${FILESDIR}/getopts.patch || die "patching getopts.patch" + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die + insinto "/usr/share/ftdi_eeprom" + for item in ${FILESDIR}/confs/*.conf; do + doins ${item} + done + dodoc AUTHORS ChangeLog README src/example.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-0.0.1-r4.ebuild new file mode 100644 index 0000000000..20b5b011da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-0.0.1-r4.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="66f1f0d949f4ca4836c1a65b622629205240e37a" +CROS_WORKON_TREE="9e4e01d060cdaf9232236674d7e2a5bd14f1dfae" +CROS_WORKON_PROJECT="chromiumos/third_party/tegra-power-query" + +inherit cros-workon + +DESCRIPTION="Utility monitoring power usage on Harmony and Seaboard" +HOMEPAGE="" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_compile() { + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin + exeinto /usr/bin + + doexe tegra-power-query || die "doexe failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-9999.ebuild new file mode 100644 index 0000000000..26d9f8196d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/tegra-power-query" + +inherit cros-workon + +DESCRIPTION="Utility monitoring power usage on Harmony and Seaboard" +HOMEPAGE="" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_compile() { + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin + exeinto /usr/bin + + doexe tegra-power-query || die "doexe failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.1.ebuild new file mode 100644 index 0000000000..de03982c15 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.1.ebuild @@ -0,0 +1,24 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +EGIT_REPO_URI="git://nv-tegra.nvidia.com/tools/tegrarcm.git" +EGIT_COMMIT="v${PV}" +inherit git-2 + +DESCRIPTION="Utility for downloading code to tegra system in recovery mode" +HOMEPAGE="http://sourceforge.net/projects/tegra-rcm/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND=">=dev-libs/crypto++-5.6 + virtual/libusb:1" +RDEPEND="${DEPEND}" + +src_install() { + dobin src/tegrarcm +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2-r1.ebuild new file mode 120000 index 0000000000..66614c9b2c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2-r1.ebuild @@ -0,0 +1 @@ +tegrarcm-1.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2.ebuild new file mode 100644 index 0000000000..3bf1009543 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +EGIT_REPO_URI="git://nv-tegra.nvidia.com/tools/tegrarcm.git" +EGIT_COMMIT="v${PV}" +inherit git-2 + +inherit autotools + +DESCRIPTION="Utility for downloading code to tegra system in recovery mode" +HOMEPAGE="http://sourceforge.net/projects/tegra-rcm/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND=">=dev-libs/crypto++-5.6 + virtual/libusb:1" +DEPEND="${RDEPEND}" + +src_prepare() { + eautoreconf +} + +src_install() { + dobin src/tegrarcm +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-0.0.1-r3.ebuild new file mode 100644 index 0000000000..964659e7a4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-0.0.1-r3.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="1be161a89525d840e1f6d1f21b3f45645a7dedb3" +CROS_WORKON_TREE="aeb5f4b3e2d7743026b2c267a4424203c924ffeb" +CROS_WORKON_PROJECT="chromiumos/third_party/tegrastats" + +DESCRIPTION="Software to inspect and adjust DVFS parameters on tegra." +HOMEPAGE="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm" +IUSE="" + +inherit cros-workon toolchain-funcs + +RDEPEND="" +DEPEND="" + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin + exeinto /usr/bin + doexe tegrastats/tegrastats || die "doexe failed" + doexe dfs_stress/dfs_stress || die "doexe failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-9999.ebuild new file mode 100644 index 0000000000..18352cd385 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/tegrastats" + +DESCRIPTION="Software to inspect and adjust DVFS parameters on tegra." +HOMEPAGE="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm" +IUSE="" + +inherit cros-workon toolchain-funcs + +RDEPEND="" +DEPEND="" + +src_compile() { + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin + exeinto /usr/bin + doexe tegrastats/tegrastats || die "doexe failed" + doexe dfs_stress/dfs_stress || die "doexe failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/Manifest new file mode 100644 index 0000000000..753f28cd8b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/Manifest @@ -0,0 +1,8 @@ +DIST icedtea6-bin-core-1.6.2-r2-amd64.tar.bz2 35017403 RMD160 63a96e552f965958b7363d2981d644ce53c0d06e SHA1 f0eb52a7931a8d5ccd52e66215de3161be4ca878 SHA256 592dab401eeb917d318654d415dc2f0d67072e2c580d55dd9effafc5d216dae1 +DIST icedtea6-bin-core-1.6.2-r2-x86.tar.bz2 36159131 RMD160 ae9dfa92b901dbfec7d8328b51a64902190ecc4c SHA1 1b8cd20efd9f68dd7a5a785676f95accdf5dcf12 SHA256 2f54786a29f30c241cce0b70ab1f248058fe78c3c98d0de1f0bd16483b888d9c +DIST icedtea6-bin-doc-1.6.2-r2.tar.bz2 11510147 RMD160 b86886925754856cf08c785fdd8a80dd59811966 SHA1 1a96565f44d635fcb23bdebc8af88ca9cf737754 SHA256 024ac62c13e8fbcf0830c1e360c85b295289df1fdba65bd674928d3f8904e605 +DIST icedtea6-bin-examples-1.6.2-r2-amd64.tar.bz2 2175800 RMD160 d0a46694e41d93db51a6935727dd39b8c3239b1f SHA1 08eb009e0d7cd5bb82b28d14ee87416db6e214cd SHA256 ff8fdcdcf9d2b89b4f29e63e27ce8aedde1175593ccbe0367a46c9c4ec1d10d9 +DIST icedtea6-bin-examples-1.6.2-r2-x86.tar.bz2 2139371 RMD160 8cd334021b118de0b3b3313a88a9f4b9bf54886b SHA1 0c44c070f0f612ee0e7361545fa14ed048ee9afb SHA256 2725142d2b6c3f965d173d23357b610bae0f88ad3c75b88d6ad30494619ecc31 +DIST icedtea6-bin-nsplugin-1.6.2-r2-amd64.tar.bz2 87974 RMD160 6db9830f6c59524513bdd200b8f645677f8764d2 SHA1 511392dcce3b56a97222488927ee4f66db969303 SHA256 4c8a5cb3c0d71cf14f464e4a99fd94515de8755f9d318a6d03959f710c0909ad +DIST icedtea6-bin-nsplugin-1.6.2-r2-x86.tar.bz2 75695 RMD160 6ec9b559386334da68eb464b847bd082b60886e7 SHA1 37c0ab74ad64b5cea1aca01747599f0fa1201519 SHA256 3b3b31cd004700cc68d3def11df9e0cef9c679bb2ae867256570a185d483538d +DIST icedtea6-bin-src-1.6.2-r2.tar.bz2 26607726 RMD160 8ae63a6e69b42b3745014ef0ba43d1f494c07997 SHA1 ad3631199b021024245c181c86c2d400512ffdf1 SHA256 afad5f25f8ef7aa58bee06094316da26256e1a3c48a950ed27371a9fc5270865 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/files/icedtea6-bin.env b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/files/icedtea6-bin.env new file mode 100644 index 0000000000..c896da51d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/files/icedtea6-bin.env @@ -0,0 +1,18 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/files/icedtea6-bin.env,v 1.1 2008/12/24 22:22:37 caster Exp $ + +VERSION="IcedTea6-bin @PV@" +JAVA_HOME=/opt/@P@ +JDK_HOME=/opt/@P@ +JAVAC=${JAVA_HOME}/bin/javac +PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" +MANPATH="/opt/@P@/man" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="1.6" +# Taken from sun.boot.class.path property +BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r3.ebuild new file mode 100644 index 0000000000..43e8fc8148 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r3.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild,v 1.3 2010/02/19 19:35:21 maekke Exp $ + +EAPI="1" + +inherit java-vm-2 + +dist="mirror://gentoo/" +DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK" +TARBALL_VERSION="${PV}-r2" +SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 ) + x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 ) + doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 ) + examples? ( + amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 ) + x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 ) + ) + nsplugin? ( + amd64? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 ) + x86? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 ) + ) + source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )" +HOMEPAGE="http://icedtea.classpath.org" + +IUSE="X alsa doc examples nsplugin source" +RESTRICT="strip" + +LICENSE="GPL-2-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 x86" + +S="${WORKDIR}/${PN}-${TARBALL_VERSION}" + +RDEPEND=">=sys-devel/gcc-4.3 + >=sys-libs/glibc-2.9 + >=media-libs/giflib-4.1.6-r1 + virtual/jpeg + >=media-libs/libpng-1.2.38 + >=sys-libs/zlib-1.2.3-r1 + alsa? ( >=media-libs/alsa-lib-1.0.20 ) + X? ( + >=media-libs/freetype-2.3.9:2 + >=media-libs/fontconfig-2.6.0-r2:1.0 + >=x11-libs/libXext-1.0.5 + >=x11-libs/libXi-1.2.1 + >=x11-libs/libXtst-1.0.3 + >=x11-libs/libX11-1.2.2 + x11-libs/libXt + ) + nsplugin? ( + >=dev-libs/atk-1.26.0 + >=dev-libs/glib-2.20.5:2 + >=dev-libs/nspr-4.8 + >=x11-libs/cairo-1.8.8 + >=x11-libs/gtk+-2.16.6:2 + >=x11-libs/pango-1.24.5 + )" +DEPEND="" + +QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/server/libjvm.so" +QA_EXECSTACK_x86="opt/${P}/jre/lib/i386/server/libjvm.so + opt/${P}/jre/lib/i386/client/libjvm.so" + +src_install() { + local dest="/opt/${P}" + local ddest="${D}/${dest}" + dodir "${dest}" || die + + local arch=${ARCH} + + # doins can't handle symlinks. + cp -pRP bin include jre lib man "${ddest}" || die "failed to copy" + + dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die + if use doc ; then + dohtml -r ../doc/html/* || die "Failed to install documentation" + fi + + if use examples; then + cp -pRP share/{demo,sample} "${ddest}" || die + fi + + if use source ; then + cp src.zip "${ddest}" || die + fi + + if use nsplugin ; then + use x86 && arch=i386 + install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so" + fi + + set_java_env + java-vm_revdep-mask +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if use nsplugin; then + elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin" + elog "Note that the plugin works only in browsers based on xulrunner-1.9.1" + elog "such as Firefox 3.5, and not in other versions! xulrunner-1.9.2 (Firefox 3.6)" + elog "is not supported by upstream yet." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/Manifest new file mode 100644 index 0000000000..40b0b15aad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/Manifest @@ -0,0 +1,2 @@ +DIST Python-2.6.4.tar.bz2 11249486 RMD160 fd33853842110fa3636dd296f2f27646fd2b151a SHA1 bee572680d1966501247cb2b26e0e51f94d1cd13 SHA256 dad8d5575144a210d5cc4fdbc40b8a26386e9cdb1ef58941bec0be02c7cb9d89 +DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c803c1e8a67e24b SHA1 51d4174b2a4136a11c64ae0007b59e4c2f0e13f2 SHA256 19a66a0855df270c030438f21c29260e7ff69b299830409f6aa9140611b721e2 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/pydoc.conf b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/pydoc.conf new file mode 100644 index 0000000000..4a98fd40e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/pydoc.conf @@ -0,0 +1,8 @@ +# /etc/init.d/pydoc.conf +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.2 2008/06/30 15:10:28 hawking Exp $ + +# This file contains the configuration information for pydoc's internal +# webserver. The variables should be rather self explanatory :-) + +# Default port for Python's pydoc server +PYDOC_PORT=7464 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/pydoc.init b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/pydoc.init new file mode 100755 index 0000000000..19b63e31df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/pydoc.init @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public Licence v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.2 2008/06/30 15:10:28 hawking Exp $ + +depend() { + need net +} + +start() { + if [ -z $PYDOC_PORT ] ; then + eerror "Port not set" + return 1 + fi + ebegin "Starting pydoc server on port $PYDOC_PORT" + start-stop-daemon --start --background --make-pidfile \ + --pidfile /var/run/pydoc.pid \ + --startas /usr/bin/pydoc -- -p $PYDOC_PORT + eend $? +} + +stop() { + ebegin "Stopping pydoc server" + start-stop-daemon --stop --quiet --pidfile /var/run/pydoc.pid + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6-cross-getaddrinfo.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6-cross-getaddrinfo.patch new file mode 100644 index 0000000000..9e390d5903 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6-cross-getaddrinfo.patch @@ -0,0 +1,13 @@ +--- configure.in.orig 2010-10-11 14:39:17.000000000 -0400 ++++ configure.in 2010-10-11 14:44:17.000000000 -0400 +@@ -2950,8 +2950,8 @@ + buggygetaddrinfo=no, + AC_MSG_RESULT(buggy) + buggygetaddrinfo=yes, +-AC_MSG_RESULT(buggy) +-buggygetaddrinfo=yes)], [ ++AC_MSG_RESULT(cross-compiling - assuming no) ++buggygetaddrinfo=no)], [ + AC_MSG_RESULT(no) + buggygetaddrinfo=yes + ]) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-configure-sizeof.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-configure-sizeof.patch new file mode 100644 index 0000000000..533e014896 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-configure-sizeof.patch @@ -0,0 +1,110 @@ +taken from upstream to fix cross-compile tests + +http://crosbug.com/35372 + +changeset: 55282:cb3aa8bcd7b0 +user: Alexandre Vassalotti +date: Fri Jul 17 05:47:33 2009 +0000 +summary: Use AC_CHECK_SIZEOF to find the size of off_t, pthread_t and time_t. + +diff -r e621e3e3196e -r cb3aa8bcd7b0 configure.in +--- a/configure.in Fri Jul 17 05:41:49 2009 +0000 ++++ b/configure.in Fri Jul 17 05:47:33 2009 +0000 +@@ -1384,26 +1384,11 @@ + #include + #endif]) + +- +-# Hmph. AC_CHECK_SIZEOF() doesn't include . +-AC_MSG_CHECKING(size of off_t) +-AC_CACHE_VAL(ac_cv_sizeof_off_t, +-[AC_TRY_RUN([#include ++AC_CHECK_SIZEOF(off_t, [], [ ++#ifdef HAVE_SYS_TYPES_H + #include +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(off_t)); +- exit(0); +-}], +-ac_cv_sizeof_off_t=`cat conftestval`, +-ac_cv_sizeof_off_t=0, +-ac_cv_sizeof_off_t=4) ++#endif + ]) +-AC_MSG_RESULT($ac_cv_sizeof_off_t) +-AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t, +-[The number of bytes in an off_t.]) + + AC_MSG_CHECKING(whether to enable large file support) + if test "$have_long_long" = yes +@@ -1419,26 +1404,14 @@ + AC_MSG_RESULT(no) + fi + +-# AC_CHECK_SIZEOF() doesn't include . +-AC_MSG_CHECKING(size of time_t) +-AC_CACHE_VAL(ac_cv_sizeof_time_t, +-[AC_TRY_RUN([#include ++AC_CHECK_SIZEOF(time_t, [], [ ++#ifdef HAVE_SYS_TYPES_H ++#include ++#endif ++#ifdef HAVE_TIME_H + #include +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(time_t)); +- exit(0); +-}], +-ac_cv_sizeof_time_t=`cat conftestval`, +-ac_cv_sizeof_time_t=0, +-ac_cv_sizeof_time_t=4) ++#endif + ]) +-AC_MSG_RESULT($ac_cv_sizeof_time_t) +-AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t, +-[The number of bytes in a time_t.]) +- + + # if have pthread_t then define SIZEOF_PTHREAD_T + ac_save_cc="$CC" +@@ -1449,30 +1422,17 @@ + elif test "$ac_cv_pthread" = "yes" + then CC="$CC -pthread" + fi ++ + AC_MSG_CHECKING(for pthread_t) + have_pthread_t=no + AC_TRY_COMPILE([#include ], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes) + AC_MSG_RESULT($have_pthread_t) + if test "$have_pthread_t" = yes ; then +- # AC_CHECK_SIZEOF() doesn't include . +- AC_MSG_CHECKING(size of pthread_t) +- AC_CACHE_VAL(ac_cv_sizeof_pthread_t, +- [AC_TRY_RUN([#include ++ AC_CHECK_SIZEOF(pthread_t, [], [ ++#ifdef HAVE_PTHREAD_H + #include +- main() +- { +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(pthread_t)); +- exit(0); +- }], +- ac_cv_sizeof_pthread_t=`cat conftestval`, +- ac_cv_sizeof_pthread_t=0, +- ac_cv_sizeof_pthread_t=4) ++#endif + ]) +- AC_MSG_RESULT($ac_cv_sizeof_pthread_t) +- AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t, +- [The number of bytes in a pthread_t.]) + fi + CC="$ac_save_cc" + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-distutils.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-distutils.patch new file mode 100644 index 0000000000..f963636be6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-distutils.patch @@ -0,0 +1,94 @@ +Extensions should be installed to the targets libdir. This is important if e.g. host +has a 64bit /usr/lib64, but the target is 32bit and has $ROOT/usr/lib. Make sure we +respect the target's lib structure by getting the libdir name from Makefile. + +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -38,8 +38,8 @@ + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', +- 'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', ++ 'purelib': '$base/$libdirname/python$py_version_short/site-packages', ++ 'platlib': '$platbase/$libdirname/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +@@ -289,6 +289,7 @@ + # everything else. + self.config_vars['base'] = self.install_base + self.config_vars['platbase'] = self.install_platbase ++ self.config_vars['libdirname'] = self.install_libdirname + + if DEBUG: + from pprint import pprint +@@ -394,6 +395,10 @@ + + self.install_base = self.prefix + self.install_platbase = self.exec_prefix ++ self.install_libdirname = os.path.basename(get_config_vars('LIBDIR')[0]) ++ if self.install_libdirname is None: ++ self.install_libdirname = '@@GENTOO_LIBDIR@@' ++ + self.select_scheme("unix_prefix") + + # finalize_unix () +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -201,7 +201,8 @@ + and sysconfig.get_config_var('Py_ENABLE_SHARED'): + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): + # building third party extensions +- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) ++ sysroot = os.getenv('SYSROOT', '') ++ self.library_dirs.append(sysroot + sysconfig.get_config_var('LIBDIR')) + else: + # building python standard extensions + self.library_dirs.append('.') +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -19,9 +19,16 @@ + from distutils.errors import DistutilsPlatformError + + # These are needed in a couple of spots, so just compute them once. ++SYSROOT = os.getenv('SYSROOT', '') + PREFIX = os.path.normpath(sys.prefix) + EXEC_PREFIX = os.path.normpath(sys.exec_prefix) + ++# Make sure we respect the user specified SYSROOT environment variable. ++# This is the first step to get distutils to crosscompile stuff. ++if SYSROOT: ++ PREFIX = os.path.normpath(SYSROOT + os.path.sep + PREFIX) ++ EXEC_PREFIX = os.path.normpath(SYSROOT + os.path.sep + EXEC_PREFIX) ++ + # Path to the base directory of the project. On Windows the binary may + # live in project/PCBuild9. If we're dealing with an x64 Windows build, + # it'll live in project/PCbuild/amd64. +@@ -110,6 +117,12 @@ + + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. ++ ++ For the posix system we can not always assume the host's notion of the ++ libdir is the same for the target. e.g. compiling on an x86_64 system ++ will use 'lib64' but an arm 32bit target will use 'lib'. So encode all ++ the known lists of dirs and search them all (starting with the host one ++ so that native builds work just fine). + """ + if prefix is None: + prefix = plat_specific and EXEC_PREFIX or PREFIX +@@ -119,9 +119,10 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": +- libpython = os.path.join(prefix, +- "@@GENTOO_LIBDIR@@", +- "python" + get_python_version()) ++ for libdir in ['@@GENTOO_LIBDIR@@', 'lib64', 'lib32', 'libx32', 'lib']: ++ libpython = os.path.join(prefix, libdir, "python" + get_python_version()) ++ if os.path.exists(libpython): ++ break + if standard_lib: + return libpython + else: diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-h2py.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-h2py.patch new file mode 100644 index 0000000000..072a127b11 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-h2py.patch @@ -0,0 +1,34 @@ +use the host python when running the h2py code, and have that search sysroot + +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -431,8 +431,8 @@ platformspecificmods: $(BUILDPYTHON) sharedmods + cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen; \ + fi \ + fi +- @EXE="$(BUILDEXE)"; export EXE; \ +- PATH="`pwd`:$$PATH"; export PATH; \ ++ @HOSTPYTHON="`realpath $(HOSTPYTHON)`"; export HOSTPYTHON; \ ++ INCLUDE="$(SYSROOT)$(INCLUDEDIR)"; export INCLUDE; \ + PYTHONPATH="`pwd`/Lib"; export PYTHONPATH; \ + cd $(srcdir)/Lib/$(PLATDIR); \ + $(RUNSHARED) ./regen || exit 1; \ +--- a/Tools/scripts/h2py.py ++++ b/Tools/scripts/h2py.py +@@ -60,6 +60,7 @@ except KeyError: + searchdirs=['/usr/include'] + + def main(): ++ sysroot = os.getenv('SYSROOT', '') + global filedict + opts, args = getopt.getopt(sys.argv[1:], 'i:') + for o, a in opts: +@@ -72,7 +73,7 @@ def main(): + sys.stdout.write('# Generated by h2py from stdin\n') + process(sys.stdin, sys.stdout) + else: +- fp = open(filename, 'r') ++ fp = open(sysroot + filename, 'r') + outfile = os.path.basename(filename) + i = outfile.rfind('.') + if i > 0: outfile = outfile[:i] diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-install-compile.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-install-compile.patch new file mode 100644 index 0000000000..4d9d0c8194 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-install-compile.patch @@ -0,0 +1,33 @@ +some of the modules that we compile need more modules on the host to make work + +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -924,23 +924,23 @@ libinstall: build_all + done; \ + done + $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt +- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ PYTHONPATH=$(HOSTPYTHONPATH):$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) +- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ PYTHONPATH=$(HOSTPYTHONPATH):$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ -PYTHONPATH=$(HOSTPYTHONPATH):$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ -PYTHONPATH=$(HOSTPYTHONPATH):$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ -PYTHONPATH=$(HOSTPYTHONPATH):$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" + + # Install the include files diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-libdirname.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-libdirname.patch new file mode 100644 index 0000000000..a2753866eb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-libdirname.patch @@ -0,0 +1,13 @@ +the older python on the host expects LIBDIRNAME here. +once it gets upgraded to 2.6.8, we can drop this patch. + +--- Makefile.pre.in ++++ Makefile.pre.in +@@ -87,6 +87,7 @@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include + SCRIPTDIR= $(prefix)/@@GENTOO_LIBDIR@@ ++LIBDIRNAME= @@GENTOO_LIBDIR@@ + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-setup-sysroot.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-setup-sysroot.patch new file mode 100644 index 0000000000..70f3f3c06e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/files/python-2.6.8-cross-setup-sysroot.patch @@ -0,0 +1,169 @@ +Change setup.py to respect the SYSROOT environment variable + +--- a/setup.py ++++ b/setup.py +@@ -337,9 +337,13 @@ + + def detect_modules(self): + global disable_ssl ++ ++ # We must respect the user specified sysroot! ++ sysroot = os.getenv('SYSROOT', '') ++ + # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ add_dir_to_list(self.compiler.library_dirs, sysroot + '/usr/local/lib') ++ add_dir_to_list(self.compiler.include_dirs, sysroot + '/usr/local/include') + + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. +@@ -375,12 +381,18 @@ + for directory in reversed(options.dirs): + add_dir_to_list(dir_list, directory) + +- if os.path.normpath(sys.prefix) != '/usr': ++ if os.path.normpath(sys.prefix) != '/usr/local': + add_dir_to_list(self.compiler.library_dirs, + sysconfig.get_config_var("LIBDIR")) + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + ++ # We should always look into sysroot/usr/include and consider ++ # also the lib dirs there for searching for files ++ add_dir_to_list(self.compiler.include_dirs, sysroot + '/usr/include') ++ add_dir_to_list(self.compiler.library_dirs, sysroot + '/@@GENTOO_LIBDIR@@') ++ add_dir_to_list(self.compiler.library_dirs, sysroot + '/usr/@@GENTOO_LIBDIR@@') ++ + try: + have_unicode = unicode + except NameError: +@@ -389,6 +403,9 @@ + '/lib', '/usr/lib', + ] + inc_dirs = self.compiler.include_dirs + ['/usr/include'] ++ # Ignore previous settings. ++ lib_dirs = self.compiler.library_dirs ++ inc_dirs = self.compiler.include_dirs + exts = [] + missing = [] + +@@ -613,11 +624,11 @@ + elif self.compiler.find_library_file(lib_dirs, 'curses'): + readline_libs.append('curses') + elif self.compiler.find_library_file(lib_dirs + +- ['/usr/@@GENTOO_LIBDIR@@/termcap'], ++ [sysroot + '/usr/@@GENTOO_LIBDIR@@/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'], ++ library_dirs=[sysroot + '/usr/@@GENTOO_LIBDIR@@/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + else: +@@ -642,20 +653,20 @@ + depends = ['socketmodule.h']) ) + # Detect SSL support for the socket module (via _ssl) + search_for_ssl_incs_in = [ +- '/usr/local/ssl/include', +- '/usr/contrib/ssl/include/' ++ sysroot + '/usr/local/ssl/include', ++ sysroot + '/usr/contrib/ssl/include/' + ] + ssl_incs = find_file('openssl/ssl.h', inc_dirs, + search_for_ssl_incs_in + ) + if ssl_incs is not None and not disable_ssl: + krb5_h = find_file('krb5.h', inc_dirs, +- ['/usr/kerberos/include']) ++ [sysroot + '/usr/kerberos/include']) + if krb5_h: + ssl_incs += krb5_h + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', +- '/usr/contrib/ssl/lib/' ++ [sysroot + '/usr/local/ssl/lib', ++ sysroot + '/usr/contrib/ssl/lib/' + ] ) + + if (ssl_incs is not None and +@@ -773,6 +785,7 @@ + db_inc_paths.append('/usr/local/include/db3%d' % x) + db_inc_paths.append('/pkg/db-3.%d/include' % x) + db_inc_paths.append('/opt/db-3.%d/include' % x) ++ db_inc_paths = [sysroot + x for x in db_inc_paths] + + # Add some common subdirectories for Sleepycat DB to the list, + # based on the standard include directories. This way DB3/4 gets +@@ -921,5 +933,6 @@ + '/usr/local/include/sqlite', + '/usr/local/include/sqlite3', + ] ++ sqlite_inc_paths = [sysroot + x for x in sqlite_inc_paths] + MIN_SQLITE_VERSION_NUMBER = (3, 0, 8) + MIN_SQLITE_VERSION = ".".join([str(x) +@@ -1021,7 +1033,7 @@ + # we do not build this one. Otherwise this build will pick up + # the more recent berkeleydb's db.h file first in the include path + # when attempting to compile and it will fail. +- f = "/usr/include/db.h" ++ f = sysroot + "/usr/include/db.h" + + if sys.platform == 'darwin': + if is_macosx_sdk_path(f): +@@ -1236,7 +1248,7 @@ + # More information on Expat can be found at www.libexpat.org. + # + # Use system expat +- expatinc = '/usr/include' ++ expatinc = sysroot + '/usr/include' + define_macros = [] + + exts.append(Extension('pyexpat', +@@ -1546,7 +1558,7 @@ + # For 8.4a2, the X11 headers are not included. Rather than include a + # complicated search, this is a hard-coded path. It could bail out + # if X11 libs are not found... +- include_dirs.append('/usr/X11R6/include') ++ include_dirs.append(sysroot + '/usr/X11R6/include') + frameworks = ['-framework', 'Tcl', '-framework', 'Tk'] + + # All existing framework builds of Tcl/Tk don't support 64-bit +@@ -1579,6 +1591,9 @@ + def detect_tkinter(self, inc_dirs, lib_dirs): + # The _tkinter module. + ++ # We must respect the user specified sysroot! ++ sysroot = os.getenv('SYSROOT', '') ++ + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +@@ -1633,17 +1650,17 @@ + if platform == 'sunos5': + include_dirs.append('/usr/openwin/include') + added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') ++ elif os.path.exists(sysroot + '/usr/X11R6/include'): ++ include_dirs.append(sysroot + '/usr/X11R6/include') ++ added_lib_dirs.append(sysroot + '/usr/X11R6/lib64') ++ added_lib_dirs.append(sysroot + '/usr/X11R6/lib') ++ elif os.path.exists(sysroot + '/usr/X11R5/include'): ++ include_dirs.append(sysroot + '/usr/X11R5/include') ++ added_lib_dirs.append(sysroot + '/usr/X11R5/lib') + else: + # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') ++ include_dirs.append(sysroot + '/usr/X11/include') ++ added_lib_dirs.append(sysroot + '/usr/X11/lib') + + # If Cygwin, then verify that X is installed before proceeding + if platform == 'cygwin': diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python/python-2.6.8-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/python-2.6.8-r1.ebuild new file mode 100644 index 0000000000..391454ff4d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python/python-2.6.8-r1.ebuild @@ -0,0 +1,372 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8.ebuild,v 1.15 2012/05/26 17:27:12 armin76 Exp $ + +EAPI="2" +WANT_AUTOMAKE="none" +WANT_LIBTOOL="none" + +inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs multiprocessing + +MY_P="Python-${PV}" +PATCHSET_REVISION="0" + +DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 + mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2" + +LICENSE="PSF-2" +SLOT="2.6" +PYTHON_ABI="${SLOT}" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" + +RDEPEND="app-arch/bzip2 + >=sys-libs/zlib-1.1.3 + virtual/libffi + virtual/libintl + !build? ( + berkdb? ( || ( + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 + ) ) + gdbm? ( sys-libs/gdbm ) + ncurses? ( + >=sys-libs/ncurses-5.2 + readline? ( >=sys-libs/readline-4.1 ) + ) + sqlite? ( >=dev-db/sqlite-3.3.3:3 ) + ssl? ( dev-libs/openssl ) + tk? ( + >=dev-lang/tk-8.0 + dev-tcltk/blt + ) + xml? ( >=dev-libs/expat-2.1 ) + ) + !!/dev/null + OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \ + "${S}"/configure \ + --{build,host}=${CBUILD} \ + || die "cross-configure failed" + ) & + multijob_post_fork + fi + + # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. + tc-export CXX + # The configure script fails to use pkg-config correctly. + # http://bugs.python.org/issue15506 + export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) + + # Set LDFLAGS so we link modules with -lpython2.6 correctly. + # Needed on FreeBSD unless Python 2.6 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + cd "${WORKDIR}"/${CHOST} + ECONF_SOURCE=${S} OPT="" \ + econf \ + --with-fpectl \ + --enable-shared \ + $(use_enable ipv6) \ + $(use_with threads) \ + $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ + --with-libc="" \ + --with-system-ffi + + if tc-is-cross-compiler; then + # Modify the Makefile.pre so we don't regen for the host/ one. + # We need to link the host python programs into $PWD and run + # them from here because the distutils sysconfig module will + # parse Makefile/etc... from argv[0], and we need it to pick + # up the target settings, not the host ones. + sed -i \ + -e '1iHOSTPYTHONPATH = ./hostpythonpath:' \ + -e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \ + -e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \ + Makefile{.pre,} || die "sed failed" + fi + + multijob_finish +} + +src_compile() { + if tc-is-cross-compiler; then + cd "${WORKDIR}"/${CBUILD} + # Disable as many modules as possible -- but we need a few to install. + PYTHON_DISABLE_MODULES=$( + sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \ + egrep -v '(unicodedata|time|cStringIO|_struct|binascii)' + ) \ + PTHON_DISABLE_SSL="1" \ + SYSROOT= \ + emake || die "cross-make failed" + [[ -e build/lib.linux-x86_64-2.6/unicodedata.so ]] || die + # See comment in src_configure about these. + ln python ../${CHOST}/hostpython || die + ln Parser/pgen ../${CHOST}/Parser/hostpgen || die + ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die + fi + + cd "${WORKDIR}"/${CHOST} + emake EPYTHON="python${PV%%.*}" || die "emake failed" + + # Work around bug 329499. See also bug 413751. + pax-mark m python +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + cd "${WORKDIR}"/${CHOST} + + # Byte compiling should be enabled here. + # Otherwise test_import fails. + python_enable_pyc + + # Skip failing tests. + local skipped_tests="distutils tcl" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" || die + done + + # Rerun failed tests in verbose mode (regrtest -w). + emake test EXTRATESTOPTS="-w" < /dev/tty + local result="$?" + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test/ || die + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}$(python_get_libdir)/test'" + elog "and run the tests separately." + + python_disable_pyc + + if [[ "${result}" -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/" + + cd "${WORKDIR}"/${CHOST} + emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" + python_clean_installation_image -q + + mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}" + + # Fix collisions between different slots of Python. + mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" + mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" + mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" + mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1" + rm -f "${ED}usr/bin/smtpd.py" + + if use build; then + rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test} + else + use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test} + use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,test/test_bsddb*} + use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} + use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk} + fi + + use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing" + use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe + + dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r "${S}"/Tools || die "doins failed" + fi + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${SLOT}:" \ + -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + [[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/" + + if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir) + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn "You should switch active version of Python ${PV%%.*} and run" + ewarn "'python-updater [options]' to rebuild Python modules." + fi +} + +pkg_postrm() { + eselect_python_update + + python_mod_cleanup $(python_get_libdir) +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/v8/v8-5208.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/v8/v8-5208.ebuild new file mode 100644 index 0000000000..9fbf5c0525 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/v8/v8-5208.ebuild @@ -0,0 +1,57 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="V8 JavaScript engine." +HOMEPAGE="http://code.google.com/p/v8/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-svn-${PV}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="" + +src_compile() { + if tc-is-cross-compiler ; then + tc-getCC + tc-getCXX + tc-getAR + tc-getRANLIB + tc-getLD + tc-getNM + fi + + # The v8 SConstruct file adds this flag when building dtoa on gcc 4.4, but + # the build also fails when building src/handles-inl.h + # with "src/handles-inl.h:50: error: dereferencing pointer '' + # does break strict-aliasing rules". + # See http://code.google.com/p/v8/issues/detail?id=463 + export CCFLAGS="$CCFLAGS -fno-strict-aliasing \ + $(test-flags-CC -Wno-error=unused-but-set-variable) \ + $(test-flags-CC -Wno-error=conversion-null)" + export GCC_VERSION="44" + + local arch="" + + if use "x86"; then + arch="ia32" + elif use "amd64"; then + arch="x64" + elif use "arm"; then + arch="arm" + else + die "Unknown architecture" + fi + + scons arch=$arch importenv='SYSROOT,CCFLAGS,CC,CXX,AR,RANLIB,LD,NM' \ + || die "v8 compile failed." +} + +src_install() { + dolib libv8.a + + insinto /usr/include + doins include/v8.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-0.0.2-r36.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-0.0.2-r36.ebuild new file mode 100644 index 0000000000..3e49fc22a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-0.0.2-r36.ebuild @@ -0,0 +1,47 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="7104857773f790a549d399715482fa23d9b736cd" +CROS_WORKON_TREE="6ce294bb88229f44567404a1a5a9cd1b89157724" +CROS_WORKON_PROJECT="chromiumos/third_party/dbus-cplusplus" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="C++ D-Bus bindings" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B" +SRC_URI="" +LICENSE="LGPL-2" +SLOT="1" +IUSE="debug doc +glib" +KEYWORDS="amd64 x86 arm" + +RDEPEND=" + glib? ( >=dev-libs/dbus-glib-0.76 ) + glib? ( >=dev-libs/glib-2.19:2 ) + >=sys-apps/dbus-1.0 + >=dev-cpp/ctemplate-1.0" +DEPEND="${DEPEND} + doc? ( dev-libs/libxslt ) + doc? ( app-doc/doxygen ) + dev-util/pkgconfig" + +src_prepare() { + ./bootstrap || die "failed to bootstrap autotools" +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable doc doxygen-docs) \ + $(use_enable glib glib) || die "failed to congfigure" +} + +src_compile() { + emake || die "failed to compile dbus-c++" +} + +src_install() { + emake DESTDIR="${D}" install || die "failed to make" + dodoc AUTHORS ChangeLog NEWS README || die "failed to intall doc" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-9999.ebuild new file mode 100644 index 0000000000..0fa08d3d16 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-9999.ebuild @@ -0,0 +1,45 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/dbus-cplusplus" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="C++ D-Bus bindings" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B" +SRC_URI="" +LICENSE="LGPL-2" +SLOT="1" +IUSE="debug doc +glib" +KEYWORDS="~amd64 ~x86 ~arm" + +RDEPEND=" + glib? ( >=dev-libs/dbus-glib-0.76 ) + glib? ( >=dev-libs/glib-2.19:2 ) + >=sys-apps/dbus-1.0 + >=dev-cpp/ctemplate-1.0" +DEPEND="${DEPEND} + doc? ( dev-libs/libxslt ) + doc? ( app-doc/doxygen ) + dev-util/pkgconfig" + +src_prepare() { + ./bootstrap || die "failed to bootstrap autotools" +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable doc doxygen-docs) \ + $(use_enable glib glib) || die "failed to congfigure" +} + +src_compile() { + emake || die "failed to compile dbus-c++" +} + +src_install() { + emake DESTDIR="${D}" install || die "failed to make" + dodoc AUTHORS ChangeLog NEWS README || die "failed to intall doc" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/ChangeLog new file mode 100644 index 0000000000..c5aa8b8740 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/ChangeLog @@ -0,0 +1,203 @@ +# ChangeLog for dev-libs/dbus-glib +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.52 2010/01/22 07:39:51 eva Exp $ + +*dbus-glib-0.82-r1 (22 Jan 2010) + + 22 Jan 2010; Gilles Dartiguelongue + +dbus-glib-0.82-r1.ebuild: + Version bump. Do not use static dbus instrospection file. Enable checks + always just like for every other glib-based program. + +*dbus-glib-0.82 (07 Nov 2009) + + 07 Nov 2009; Gilles Dartiguelongue + -files/dbus-glib-0.73-namespaces.patch, -dbus-glib-0.74.ebuild, + -dbus-glib-0.74-r1.ebuild, -dbus-glib-0.78.ebuild, + -files/dbus-glib-0.78-as-needed.patch, + -files/dbus-glib-0.78-fix-building-tests.patch, +dbus-glib-0.82.ebuild: + Version bump. + + 30 Mar 2009; Raúl Porcel dbus-glib-0.76.ebuild: + arm/ia64/s390/sh stable wrt #250289 + +*dbus-glib-0.80 (08 Mar 2009) + + 08 Mar 2009; Gilles Dartiguelongue + -dbus-glib-0.73.ebuild, +dbus-glib-0.80.ebuild: + Bump to 0.80. Various fixes and notably testsuite. + + 06 Feb 2009; Jeroen Roovers dbus-glib-0.76.ebuild: + Stable for HPPA (bug #250289). + + 18 Jan 2009; Gilles Dartiguelongue dbus-glib-0.78.ebuild: + Clean up econf per bug #253596 and add missing deps. + + 13 Jan 2009; Doug Goldstein metadata.xml: + gentopia is becoming freedesktop + + 30 Dec 2008; Doug Goldstein + files/dbus-glib-0.78-as-needed.patch, + +files/dbus-glib-0.78-fix-building-tests.patch, dbus-glib-0.78.ebuild: + fix building tests in parallel make situations. upstream bug #19325. + Update --as-needed patch to follow upstream's patch. + + 27 Dec 2008; Doug Goldstein dbus-glib-0.78.ebuild: + add gtk-doc-am to DEPEND so that automake successfully runs + +*dbus-glib-0.78 (23 Dec 2008) + + 23 Dec 2008; Doug Goldstein + +files/dbus-glib-0.78-as-needed.patch, +dbus-glib-0.78.ebuild: + version bump. ebuild from Santiago M. Mola with + additional changes for fixing tests and correcting depends by me + + 15 Dec 2008; Tobias Klausmann dbus-glib-0.76.ebuild: + Stable on alpha, bug #250289 + + 14 Dec 2008; nixnut dbus-glib-0.76.ebuild: + Stable on ppc wrt bug 250289 + + 10 Dec 2008; Markus Meier dbus-glib-0.76.ebuild: + amd64/x86 stable, bug #250289 + + 08 Dec 2008; Brent Baude dbus-glib-0.76.ebuild: + stable ppc64, bug 250289 + + 08 Dec 2008; Ferris McCormick dbus-glib-0.76.ebuild: + Sparc stable, Bug #250289. + +*dbus-glib-0.76 (15 Aug 2008) + + 15 Aug 2008; Doug Goldstein -dbus-glib-0.72.ebuild, + +dbus-glib-0.76.ebuild: + remove old version. add new version. + http://lists.freedesktop.org/archives/dbus/2008-June/009898.html + +*dbus-glib-0.74-r1 (22 Apr 2008) + + 22 Apr 2008; Saleem Abdulrasool + +files/dbus-glib-0.73-namespaces.patch, +dbus-glib-0.74-r1.ebuild: + Add patch for namespace support in dbus-binding-tool + + 29 Feb 2008; Jeroen Roovers dbus-glib-0.74.ebuild: + Stable for HPPA (bug #208917). + + 29 Feb 2008; Brent Baude dbus-glib-0.74.ebuild: + stable ppc64, bug 208917 + + 28 Feb 2008; Santiago M. Mola dbus-glib-0.74.ebuild: + amd64 stable wrt bug #208917 + + 28 Feb 2008; Raúl Porcel dbus-glib-0.74.ebuild: + alpha/ia64 stable wrt #208917 + + 28 Feb 2008; nixnut dbus-glib-0.74.ebuild: + Stable on ppc wrt bug 208917 + + 28 Feb 2008; Christian Faulhammer + dbus-glib-0.74.ebuild: + stable x86, bug 208917 + + 27 Feb 2008; Ferris McCormick dbus-glib-0.74.ebuild: + Sparc stable --- Bug #208917 --- around over 5 months and all tests pass. + +*dbus-glib-0.74 (06 Sep 2007) + + 06 Sep 2007; Doug Goldstein +dbus-glib-0.74.ebuild: + ver bump + + 13 May 2007; Joshua Kinard dbus-glib-0.73.ebuild: + Stable on mips, per #174808. + + 22 Apr 2007; Tobias Scherbaum + dbus-glib-0.73.ebuild: + ppc stable, bug #174808 + + 18 Apr 2007; Alexander H. Færøy + dbus-glib-0.73.ebuild: + Marked ~mips. + + 18 Apr 2007; Christian Faulhammer + dbus-glib-0.73.ebuild: + stable x86, bug 174808 + + 18 Apr 2007; Daniel Gryniewicz dbus-glib-0.73.ebuild: + Marked stable on amd64 for bug #174808 + + 17 Apr 2007; Jeroen Roovers dbus-glib-0.73.ebuild: + Stable for HPPA (bug #174808). + + 17 Apr 2007; Gustavo Zacarias dbus-glib-0.73.ebuild: + Stable on sparc wrt #174808 + + 17 Apr 2007; Markus Rothe dbus-glib-0.73.ebuild: + Stable on ppc64; bug #174808 + + 16 Apr 2007; Bryan Østergaard dbus-glib-0.73.ebuild: + Stable on Alpha, bug 174808. + + 16 Apr 2007; Raúl Porcel dbus-glib-0.73.ebuild: + ia64 stable wrt bug 174808 + + 04 Apr 2007; Bryan Østergaard dbus-glib-0.72.ebuild: + Stable on Alpha. + +*dbus-glib-0.73 (13 Feb 2007) + + 13 Feb 2007; Doug Goldstein +dbus-glib-0.73.ebuild: + rev bump + + 29 Jan 2007; Gustavo Zacarias dbus-glib-0.72.ebuild: + Stable on sparc wrt #162877 + + 23 Jan 2007; Jeroen Roovers dbus-glib-0.72.ebuild: + Stable for HPPA (bug #162877). + + 22 Jan 2007; Olivier Crête dbus-glib-0.72.ebuild: + stable on amd64 per bug #162877 + + 21 Jan 2007; Andrej Kacian dbus-glib-0.72.ebuild: + Stable on x86, bug 162877. + + 21 Jan 2007; Markus Rothe dbus-glib-0.72.ebuild: + Stable on ppc64; bug #162877 + + 21 Jan 2007; nixnut dbus-glib-0.72.ebuild: + Stable on ppc wrt bug 162877 + + 16 Jan 2007; Roy Marples dbus-glib-0.72.ebuild: + Added ~x86-fbsd keyword. + + 05 Jan 2007; Diego Pettenò dbus-glib-0.72.ebuild: + Remove debug.eclass usage. + + 02 Dec 2006; Doug Goldstein dbus-glib-0.72.ebuild: + Fixed glib depend + + 30 Oct 2006; Steev Klimaszewski -dbus-glib-0.71.ebuild, + dbus-glib-0.72.ebuild: + Remove dbus-glib .71 and update the dependency to reflect dbus instead of + dbus-core. + + 28 Oct 2006; Steev Klimaszewski dbus-glib-0.72.ebuild: + dbus-glib .72 requires dbus-core .94 or better. + +*dbus-glib-0.72 (27 Oct 2006) + + 27 Oct 2006; Steev Klimaszewski +dbus-glib-0.72.ebuild: + New upstream release, quite a few changes, if you program anything and use + these bindings, PLEASE read the ChangeLog. + + 21 Aug 2006; Steev Klimaszewski + files/dbus-glib-introspection.patch: + Fix the patch to apply the xml file properly to not try to connect to the D-Bus + daemon. + +*dbus-glib-0.71 (18 Aug 2006) + + 18 Aug 2006; Steev Klimaszewski + +files/dbus-glib-introspection.patch, +metadata.xml, + +dbus-glib-0.71.ebuild: + Glib bindings for dbus. Initial import + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/Manifest new file mode 100644 index 0000000000..44bd8f6474 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/Manifest @@ -0,0 +1,2 @@ +DIST dbus-glib-0.82.tar.gz 674953 RMD160 570664552de2d455ca4aa27144243be3974e7d77 SHA1 8ad09cf13810382048a685bcafc72f252b2539a8 SHA256 ddfb062797341b5c5a22555ffe80138953cc61a67ba805647b2746f519bfbde1 +DIST dbus-glib-0.92.tar.gz 687138 RMD160 63ad9e0a673f4df7d1b24f752502b697b9f54ab3 SHA1 69aa860251a2c916907ac7b34d5a40196cf073ff SHA256 5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.82.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.82.ebuild new file mode 100644 index 0000000000..9e63436adb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.82.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.82.ebuild,v 1.1 2009/11/07 20:00:54 eva Exp $ + +EAPI="2" + +inherit eutils bash-completion + +DESCRIPTION="D-Bus bindings for glib" +HOMEPAGE="http://dbus.freedesktop.org/" +SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 AFL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="bash-completion debug doc test" + +RDEPEND=">=sys-apps/dbus-1.1 + >=dev-libs/glib-2.10 + >=dev-libs/expat-1.95.8" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + doc? ( + app-doc/doxygen + app-text/xmlto + >=dev-util/gtk-doc-1.4 )" + +BASH_COMPLETION_NAME="dbus" + +pkg_setup() { + # We need a dbus-binding-tool installed on the host for cross-compilation. + # So check if we have it in the path and can call it right at the beginning... + if tc-is-cross-compiler ; then + dbus-binding-tool --version >/dev/null 2>&1 + [[ "$?" != "0" ]] && die "Cross-compilation requires a dbus-binding-tool on the host. Please emerge dbus-glib to your host!" + fi +} + +src_prepare() { + # description ? + epatch "${FILESDIR}"/${PN}-introspection.patch +} + +src_configure() { + local myconf="" + + # For cross-compilation we need the host dbus-binding-tool + if tc-is-cross-compiler ; then + myconf="${myconf} \ + --with-dbus-binding-tool=dbus-binding-tool" + fi + + econf \ + --localstatedir=/var \ + $(use_enable bash-completion) \ + $(use_enable debug verbose-mode) \ + $(use_enable debug checks) \ + $(use_enable debug asserts) \ + $(use_enable doc doxygen-docs) \ + $(use_enable doc gtk-doc) \ + $(use_enable test tests) \ + $(use_with test test-socket-dir "${T}"/dbus-test-socket) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog HACKING NEWS README || die "dodoc failed." + + # FIXME: We need --with-bash-completion-dir + if use bash-completion ; then + dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh + rm -rf "${D}"/etc/bash_completion.d || die "rm failed" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.92.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.92.ebuild new file mode 100644 index 0000000000..72d1956ec9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.92.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.92.ebuild,v 1.1 2010/11/10 16:49:58 ssuominen Exp $ + +EAPI=2 +inherit bash-completion toolchain-funcs + +DESCRIPTION="D-Bus bindings for glib" +HOMEPAGE="http://dbus.freedesktop.org/" +SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 AFL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="bash-completion debug doc static-libs test" + +RDEPEND=">=sys-apps/dbus-1.1 + >=dev-libs/glib-2.26 + >=dev-libs/expat-1.95.8" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + doc? ( + app-doc/doxygen + app-text/xmlto + >=dev-util/gtk-doc-1.4 )" + +# out of sources build directory +BD=${WORKDIR}/${P}-build +# out of sources build dir for make check +TBD=${WORKDIR}/${P}-tests-build + +BASHCOMPLETION_NAME="dbus" + +pkg_setup() { + # We need a dbus-binding-tool installed on the host for cross-compilation. + # So check if we have it in the path and can call it right at the beginning... + if tc-is-cross-compiler ; then + dbus-binding-tool --version >/dev/null 2>&1 + [[ "$?" != "0" ]] && die "Cross-compilation requires a dbus-binding-tool on the host. Please emerge dbus-glib to your host!" + fi +} + +src_configure() { + local my_conf + + my_conf="--localstatedir=/var + $(use_enable bash-completion) + $(use_enable debug verbose-mode) + $(use_enable debug asserts) + $(use_enable doc doxygen-docs) + $(use_enable static-libs static) + $(use_enable doc gtk-doc) + --with-html-dir=/usr/share/doc/${PF}/html" + + if tc-is-cross-compiler ; then + my_conf="${my_conf} \ + --with-dbus-binding-tool=dbus-binding-tool" + fi + + mkdir "${BD}" + cd "${BD}" + einfo "Running configure in ${BD}" + ECONF_SOURCE="${S}" econf ${my_conf} + + if use test; then + mkdir "${TBD}" + cd "${TBD}" + einfo "Running configure in ${TBD}" + ECONF_SOURCE="${S}" econf \ + ${my_conf} \ + $(use_enable test checks) \ + $(use_enable test tests) \ + $(use_enable test asserts) \ + $(use_with test test-socket-dir "${T}"/dbus-test-socket) + fi +} + +src_compile() { + cd "${BD}" + einfo "Running make in ${BD}" + emake || die + + if use test; then + cd "${TBD}" + einfo "Running make in ${TBD}" + emake || die + fi +} + +src_test() { + cd "${TBD}" + emake check || die +} + +src_install() { + dodoc AUTHORS ChangeLog HACKING NEWS README || die + + cd "${BD}" + emake DESTDIR="${D}" install || die + + # FIXME: We need --with-bash-completion-dir + if use bash-completion ; then + dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh + rm -rf "${D}"/etc/bash_completion.d || die + fi + + find "${D}" -name '*.la' -exec rm -f '{}' + +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/files/dbus-glib-introspection.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/files/dbus-glib-introspection.patch new file mode 100644 index 0000000000..4e65bda388 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/files/dbus-glib-introspection.patch @@ -0,0 +1,78 @@ +diff -Npru dbus-glib-0.71-orig/tools/dbus-bus-introspect.xml dbus-glib-0.71/tools/dbus-bus-introspect.xml +--- tools/dbus-bus-introspect.xml 1969-12-31 17:00:00.000000000 -0700 ++++ tools/dbus-bus-introspect.xml 2006-07-24 14:32:01.000000000 -0600 +@@ -0,0 +1,74 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/metadata.xml new file mode 100644 index 0000000000..f65c1a3d3d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/metadata.xml @@ -0,0 +1,11 @@ + + + +freedesktop + + cardoe@gentoo.org + + + steev@gentoo.org + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/ChangeLog new file mode 100644 index 0000000000..30018b0d1b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/ChangeLog @@ -0,0 +1,1494 @@ +# ChangeLog for dev-libs/glib +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.400 2010/03/06 16:14:28 phajdan.jr Exp $ + + 06 Mar 2010; Pawel Hajdan jr glib-2.22.4.ebuild: + x86 stable wrt bug #304777 + + 06 Mar 2010; Samuli Suominen glib-2.22.4.ebuild: + amd64 stable wrt #304777 + +*glib-2.22.4 (28 Jan 2010) + + 28 Jan 2010; Gilles Dartiguelongue -glib-2.20.5.ebuild, + +glib-2.22.4.ebuild: + Version bump. Bug fixes, and notably bug #297483. Disable test affecting + live filesystem, bug #297684. + + 19 Jan 2010; Raúl Porcel glib-2.22.2.ebuild: + arm stable + +*glib-2.22.3 (18 Dec 2009) + + 18 Dec 2009; Romain Perier +glib-2.22.3.ebuild: + Version bump + + 10 Dec 2009; Raúl Porcel glib-2.22.2.ebuild: + sparc stable + + 17 Nov 2009; Brent Baude glib-2.20.5-r1.ebuild: + Marking glib-2.20.5-r1 ppc64 for bug 286102 + + 10 Nov 2009; Raúl Porcel glib-2.20.5-r1.ebuild: + ia64/m68k/s390/sh stable wrt #286102 + + 09 Nov 2009; Tiago Cunha glib-2.20.5-r1.ebuild: + stable sparc, security bug 286102 + + 09 Nov 2009; Markus Meier glib-2.20.5-r1.ebuild: + amd64/arm stable, bug #286102 + + 09 Nov 2009; Jeroen Roovers glib-2.20.5-r1.ebuild: + Stable for HPPA (bug #286102). + + 08 Nov 2009; Mounir Lamouri glib-2.20.5-r1.ebuild: + Stable for ppc, bug 286102 + + 07 Nov 2009; Romain Perier + glib-2.20.5-r1.ebuild: + Fix bug #292292, eautomake failed due to missing gtk-doc-am in DEPEND, + drop redundant elibtoolize. + + 07 Nov 2009; Tobias Klausmann glib-2.20.5-r1.ebuild: + Stable on alpha, bug #286102 + + 07 Nov 2009; Christian Faulhammer + glib-2.20.5-r1.ebuild: + stable x86, security bug 286102 + +*glib-2.20.5-r1 (06 Nov 2009) + + 06 Nov 2009; Romain Perier + +glib-2.20.5-r1.ebuild, + +files/glib2-CVE-2009-3289.patch: + Fix bug #286102, symlink permission error (CVE-2009-3289), new revision. + + 02 Nov 2009; Gilles Dartiguelongue glib-2.22.2.ebuild: + Remove virtual/libc again. + +*glib-2.22.2 (29 Oct 2009) + + 29 Oct 2009; Gilles Dartiguelongue + -files/glib-2.18.1-gdesktopappinfo-memleak-fix.patch, + -glib-2.18.4-r1.ebuild, -glib-2.18.4-r2.ebuild, + -files/glib-2.18.4-gcc44.patch, -files/glib-2.20.1-gio-unref.patch, + +glib-2.22.2.ebuild: + New version for GNOME 2.28. Clean up old revisions. + + 26 Oct 2009; Raúl Porcel glib-2.20.5.ebuild: + ia64/m68k/s390/sh/sparc stable wrt #285586 + + 08 Oct 2009; Markus Meier glib-2.20.5.ebuild: + arm stable, bug #285586 + + 03 Oct 2009; Tobias Klausmann glib-2.20.5.ebuild: + Stable on alpha, bug #285586 + + 30 Sep 2009; Jeroen Roovers glib-2.20.5.ebuild: + Stable for HPPA (bug #285586). + + 27 Sep 2009; nixnut glib-2.20.5.ebuild: + ppc stable #285586 + + 25 Sep 2009; Brent Baude glib-2.20.5.ebuild: + Marking glib-2.20.5 ppc64 stable for bug 285586 + + 23 Sep 2009; Patrick Lauer glib-2.18.4-r1.ebuild, + glib-2.18.4-r2.ebuild, glib-2.20.5.ebuild: + Remove virtual/libc + + 22 Sep 2009; Markus Meier glib-2.20.5.ebuild: + x86 stable, bug #285586 + + 19 Sep 2009; Olivier Crête glib-2.20.5.ebuild: + Stable on amd64, bug #285586 + +*glib-2.20.5 (01 Sep 2009) + + 01 Sep 2009; Romain Perier + +glib-2.20.5.ebuild: + Version bump, 4 bugfixes, 2 translations updates. + +*glib-2.20.4 (09 Jul 2009) + + 09 Jul 2009; Gilles Dartiguelongue -glib-2.20.2.ebuild, + +glib-2.20.4.ebuild: + Version bump. Bug fixes and translation updates. + +*glib-2.20.3 (08 Jun 2009) + + 08 Jun 2009; Gilles Dartiguelongue + -glib-2.16.6-r1.ebuild, -glib-2.20.1.ebuild, -glib-2.20.1-r1.ebuild, + +glib-2.20.3.ebuild: + Bump to 2.20.3. Bug fixes and translation updates. Define XDG environment + variable for tests since they might not be present even when + xdg-utils-1.0.2-r3 is installed, bug #269155. + + 18 May 2009; Gilles Dartiguelongue glib-2.20.2.ebuild: + Remove unused patch. + +*glib-2.20.2 (18 May 2009) + + 18 May 2009; Gilles Dartiguelongue +glib-2.20.2.ebuild: + Bump to 2.20.2. Bug fixes. + +*glib-2.20.1-r1 (04 May 2009) +*glib-2.18.4-r2 (04 May 2009) + + 04 May 2009; Gilles Dartiguelongue + +files/glib-2.18.4-gcc44.patch, +files/glib-2.20.1-gio-unref.patch, + +glib-2.18.4-r2.ebuild, +glib-2.20.1-r1.ebuild: + Fix gio unref, bug #260301. Fix compilation of glib-2.18 with gcc 4.4, bug + #264686. + +*glib-2.20.1 (04 May 2009) + + 04 May 2009; Gilles Dartiguelongue +glib-2.20.1.ebuild: + Bump to 2.20.1. Update internal copy of libprcre to 7.8, gio and + GHashTable enhancements. + + 27 Apr 2009; Jeroen Roovers glib-2.18.4-r1: + Stable for HPPA (bug #260063). + + 19 Apr 2009; Mart Raudsepp -glib-2.16.5.ebuild, + -glib-2.16.6.ebuild, -glib-2.18.4.ebuild: + Remove old redundant security vulnerable revisions + + 12 Apr 2009; Friedrich Oslage ChangeLog: + Stable on sparc, bug #260063 + + 26 Mar 2009; Raúl Porcel glib-2.16.6-r1.ebuild, + glib-2.18.4.ebuild, glib-2.18.4-r1.ebuild: + arm/ia64/s390/sh/sparc stable + + 18 Mar 2009; Brent Baude glib-2.18.4-r1.ebuild: + Marking glib-2.18.4-r1 ppc for bug 249214 + + 18 Mar 2009; Raúl Porcel glib-2.18.4.ebuild: + alpha/ia64 stable wrt #260063 + + 17 Mar 2009; Raúl Porcel glib-2.16.6.ebuild, + glib-2.16.6-r1.ebuild, glib-2.18.4.ebuild, glib-2.18.4-r1.ebuild: + m68k stable, thanks to kolla for testing + + 15 Mar 2009; Markus Meier glib-2.18.4-r1.ebuild: + x86 stable, bug #260063 + + 15 Mar 2009; Tobias Klausmann glib-2.18.4-r1.ebuild: + Stable on alpha, bug #249214 + + 15 Mar 2009; Tobias Klausmann glib-2.16.6-r1.ebuild: + Stable on alpha, bug #249214 + + 15 Mar 2009; Markus Meier glib-2.16.6-r1.ebuild: + amd64/x86 stable, bug #249214 + + 15 Mar 2009; Brent Baude glib-2.16.6-r1.ebuild, + glib-2.18.4-r1.ebuild: + Marking glib-2.16.6-r1 glib-2.18.4-r1 ppc64 for bug 249214 + + 13 Mar 2009; Daniel Gryniewicz glib-2.18.4-r1.ebuild: + Oops, managed to get ~arch in ebuild + +*glib-2.18.4-r1 (13 Mar 2009) +*glib-2.16.6-r1 (13 Mar 2009) + + 13 Mar 2009; Daniel Gryniewicz + +files/glib2-CVE-2008-4316.patch, +glib-2.16.6-r1.ebuild, + +glib-2.18.4-r1.ebuild: + Add versions with fixes for bug #249214 + + 11 Mar 2009; Daniel Gryniewicz glib-2.18.4.ebuild: + Marked stable on amd64 + + 06 Mar 2009; Brent Baude glib-2.18.4.ebuild: + Marking glib-2.18.4 ppc stable for bug 260063 + + 05 Mar 2009; Brent Baude glib-2.18.4.ebuild: + Marking glib-2.18.4 ppc64 stable for bug 260063 + + 02 Mar 2009; Brent Baude glib-2.16.6.ebuild: + Marking glib-2.16.6 ppc64 for bug 245092 + + 16 Feb 2009; Brent Baude glib-2.16.6.ebuild: + stable ppc, bug 245092 + + 15 Feb 2009; Gilles Dartiguelongue + -files/glib-2.16.3-pcre-buffer-overflow.patch, -glib-2.14.3.ebuild, + -glib-2.14.6.ebuild, -glib-2.16.3-r1.ebuild, glib-2.16.5.ebuild, + -glib-2.18.1.ebuild, -glib-2.18.2.ebuild, -glib-2.18.3.ebuild: + Clean up old revisions. + + 15 Feb 2009; Raúl Porcel glib-2.16.6.ebuild: + arm/ia64/s390/sh/sparc stable wrt #245092 + + 14 Feb 2009; Markus Meier glib-2.16.6.ebuild: + amd64/x86 stable, bug #245092 + + 13 Feb 2009; Tobias Klausmann glib-2.16.6.ebuild, + glib-2.18.1.ebuild: + Brain fart when trying to stabilize 2.16.6 (bug 245092) + + 11 Feb 2009; Tobias Klausmann ChangeLog: + Stable on alpha, bug #245092 + + 11 Feb 2009; Jeroen Roovers glib-2.16.6.ebuild: + Stable for HPPA (bug #245092). + + 09 Feb 2009; Tobias Klausmann glib-2.18.1.ebuild: + Stable on alpha, bug #258344 + +*glib-2.18.4 (13 Jan 2009) + + 13 Jan 2009; Mart Raudsepp +glib-2.18.4.ebuild: + Version bump for various bug fixes - mostly to GIO, e.g MIME sniffing does + not update access time anymore + +*glib-2.18.3 (27 Nov 2008) + + 27 Nov 2008; Mart Raudsepp +glib-2.18.3.ebuild: + New bug fix release - improves custom mimetype icons display, various + memory leak fixes, and GKeyFile improvements. + + 13 Nov 2008; Brent Baude glib-2.16.5.ebuild: + Marking glib-2.16.5 ppc64 stable for bug 236971 + +*glib-2.18.2 (19 Oct 2008) + + 19 Oct 2008; Mart Raudsepp +glib-2.18.2.ebuild: + New bug fix release, fixing wrong fallback order of mimetype icons and + more + + 18 Oct 2008; Brent Baude glib-2.16.5.ebuild: + Marking glib-2.16.5 ppc stable for bug 236971 + + 25 Sep 2008; Jeroen Roovers glib-2.16.5.ebuild: + Stable for HPPA (bug #236971). + +*glib-2.18.1 (25 Sep 2008) + + 25 Sep 2008; Mart Raudsepp + +files/glib-2.18.1-gdesktopappinfo-memleak-fix.patch, + +files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch, + +glib-2.18.1.ebuild: + Major version bump. Supports latest version of shared-mime spec, emblems + on icons, subparsers in GMarkup, and more + +*glib-2.16.6 (22 Sep 2008) + + 22 Sep 2008; Mart Raudsepp +glib-2.16.6.ebuild: + Version bump for bug fixes in the 2.16 series + + 09 Sep 2008; Raúl Porcel glib-2.16.5.ebuild: + alpha/ia64/sparc stable wrt #236971 + + 08 Sep 2008; Markus Meier glib-2.16.5.ebuild: + x86 stable, bug #236971 + + 07 Sep 2008; Olivier Crête glib-2.16.5.ebuild: + amd64 stable, bug #236971 + + 07 Sep 2008; Gilles Dartiguelongue glib-2.16.5.ebuild: + drop USE="doc" for 2.16.5 only, bug #232417. + + 03 Aug 2008; Gilles Dartiguelongue + -files/glib-2.8.3-macos.patch, glib-1.2.10-r5.ebuild, -glib-2.8.6.ebuild, + -glib-2.10.3.ebuild, -glib-2.10.3-r1.ebuild, -glib-2.12.12.ebuild, + -glib-2.12.13.ebuild, glib-2.14.3.ebuild, -glib-2.16.1.ebuild, + -glib-2.16.2.ebuild, -glib-2.16.3.ebuild, -glib-2.16.4.ebuild: + clean up old revisions, drop to ~mips to shut up repoman's warnings. + +*glib-2.16.5 (20 Jul 2008) + + 20 Jul 2008; Mart Raudsepp +glib-2.16.5.ebuild: + Version bump for working around AC_C_BIGENDIAN breakage in autoconf 2.61 + (bug 231670) and a few bug fixes + +*glib-2.16.4 (12 Jul 2008) + + 12 Jul 2008; +glib-2.16.4.ebuild: + Version bump for bug fixes + + 05 Jul 2008; Tobias Scherbaum + glib-2.16.3-r1.ebuild: + ppc stable, bug #230039 + + 01 Jul 2008; Markus Rothe glib-2.16.3-r1.ebuild: + Stable on ppc64; bug #230039 + +*glib-2.16.3-r1 (01 Jul 2008) + + 01 Jul 2008; Mart Raudsepp + +files/glib-2.16.3-pcre-buffer-overflow.patch, +glib-2.16.3-r1.ebuild: + Fix for a heap-based buffer overflow possibility in the included modified + copy of PCRE, bug 230039, related to CVE-2008-2371 + + 30 Jun 2008; Jeroen Roovers glib-2.16.3.ebuild: + Stable for HPPA (bug #227679). + + 21 Jun 2008; Markus Rothe glib-2.16.3.ebuild: + Stable on ppc64; bug #227679 + + 20 Jun 2008; Christian Faulhammer glib-2.16.3.ebuild: + stable x86, bug 227679 + + 19 Jun 2008; Raúl Porcel glib-2.16.3.ebuild: + alpha/ia64/sparc stable wrt #227679 + + 19 Jun 2008; nixnut glib-2.16.3.ebuild: + Stable on ppc wrt bug 227679 + + 19 Jun 2008; Olivier Crête glib-2.16.3.ebuild: + amd64 stable, bug #227679 + + 18 Jun 2008; Raúl Porcel glib-2.16.3.ebuild: + Fix test failure on alpha/ppc/sparc and probably other arches, authorized + by leio, GNOME bug #538836 + +*glib-2.16.3 (09 Apr 2008) + + 09 Apr 2008; Mart Raudsepp +glib-2.16.3.ebuild: + New version. In addition to a few bug fixes and translation updates this + updates Unicode support to version 5.1 + +*glib-2.16.2 (02 Apr 2008) + + 02 Apr 2008; Mart Raudsepp +glib-2.16.2.ebuild: + New bug fix release + +*glib-2.16.1 (11 Mar 2008) + + 11 Mar 2008; Mart Raudsepp -glib-2.16.0.ebuild, + +glib-2.16.1.ebuild: + Quick follow-up to fix a GIO crasher and included pcre copy version to + secure version + +*glib-2.16.0 (10 Mar 2008) + + 10 Mar 2008; Mart Raudsepp +glib-2.16.0.ebuild: + New major release. Major new features include: GIO - a virtual filesystem + API designed to replace gnome-vfs, carrying support for local filesystems + with gnome-base/gvfs containing backends for many other (samba, ftp, sftp, + http, etc); GChecksum providing MD5, SHA-1 and SHA-256 algorithms for + applications to use; GTest - a test framework + + 10 Feb 2008; Olivier Crête glib-2.14.6.ebuild: + Stable on amd64, security bug #209293 + + 08 Feb 2008; Raúl Porcel glib-2.14.6.ebuild: + alpha/ia64/sparc stable wrt security #209293 + + 08 Feb 2008; Jeroen Roovers glib-2.14.6.ebuild: + Stable for HPPA (bug #209293). + + 08 Feb 2008; Tobias Scherbaum glib-2.14.6.ebuild: + ppc stable, bug #209293 + + 08 Feb 2008; Brent Baude glib-2.14.6.ebuild: + stable ppc64, bug 209293 + + 07 Feb 2008; Markus Meier glib-2.14.6.ebuild: + x86 stable, security bug #209293 + +*glib-2.14.6 (07 Feb 2008) + + 07 Feb 2008; Mart Raudsepp +glib-2.14.6.ebuild: + Version bump for security fix in the included copy of libpcre (updated to 7.6) + + 04 Feb 2008; Jeroen Roovers glib-2.14.5.ebuild: + Stable for HPPA (bug #208366). + + 03 Feb 2008; Raúl Porcel glib-2.14.5.ebuild: + alpha/ia64/sparc stable wrt #208366 + + 02 Feb 2008; Chris Gianelloni glib-2.14.5.ebuild: + Stable on amd64 wrt bug #208366. + + 01 Feb 2008; Brent Baude glib-2.14.5.ebuild: + Marking glib-2.14.5 ppc64 and ppc stable for bug 208366 + + 01 Feb 2008; Christian Faulhammer glib-2.14.5.ebuild: + stable x86, bug 208366 + +*glib-2.14.5 (10 Jan 2008) + + 10 Jan 2008; Gilles Dartiguelongue +glib-2.14.5.ebuild: + bump to 2.14.5 + + 27 Nov 2007; Jeroen Roovers glib-2.14.3.ebuild: + Make hppa use -O1. + +*glib-2.14.4 (25 Nov 2007) + + 25 Nov 2007; Mart Raudsepp +glib-2.14.4.ebuild: + Version bump for various non-critical bug fixes + + 23 Nov 2007; Jeroen Roovers glib-2.14.3.ebuild: + Stable for HPPA (bug #198845). + + 20 Nov 2007; Joshua Kinard glib-2.14.3.ebuild: + Stable on mips, per #190019. + + 19 Nov 2007; Markus Rothe glib-2.14.3.ebuild: + Stable on ppc64; bug #198845 + + 17 Nov 2007; nixnut glib-2.14.3.ebuild: + Stable on ppc wrt bug 198845 + + 14 Nov 2007; Raúl Porcel glib-2.14.3.ebuild: + sparc stable wrt #198845 + + 14 Nov 2007; Raúl Porcel glib-2.14.3.ebuild: + alpha/ia64 stable wrt #198845 + + 13 Nov 2007; Christian Faulhammer glib-2.14.3.ebuild: + stable x86, bug 198845 + + 12 Nov 2007; Samuli Suominen glib-2.14.3.ebuild: + amd64 stable wrt #198845 + +*glib-2.14.3 (09 Nov 2007) + + 09 Nov 2007; Mart Raudsepp -glib-2.14.1.ebuild, + +glib-2.14.3.ebuild: + Version bump + +*glib-2.14.2 (16 Oct 2007) + + 16 Oct 2007; Mart Raudsepp +glib-2.14.2.ebuild: + Version bump + +*glib-2.14.1 (21 Sep 2007) + + 21 Sep 2007; Rémi Cardona +glib-2.14.1.ebuild: + Add glib-2.14.1 (for Gnome 2.20) + + 21 Sep 2007; Brent Baude glib-2.12.13.ebuild: + Marking glib-2.12.13 ppc64 for bug#190019 + + 28 Aug 2007; nixnut glib-2.12.13.ebuild: + Stable on ppc wrt bug 190019 + + 28 Aug 2007; Jeroen Roovers glib-2.12.13.ebuild: + Stable for HPPA (bug #190019). + + 25 Aug 2007; Raúl Porcel glib-2.12.13.ebuild: + alpha/ia64/x86 stable wrt #190019 + + 24 Aug 2007; Wulf C. Krueger glib-2.12.13.ebuild: + Marked stable on amd64 as per bug 190019. + + 24 Aug 2007; Gustavo Zacarias glib-2.12.13.ebuild: + Stable on sparc wrt #190019 + + 06 Aug 2007; Joshua Kinard glib-2.12.12.ebuild: + Stable on mips, per #185823. + + 23 Jul 2007; nixnut glib-2.12.12.ebuild: + Stable on ppc wrt bug 185614 + + 19 Jul 2007; Christoph Mende glib-2.12.12.ebuild: + Stable on amd64 wrt bug #185614 + + 18 Jul 2007; Raúl Porcel glib-2.12.12.ebuild: + alpha/ia64/x86 stable wrt #185614 + + 17 Jul 2007; Jeroen Roovers glib-2.12.12.ebuild: + Stable for HPPA (bug #185614). + + 17 Jul 2007; Markus Rothe glib-2.12.12.ebuild: + Stable on ppc64; bug #185614 + + 17 Jul 2007; Gustavo Zacarias glib-2.12.12.ebuild: + Stable on sparc wrt #185614 + +*glib-2.12.13 (16 Jul 2007) + + 16 Jul 2007; Mart Raudsepp +glib-2.12.13.ebuild: + Version bump + + 06 Jul 2007; Daniel Gryniewicz + +files/glib-2.12.12-fbsd.patch, glib-2.12.12.ebuild: + Fix gmodule issues on fbsd; bug #184301 + + 27 Jun 2007; Mike Frysinger + +files/glib-1.2.10-automake.patch, glib-1.2.10-r5.ebuild: + Fixup autotool handling #168198. + + 05 Jun 2007; Daniel Gryniewicz glib-2.12.12.ebuild: + Add back elibtoolize for fbsd + +*glib-2.12.12 (05 Jun 2007) + + 05 Jun 2007; Mart Raudsepp +glib-2.12.12.ebuild: + Version bump + + 02 Jun 2007; Mart Raudsepp -files/glib-2.12.4-gtimer-fix.patch, + -files/glib-2.12.4-tests_pthread.patch, -files/glib-2-macos.patch, + -glib-2.12.4-r1.ebuild, -glib-2.12.6.ebuild, -glib-2.12.7.ebuild: + Remove redundant versions + + 02 Jun 2007; Brent Baude glib-2.12.11.ebuild: + Marking glib-2.12.11 ppc stable for bug #171107 + + 31 May 2007; Jeroen Roovers glib-2.12.11.ebuild: + Stable for HPPA (bug #171107). + + 30 May 2007; Brent Baude glib-2.12.11.ebuild: + Marking glib-2.12.11 ppc64 stable for bug 171107 + + 30 May 2007; Daniel Gryniewicz glib-2.12.11.ebuild: + Marked stable on amd64 for bug #171107 + + 30 May 2007; Raúl Porcel glib-2.12.11.ebuild: + alpha/ia64 stable wrt #171107 + + 29 May 2007; Andrej Kacian glib-2.12.11.ebuild: + Stable on x86, bug #171107. + + 29 May 2007; Gustavo Zacarias glib-2.12.11.ebuild: + Stable on sparc wrt #171107 + + 27 May 2007; Joshua Kinard glib-2.12.11.ebuild: + Stable on mips. + + 12 May 2007; Joshua Kinard glib-2.12.9.ebuild: + Stable on mips for #163678. + + 25 Apr 2007; Daniel Gryniewicz glib-2.12.9.ebuild, + glib-2.12.11.ebuild: + Remove elibtoolize; it's not needed anymore, and it was causing problems + with automake mismatches + + 22 Mar 2007; Chris Gianelloni glib-2.12.9.ebuild: + Stable on alpha/ia64/ppc wrt bug #163678. + + 15 Mar 2007; Markus Rothe glib-2.12.9.ebuild: + Stable on ppc64; bug #163678 + + 15 Mar 2007; Gustavo Zacarias glib-2.12.9.ebuild: + Stable on sparc wrt #163678 + + 15 Mar 2007; Jeroen Roovers glib-2.12.9.ebuild: + Stable for HPPA (bug #163678). + +*glib-2.12.11 (14 Mar 2007) + + 14 Mar 2007; Daniel Gryniewicz +glib-2.12.11.ebuild: + Bump to 2.12.11 + - assorted bug fixes + + 14 Mar 2007; Simon Stelling glib-2.12.9.ebuild: + stable on amd64; bug 163678 + + 14 Mar 2007; Christian Faulhammer glib-2.12.9.ebuild: + stable x86, bug 163678 + + 03 Mar 2007; Raphael Marichez glib-1.2.10-r5.ebuild: + Fix as-needed patch mess up reported by Daniel Glöckner (bug #166374) + + 11 Feb 2007; Fabian Groffen glib-1.2.10-r5.ebuild, + glib-2.10.3-r1.ebuild, glib-2.12.4-r1.ebuild, glib-2.12.6.ebuild, + glib-2.12.7.ebuild, glib-2.12.9.ebuild: + Dropped ppc-macos keyword, see you in prefix + + 04 Feb 2007; Markus Rothe glib-2.12.7.ebuild: + Stable on ppc64; bug #164978 + + 03 Feb 2007; Andrej Kacian glib-2.12.7.ebuild: + Stable on x86, bug #164978. + + 03 Feb 2007; Jeroen Roovers glib-2.12.7.ebuild: + Stable for HPPA (bug #164978). + + 03 Feb 2007; Simon Stelling glib-2.12.7.ebuild: + stable on amd64 + + 03 Feb 2007; Tobias Scherbaum glib-2.12.7.ebuild: + Stable on ppc wrt bug #164978. + + 03 Feb 2007; Saleem Abdulrasool + glib-1.2.10-r5.ebuild: + Add patch for as-needed (bug #133818) + + 02 Feb 2007; Gustavo Zacarias glib-2.12.7.ebuild: + Stable on sparc wrt #164978 + +*glib-2.12.9 (17 Jan 2007) + + 17 Jan 2007; Mart Raudsepp +glib-2.12.9.ebuild: + Version bump + + 05 Jan 2007; Mart Raudsepp glib-2.8.6.ebuild, glib-2.10.3.ebuild, + glib-2.10.3-r1.ebuild, glib-2.12.4-r1.ebuild, glib-2.12.6.ebuild: + Remove debug.eclass usage, bug 160095 + + 05 Jan 2007; Mart Raudsepp + -files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch, -glib-2.8.4.ebuild, + -glib-2.8.5.ebuild, -glib-2.12.5-r1.ebuild: + Remove some redundant versions + +*glib-2.12.7 (05 Jan 2007) + + 05 Jan 2007; Mart Raudsepp +glib-2.12.7.ebuild: + New release + +*glib-2.12.6 (21 Dec 2006) + + 21 Dec 2006; Marinus Schraal glib-2.12.6.ebuild : + New release + +*glib-2.12.5-r1 (20 Dec 2006) + + 20 Dec 2006; Mart Raudsepp + +files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch, +glib-2.12.5-r1.ebuild: + Fix file association from MIME types, bug 158646 + +*glib-2.12.5 (19 Dec 2006) + + 19 Dec 2006; Luis Medinas +glib-2.12.5.ebuild: + Version Bump. Remove macosx and freebsd patches that is included in this + release. + + 09 Dec 2006; Bryan Østergaard glib-2.12.4-r1.ebuild: + Stable on Alpha. + + 01 Dec 2006; Gustavo Zacarias glib-2.12.4-r1.ebuild: + Stable on hppa wrt #156572 + + 01 Dec 2006; Markus Rothe glib-2.12.4-r1.ebuild: + Stable on ppc64; bug #156572 + + 01 Dec 2006; Gustavo Zacarias glib-2.12.4-r1.ebuild: + Stable on sparc wrt #156572 + + 30 Nov 2006; Tobias Scherbaum + glib-2.12.4-r1.ebuild: + ppc stable, bug #156572 + + 30 Nov 2006; Christian Faulhammer + glib-2.12.4-r1.ebuild: + stable x86, bug #156572 + + 29 Nov 2006; Olivier Crête glib-2.12.4-r1.ebuild: + Stable on amd64 for bugs #156572 + + 05 Nov 2006; John N. Laliberte -glib-2.6.5.ebuild: + remove older glib, fixes #153930 + + 03 Nov 2006; Fabian Groffen glib-1.2.10-r5.ebuild, + glib-2.6.5.ebuild, glib-2.8.4.ebuild, glib-2.8.5.ebuild, + glib-2.8.6.ebuild, glib-2.10.3.ebuild: + Dropped ppc-macos, see you in prefix. + +*glib-2.10.3-r1 (03 Nov 2006) + + 03 Nov 2006; John N. Laliberte + +glib-2.10.3-r1.ebuild: + apply static lib fix to 2.10.x as well. + +*glib-2.12.4-r1 (03 Nov 2006) + + 03 Nov 2006; John N. Laliberte -glib-2.12.0.ebuild, + -glib-2.12.1.ebuild, -glib-2.12.2.ebuild, -glib-2.12.3.ebuild, + -glib-2.12.4.ebuild, +glib-2.12.4-r1.ebuild: + add --enable-static so we always build static libs. fixes #153807 + + 24 Oct 2006; Roy Marples glib-2.12.4.ebuild: + Added ~sparc-fbsd keyword. + + 19 Oct 2006; Bryan Østergaard glib-2.10.3.ebuild: + Stable on Alpha. + + 15 Oct 2006; Mart Raudsepp + +files/glib-2.12.4-tests_pthread.patch, glib-2.12.4.ebuild: + Fix pthread related build failure on Gentoo/FreeBSD, bug #150583 + + 09 Oct 2006; Mart Raudsepp + +files/glib-2.12.4-gtimer-fix.patch, glib-2.12.4.ebuild: + Fix gtimer build on Gentoo/FreeBSD, bug #150557 + +*glib-2.12.4 (06 Oct 2006) + + 06 Oct 2006; Mart Raudsepp +glib-2.12.4.ebuild: + Version bump + + 13 Sep 2006; Aron Griffis glib-2.10.3.ebuild, + glib-2.12.0.ebuild, glib-2.12.1.ebuild, glib-2.12.2.ebuild, + glib-2.12.3.ebuild: + Propogate ia64-atomic-ops.patch to more ebuilds + +*glib-2.12.3 (04 Sep 2006) + + 04 Sep 2006; Saleem Abdulrasool +glib-2.12.3.ebuild: + version bump from upstream (bug #146208) + + 18 Aug 2006; Tim Yamin glib-2.10.3.ebuild, + +files/glib-2.10.3-ia64-atomic-ops.patch: + Fix compile bug on IA64 with GCC < 4.1. + + 16 Aug 2006; Markus Rothe glib-2.10.3.ebuild: + Stable on ppc64 + + 26 Jul 2006; Joshua Kinard glib-2.10.3.ebuild: + Marking stable on mips (dep needed by gnome-vfs). + +*glib-2.12.1 (24 Jul 2006) + + 24 Jul 2006; Stefan Schweizer +glib-2.12.1.ebuild: + version bump + + 17 Jul 2006; Daniel Gryniewicz glib-2.10.3.ebuild: + Marked stable on amd64 for bug #139612 + + 16 Jul 2006; Tobias Scherbaum glib-2.10.3.ebuild: + hppa stable, bug #139612 + + 14 Jul 2006; Tobias Scherbaum glib-2.10.3.ebuild: + ppc stable, bug #139612 + + 12 Jul 2006; Chris Gianelloni glib-2.10.3.ebuild: + Stable on x86 wrt bug #139612. + + 10 Jul 2006; Gustavo Zacarias glib-2.10.3.ebuild: + Stable on sparc wrt #139612 + +*glib-2.12.0 (05 Jul 2006) + + 05 Jul 2006; Stefan Schweizer +glib-2.12.0.ebuild: + version bump + + 10 Jun 2006; Mike Frysinger + +files/glib-1.2.10-configure-LANG.patch, glib-1.2.10-r5.ebuild: + Fix building in et_EE locales #133679 by Andres Toomsalu. + +*glib-2.10.3 (26 May 2006) + + 26 May 2006; John N. Laliberte + -glib-2.10.1-r1.ebuild, -glib-2.10.2.ebuild, +glib-2.10.3.ebuild: + new version + + 07 May 2006; Diego Pettenò Manifest: + Remove .orig file from manifest. + + 06 May 2006; Diego Pettenò glib-2.10.2.ebuild: + Add ~x86-fbsd keyword. + + 23 Apr 2006; Diego Pettenò glib-2.8.6.ebuild, + glib-2.10.2.ebuild: + Don't remove charset.alias conditionally. Wherever you are, if that is + generated it has to be removed. + + 21 Apr 2006; Thomas Cort glib-2.8.6.ebuild: + Stable on alpha wrt Bug #126321. + + 15 Apr 2006; Stephen P. Becker glib-2.8.6.ebuild: + stable on mips + + 13 Apr 2006; Diego Pettenò glib-2.8.6.ebuild, + glib-2.10.2.ebuild: + Add dependency over virtual/libiconv as needed. + + 12 Apr 2006; Diego Pettenò glib-1.2.10-r5.ebuild: + Add ~x86-fbsd keyword. + +*glib-2.10.2 (10 Apr 2006) + + 10 Apr 2006; Marinus Schraal glib-2.10.2.ebuild : + New release + + 31 Mar 2006; Diego Pettenò glib-2.8.6.ebuild: + Drop virtual/libc dep, fix gettext and libintl dependency and add ~x86-fbsd. + +*glib-2.10.1-r1 (27 Mar 2006) + + 27 Mar 2006; Saleem Abdulrasool + +glib-2.10.1-r1.ebuild: + Revbump with fix for debug (bug #127712) + + 19 Mar 2006; glib-1.2.10-r5.ebuild: + Use portability eclass for NetBSD/OpenBSD compatibility + + 19 Mar 2006; Markus Rothe glib-2.8.6.ebuild: + Stable on ppc64 + + 18 Mar 2006; Olivier Crête glib-2.8.6.ebuild: + Stable on amd64 per bug #126321 + + 17 Mar 2006; Chris Gianelloni glib-2.8.6.ebuild: + Stable on x86 wrt bug #126321. + + 17 Mar 2006; Tobias Scherbaum glib-2.8.6.ebuild: + Stable gnome-2.12.3 for ppc, bug #126321 + + 14 Mar 2006; Gustavo Zacarias glib-2.8.6.ebuild: + Stable on hppa + +*glib-2.10.1 (13 Mar 2006) + + 13 Mar 2006; Saleem Abdulrasool +glib-2.10.1.ebuild: + Version bump from upstream + + 13 Mar 2006; Gustavo Zacarias glib-2.8.6.ebuild: + Stable on sparc + + 26 Feb 2006; Joshua Kinard glib-2.8.5.ebuild: + Marked stable on mips. + +*glib-2.8.6 (08 Feb 2006) + + 08 Feb 2006; Saleem Abdulrasool +glib-2.8.6.ebuild: + Version bump from upstream for 2.12.3 + + 04 Feb 2006; Aron Griffis glib-2.8.5.ebuild: + Mark 2.8.5 stable on alpha + + 22 Jan 2006; Markus Rothe glib-2.8.5.ebuild: + Stable on ppc64 + + 22 Jan 2006; glib-2.8.5.ebuild: + Marked stable on amd64 per bug #119634 + + 22 Jan 2006; Gustavo Zacarias glib-2.8.5.ebuild: + Stable on sparc + + 22 Jan 2006; Tobias Scherbaum glib-2.8.5.ebuild: + Marked ppc stable for bug #119634; Stabilize Gnome-2.12.2 + + 22 Jan 2006; Joshua Jackson glib-2.8.5.ebuild: + Stable on x86 for bug #119634; Stabilize Gnome-2.12.2 + +*glib-2.8.5 (08 Jan 2006) + + 08 Jan 2006; -glib-2.8.3.ebuild, +glib-2.8.5.ebuild: + New upstream version; remove 2.8.3, since 2.8.4 is stable + + 08 Jan 2006; Tobias Scherbaum glib-2.8.4.ebuild: + ppc stable, bug #117505 + + 04 Jan 2006; Mark Loeser glib-2.8.4.ebuild: + Stable on x86; bug #117505 + + 03 Jan 2006; Fernando J. Pereda glib-2.8.4.ebuild: + Stable on alpha wrt bug #117505 + + 03 Jan 2006; Luis Medinas glib-2.8.4.ebuild: + Stable on amd64. For bug #117505. + + 03 Jan 2006; Markus Rothe glib-2.8.4.ebuild: + Stable on ppc64 + + 03 Jan 2006; Gustavo Zacarias glib-2.8.4.ebuild: + Stable on sparc wrt #117505 + + 03 Jan 2006; Fabian Groffen glib-2.8.4.ebuild: + Marked ppc-macos (bug #117505) + +*glib-2.8.4 (18 Nov 2005) + + 18 Nov 2005; Leonardo Boshell +glib-2.8.4.ebuild: + New version. + + 22 Oct 2005; Fabian Groffen + +files/glib-2.8.3-macos.patch, glib-2.8.3.ebuild: + Removed unnecessary conditional operations for ppc-macos (bug #110127). + Added patch for ppc-macos that forces use of emulated poll(), since the OSX + provided one is buggy as hell. Patch provided by and thanks to + + +*glib-2.8.3 (20 Oct 2005) + + 20 Oct 2005; Leonardo Boshell +glib-2.8.3.ebuild: + New version. + + 16 Oct 2005; Fabian Groffen glib-2.8.2.ebuild: + Removing patch invocation, as it seems to be no longer necessary (bug #109459) + +*glib-2.8.2 (27 Sep 2005) + + 27 Sep 2005; Leonardo Boshell -glib-2.6.4.ebuild, + -glib-2.8.1.ebuild, +glib-2.8.2.ebuild: + New version. Avoid passing --disable-debug. + + 10 Sep 2005; Aron Griffis glib-2.6.5.ebuild: + Mark 2.6.5 stable on alpha + + 07 Sep 2005; Aaron Walker glib-2.6.5.ebuild: + Stable on mips. + + 03 Sep 2005; Markus Rothe glib-2.6.5.ebuild: + Stable on ppc64 + + 02 Sep 2005; Michael Hanselmann glib-2.6.5.ebuild: + Stable on ppc. + + 31 Aug 2005; Herbie Hopkins glib-2.6.5.ebuild: + Stable on amd64. + + 26 Aug 2005; Gustavo Zacarias glib-2.6.5.ebuild: + Stable on sparc + + 25 Aug 2005; Aron Griffis glib-2.6.5.ebuild: + stable on ia64 + + 25 Aug 2005; Leonardo Boshell glib-2.6.5.ebuild: + Stable on x86. + +*glib-2.8.1 (24 Aug 2005) + + 24 Aug 2005; Leonardo Boshell -glib-2.8.0.ebuild, + +glib-2.8.1.ebuild: + New version. + +*glib-2.8.0 (15 Aug 2005) + + 15 Aug 2005; Leonardo Boshell glib-2.8.0.ebuild: + New version. + + 10 Aug 2005; Aaron Walker glib-2.6.4.ebuild: + Stable on mips. + + 02 Aug 2005; Simon Stelling glib-2.6.4.ebuild: + stable on amd64 + +*glib-2.7.4 (31 Jul 2005) + + 31 Jul 2005; Marinus Schraal glib-2.7.4.ebuild : + New test release + + 31 Jul 2005; Tobias Scherbaum glib-2.6.4.ebuild: + ppc stable + + 16 Jul 2005; Diego Pettenò glib-1.2.10-r5.ebuild: + Don't use -ldl when using FreeBSD's libc, as it's not present. + + 02 Jul 2005; Bryan Østergaard glib-2.6.4.ebuild: + Stable on alpha. + + 25 Jun 2005; Markus Rothe glib-2.6.4.ebuild: + Stable on ppc64 + + 22 Jun 2005; Gustavo Zacarias glib-2.6.4.ebuild: + Stable on sparc + +*glib-2.6.5 (22 Jun 2005) + + 22 Jun 2005; Marinus Schraal glib-2.6.5.ebuild : + Add specific docbook dtd dep + + 19 May 2005; Rene Nussbaumer glib-2.6.3.ebuild: + Stable on hppa + + 25 Apr 2005; Markus Rothe glib-2.6.3.ebuild: + Stable on ppc64 + + 20 Apr 2005; Simon Stelling glib-2.6.3.ebuild: + stable on amd64 + + 18 Apr 2005; Michael Hanselmann glib-2.6.3.ebuild: + Stable on ppc. + + 07 Apr 2005; Daniel Ostrow glib-1.2.10-r5.ebuild: + More hardened ppc64 stuff. + + 06 Apr 2005; Daniel Ostrow glib-2.6.3.ebuild: + Patches for ppc64 hardened + + 02 Apr 2005; Stephen P. Becker glib-2.6.2-r1.ebuild: + stable on mips + + 01 Apr 2005; Simon Stelling glib-2.6.2-r1.ebuild: + stable on amd64 + + 31 Mar 2005; Aron Griffis glib-2.6.3.ebuild: + stable on ia64 + + 26 Mar 2005; Bryan Østergaard glib-2.6.2-r1.ebuild: + Stable on alpha. + + 08 Mar 2005; Gustavo Zacarias glib-2.6.3.ebuild: + Stable on sparc + + 07 Mar 2005; Markus Rothe glib-2.6.2-r1.ebuild: + Stable on ppc64 + +*glib-2.6.3 (02 Mar 2005) + + 02 Mar 2005; foser glib-2.6.3.ebuild : + New release + + 12 Feb 2005; Lina Pezzella glib-2.6.0.ebuild, + glib-2.6.1.ebuild, glib-2.6.2-r1.ebuild: + Applied pthread fix to 2.6 ebuilds. + + 12 Feb 2005; Lina Pezzella +files/glib-2-macos.patch, + glib-2.4.8.ebuild: + Fix for Bug #73708. Kudos to kito for the append-ldflags fix. + +*glib-2.6.2-r1 (11 Feb 2005) + + 11 Feb 2005; foser glib-2.6.2-r1.ebuild : + Enable static build by default for pam + Add epunt for cxx checks (#79485) + + 06 Feb 2005; Joshua Kinard glib-2.4.8.ebuild: + Marked stable on mips. + +*glib-2.6.2 (05 Feb 2005) + + 05 Feb 2005; Joe McCann +glib-2.6.2.ebuild: + New upstream release + + 02 Feb 2005; Lina Pezzella glib-1.2.10-r5.ebuild: + Stable ppc-macos + +*glib-2.6.1 (16 Jan 2005) + + 16 Jan 2005; foser glib-2.6.1.ebuild : + New release + + 01 Jan 2005; Lina Pezzella glib-1.2.10-r5.ebuild: + ppc-macos needs to call darwintoolize and gnuconfig_update. Bug #75209 + Thanks to Lars T. Mikkelsen for this information. + + 29 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 29 Dec 2004; Tom Gall glib-1.2.10-r5.ebuild: + add back in call for gnuconfig_update bug #76039 + + 23 Dec 2004; Guy Martin glib-2.4.8.ebuild: + Stable on hppa. + + 21 Dec 2004; Gustavo Zacarias glib-2.4.8.ebuild: + Stable on sparc + + 21 Dec 2004; Bryan Østergaard glib-2.4.8.ebuild: + Stable on alpha. + + 20 Dec 2004; Dylan Carlson glib-2.4.8.ebuild: + Stable on amd64. + + 19 Dec 2004; Mike Gardiner glib-2.4.8.ebuild: + Keyworded x86 and ppc for GNOME 2.8.1 + + 18 Dec 2004; Dylan Carlson glib-2.6.0.ebuild: + Fixed SRC_URI. + +*glib-2.6.0 (18 Dec 2004) + + 18 Dec 2004; foser glib-2.6.0.ebuild : + New release, add USE static + + 17 Dec 2004; Mike Frysinger glib-1.2.10-r5.ebuild: + Clean up ebuild and dont bother calling elibtoolize anymore (since it doesnt + actually do anything). + + 16 Dec 2004; Dylan Carlson glib-2.4.7.ebuild: + Stable on amd64. + + 06 Dec 2004; Gustavo Zacarias glib-2.4.7.ebuild: + Stable on sparc + +*glib-2.4.8 (02 Dec 2004) + + 02 Dec 2004; foser glib-2.4.8.ebuild : + New minor bugfix release + + 11 Nov 2004; Mike Gardiner glib-2.4.6.ebuild: + Keyworded ppc for GNOME 2.8 + + 07 Nov 2004; Joshua Kinard glib-2.4.6.ebuild: + Marked stable on mips. + + 19 Oct 2004; Dylan Carlson glib-2.4.6.ebuild: + Stable on amd64. + + 12 Oct 2004; Gustavo Zacarias glib-2.4.6.ebuild: + Stable on sparc + + 11 Oct 2004; Guy Martin glib-2.4.6.ebuild: + Marked stable on hppa. + + 11 Oct 2004; Mamoru KOMACHI glib-1.2.10-r5.ebuild: + Fixed shared libraries compilation on macos. This closes bug #60580. + + 10 Oct 2004; Bryan Østergaard glib-2.4.6.ebuild: + Stable on alpha. + +*glib-2.4.7 (09 Oct 2004) + + 09 Oct 2004; foser glib-2.4.7.ebuild : + New release + + 29 Sep 2004; Lina Pezzella glib-2.4.4.ebuild, glib-2.4.5.ebuild, glib-2.4.6.ebuild: + Updated to not install charset.alias on macos. + + 19 Sep 2004; Joshua Kinard glib-2.4.5.ebuild: + Marked stable on mips. + + 06 Sep 2004; Guy Martin glib-2.4.5.ebuild: + Marked stable on hppa. + + 06 Sep 2004; Bryan Østergaard glib-2.4.5.ebuild: + Stable on alpha. + + 31 Aug 2004; Michael Hanselmann glib-1.2.10-r5.ebuild: + Fixed bug #61490 by using glibtoolize on Mac OS X instead of elibtoolize. + + 20 Aug 2004; Gustavo Zacarias glib-2.4.5.ebuild: + Stable on sparc + +*glib-2.4.6 (19 Aug 2004) + + 19 Aug 2004; foser glib-2.4.6.ebuild : + New release + + 08 Aug 2004; Bryan Østergaard glib-2.4.4.ebuild: + Stable on alpha. + + 07 Aug 2004; Travis Tilley glib-2.4.4.ebuild: + stable on amd64 + + 07 Aug 2004; Michael Hanselmann glib-1.2.10-r5.ebuild: + Added to ~macos. + + 05 Aug 2004; Gustavo Zacarias glib-2.4.4.ebuild: + Stable on sparc + + 05 Aug 2004; Guy Martin glib-2.4.4.ebuild: + Stable on hppa. + +*glib-2.4.5 (31 Jul 2004) + + 31 Jul 2004; +glib-2.4.5.ebuild: + versionbump + + 31 Jul 2004; glib-2.4.4.ebuild: + stable on x86 for gnome 2.6.2 + + 27 Jul 2004; glib-2.4.1.ebuild: + stable on ia64 + +*glib-2.4.4 (12 Jul 2004) + + 12 Jul 2004; +glib-2.4.4.ebuild: + versionbump + + 01 Jul 2004; Jeremy Huddleston + glib-1.2.10-r5.ebuild, glib-2.2.3.ebuild, glib-2.4.0.ebuild, + glib-2.4.1.ebuild, glib-2.4.2.ebuild: + virtual/glibc -> virtual/libc + + 30 Jun 2004; Guy Martin glib-2.4.1.ebuild: + Marked stable on hppa. + + 28 Jun 2004; Tom Gall glib-2.4.2.ebuild: + stable on ppc64 bug #54792 + + 19 Jun 2004; Gustavo Zacarias glib-2.4.1.ebuild: + sparc stable + + 16 Jun 2004; Bryan Østergaard glib-2.4.1.ebuild: + Stable on alpha. + +*glib-2.4.2 (15 Jun 2004) + + 15 Jun 2004; foser glib-2.4.2.ebuild : + New release + + 05 Jun 2004; glib-2.4.1.ebuild: + Stable on mips + + 11 May 2004; Michael McCabe glib-1.2.10-r5.ebuild: + s390 Spefific Changes + + 10 May 2004; Michael McCabe glib-2.4.1.ebuild: + Stable on s390 + +*glib-2.4.1 (04 May 2004) + + 04 May 2004; foser glib-2.4.1.ebuild : + New release + + 02 May 2004; Tom Gall glib-1.2.10-r5.ebuild : + need gnuconfig_update on ppc64 bug #49795 + + 28 Apr 2004; Jon Portnoy glib-2.4.0.ebuild : + Stable on AMD64. + + 23 Apr 2004; Aron Griffis glib-1.2.10-r5.ebuild: + Instead of being choosy about what arches to use -fPIC on, just use it on all + of them. This fixes bug 48839 (pam fails to build on ia64) + + 19 Apr 2004; Jon Portnoy glib-1.2.10-r5.ebuild : + Call gnuconfig_update on AMD64 to fix AMD64 bootstrap breakage. + See the comments in the ebuild and bug #47950 for more information. + + 17 Apr 2004; Guy Martin glib-1.2.10-r5.ebuild: + Added -fPIC to CFLAGS for hppa. + + 14 Apr 2004; Stephen P. Becker glib-2.4.0.ebuild: + Marked stable on mips. + + 08 Apr 2004; Joshua Kinard glib-1.2.10-r5.ebuild, + files/glib-1.2.10-gcc34-fix.patch: + Added a patch to allow glibc-1.2.10-r5 compile under gcc-3.4.x. Closes Bug + #47047. + + 22 Mar 2004; foser glib-2.4.0.ebuild : + Fix a very dumb mistake by mixing up src_compile & src_install + Thnx to joem on IRC for the notificiation + Probably fixes #45205 & #45348 + +*glib-2.4.0 (18 Mar 2004) + + 18 Mar 2004; foser glib-2.4.0.ebuild : + New minor release + Minor ebuilds fixes, correct license + + 05 Mar 2004; Tom Gall glib-2.2.3.ebuild: + stable on ppc64 + + 04 Mar 2004; Brian Jackson glib-2.2.3.ebuild: + add s390? around gtk-doc + + 02 Jan 2004; Brad House glib-1.2.10-r5.ebuild: + elibtoolize appears to be broken now, manually run libtoolize + + 28 Dec 2003; Joshua Kinard glib-2.2.3.ebuild: + Move to mips stable (~mips -> mips) + + 08 Nov 2003; Todd Sunderlin glib-2.2.3.ebuild: + added sparc keyword + + 22 Oct 2003; Bartosch Pixa glib-2.2.3.ebuild: + set ppc in keywords + + 17 Oct 2003; Aron Griffis glib-2.2.3.ebuild: + Stable on alpha + + 13 Oct 2003; Mike Gardiner glib-2.2.1-r1.ebuild, + glib-2.2.1.ebuild, glib-2.2.2.ebuild, glib-2.2.3.ebuild: + Added gettext DEPENDs re bug #28364 + + 05 Oct 2003; Mike Gardiner glib-2.2.3.ebuild: + Marked stable on x86 + + 23 Sep 2003; Bartosch Pixa glib-2.2.2.ebuild: + set ppc in keywords + +*glib-2.2.3 (27 Aug 2003) + + 15 Nov 2003; Guy Martin glib-2.2.3.ebuild : + Marked stable on hppa. + + 27 Aug 2003; foser glib-2.2.3.ebuild : + New version, minor esthetic ebuild fixes + + 08 Jul 2003; Alastair Tse glib-2.2.1-r1.ebuild, + glib-2.2.1.ebuild, glib-2.2.2.ebuild: + allow USE='debug' to enable debuggign mode + + 01 Jul 2003; Todd Sunderlin glib-2.2.2.ebuild : + set stable on sparc + +*glib-2.2.2 (10 Jun 2003) + + 23 Jul 2003; Guy Martin glib-2.2.2.ebuild : + Marked stable on hppa. + + 10 Jun 2003; foser glib-2.2.2.ebuild : + New version + +*glib-2.2.1-r1 (29 May 2003) + + 30 May 2003; Stanislav Brabec glib-2.2.1-r1.ebuild: + Package masked. Needs more testing in ~x86. + + 29 May 2003; Stanislav Brabec glib-2.2.1-r1.ebuild: + Added env.d file setting G_BROKEN_FILENAMES (improves behavior with non UTF-8 + filenames). + +*glib-2.2.1 (04 Feb 2003) + + 13 Mar 2003; Olivier Reisch glib-2.2.1.ebuild : + Marked ppc stable + + 21 Feb 2003; Zach Welch glib-1.2.10-r5.ebuild glib-2.2.1.ebuild : + Added arm to keywords. + + 30 Mar 2003; Christian Birchinger glib-2.2.1.ebuild: + Added sparc stable keyword + + 16 Mar 2003; Jan Seidel : + Added mips to KEYWORDS + + 25 Feb 2003; Guy Martin glib-2.2.1.ebuild : + Added hppa to keywords. + + 21 Feb 2003; Aron Griffis glib-2.2.1.ebuild : + Mark stable on alpha + + 04 Feb 2003; Spider glib-2.2.1.ebuild : + new version, fix some and clean the old cruft DEBUG variable out + + +*glib-2.2.0 (22 Dec 2002) + + 04 Mar 2003; Jason Wever glib-2.2.0.ebuild: + Added sparc to keywords. + + 04 Feb 2003; Spider glib-2.2.0.ebuild : + changed DEBUG to DEBUGBUILD + + 01 Jan 2003; Aron Griffis glib-2.2.0.ebuild : + Add ~alpha to KEYWORDS + + 25 Dec 2002; Martin Holzer glib-2.2.0.ebuild ChangeLog : + Fixed dep pkg-config. Closes #12678 + + 22 Dec 2002; foser glib-2.2.0.ebuild : + New version + + 17 Dec 2002; Aron Griffis glib-2.0.7.ebuild : + Removed ~alpha because this version is definitely broken on alpha + + 08 Dec 2002; Jack Morgan glib-2.0.7.ebuild : + Changed ~sparc to sparc + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + + +*glib-2.0.7 (04 Nov 2002) + + 04 Feb 2003; Spider glib-2.0.7.ebuild : + move DEBUG to DEBUGBUILD + + 11 Nov 2002; Spider glib-2.0.7.ebuild : + marked stable for x86 + + 04 Nov 2002; Spider glib-2.0.7.ebuild + files/digest-glib-2.0.7 : Whoppie, new version released and ready for + testing. bugfix release that is binary compatible. + + +*glib-1.2.10-r5 (26 Oct 2002) + + 09 Feb 2003; Guy Martin glib-1.2.10-r5.ebuild : + Added hppa to keywords. + + 18 Jan 2003; Jan Seidel : + Added mips to keywords + + 26 Oct 2002; Martin Schlemmer : + Libtoolize the sucker. + +*glib-2.0.6-r1 (4 aug 2002) + + 04 Feb 2003; Spider glib-2.0.6-r1.ebuild : + move DEBUG to DEBUGBUILD + + 13 Aug 2002; Pieter Van den Abeele : + Added ppc keyword + + 4 Aug 2002; Spider glib-2.0.6-r1.ebuild : + remove debugging info, change build process + +*glib-2.0.6 (4 Aug 2002) + 4 Aug 2002; Gabriele Giorgetti glib-2.0.6.ebuild: + Version bump. + +*glib-2.0.4-r1 (30 Jun 2002) + 23 Jul 2002; Calum Selkrik glib-2.0.4.ebuild-r1 + glib-2.0.4.ebuild glib-1.2.10-r4.ebuild glib-2.0.1-r6.ebuild : + Added KEYWORDS="x86 ppc" + Added RDEPEND to glib-1.2.10-r4.ebuild + + 30 Jun 2002; Martin Schlemmer glib-2.0.4.ebuild-r1 : + Try to fix bug #4190 with a fix for nautilus. Seems we have + another libtool bug to recon with. + + http://bugzilla.gnome.org/show_bug.cgi?id=75635 + +*glib-2.0.4 (15 Jun 2002) + 15 Jun 2002; Spider glib-2.0.4.ebuild : + libtool fix with elibtoolize + move deubg ot debug.eclass + +*glib-2.0.2 (28 May 2002) + 28 May 2002; Spider glib-2.0.2.ebuild: + new version + +*glib-2.0.1-r6 (25 May 2002) + + 25 May 2002; Karl Trygve Kalleberg glib-2.0.1-r6.ebuild files/digest-glib-2.0.1-r6: + + removed libtoolize from the ebuild, as it resulted in missing .so files. + + Removed glib-2.0.1-r5.ebuild files/digest-glib-2.0.1-r5 + +*glib-2.0.0-r5 (22 May 2002) + 22 May 2002; Spider glib-2.0.1-r5.ebuild: + return debug info into this for the upcoming gnome2 testing + + 25 May 2002; Karl Trygve Kalleberg glib-2.0.1-r5.ebuild: + +*glib-2.0.0-r4 (1 May 2002) + 1 May 2002 ; Spider glib-2.0.1-r4.ebuild: + remove libiconv again, this seems to have been a mistake as some other + things break because of it. hope I didn't mess too much up in case + of problems: + + remove libiconv, emerge glibc, log out and in again (needed for + ld.so.conf/preload ) and you can emerge glib again. Sorry for the + inconvenience. + +*glib-2.0.0-r3 (1 MayApr 2002) + 1 May 2002 ; Spider glib-2.0.1-r3.ebuild: + add libiconv dependency for ppc + +*glib-2.0.0-r2 (24 Apr 2002) + 24 Apr 2002 ; Spider glib-2.0.1-r2.ebuild: + Libtoolize + +*glib-2.0.0-r1 (11 Apr 2002) + 11 Apr 2002 ; Spider glib-2.0.1-r1.ebuild: + This is a release of the glib 2.0, new API makes it incompatible + with glib 1.2 and thus you need both versions installed. + +*glib-1.2.10-r4 (21 Mar 2002) + + 21 Mar 2002; Seemant Kulleen glib-1.2.10-r4.ebuild : + + Fix to have html documentation handled by dohtml instead of dodoc. Bug + reported by stefan@mdy.univie.ac.at. + +*glib-1.2.10-r3.ebuild (4 March 2002) + + 4 March 2002; Donny Davies glib-1.2.10-r3.ebuild : + + Fix to install libgmodule-1.2.so.0.0.10 mode 755. + +*glib-1.3.14 (20 Feb 2002) + + 20 Feb 2002; G.Bevin : + + Added masked development version to use for development of additional portage + tools. + +*glib-1.2.10-r2 (20 Feb 2002) + + 20 Feb 2002; G.Bevin : + + Added binary compatibility slot for later. + +*glib-1.2.10-r1 (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/Manifest new file mode 100644 index 0000000000..9eefd71ed5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/Manifest @@ -0,0 +1,3 @@ +DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 +DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f +DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-automake.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-automake.patch new file mode 100644 index 0000000000..c4f8fd3211 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-automake.patch @@ -0,0 +1,29 @@ +fix errors with newer automake: + +gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+=' + +Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ... +Makefile.am:11: ... `BUILT_SOURCES' previously defined here + +--- Makefile.am ++++ Makefile.am +@@ -70,7 +70,7 @@ + + CONFIGURE_DEPENDENCIES = acglib.m4 + +-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h ++BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h + glibconfig.h: stamp-gc-h + @: + stamp-gc-h: config.status +--- gmodule/Makefile.am ++++ gmodule/Makefile.am +@@ -41,7 +41,7 @@ + libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib) + + noinst_PROGRAMS = testgmodule +-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ ++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ + testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ + + .PHONY: files release diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch new file mode 100644 index 0000000000..b5e9e82a74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch @@ -0,0 +1,44 @@ +The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in +option parsing, it may break. + +http://bugs.gentoo.org/133679 + +--- configure ++++ configure +@@ -54,6 +54,19 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ unset $as_var ++ fi ++done ++ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= +@@ -452,16 +463,6 @@ + esac + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h + # AIX cpp loses on an empty file, so make sure it contains at least a newline. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch new file mode 100644 index 0000000000..1b896484d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch @@ -0,0 +1,41 @@ +--- glib-1.2.10/gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100 ++++ glib-1.2.10/gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100 +@@ -867,7 +867,7 @@ + /* beware of positional parameters + */ + case '$': +- g_warning (G_GNUC_PRETTY_FUNCTION ++ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, + "(): unable to handle positional parameters (%%n$)"); + len += 1024; /* try adding some safety padding */ + break; +@@ -1034,7 +1034,7 @@ + /* n . dddddddddddddddddddddddd E +- eeee */ + conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4; + if (spec.mod_extra_long) +- g_warning (G_GNUC_PRETTY_FUNCTION ++ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, + "(): unable to handle long double, collecting double only"); + #ifdef HAVE_LONG_DOUBLE + #error need to implement special handling for long double +@@ -1077,7 +1077,7 @@ + conv_done = TRUE; + if (spec.mod_long) + { +- g_warning (G_GNUC_PRETTY_FUNCTION ++ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, + "(): unable to handle wide char strings"); + len += 1024; /* try adding some safety padding */ + } +@@ -1108,9 +1108,8 @@ + conv_len += format - spec_start; + break; + default: +- g_warning (G_GNUC_PRETTY_FUNCTION +- "(): unable to handle `%c' while parsing format", +- c); ++ g_warning ("%s(): unable to handle `%c' while parsing format", ++ G_GNUC_PRETTY_FUNCTION, c); + break; + } + conv_done |= conv_len > 0; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-m4.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-m4.patch new file mode 100644 index 0000000000..f57ecf7c11 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-1.2.10-m4.patch @@ -0,0 +1,9 @@ +Fix aclocal warning: +/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB +--- glib-1.2.10/glib.m4 ++++ glib-1.2.10/glib.m4 +@@ -7,3 +7,3 @@ + dnl +-AC_DEFUN(AM_PATH_GLIB, ++AC_DEFUN([AM_PATH_GLIB], + [dnl diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch new file mode 100644 index 0000000000..0859e3310a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch @@ -0,0 +1,39 @@ +From Debian, this one is needed for gcc < 4.1... + +--- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000 ++++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000 +@@ -414,14 +414,14 @@ + g_atomic_int_exchange_and_add (volatile gint *atomic, + gint val) + { +- return __sync_fetch_and_add (atomic, val); ++ return __sync_fetch_and_add_si (atomic, val); + } + + void + g_atomic_int_add (volatile gint *atomic, + gint val) + { +- __sync_fetch_and_add (atomic, val); ++ __sync_fetch_and_add_si (atomic, val); + } + + gboolean +@@ -429,7 +429,7 @@ + gint oldval, + gint newval) + { +- return __sync_bool_compare_and_swap (atomic, oldval, newval); ++ return __sync_bool_compare_and_swap_si (atomic, oldval, newval); + } + + gboolean +@@ -437,7 +437,7 @@ + gpointer oldval, + gpointer newval) + { +- return __sync_bool_compare_and_swap ((long *)atomic, ++ return __sync_bool_compare_and_swap_di ((long *)atomic, + (long)oldval, (long)newval); + } + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.12.12-fbsd.patch new file mode 100644 index 0000000000..bba632964e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.12.12-fbsd.patch @@ -0,0 +1,21 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c +--- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400 ++++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400 +@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name, + static gpointer + _g_module_self (void) + { ++#ifndef __FreeBSD__ + gpointer handle; + + /* to query symbols from the program itself, special link options +@@ -117,6 +118,9 @@ _g_module_self (void) + g_module_set_error (fetch_dlerror (TRUE)); + + return handle; ++#else ++ return RTLD_DEFAULT; ++#endif + } + + static void diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch new file mode 100644 index 0000000000..cabe56f567 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch @@ -0,0 +1,20 @@ +Temporary workaround for gio tests failure when ran without FEATURES=userpriv +until upstream bug #552912 is fixed + +--- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300 ++++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300 +@@ -769,11 +769,14 @@ + if (posix_compat) + { + /* target directory is not accessible (no execute flag) */ ++#if 0 ++/* Fails when ran as root */ + do_copy_move (root, item, TEST_DIR_NO_ACCESS, + TEST_NO_ACCESS); + /* target directory is readonly */ + do_copy_move (root, item, TEST_DIR_NO_WRITE, + TEST_NO_ACCESS); ++#endif + } + } + } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.24-assert-test-failure.patch new file mode 100644 index 0000000000..6d8e74f325 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.24-assert-test-failure.patch @@ -0,0 +1,19 @@ +Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed +because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This +causes gdb to use the system-wide glib instead, and fail on the test. + +This patch exports LD_LIBRARY_PATH before running gdb + +https://bugzilla.gnome.org/621368 + +--- +--- tests/run-assert-msg-test.sh ++++ tests/run-assert-msg-test.sh +@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then + msg_test="lt-$msg_test" + fi + echo_v "Running gdb on assert-msg-test" ++export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH" + OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \ + fail "failed to run gdb" + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.25-punt-python-check.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.25-punt-python-check.patch new file mode 100644 index 0000000000..077ebf440f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.25-punt-python-check.patch @@ -0,0 +1,20 @@ +Remove python detection from configure.in, we won't be installing the gdb python +scripts anymore. They use a redhat-specific gdb module that has not been +upstreamed yet. + +https://bugs.gentoo.org/291328 +https://bugzilla.gnome.org/623552 +--- +--- configure.ac ++++ configure.ac +@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then + fi + AC_SUBST(PERL_PATH) + +-# Need suitable python path for greport +-AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4") +- +- + dnl *********************** + dnl *** Tests for iconv *** + dnl *********************** diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch new file mode 100644 index 0000000000..baca1eca86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch @@ -0,0 +1,22 @@ +--- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300 ++++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300 +@@ -1448,7 +1448,7 @@ + + g_test_add_func ("/gdbus/peer-to-peer", test_peer); + g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing); +- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp); ++ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp); + g_test_add_func ("/gdbus/credentials", test_credentials); + g_test_add_func ("/gdbus/overflow", test_overflow); + +--- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300 ++++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300 +@@ -336,7 +336,7 @@ + /* all the tests rely on a shared main loop */ + loop = g_main_loop_new (NULL, FALSE); + +- g_test_add_func ("/gdbus/non-socket", test_non_socket); ++ //g_test_add_func ("/gdbus/non-socket", test_non_socket); + + ret = g_test_run(); + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26-gdbus-bad-assertion.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26-gdbus-bad-assertion.patch new file mode 100644 index 0000000000..29e3116881 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26-gdbus-bad-assertion.patch @@ -0,0 +1,46 @@ +diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c +index 4a668b8..6ca7b6f 100644 +--- a/gio/gdbusprivate.c ++++ b/gio/gdbusprivate.c +@@ -913,7 +913,7 @@ write_message_async_cb (GObject *source_object, + g_object_unref (simple); + goto out; + } +- g_assert (bytes_written > 0); /* zero is never returned */ ++ g_assert (bytes_written >= 0); + + write_message_print_transport_debug (bytes_written, data); + +@@ -1009,10 +1009,10 @@ write_message_continue_writing (MessageToWriteData *data) + if (control_message != NULL) + g_object_unref (control_message); + +- if (bytes_written == -1) ++ if (bytes_written == -1 || bytes_written == 0) + { +- /* Handle WOULD_BLOCK by waiting until there's room in the buffer */ +- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) ++ /* Handle zero bytes written or WOULD_BLOCK by waiting until there's room in the buffer */ ++ if (bytes_written == 0 || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) + { + GSource *source; + source = g_socket_create_source (data->worker->socket, +@@ -1024,7 +1024,8 @@ write_message_continue_writing (MessageToWriteData *data) + NULL); /* GDestroyNotify */ + g_source_attach (source, g_main_context_get_thread_default ()); + g_source_unref (source); +- g_error_free (error); ++ if (error != NULL) ++ g_error_free (error); + goto out; + } + g_simple_async_result_take_error (simple, error); +@@ -1032,7 +1033,7 @@ write_message_continue_writing (MessageToWriteData *data) + g_object_unref (simple); + goto out; + } +- g_assert (bytes_written > 0); /* zero is never returned */ ++ g_assert (bytes_written > 0); /* -1 and 0 is handled above */ + + write_message_print_transport_debug (bytes_written, data); + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch new file mode 100644 index 0000000000..235d5c73e0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch @@ -0,0 +1,50 @@ +From 3a02a86a0a413304843c1cfad359922322486da6 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 6 Oct 2010 23:21:01 +0200 +Subject: [PATCH 1/2] gsettings: disable locale sensitive test. + +--- + gio/tests/gsettings.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c +index fdadf96..4d19618 100644 +--- a/gio/tests/gsettings.c ++++ b/gio/tests/gsettings.c +@@ -625,14 +625,14 @@ test_l10n (void) + g_free (str); + str = NULL; + +- setlocale (LC_MESSAGES, "de_DE"); ++ /*setlocale (LC_MESSAGES, "de_DE"); + str = g_settings_get_string (settings, "error-message"); + setlocale (LC_MESSAGES, locale); + + g_assert_cmpstr (str, ==, "Unbenannt"); + g_object_unref (settings); + g_free (str); +- str = NULL; ++ str = NULL;*/ + + g_free (locale); + } +@@ -666,14 +666,14 @@ test_l10n_context (void) + g_free (str); + str = NULL; + +- setlocale (LC_MESSAGES, "de_DE"); ++ /*setlocale (LC_MESSAGES, "de_DE"); + g_settings_get (settings, "backspace", "s", &str); + setlocale (LC_MESSAGES, locale); + + g_assert_cmpstr (str, ==, "Löschen"); + g_object_unref (settings); + g_free (str); +- str = NULL; ++ str = NULL;*/ + + g_free (locale); + } +-- +1.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch new file mode 100644 index 0000000000..34fad9e2d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch @@ -0,0 +1,43 @@ +From 8eb4fb83d0933d09bb6ef0ec1511a6b0eb2cee9b Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 6 Oct 2010 23:21:22 +0200 +Subject: [PATCH 2/2] volumemonitor: disable failing test + +--- + gio/tests/volumemonitor.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/tests/volumemonitor.c b/gio/tests/volumemonitor.c +index 54123ec..df19b58 100644 +--- a/gio/tests/volumemonitor.c ++++ b/gio/tests/volumemonitor.c +@@ -112,7 +112,7 @@ test_connected_drives (void) + g_list_free (drives); + } + +-static void ++/*static void + test_volumes (void) + { + GList *volumes, *l; +@@ -131,7 +131,7 @@ test_volumes (void) + + g_list_foreach (volumes, (GFunc)g_object_unref, NULL); + g_list_free (volumes); +-} ++}*/ + + static void + test_mounts (void) +@@ -173,7 +173,7 @@ main (int argc, char *argv[]) + monitor = g_volume_monitor_get (); + + g_test_add_func ("/volumemonitor/connected_drives", test_connected_drives); +- g_test_add_func ("/volumemonitor/volumes", test_volumes); ++ //g_test_add_func ("/volumemonitor/volumes", test_volumes); + g_test_add_func ("/volumemonitor/mounts", test_mounts); + + ret = g_test_run (); +-- +1.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-error-pileup.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-error-pileup.patch new file mode 100644 index 0000000000..86b0468b63 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-error-pileup.patch @@ -0,0 +1,30 @@ +From 1c6fd63f60ffa24aa9ea29d2ac13bb0b2b5b9d4e Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sun, 17 Oct 2010 03:30:30 +0000 +Subject: Prevent error pileup + +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index c2725b4..22681d0 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -497,8 +497,7 @@ key_state_start_aliases (KeyState *state, + g_set_error_literal (error, G_MARKUP_ERROR, + G_MARKUP_ERROR_INVALID_CONTENT, + " already specified for this key"); +- +- if (!state->is_flags && !state->is_enum && !state->has_choices) ++ else if (!state->is_flags && !state->is_enum && !state->has_choices) + g_set_error_literal (error, G_MARKUP_ERROR, + G_MARKUP_ERROR_INVALID_CONTENT, + " can only be specified for keys with " +@@ -1634,6 +1633,7 @@ parse_gschema_files (gchar **files, + + /* let them know */ + fprintf (stderr, "%s: %s. ", filename, error->message); ++ g_clear_error (&error); + + if (strict) + { +-- +cgit v0.8.3.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-not-close.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-not-close.patch new file mode 100644 index 0000000000..3afb113d3b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-not-close.patch @@ -0,0 +1,26 @@ +From e01a20ceb958a9a43383a2ef236524ba9f79b6d9 Mon Sep 17 00:00:00 2001 +From: Tor Lillqvist +Date: Thu, 07 Oct 2010 09:04:52 +0000 +Subject: Don't call close() on -1 + +Of course, a proper implementation of close() will just ignore an +invalid parameter silently, and set errno. But apparently the "debug" +version of the Microsoft C library generates some noise in this +case. So avoid that. Thanks to John Emmas for reporting. +--- +diff --git a/tests/testglib.c b/tests/testglib.c +index 7625928..b4e29f0 100644 +--- a/tests/testglib.c ++++ b/tests/testglib.c +@@ -886,7 +886,8 @@ test_file_functions (void) + fd = g_mkstemp (template); + if (g_test_verbose() && fd != -1) + g_print ("g_mkstemp works even if template doesn't end in XXXXXX\n"); +- close (fd); ++ if (fd != -1) ++ close (fd); + strcpy (template, "fooXXXXXX"); + fd = g_mkstemp (template); + if (fd == -1) +-- +cgit v0.8.3.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-unref-null.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-unref-null.patch new file mode 100644 index 0000000000..1925d6e2a1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.0-unref-null.patch @@ -0,0 +1,25 @@ +From 2a9b14c015a05cd8dc16a2c5bce2d531c76824c8 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Thu, 30 Sep 2010 18:40:50 +0000 +Subject: message_to_write_data_free: Don't unref data->message if it is NULL + +After the recent changes to message filtering, it can happen that +data->message is NULL when we get here. +(cherry picked from commit fe1186a842458dcc647c5f9ab03f17c762354e95) +--- +diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c +index 442d5e1..dd9d58a 100644 +--- a/gio/gdbusprivate.c ++++ b/gio/gdbusprivate.c +@@ -876,7 +876,8 @@ static void + message_to_write_data_free (MessageToWriteData *data) + { + _g_dbus_worker_unref (data->worker); +- g_object_unref (data->message); ++ if (data->message) ++ g_object_unref (data->message); + g_free (data->blob); + g_free (data); + } +-- +cgit v0.8.3.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.1-gdbus-remove-false-warnings.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.1-gdbus-remove-false-warnings.patch new file mode 100644 index 0000000000..deb3a93b64 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.1-gdbus-remove-false-warnings.patch @@ -0,0 +1,28 @@ +diff -ur glib-2.26.1.orig/gio/gdbusconnection.c glib-2.26.1/gio/gdbusconnection.c +--- glib-2.26.1.orig/gio/gdbusconnection.c 2010-11-12 22:55:24.000000000 +0900 ++++ glib-2.26.1/gio/gdbusconnection.c 2010-12-15 15:59:31.323159007 +0900 +@@ -1449,7 +1449,8 @@ + if (out_serial != NULL) + *out_serial = serial_to_use; + +- g_dbus_message_set_serial (message, serial_to_use); ++ if ((flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL) == 0) ++ g_dbus_message_set_serial (message, serial_to_use); + + g_dbus_message_lock (message); + _g_dbus_worker_send_message (connection->worker, +diff -ur glib-2.26.1.orig/gio/gdbusmethodinvocation.c glib-2.26.1/gio/gdbusmethodinvocation.c +--- glib-2.26.1.orig/gio/gdbusmethodinvocation.c 2010-12-15 10:45:37.883158988 +0900 ++++ glib-2.26.1/gio/gdbusmethodinvocation.c 2010-12-15 11:27:15.733159008 +0900 +@@ -403,8 +403,9 @@ + error = NULL; + if (!g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, &error)) + { +- g_warning (_("Error sending message: %s"), error->message); +- g_error_free (error); ++ g_warning (_("Error sending message: %s"), error ? error->message : "(null!)"); ++ if (error) ++ g_error_free (error); + } + g_object_unref (reply); + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.1-inotify.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.1-inotify.patch new file mode 100644 index 0000000000..05e3f5cd34 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.26.1-inotify.patch @@ -0,0 +1,12 @@ +diff -uNr glib-2.26.1/gio/inotify/inotify-kernel.c glib-2.26.1.mod/gio/inotify/inotify-kernel.c +--- glib-2.26.1/gio/inotify/inotify-kernel.c 2010-08-17 03:43:54.000000000 +0900 ++++ glib-2.26.1.mod/gio/inotify/inotify-kernel.c 2010-11-29 14:55:09.031045372 +0900 +@@ -32,7 +32,7 @@ + #include + + /* Timings for pairing MOVED_TO / MOVED_FROM events */ +-#define PROCESS_EVENTS_TIME 1000 /* 1000 milliseconds (1 hz) */ ++#define PROCESS_EVENTS_TIME 1 /* 1 milliseconds (1000 hz) */ + #define DEFAULT_HOLD_UNTIL_TIME 0 /* 0 millisecond */ + #define MOVE_HOLD_UNTIL_TIME 500 /* 500 microseconds or 0.5 milliseconds */ + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch new file mode 100644 index 0000000000..abec0dd722 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch @@ -0,0 +1,95 @@ +From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Wed, 24 Aug 2011 21:35:59 -0400 +Subject: [PATCH] Use an external gdbus-codegen package + +--- + configure.ac | 4 +--- + docs/reference/gio/Makefile.am | 3 +-- + gio/Makefile.am | 2 +- + gio/tests/Makefile.am | 4 +--- + gio/tests/gdbus-object-manager-example/Makefile.am | 4 +--- + 5 files changed, 5 insertions(+), 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dc23b8b..0bb0c4a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -365,7 +365,7 @@ fi + AC_SUBST(PERL_PATH) + + # Need suitable python path for greport +-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") ++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") + + + dnl *********************** +@@ -3858,8 +3858,6 @@ gobject/tests/Makefile + gthread/Makefile + gthread/tests/Makefile + gio/Makefile +-gio/gdbus-2.0/codegen/Makefile +-gio/gdbus-2.0/codegen/config.py + gio/xdgmime/Makefile + gio/inotify/Makefile + gio/libasyncns/Makefile +diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am +index 9eb0fce..511aec9 100644 +--- a/docs/reference/gio/Makefile.am ++++ b/docs/reference/gio/Makefile.am +@@ -79,8 +79,7 @@ man_MANS = \ + gio-querymodules.1 \ + glib-compile-schemas.1 \ + gsettings.1 \ +- gdbus.1 \ +- gdbus-codegen.1 ++ gdbus.1 + + if ENABLE_MAN + +diff --git a/gio/Makefile.am b/gio/Makefile.am +index 7803bb2..d4a08e5 100644 +--- a/gio/Makefile.am ++++ b/gio/Makefile.am +@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl + + NULL = + +-SUBDIRS = gdbus-2.0/codegen ++SUBDIRS = + + if OS_UNIX + SUBDIRS += libasyncns xdgmime +diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am +index a85ea4f..8fbe8ec 100644 +--- a/gio/tests/Makefile.am ++++ b/gio/tests/Makefile.am +@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd) + + if OS_UNIX + gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml +- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ +- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ +- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ ++ $(AM_V_GEN) gdbus-codegen \ + --interface-prefix org.project. \ + --generate-c-code gdbus-test-codegen-generated \ + --c-generate-object-manager \ +diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am +index 5e6eb9a..8b16926 100644 +--- a/gio/tests/gdbus-object-manager-example/Makefile.am ++++ b/gio/tests/gdbus-object-manager-example/Makefile.am +@@ -22,9 +22,7 @@ GDBUS_GENERATED = \ + $(NULL) + + $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml +- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ +- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ +- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ ++ $(AM_V_GEN) gdbus-codegen \ + --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ + --c-namespace Example \ + --c-generate-object-manager \ +-- +1.7.6.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.30.0-missing-decls.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.30.0-missing-decls.patch new file mode 100644 index 0000000000..67fd375c96 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.30.0-missing-decls.patch @@ -0,0 +1,19 @@ +diff -rupN glib-2.30.0/glib/glib-unix.h glib-2.30.0.patched/glib/glib-unix.h +--- glib-2.30.0/glib/glib-unix.h 2011-09-14 17:10:44.000000000 -0700 ++++ glib-2.30.0_patched/glib/glib-unix.h 2011-11-10 17:08:02.621275643 -0800 +@@ -38,6 +38,8 @@ + #error "This header may only be used on UNIX" + #endif + ++G_BEGIN_DECLS ++ + /** + * G_UNIX_ERROR: + * +@@ -77,4 +79,6 @@ guint g_unix_signal_add (gint + GSourceFunc handler, + gpointer user_data); + ++G_END_DECLS ++ + #endif diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.30.0-qsort_r-check.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.30.0-qsort_r-check.patch new file mode 100644 index 0000000000..4103b2b2cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.30.0-qsort_r-check.patch @@ -0,0 +1,12 @@ +diff -rupN glib-2.30.0/configure.ac glib-2.30.0.patched/configure.ac +--- glib-2.30.0/configure.ac 2011-09-27 17:03:02.456785498 -0700 ++++ glib-2.30.0.patched/configure.ac 2011-09-27 16:58:29.346782462 -0700 +@@ -584,7 +584,7 @@ AC_CHECK_FUNCS(atexit on_exit timegm gmt + dnl don't use AC_CHECK_FUNCS here, otherwise HAVE_QSORT_R will + dnl be automatically defined, which we don't want to do + dnl until we have checked this function is actually usable +-AC_CHECK_FUNC([qsort_r]) ++# AC_CHECK_FUNC([qsort_r]) + + # BSD has a qsort_r with wrong argument order + if test x$ac_cv_func_qsort_r = xyes ; then diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch new file mode 100644 index 0000000000..9b104dd570 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch @@ -0,0 +1,11 @@ +--- tests/Makefile.in.orig 2005-04-07 01:05:39.000000000 +0000 ++++ tests/Makefile.in 2005-04-07 01:09:02.000000000 +0000 +@@ -50,7 +50,7 @@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -fno-stack-protector + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-inotify.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-inotify.patch new file mode 100644 index 0000000000..b599532af1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib-inotify.patch @@ -0,0 +1,26 @@ +This patch decreases the inteval time between calls to ik_process_eq_callback() +from 1 second to 1 millisecond, as 1 second is too long for interactive +programs to get notified about file changes. + +The performance impact of the patch should be negligible: + +1. The code is used only when GFileMonotor is in use. +2. ik_process_eq_callback(), which is called from the glib main loop + periodically to process inotify events, is deleted from the main loop, + once the last event is processed. + +See crosbug.com/6375 and https://bugzilla.gnome.org/show_bug.cgi?id=627285 +for details. + +diff -ur glib-2.22.4.orig/gio/inotify/inotify-kernel.c glib-2.22.4/gio/inotify/inotify-kernel.c +--- glib-2.22.4.orig/gio/inotify/inotify-kernel.c 2009-09-24 23:25:53.000000000 +0900 ++++ glib-2.22.4/gio/inotify/inotify-kernel.c 2010-09-07 15:55:48.893073025 +0900 +@@ -32,7 +32,7 @@ + #include + + /* Timings for pairing MOVED_TO / MOVED_FROM events */ +-#define PROCESS_EVENTS_TIME 1000 /* milliseconds (1 hz) */ ++#define PROCESS_EVENTS_TIME 1 /* milliseconds (1000 hz) */ + #define DEFAULT_HOLD_UNTIL_TIME 0 /* 0 millisecond */ + #define MOVE_HOLD_UNTIL_TIME 0 /* 0 milliseconds */ + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib2-CVE-2008-4316.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib2-CVE-2008-4316.patch new file mode 100644 index 0000000000..758a01b2b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib2-CVE-2008-4316.patch @@ -0,0 +1,62 @@ +--- glib/gbase64.c.orig 2008-12-04 12:07:21.000000000 +0100 ++++ glib/gbase64.c 2009-01-12 14:08:31.000000000 +0100 +@@ -54,8 +54,9 @@ static const char base64_alphabet[] = + * + * The output buffer must be large enough to fit all the data that will + * be written to it. Due to the way base64 encodes you will need +- * at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will +- * need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes. ++ * at least: (@len / 3 + 1) * 4 + 4 bytes (+ 4 may be needed in case of ++ * non-zero state). If you enable line-breaking you will need at least: ++ * ((@len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space. + * + * @break_lines is typically used when putting base64-encoded data in emails. + * It breaks the lines at 72 columns instead of putting all of the text on +@@ -233,8 +234,14 @@ g_base64_encode (const guchar *data, + g_return_val_if_fail (data != NULL, NULL); + g_return_val_if_fail (len > 0, NULL); + +- /* We can use a smaller limit here, since we know the saved state is 0 */ +- out = g_malloc (len * 4 / 3 + 4); ++ /* We can use a smaller limit here, since we know the saved state is 0, ++ +1 is needed for trailing \0, also check for unlikely integer overflow */ ++ if (len >= ((G_MAXSIZE - 1) / 4 - 1) * 3) ++ g_error("%s: input too large for Base64 encoding (%"G_GSIZE_FORMAT" chars)", ++ G_STRLOC, len); ++ ++ out = g_malloc ((len / 3 + 1) * 4 + 1); ++ + outlen = g_base64_encode_step (data, len, FALSE, out, &state, &save); + outlen += g_base64_encode_close (FALSE, out + outlen, &state, &save); + out[outlen] = '\0'; +@@ -275,7 +282,8 @@ static const unsigned char mime_base64_r + * + * The output buffer must be large enough to fit all the data that will + * be written to it. Since base64 encodes 3 bytes in 4 chars you need +- * at least: @len * 3 / 4 bytes. ++ * at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero ++ * state). + * + * Return value: The number of bytes of output that was written + * +@@ -358,7 +366,8 @@ g_base64_decode (const gchar *text, + gsize *out_len) + { + guchar *ret; +- gint input_length, state = 0; ++ gsize input_length; ++ gint state = 0; + guint save = 0; + + g_return_val_if_fail (text != NULL, NULL); +@@ -368,7 +377,9 @@ g_base64_decode (const gchar *text, + + g_return_val_if_fail (input_length > 1, NULL); + +- ret = g_malloc0 (input_length * 3 / 4); ++ /* We can use a smaller limit here, since we know the saved state is 0, ++ +1 used to avoid calling g_malloc0(0), and hence retruning NULL */ ++ ret = g_malloc0 ((input_length / 4) * 3 + 1); + + *out_len = g_base64_decode_step (text, input_length, ret, &state, &save); + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib2-CVE-2009-3289.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib2-CVE-2009-3289.patch new file mode 100644 index 0000000000..4adf30961d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/files/glib2-CVE-2009-3289.patch @@ -0,0 +1,103 @@ +Patch for bug 286102 from upstream git. It includes the following 5 commits: + +commit 3826963e65d8c4c68bcd3e4066505f63ef734b95 +Author: Benjamin Otte +Date: Tue Sep 1 21:53:35 2009 +0200 + +commit 48e0af0157f52ac12b904bd92540432a18b139c7 +Author: Benjamin Otte +Date: Tue Sep 1 21:26:08 2009 +0200 + +commit bb7852e34b1845e516290e1b45a960a345ee8a43 +Author: Benjamin Otte +Date: Tue Sep 1 20:36:31 2009 +0200 + +commit fc44bf40a4eff8e122b223e97ee5efcbc548be03 +Author: Benjamin Otte +Date: Tue Sep 1 12:48:55 2009 +0200 + +commit e695c0932f5d02f3b222f0b7a3de1f8c00ba7b81 +Author: Benjamin Otte +Date: Tue Sep 1 11:54:48 2009 +0200 + +Patch generated by a3li@gentoo.org, +CVE available for 2.20.5 only (see timeline). + +diff --git a/configure.in b/configure.in +index 7bda924..e2a33b5 100644 +--- a/configure.in ++++ b/configure.in +@@ -952,7 +952,7 @@ AC_MSG_RESULT(unsigned $glib_size_type) + + # Check for some functions + AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk) +-AC_CHECK_FUNCS(chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid) ++AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid) + AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo) + # Check for high-resolution sleep functions + AC_CHECK_FUNCS(nanosleep nsleep) +diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c +index 72a59b5..a61cc55 100644 +--- a/gio/glocalfileinfo.c ++++ b/gio/glocalfileinfo.c +@@ -1869,15 +1869,40 @@ get_string (const GFileAttributeValue *value, + + static gboolean + set_unix_mode (char *filename, ++ GFileQueryInfoFlags flags, + const GFileAttributeValue *value, + GError **error) + { + guint32 val; ++ int res = 0; + + if (!get_uint32 (value, &val, error)) + return FALSE; +- +- if (g_chmod (filename, val) == -1) ++ ++#ifdef HAVE_SYMLINK ++ if (flags & G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS) { ++#ifdef HAVE_LCHMOD ++ res = lchmod (filename, val); ++#else ++ struct stat statbuf; ++ /* Calling chmod on a symlink changes permissions on the symlink. ++ * We don't want to do this, so we need to check for a symlink */ ++ res = g_lstat (filename, &statbuf); ++ if (res == 0 && S_ISLNK (statbuf.st_mode)) ++ { ++ g_set_error_literal (error, G_IO_ERROR, ++ G_IO_ERROR_NOT_SUPPORTED, ++ _("Cannot set permissions on symlinks")); ++ return FALSE; ++ } ++ else if (res == 0) ++ res = g_chmod (filename, val); ++#endif ++ } else ++#endif ++ res = g_chmod (filename, val); ++ ++ if (res == -1) + { + int errsv = errno; + +@@ -2172,7 +2197,7 @@ _g_local_file_info_set_attribute (char *filename, + _g_file_attribute_value_set_from_pointer (&value, type, value_p, FALSE); + + if (strcmp (attribute, G_FILE_ATTRIBUTE_UNIX_MODE) == 0) +- return set_unix_mode (filename, &value, error); ++ return set_unix_mode (filename, flags, &value, error); + + #ifdef HAVE_CHOWN + else if (strcmp (attribute, G_FILE_ATTRIBUTE_UNIX_UID) == 0) +@@ -2316,7 +2341,7 @@ _g_local_file_info_set_attributes (char *filename, + value = _g_file_info_get_attribute_value (info, G_FILE_ATTRIBUTE_UNIX_MODE); + if (value) + { +- if (!set_unix_mode (filename, value, error)) ++ if (!set_unix_mode (filename, flags, value, error)) + { + value->status = G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING; + res = FALSE; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-1.2.10-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-1.2.10-r5.ebuild new file mode 100644 index 0000000000..6852e8d2b1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-1.2.10-r5.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.53 2008/08/03 22:36:31 eva Exp $ + +inherit autotools libtool flag-o-matic eutils portability + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz + ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz + mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2" + +LICENSE="LGPL-2.1" +SLOT="1" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="hardened" + +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-automake.patch + epatch "${FILESDIR}"/${P}-m4.patch + epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679 + + # Allow glib to build with gcc-3.4.x #47047 + epatch "${FILESDIR}"/${P}-gcc34-fix.patch + + # Fix for -Wl,--as-needed (bug #133818) + epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2 + + use ppc64 && use hardened && replace-flags -O[2-3] -O1 + append-ldflags $(dlopen_lib) + + rm -f acinclude.m4 #168198 + eautoreconf + elibtoolize +} + +src_compile() { + # Bug 48839: pam fails to build on ia64 + # The problem is that it attempts to link a shared object against + # libglib.a; this library needs to be built with -fPIC. Since + # this package doesn't contain any significant binaries, build the + # whole thing with -fPIC (23 Apr 2004 agriffis) + append-flags -fPIC + + econf \ + --with-threads=posix \ + --enable-debug=yes \ + || die + emake || die +} + +src_install() { + make install DESTDIR="${D}" || die + + dodoc AUTHORS ChangeLog README* INSTALL NEWS + dohtml -r docs + + cd "${D}"/usr/$(get_libdir) || die + chmod 755 libgmodule-1.2.so.* +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.20.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.20.5-r1.ebuild new file mode 100644 index 0000000000..764887b287 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.20.5-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.5-r1.ebuild,v 1.10 2009/11/17 15:41:51 ranger Exp $ + +EAPI="2" + +inherit gnome.org eutils flag-o-matic autotools + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="debug doc fam hardened selinux xattr" + +RDEPEND="virtual/libiconv + xattr? ( sys-apps/attr ) + fam? ( virtual/fam )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.16 + >=sys-devel/gettext-0.11 + dev-util/gtk-doc-am + doc? ( + >=dev-libs/libxslt-1.0 + >=dev-util/gtk-doc-1.11 + ~app-text/docbook-xml-dtd-4.1.2 )" + +src_prepare() { + if use ppc64 && use hardened ; then + replace-flags -O[2-3] -O1 + epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" + fi + + if use ia64 ; then + # Only apply for < 4.1 + local major=$(gcc-major-version) + local minor=$(gcc-minor-version) + if (( major < 4 || ( major == 4 && minor == 0 ) )); then + epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" + fi + fi + + # Don't fail gio tests when ran without userpriv, upstream bug 552912 + # This is only a temporary workaround, remove as soon as possible + epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" + + # Fix gmodule issues on fbsd; bug #184301 + epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch + + # Fix bug 286102, symlink permission error (CVE-2009-3289) + epatch "${FILESDIR}"/${PN}2-CVE-2009-3289.patch + + eautoreconf +} + +src_configure() { + local myconf + + epunt_cxx + + # Building with --disable-debug highly unrecommended. It will build glib in + # an unusable form as it disables some commonly used API. Please do not + # convert this to the use_enable form, as it results in a broken build. + # -- compnerd (3/27/06) + use debug && myconf="--enable-debug" + + # Always build static libs, see #153807 + # Always use internal libpcre, bug #254659 + econf ${myconf} \ + $(use_enable xattr) \ + $(use_enable doc man) \ + $(use_enable doc gtk-doc) \ + $(use_enable fam) \ + $(use_enable selinux) \ + --enable-static \ + --enable-regex \ + --with-pcre=internal \ + --with-threads=posix +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + # Do not install charset.alias even if generated, leave it to libiconv + rm -f "${D}/usr/lib/charset.alias" + + dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed" +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + emake check || die "tests failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.2.ebuild new file mode 100644 index 0000000000..ac03208e22 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.2.ebuild,v 1.4 2010/01/19 17:17:43 armin76 Exp $ + +EAPI="2" + +inherit gnome.org libtool eutils flag-o-matic + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="debug doc fam hardened selinux xattr" + +RDEPEND="virtual/libiconv + xattr? ( sys-apps/attr ) + fam? ( virtual/fam )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.16 + >=sys-devel/gettext-0.11 + doc? ( + >=dev-libs/libxslt-1.0 + >=dev-util/gtk-doc-1.11 + ~app-text/docbook-xml-dtd-4.1.2 )" + +src_prepare() { + if use ppc64 && use hardened ; then + replace-flags -O[2-3] -O1 + epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" + fi + + if use ia64 ; then + # Only apply for < 4.1 + local major=$(gcc-major-version) + local minor=$(gcc-minor-version) + if (( major < 4 || ( major == 4 && minor == 0 ) )); then + epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" + fi + fi + + # Don't fail gio tests when ran without userpriv, upstream bug 552912 + # This is only a temporary workaround, remove as soon as possible + epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" + + # Fix gmodule issues on fbsd; bug #184301 + epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch + + [[ ${CHOST} == *-freebsd* ]] && elibtoolize +} + +src_configure() { + local myconf + + epunt_cxx + + # Building with --disable-debug highly unrecommended. It will build glib in + # an unusable form as it disables some commonly used API. Please do not + # convert this to the use_enable form, as it results in a broken build. + # -- compnerd (3/27/06) + use debug && myconf="--enable-debug" + + # Always build static libs, see #153807 + # Always use internal libpcre, bug #254659 + econf ${myconf} \ + $(use_enable xattr) \ + $(use_enable doc man) \ + $(use_enable doc gtk-doc) \ + $(use_enable fam) \ + $(use_enable selinux) \ + --enable-static \ + --enable-regex \ + --with-pcre=internal \ + --with-threads=posix +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + # Do not install charset.alias even if generated, leave it to libiconv + rm -f "${D}/usr/lib/charset.alias" + + dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed" +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export XDG_DATA_HOME="${T}" + emake check || die "tests failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.3.ebuild new file mode 100644 index 0000000000..7cb9b64979 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.3.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.3.ebuild,v 1.1 2009/12/18 13:35:16 mrpouet Exp $ + +EAPI="2" + +inherit gnome.org libtool eutils flag-o-matic + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="debug doc fam hardened selinux xattr" + +RDEPEND="virtual/libiconv + xattr? ( sys-apps/attr ) + fam? ( virtual/fam )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.16 + >=sys-devel/gettext-0.11 + doc? ( + >=dev-libs/libxslt-1.0 + >=dev-util/gtk-doc-1.11 + ~app-text/docbook-xml-dtd-4.1.2 )" + +src_prepare() { + if use ppc64 && use hardened ; then + replace-flags -O[2-3] -O1 + epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" + fi + + if use ia64 ; then + # Only apply for < 4.1 + local major=$(gcc-major-version) + local minor=$(gcc-minor-version) + if (( major < 4 || ( major == 4 && minor == 0 ) )); then + epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" + fi + fi + + # Don't fail gio tests when ran without userpriv, upstream bug 552912 + # This is only a temporary workaround, remove as soon as possible + epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" + + # Fix gmodule issues on fbsd; bug #184301 + epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch + + [[ ${CHOST} == *-freebsd* ]] && elibtoolize +} + +src_configure() { + local myconf + + epunt_cxx + + # Building with --disable-debug highly unrecommended. It will build glib in + # an unusable form as it disables some commonly used API. Please do not + # convert this to the use_enable form, as it results in a broken build. + # -- compnerd (3/27/06) + use debug && myconf="--enable-debug" + + # Always build static libs, see #153807 + # Always use internal libpcre, bug #254659 + econf ${myconf} \ + $(use_enable xattr) \ + $(use_enable doc man) \ + $(use_enable doc gtk-doc) \ + $(use_enable fam) \ + $(use_enable selinux) \ + --enable-static \ + --enable-regex \ + --with-pcre=internal \ + --with-threads=posix +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + # Do not install charset.alias even if generated, leave it to libiconv + rm -f "${D}/usr/lib/charset.alias" + + dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed" +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export XDG_DATA_HOME="${T}" + emake check || die "tests failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.4-r1.ebuild new file mode 100644 index 0000000000..07d1946a52 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.22.4-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.4.ebuild,v 1.3 2010/03/06 16:14:28 phajdan.jr Exp $ + +EAPI="2" + +inherit gnome.org libtool eutils flag-o-matic + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="debug doc fam hardened selinux xattr" + +RDEPEND="virtual/libiconv + xattr? ( sys-apps/attr ) + fam? ( virtual/fam )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.16 + >=sys-devel/gettext-0.11 + doc? ( + >=dev-libs/libxslt-1.0 + >=dev-util/gtk-doc-1.11 + ~app-text/docbook-xml-dtd-4.1.2 )" + +src_prepare() { + # GFileMonitor has a bug that causes the notification delivery to + # delay for a second. See comments in the patch for details. + epatch "${FILESDIR}/${PN}-inotify.patch" + + if use ppc64 && use hardened ; then + replace-flags -O[2-3] -O1 + epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" + fi + + if use ia64 ; then + # Only apply for < 4.1 + local major=$(gcc-major-version) + local minor=$(gcc-minor-version) + if (( major < 4 || ( major == 4 && minor == 0 ) )); then + epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" + fi + fi + + # Don't fail gio tests when ran without userpriv, upstream bug 552912 + # This is only a temporary workaround, remove as soon as possible + epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" + + # Fix gmodule issues on fbsd; bug #184301 + epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch + + # Do not try to remove files on live filesystem, bug #XXX ? + sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ + -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" + + [[ ${CHOST} == *-freebsd* ]] && elibtoolize +} + +src_configure() { + local myconf + + epunt_cxx + + # Building with --disable-debug highly unrecommended. It will build glib in + # an unusable form as it disables some commonly used API. Please do not + # convert this to the use_enable form, as it results in a broken build. + # -- compnerd (3/27/06) + use debug && myconf="--enable-debug" + + # Always build static libs, see #153807 + # Always use internal libpcre, bug #254659 + econf ${myconf} \ + $(use_enable xattr) \ + $(use_enable doc man) \ + $(use_enable doc gtk-doc) \ + $(use_enable fam) \ + $(use_enable selinux) \ + --enable-static \ + --enable-regex \ + --with-pcre=internal \ + --with-threads=posix +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + # Do not install charset.alias even if generated, leave it to libiconv + rm -f "${D}/usr/lib/charset.alias" + + dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed" +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export XDG_DATA_HOME="${T}" + emake check || die "tests failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.26.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.26.1-r3.ebuild new file mode 100644 index 0000000000..fe5e89f810 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.26.1-r3.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.0-r1.ebuild,v 1.1 2010/10/17 15:12:35 pacho Exp $ + +EAPI="2" + +inherit autotools gnome.org libtool eutils flag-o-matic pax-utils + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="debug doc fam selinux +static-libs test xattr" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2" + +RDEPEND="virtual/libiconv + sys-libs/zlib + xattr? ( sys-apps/attr ) + fam? ( virtual/fam )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.16 + >=sys-devel/gettext-0.11 + >=dev-util/gtk-doc-am-1.13 + doc? ( + >=dev-libs/libxslt-1.0 + >=dev-util/gtk-doc-1.13 + ~app-text/docbook-xml-dtd-4.1.2 ) + test? ( >=sys-apps/dbus-1.2.14 )" + +# We don't use gobject-introspection. +# PDEPEND="introspection? ( dev-libs/gobject-introspection )" + +# eautoreconf needs gtk-doc-am +# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it + +src_prepare() { + if use ia64 ; then + # Only apply for < 4.1 + local major=$(gcc-major-version) + local minor=$(gcc-minor-version) + if (( major < 4 || ( major == 4 && minor == 0 ) )); then + epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" + fi + fi + + # Don't fail gio tests when ran without userpriv, upstream bug 552912 + # This is only a temporary workaround, remove as soon as possible + epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" + + # Fix gmodule issues on fbsd; bug #184301 + epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch + + # Don't check for python, hence removing the build-time python dep. + # We remove the gdb python scripts in src_install due to bug 291328 + epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch" + + # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368 + epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch" + + # skip tests that require writing to /root/.dbus, upstream bug ??? + epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch" + + # Do not try to remove files on live filesystem, upstream bug #619274 + sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ + -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" + + # Disable failing tests, upstream bug #??? + epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch" + epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch" + + # GFileMonitor has a bug that causes the notification delivery to + # delay for a second. See comments in the patch for details. + epatch "${FILESDIR}/${PN}-2.26.1-inotify.patch" + + # Remove false warning and fix possible NULL pointer deref. + epatch "${FILESDIR}/${PN}-2.26.1-gdbus-remove-false-warnings.patch" + + # Fix crosbug.com/15242 + epatch "${FILESDIR}/${PN}-2.26-gdbus-bad-assertion.patch" + + # Needed for the punt-python-check patch. + # Also needed to prevent croscompile failures, see bug #267603 + eautoreconf + + [[ ${CHOST} == *-freebsd* ]] && elibtoolize + + epunt_cxx +} + +src_configure() { + local myconf + + # Building with --disable-debug highly unrecommended. It will build glib in + # an unusable form as it disables some commonly used API. Please do not + # convert this to the use_enable form, as it results in a broken build. + # -- compnerd (3/27/06) + # disable-visibility needed for reference debug, bug #274647 + use debug && myconf="--enable-debug --disable-visibility" + + # Always use internal libpcre, bug #254659 + econf ${myconf} \ + $(use_enable xattr) \ + $(use_enable doc man) \ + $(use_enable doc gtk-doc) \ + $(use_enable fam) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + --enable-regex \ + --with-pcre=internal \ + --with-threads=posix +} + +src_install() { + local f + emake DESTDIR="${D}" install || die "Installation failed" + + # Do not install charset.alias even if generated, leave it to libiconv + rm -f "${D}/usr/lib/charset.alias" + + # Don't install gdb python macros, bug 291328 + rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/" + + dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed" + + insinto /usr/share/bash-completion + for f in gdbus gsettings; do + newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die + done + rm -rf "${D}/etc" +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export XDG_DATA_HOME="${T}" + + # Hardened: gdb needs this, bug #338891 + if host-is-pax ; then + pax-mark -mr "${S}"/tests/.libs/assert-msg-test \ + || die "Hardened adjustment failed" + fi + + emake check || die "tests failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.30.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.30.0-r2.ebuild new file mode 120000 index 0000000000..6d53b26ce2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.30.0-r2.ebuild @@ -0,0 +1 @@ +glib-2.30.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.30.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.30.0.ebuild new file mode 100644 index 0000000000..0a623e6732 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/glib/glib-2.30.0.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.0.ebuild,v 1.2 2011/09/28 11:19:21 ssuominen Exp $ + +EAPI="4" + +inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="${SRC_URI} + http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf + +LICENSE="LGPL-2" +SLOT="2" +IUSE="debug doc fam selinux +static-libs systemtap test xattr" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh +~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" + +RDEPEND="virtual/libiconv + virtual/libffi + sys-libs/zlib + xattr? ( sys-apps/attr ) + fam? ( virtual/fam )" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.11 + >=dev-util/gtk-doc-am-1.15 + doc? ( + >=dev-libs/libxslt-1.0 + >=dev-util/gtk-doc-1.15 + ~app-text/docbook-xml-dtd-4.1.2 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + test? ( + >=dev-util/gdbus-codegen-2.30.0 + >=sys-apps/dbus-1.2.14 ) + ! + + +gnome + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/files/libdivsufsort-2.0.1-libsuffix.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/files/libdivsufsort-2.0.1-libsuffix.patch new file mode 100644 index 0000000000..9ff55baf18 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/files/libdivsufsort-2.0.1-libsuffix.patch @@ -0,0 +1,40 @@ +http://code.google.com/p/libdivsufsort/issues/detail?id=2 + +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -7,8 +7,8 @@ set(divsufsort_SRCS divsufsort.c sssort.c trsort.c utils.c) + add_library(divsufsort ${divsufsort_SRCS}) + install(TARGETS divsufsort + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + set_target_properties(divsufsort PROPERTIES + VERSION "${LIBRARY_VERSION_FULL}" + SOVERSION "${LIBRARY_VERSION_MAJOR}" +@@ -20,8 +20,8 @@ if(BUILD_DIVSUFSORT64) + add_library(divsufsort64 ${divsufsort_SRCS}) + install(TARGETS divsufsort64 + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + set_target_properties(divsufsort64 PROPERTIES + VERSION "${LIBRARY_VERSION_FULL}" + SOVERSION "${LIBRARY_VERSION_MAJOR}" +--- a/pkgconfig/CMakeLists.txt ++++ b/pkgconfig/CMakeLists.txt +@@ -2,9 +2,9 @@ + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(W64BIT "") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libdivsufsort.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort.pc" @ONLY) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort.pc" DESTINATION lib/pkgconfig) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig) + if(BUILD_DIVSUFSORT64) + set(W64BIT "64") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libdivsufsort.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort64.pc" @ONLY) +- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort64.pc" DESTINATION lib/pkgconfig) ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort64.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig) + endif(BUILD_DIVSUFSORT64) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild new file mode 100644 index 0000000000..10bcf4e1b8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit cmake-utils + +DESCRIPTION="library to construct the suffix array and the Burrows-Wheeler transformed string" +HOMEPAGE="http://code.google.com/p/libdivsufsort/" +SRC_URI="http://libdivsufsort.googlecode.com/files/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.0.1-libsuffix.patch +} + +src_configure() { + local mycmakeargs="-DBUILD_DIVSUFSORT64=ON" + tc-export CC + cmake-utils_src_configure +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/ChangeLog new file mode 100644 index 0000000000..43653bc45b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/ChangeLog @@ -0,0 +1,104 @@ +# ChangeLog for dev-libs/libelf +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.28 2009/11/21 09:24:32 patrick Exp $ + +*libelf-0.8.12 (21 Nov 2009) + + 21 Nov 2009; Patrick Lauer +libelf-0.8.12.ebuild: + Bump, fixes #293915 + + 22 May 2009; Alexis Ballier libelf-0.8.10.ebuild: + keyword ~sparc-fbsd + + 16 Nov 2008; Diego E. Pettenò + libelf-0.8.10.ebuild: + Workaround parallel install failures (use -j1 for install). + + 07 Jun 2008; Jeroen Roovers libelf-0.8.4.ebuild: + Fix SRC_URI and HOMEPAGE 404s. + +*libelf-0.8.10 (07 Jun 2008) + + 07 Jun 2008; Jeroen Roovers +libelf-0.8.10.ebuild: + Version bump. + + 19 Oct 2007; Roy Marples libelf-0.8.9.ebuild: + Keyword ~x86-fbsd. + + 29 Jun 2007; Joel Martin + files/libelf-0.8.9-parallelmakefix.patch: + After discussion with maintainer, change mkinstalldirs to be + more parallel safe. + + 29 Jun 2007; Joel Martin + files/libelf-0.8.9-parallelmakefix.patch: + Update parallel make patch to only mkinstalldirs if not already there. + + 20 Jun 2007; Joel Martin + +files/libelf-0.8.9-parallelmakefix.patch, libelf-0.8.9.ebuild: + Apply new parallel patch to 0.8.9 + +*libelf-0.8.9 (17 Jun 2007) + + 17 Jun 2007; Tiziano Müller +libelf-0.8.9.ebuild: + Version bump. + + 14 May 2007; Thilo Bangert metadata.xml: + add no-herd + + 22 Feb 2007; Piotr Jaroszyński ChangeLog: + Transition to Manifest2. + + 06 Jan 2007; Danny van Dyk -libelf-0.8.5.ebuild: + QA: Removed unused versions. + +*libelf-0.8.6 (03 Sep 2005) + + 03 Sep 2005; Daniel Black + +files/libelf-0.8.6-parallelmakefix.patch, +libelf-0.8.6.ebuild: + version bump. homepage/src_uri change + + 29 Aug 2005; Danny van Dyk libelf-0.8.4.ebuild, + libelf-0.8.5.ebuild: + Fixed multilib-strict BUG #104171. + +*libelf-0.8.5 (09 Feb 2005) + + 09 Feb 2005; Mike Frysinger +libelf-0.8.5.ebuild: + Version bump. + + 14 Nov 2003; Brad House libelf-0.8.4.ebuild: + add ~amd64 flag + +*libelf-0.8.4 (11 Nov 2003) + + 11 Nov 2003; Mike Frysinger : + Version bump. + +*libelf-0.8.2 (29 Sep 2002) + + 08 Feb 2003; Guy Martin libelf-0.8.2.ebuild : + Added hppa to keywords. + + 02 Jan 2003; Martin Schlemmer : + Add "!dev-libs/elfutils" to DEPEND, as elfutils replaces libelf ... + + 18 Dec 2002; Mark Guertin libelf-0.8.2.ebuild : + set ppc in keywords + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + + 29 Sep 2002; Martin Schlemmer : + + Bump version to fully fix bug #4540. Also fix the docs being installed, + and compat headers not installed when package was already merged. + +*libelf-0.7.0 (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/Manifest new file mode 100644 index 0000000000..c4b91b0ae6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/Manifest @@ -0,0 +1 @@ +DIST libelf-0.8.12.tar.gz 148090 RMD160 29ca31074134a2bc99b207adaddd10924e46d899 SHA1 b6ff5c0262418fbca8ce281f9f927e25181f4237 SHA256 ec65a3922d718c32fd4e4836db980c76cc7a6e5a8a4b05303418366158a29495 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/libelf-0.8.12.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/libelf-0.8.12.ebuild new file mode 100644 index 0000000000..3f0455d9f2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/libelf-0.8.12.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.12.ebuild,v 1.1 2009/11/21 09:24:32 patrick Exp $ + +EAPI=2 + +inherit autotools eutils multilib + +DESCRIPTION="A ELF object file access library" +HOMEPAGE="http://www.mr511.de/software/" +SRC_URI="http://www.mr511.de/software/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="arm ~alpha amd64 ~hppa ~ppc ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="debug nls elibc_FreeBSD" + +DEPEND="!dev-libs/elfutils + nls? ( sys-devel/gettext )" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + if use elibc_FreeBSD; then + # Stop libelf from stamping on the system nlist.h + sed -i -e 's:nlist.h::g' lib/Makefile.in || die + + # Enable shared libs + sed -i \ + -e 's:\*-linux\*\|\*-gnu\*:\*-linux\*\|\*-gnu\*\|\*-freebsd\*:' \ + configure || die + fi +} + +src_prepare() { + eautoreconf +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable debug) \ + --enable-shared \ + || die "econf failed" +} + +src_compile() { + emake || die "emake failed" +} + +src_install() { + emake -j1 \ + prefix="${D}"/usr \ + libdir="${D}"usr/$(get_libdir) \ + install \ + install-compat || die "emake install failed" + dodoc ChangeLog VERSION README +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/metadata.xml new file mode 100644 index 0000000000..54494c4bb8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libelf/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + +maintainer-needed@gentoo.org + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libffi/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/libffi/Manifest new file mode 100644 index 0000000000..4238e51dd6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libffi/Manifest @@ -0,0 +1 @@ +DIST libffi-3.0.9.tar.gz 731719 RMD160 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a SHA1 56e41f87780e09d06d279690e53d4ea2c371ea88 SHA256 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libffi/libffi-3.0.9-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libffi/libffi-3.0.9-r2.ebuild new file mode 100644 index 0000000000..f89b824b0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libffi/libffi-3.0.9-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.9.ebuild,v 1.4 2010/01/13 14:21:00 ranger Exp $ + +inherit binutils-funcs libtool toolchain-funcs + +DESCRIPTION="a portable, high level programming interface to various calling conventions." +HOMEPAGE="http://sourceware.org/libffi/" +SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 x86 ~sparc-fbsd ~x86-fbsd" +IUSE="debug static-libs test" + +RDEPEND="" +DEPEND="test? ( dev-util/dejagnu )" + +src_unpack() { + unpack ${A} + cd "${S}" + elibtoolize +} + +src_compile() { + econf \ + --disable-dependency-tracking \ + $(use_enable static-libs static) \ + $(use_enable debug) + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/ChangeLog new file mode 100644 index 0000000000..ae947597be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/ChangeLog @@ -0,0 +1,567 @@ +# ChangeLog for dev-libs/libgcrypt +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.142 2010/10/16 15:43:31 arfrever Exp $ + + 16 Oct 2010; Arfrever Frehtes Taifersar Arahesis + -libgcrypt-1.4.5.ebuild: + Delete. + + 16 Oct 2010; Jeroen Roovers libgcrypt-1.4.6.ebuild: + Stable for PPC (bug #337121). + + 15 Oct 2010; Jeroen Roovers libgcrypt-1.4.6.ebuild: + Stable for HPPA (bug #337121). + + 30 Sep 2010; Brent Baude libgcrypt-1.4.6.ebuild: + stable ppc64, bug 337121 + + 18 Sep 2010; Raúl Porcel libgcrypt-1.4.6.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #337121 + + 14 Sep 2010; Pawel Hajdan jr + libgcrypt-1.4.6.ebuild: + x86 stable wrt bug #337121 + + 13 Sep 2010; Markos Chandras libgcrypt-1.4.6.ebuild: + Stable on amd64 wrt bug #337121 + + 30 Aug 2010; Patrick Lauer libgcrypt-1.4.6.ebuild: + Fixing for non-bash shells #331907 + +*libgcrypt-1.4.6 (15 Jul 2010) + + 15 Jul 2010; Arfrever Frehtes Taifersar Arahesis + -libgcrypt-1.4.0-r1.ebuild, -files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch, + -libgcrypt-1.4.3-r1.ebuild, -files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch, + -libgcrypt-1.4.4.ebuild, +libgcrypt-1.4.6.ebuild, metadata.xml: + Version bump. + + 07 Mar 2010; Samuli Suominen + libgcrypt-1.4.5.ebuild: + amd64 stable wrt #300707 + + 07 Feb 2010; Raúl Porcel libgcrypt-1.4.5.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #300707 + + 03 Feb 2010; Christian Faulhammer + libgcrypt-1.4.5.ebuild: + stable x86, bug 300707 + + 19 Jan 2010; nixnut libgcrypt-1.4.5.ebuild: + ppc stable #300707 + + 14 Jan 2010; Jeroen Roovers libgcrypt-1.4.5.ebuild: + Stable for HPPA (bug #300707). + + 13 Jan 2010; Brent Baude libgcrypt-1.4.5.ebuild: + stable ppc64, bug 300707 + + 13 Dec 2009; Raúl Porcel libgcrypt-1.4.4.ebuild: + m68k stable, thanks to kolla for testing + +*libgcrypt-1.4.5 (12 Dec 2009) + + 12 Dec 2009; Arfrever Frehtes Taifersar Arahesis + +libgcrypt-1.4.5.ebuild: + Version bump. + + 07 Nov 2009; Arfrever Frehtes Taifersar Arahesis + libgcrypt-1.4.4.ebuild: + Disable C++ checks (bug #288334). + + 05 Apr 2009; Arfrever Frehtes Taifersar Arahesis + libgcrypt-1.4.4.ebuild: + Replace -O3 with -O2 on x86 when using GCC 4.1 (bug #263589). + + 25 Mar 2009; Joseph Jezak libgcrypt-1.4.4.ebuild: + Marked ppc stable for bug #263319. + + 23 Mar 2009; Jeroen Roovers libgcrypt-1.4.4.ebuild: + Stable for HPPA (bug #263319). + + 23 Mar 2009; Brent Baude libgcrypt-1.4.4.ebuild: + stable ppc64, bug 263319 + + 23 Mar 2009; Raúl Porcel libgcrypt-1.4.4.ebuild: + arm/ia64/s390/sh/sparc stable wrt #263319 + + 22 Mar 2009; Tobias Klausmann + libgcrypt-1.4.4.ebuild: + Stable on alpha, bug #263319 + + 22 Mar 2009; Markus Meier libgcrypt-1.4.4.ebuild: + amd64/x86 stable, bug #263319 + +*libgcrypt-1.4.4 (25 Jan 2009) + + 25 Jan 2009; Daniel Black + -files/libgcrypt-1.2.3-strict-aliasing.patch, -libgcrypt-1.2.4.ebuild, + -libgcrypt-1.4.1.ebuild, +libgcrypt-1.4.4.ebuild: + version bump as per bug #256049 thanks Arfrever Frehtes Taifersar Arahesis. + Dropped IDEA support in this release. removed old versions + +*libgcrypt-1.4.3-r1 (06 Nov 2008) + + 06 Nov 2008; Daniel Black + +files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch, + +files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch, libgcrypt-1.4.0-r1.ebuild, + -libgcrypt-1.4.3.ebuild, +libgcrypt-1.4.3-r1.ebuild: + hash calculation fix as per upstream + http://marc.info/?l=gcrypt-devel&m=122591162816263&w=2 + +*libgcrypt-1.4.3 (03 Nov 2008) + + 03 Nov 2008; Daniel Black + +libgcrypt-1.4.3.ebuild: + version bump thanks to Arfrever in bug #237855 + + 06 Aug 2008; Ulrich Mueller metadata.xml: + Add USE flag description to metadata wrt GLEP 56. + +*libgcrypt-1.4.1 (25 Apr 2008) + + 25 Apr 2008; Alon Bar-Lev +libgcrypt-1.4.1.ebuild: + Version bump + + 13 Feb 2008; Alon Bar-Lev -libgcrypt-1.2.2-r1.ebuild: + Cleanup + + 31 Jan 2008; Alon Bar-Lev libgcrypt-1.4.0-r1.ebuild: + Fix dependency on libgpg-error, bug#208115 + + 29 Jan 2008; Alon Bar-Lev libgcrypt-1.2.4.ebuild, + libgcrypt-1.4.0-r1.ebuild: + Modify IDEA URL + + 21 Jan 2008; Jeroen Roovers libgcrypt-1.4.0-r1.ebuild: + Stable for HPPA (bug #206666). + + 20 Jan 2008; Raúl Porcel libgcrypt-1.4.0-r1.ebuild: + alpha/ia64/sparc/x86 stable wrt #206666 + + 20 Jan 2008; Christoph Mende + libgcrypt-1.4.0-r1.ebuild: + Stable on amd64 wrt bug #206666 + + 20 Jan 2008; nixnut libgcrypt-1.4.0-r1.ebuild: + Stable on ppc wrt bug 206666 + + 20 Jan 2008; Brent Baude libgcrypt-1.4.0-r1.ebuild: + Marking libgcrypt-1.4.0-r1 ppc64 for bug 206666 + + 22 Dec 2007; nixnut libgcrypt-1.4.0-r1.ebuild: + Added ~ppc wrt bug 201901 + + 15 Dec 2007; Alon Bar-Lev libgcrypt-1.2.4.ebuild, + libgcrypt-1.4.0-r1.ebuild: + Remove reference to mediacrypt, bug#202378 + +*libgcrypt-1.4.0-r1 (14 Dec 2007) + + 14 Dec 2007; Alon Bar-Lev -libgcrypt-1.4.0.ebuild, + +libgcrypt-1.4.0-r1.ebuild: + Revbump + + 12 Dec 2007; Markus Rothe libgcrypt-1.4.0.ebuild: + Added ~ppc64; bug #201901 + + 11 Dec 2007; Alon Bar-Lev libgcrypt-1.4.0.ebuild: + Removed padlock, bug#201917, thanks to many + +*libgcrypt-1.4.0 (10 Dec 2007) + + 10 Dec 2007; Alon Bar-Lev +libgcrypt-1.4.0.ebuild: + Version bump + + 10 Nov 2007; Alon Bar-Lev -libgcrypt-1.1.12.ebuild, + -libgcrypt-1.1.94.ebuild, -libgcrypt-1.2.0.ebuild, + -libgcrypt-1.2.1.ebuild, -libgcrypt-1.2.1-r1.ebuild, + -libgcrypt-1.2.2.ebuild, -libgcrypt-1.2.3.ebuild, + -libgcrypt-1.2.3-r1.ebuild: + Cleanup + + 09 Oct 2007; Christoph Mende libgcrypt-1.2.4.ebuild: + Stable on amd64 wrt bug #194113 + + 05 Oct 2007; Tom Gall libgcrypt-1.2.4.ebuild: + stable on ppc64 + + 02 Oct 2007; Raúl Porcel libgcrypt-1.2.4.ebuild: + alpha/ia64 stable wrt #194113 + + 30 Sep 2007; Markus Meier libgcrypt-1.2.4.ebuild: + x86 stable, bug #194113 + + 29 Sep 2007; Lars Weiler libgcrypt-1.2.4.ebuild: + stable ppc, bug #194113 + + 29 Sep 2007; Jeroen Roovers libgcrypt-1.2.4.ebuild: + Stable for HPPA (bug #194113). + + 28 Sep 2007; Ferris McCormick libgcrypt-1.2.4.ebuild: + Sparc stable --- Bug #194113 --- all tests pass. + + 30 Aug 2007; Christian Heim metadata.xml: + Removing liquidx from metadata due to his retirement (see #171155 for + reference). + + 03 Mar 2007; Marius Mauch libgcrypt-1.2.3-r1.ebuild, + libgcrypt-1.2.4.ebuild: + Replacing einfo with elog/ewarn + +*libgcrypt-1.2.4 (02 Feb 2007) + + 02 Feb 2007; Alon Bar-Lev +libgcrypt-1.2.4.ebuild: + Version bump + + 12 Jan 2007; Alon Bar-Lev libgcrypt-1.2.3-r1.ebuild: + Remove WANT_AUTO* + + 10 Jan 2007; Alon Bar-Lev + +files/libgcrypt-1.2.3-strict-aliasing.patch, libgcrypt-1.2.3-r1.ebuild: + Fixed strict-aliasing qa issue, bug#161370 + + 05 Jan 2007; Alon Bar-Lev libgcrypt-1.2.3-r1.ebuild: + Added autotools variables, bug#160135, thanks to jacub + + 05 Jan 2007; Alon Bar-Lev libgcrypt-1.2.3-r1.ebuild: + Fixing idea url to upstream, who publish our patch now + + 04 Jan 2007; Diego Pettenò + libgcrypt-1.2.3-r1.ebuild: + Fix atom. + +*libgcrypt-1.2.3-r1 (04 Jan 2007) + + 04 Jan 2007; Alon Bar-Lev +libgcrypt-1.2.3-r1.ebuild: + Add idea algirithm patch, modified version of + http://www.kfwebs.net/articles/article/42/GnuPG-2.0---IDEA-support, + bug#159870 + + 28 Dec 2006; Fabian Groffen libgcrypt-1.2.0.ebuild, + libgcrypt-1.2.1.ebuild, libgcrypt-1.2.1-r1.ebuild, libgcrypt-1.2.2.ebuild, + libgcrypt-1.2.2-r1.ebuild, libgcrypt-1.2.3.ebuild: + Dropped ppc-macos keyword, see you in prefix + +*libgcrypt-1.2.3 (29 Oct 2006) + + 29 Oct 2006; Alon Bar-Lev +libgcrypt-1.2.3.ebuild: + Version bump + + 19 Oct 2006; Roy Marples libgcrypt-1.2.2-r1.ebuild: + Added ~sparc-fbsd keyword. + + 09 Jul 2006; Joshua Kinard libgcrypt-1.2.2-r1.ebuild: + Marked stable on mips. + + 27 Apr 2006; Marien Zwart + files/digest-libgcrypt-1.1.12, files/digest-libgcrypt-1.1.94, + files/digest-libgcrypt-1.2.0, files/digest-libgcrypt-1.2.1, + files/digest-libgcrypt-1.2.1-r1, Manifest: + Fixing SHA256 digest, pass four + + 23 Apr 2006; Diego Pettenò + libgcrypt-1.2.2-r1.ebuild: + Actually add the ~x86-fbsd keyword. + + 23 Apr 2006; Diego Pettenò + libgcrypt-1.2.2-r1.ebuild: + Don't run econf two times, it's useless. + + 23 Apr 2006; Diego Pettenò + libgcrypt-1.2.2-r1.ebuild: + Run elibtoolize and add ~x86-fbsd keyword. + + 21 Feb 2006; Marcelo Goes + -files/libgcrypt-1.2.1-GNU-stack-fix.patch, + -files/libgcrypt-1.2.1-info-entry-fix.patch, + -files/libgcrypt-1.2.1-ppc64-fix.patch, libgcrypt-1.2.1.ebuild, + libgcrypt-1.2.1-r1.ebuild, libgcrypt-1.2.2.ebuild, + libgcrypt-1.2.2-r1.ebuild: + Move patches to mirrors, fixes large files bug 123634 reported by Mark + Loeser . + + 14 Feb 2006; Fabian Groffen + libgcrypt-1.2.2-r1.ebuild: + Marked ppc-macos stable bug (#122760) + + 06 Feb 2006; Simon Stelling libgcrypt-1.2.2-r1.ebuild: + stable on amd64 + + 04 Feb 2006; Aron Griffis libgcrypt-1.2.2-r1.ebuild: + Mark 1.2.2-r1 stable on alpha + + 02 Jan 2006; Michael Hanselmann + libgcrypt-1.2.2-r1.ebuild: + Stable on ppc. + + 31 Dec 2005; Markus Rothe libgcrypt-1.2.2.ebuild, + libgcrypt-1.2.2-r1.ebuild: + Added tgall's fix for ppc64 to later versions, too. + + 30 Dec 2005; Markus Rothe libgcrypt-1.2.2-r1.ebuild: + Stable on ppc64 + + 29 Dec 2005; Gustavo Zacarias + libgcrypt-1.2.2-r1.ebuild: + Stable on sparc + + 29 Dec 2005; Mark Loeser libgcrypt-1.2.2-r1.ebuild: + Stable on x86; bug #117034 + + 25 Nov 2005; Tom Gall libgcrypt-1.2.1.ebuild, + +libgcrypt-1.2.1-ppc64-fix.patch: + bug #90211 + + 10 Nov 2005; Michele Noberasco libgcrypt-1.2.2-r1.ebuild files/digest-libgcrypt-1.2.2-r1 + libgcrypt-1.2.2.ebuild files/digest-libgcrypt-1.2.2 +files/libgcrypt-1.2.1-info-entry-fix.patch: + Added small patch to fix info file so that its subsequent index entry works. + +*libgcrypt-1.2.2-r1 (08 Nov 2005) + + 08 Nov 2005; Daniel Black libgcrypt-1.2.2-r1.ebuild files/digest-libgcrypt-1.2.2-r1 + Added portable nonexecutable stack method thanks to Werner + +*libgcrypt-1.2.2 (07 Nov 2005) + + 07 Nov 2005; Daniel Black + +libgcrypt-1.2.2.ebuild: + verison bump as per bug #108677 + + 04 Sep 2005; Daniel Black + +files/libgcrypt-1.2.1-GNU-stack-fix.patch, libgcrypt-1.2.1-r1.ebuild: + nonexecutable stacks hopefully fixed for all platforms (bug #96022). Thanks + to the Pax Team who I could not of fixed it without + +*libgcrypt-1.2.1-r1 (20 Aug 2005) + + 20 Aug 2005; Daniel Black libgcrypt-1.2.1-r1.ebuild files/digest-libgcrypt-1.2.1-r1 + revision bump to force pic static libraries (bug #96022) + + 17 Aug 2005; MATSUU Takuto libgcrypt-1.2.1.ebuild: + Stable on sh. + + 07 Aug 2005; Daniel Black + libgcrypt-1.1.12.ebuild, libgcrypt-1.1.94.ebuild, libgcrypt-1.2.0.ebuild, + libgcrypt-1.2.1.ebuild: + changed to mirror://gnupg + + 09 Jul 2005; Lina Pezzella libgcrypt-1.2.1.ebuild: + Stable ppc-macos. Bug #98376 + + 05 Jul 2005; Daniel Black + -files/libgcrypt-hppa.patch, -files/libgcrypt-rijndael.patch, + -libgcrypt-1.1.91.ebuild, -libgcrypt-1.1.92.ebuild, + -libgcrypt-1.2.0-r1.ebuild, -libgcrypt-1.2.0-r2.ebuild, + libgcrypt-1.2.1.ebuild: + Version cleanout and fixes bug #96792 by Chris White + + 03 Jul 2005; Hardave Riar libgcrypt-1.2.1.ebuild: + Stable on mips, dep for bug #90726. + + 06 Jun 2005; Markus Rothe libgcrypt-1.2.1.ebuild: + Stable on ppc64 + + 09 May 2005; Gustavo Zacarias + libgcrypt-1.2.1.ebuild: + Stable on sparc + + 07 May 2005; Aron Griffis libgcrypt-1.2.1.ebuild: + stable on ia64 + + 30 Apr 2005; Bryan Østergaard libgcrypt-1.2.1.ebuild: + Stable on alpha. + + 29 Apr 2005; Jan Brinkmann libgcrypt-1.2.1.ebuild: + stable on amd64 + + 29 Apr 2005; Daniel Black libgcrypt-1.2.1.ebuild: + ppc stable + + 28 Apr 2005; Daniel Black libgcrypt-1.2.1.ebuild: + x86 stable libgcrypt-1.2.1 + + 01 Apr 2005; Aron Griffis libgcrypt-1.2.0-r2.ebuild: + stable on ia64 + + 26 Mar 2005; Marcelo Goes libgcrypt-1.1.91.ebuild, + libgcrypt-1.1.92.ebuild, libgcrypt-1.1.94.ebuild, libgcrypt-1.2.0-r1.ebuild, + libgcrypt-1.2.0-r2.ebuild, libgcrypt-1.2.0.ebuild, libgcrypt-1.2.1.ebuild: + Added dev-libs/libgpg-error to RDEPEND. Fix bug 86456. Thanks Spider + . + +*libgcrypt-1.2.1 (13 Jan 2005) + + 13 Jan 2005; Daniel Black metadata.xml, + +libgcrypt-1.2.1.ebuild: + Version bump. Previous patches were included. Maintainer crypto added to + metadata.xml + + 29 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 26 Nov 2004; Jason Wever libgcrypt-1.2.0-r2.ebuild: + Stable on sparc. + +*libgcrypt-1.2.0-r2 (10 Oct 2004) + + 10 Oct 2004; Jason Wever + +files/libgcrypt-rijndael.patch, +libgcrypt-1.2.0-r2.ebuild: + Added a fix for bug #53667 that makes libgcrypt apps happy on sparc. + + 03 Oct 2004; Mamoru KOMACHI libgcrypt-1.2.0-r1.ebuild, + libgcrypt-1.2.0.ebuild: + ppc-macos fix. Added ppc-macos back because sys-devel/patch is in + package.provided. + +*libgcrypt-1.2.0-r1 (04 Sep 2004) + + 04 Sep 2004; Guy Martin +files/libgcrypt-hppa.patch, + +libgcrypt-1.2.0-r1.ebuild: + Added a fix for relocation problem on hppa. Removed macos KEYWORDS until they + stabilize sys-devel/patch. + + 09 Aug 2004; Guy Martin libgcrypt-1.2.0.ebuild: + Stable on hppa. + + 07 Aug 2004; libgcrypt-1.2.0.ebuild: + stable on ia64 to fulfill dependency for gnutls security update #59231 + + 07 Aug 2004; Luca Barbato libgcrypt-1.1.94.ebuild: + Stable on ppc + + 07 Aug 2004; Luca Barbato libgcrypt-1.1.94.ebuild: + Stable on ppc + + 06 Aug 2004; Gustavo Zacarias libgcrypt-1.2.0.ebuild: + Stable on sparc wrt #59231 + + 29 Jul 2004; Stephen P. Becker libgcrypt-1.1.94.ebuild: + Stable on mips. + + 03 Jul 2004; Bryan Østergaard libgcrypt-1.1.94.ebuild: + Stable on alpha. + + 01 Jul 2004; Tom Gall libgcrypt-1.2.0.ebuild: + stable on ppc64 bug #54804 + + 26 Jun 2004; Danny van Dyk libgcrypt-1.1.94.ebuild: + Marked stable on amd64. + + 07 Jun 2004; Daniel Black -libgcrypt-1.1.3.ebuild, + libgcrypt-1.1.91.ebuild, libgcrypt-1.1.92.ebuild, libgcrypt-1.1.94.ebuild, + libgcrypt-1.2.0.ebuild: + Keyword changes - x86 to 1.1.9*. ~hppa ~ia64 ~ppc readded to 1.2.0 as they + seem to have been dropped + +*libgcrypt-1.2.0 (30 May 2004) + + 30 May 2004; Mike Frysinger +libgcrypt-1.2.0.ebuild: + Version bump #48916 by Erinn Looney-Triggs. + + 12 May 2004; Bryan Østergaard libgcrypt-1.1.94.ebuild: + Add ~alpha. + + 02 May 2004; Stephen P. Becker libgcrypt-1.1.94.ebuild: + Added ~mips keyword. + +*libgcrypt-1.1.94 (02 May 2004) + + 02 May 2004; Bryan Østergaard +libgcrypt-1.1.94.ebuild: + Version bump, bug #49610. + + 29 Feb 2004; Jason Wever libgcrypt-1.1.92.ebuild: + I hope you like ~sparcin' too. + +*libgcrypt-1.1.92 (28 Feb 2004) + + 28 Feb 2004; Alastair Tse libgcrypt-1.1.92.ebuild: + version bump. added backward compat symlinks. (#43175) + + 01 Feb 2004; Jon Portnoy libgcrypt-1.1.91.ebuild : + AMD64 keywords. + +*libgcrypt-1.1.91 (01 Jan 2004) + + 01 Jan 2004; Hanno Boeck libgcrypt-1.1.91.ebuild: + Version bump. + + 16 Dec 2003; Guy Martin libgcrypt-1.1.12.ebuild: + Marked stable on hppa. + + 14 Dec 2003; Lars Weiler libgcrypt-1.1.12.ebuild: + Make stable on ppc + + 13 Dec 2003; Brad House libgcrypt-1.1.12.ebuild: + mark stable on amd64 + + 10 Dec 2003; libgcrypt-1.1.12.ebuild: + stable on ia64 + + 28 Nov 2003; Jason Wever libgcrypt-1.1.12.ebuild: + Marked stable on sparc. + + 16 Oct 2003; Aron Griffis libgcrypt-1.1.12.ebuild: + Stable on alpha + + 13 Oct 2003; Alastair Tse libgcrypt-1.1.10.ebuild, + libgcrypt-1.1.12.ebuild, libgcrypt-1.1.8.ebuild: + stable bump and cleanup + + 13 May 2003; Tavis Ormandy libgcrypt-1.1.12.ebuild: + adding ~alpha keyword. + + 10 May 2003; libgcrypt-1.1.12.ebuild: + Making the doctype depends optional based on the doc use variable. Closes bug + 19535. + +*libgcrypt-1.1.12 (08 Feb 2003) + + 08 Feb 2003; J Robert Ray libgcrypt-1.1.12 : Version bump, + all the docbook-sgml-utils issues should be sorted out. The configure script + needs a working docbook environment or else it prints out a warning, then + goes on to never actually use it. Since it is conceivable that it may be + used or needed in the future, I'm leaving the dependencies in place for now. + +*libgcrypt-1.1.10 (4 Feb 2003) + + 04 Feb 2003; Yannick Koehler libgcrypt-1.1.10.ebuild + files/digest-libgcrypt-1.1.10 : + + Version bump. + + 03 Jan 2003; Matthew Turk : + Changed docbook2X dependency to docbook-sgml-utils, as both have the same + results and docbook-sgml-utils is more dependable, although I can't really + tell where the docbook2X system is used in this. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*libgcrypt-1.1.8 (12 Oct 2002) + + 12 Oct 2002; Seemant Kulleen libgcrypt-1.1.8.ebuild + files/digest-libgcrypt-1.1.8 : + + Version bump. License is now LGPL-2.1 unless using a unix without + /dev/random or windows, in which case use GPL-2. Removed myconf settings + from 1.1.3 since README mentioned nothing about them. Added docs in + src_install. + +*libgcrypt-1.1.3 (15 Mar 2002 ) + + 13 Aug 2002; Pieter Van den Abeele ChangeLog : + + Added ppc keyword + + 15 Mar 2002; Seemant Kulleen ChangeLog : + + This library is necessary for the new release of aide (intrusion detection) + version 0.8 + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/Manifest new file mode 100644 index 0000000000..e617c5c649 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/Manifest @@ -0,0 +1 @@ +DIST libgcrypt-1.4.6.tar.bz2 1151877 RMD160 d4d720c4bfe80f0799b2cbdbbb49d304e3195049 SHA1 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6 SHA256 3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/libgcrypt-1.4.6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/libgcrypt-1.4.6.ebuild new file mode 100644 index 0000000000..4fb8a20161 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/libgcrypt-1.4.6.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.4.6.ebuild,v 1.9 2010/10/16 15:16:18 jer Exp $ + +EAPI="2" + +inherit autotools eutils flag-o-matic toolchain-funcs + +DESCRIPTION="General purpose crypto library based on the code used in GnuPG" +HOMEPAGE="http://www.gnupg.org/" +SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2 + ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=dev-libs/libgpg-error-1.5" +DEPEND="${RDEPEND}" + +src_prepare() { + # Fix build failure with non-bash /bin/sh. + eautoreconf + + epunt_cxx +} + +src_configure() { + # TODO: When cross compiling to x86, this package currently has an + # issue where it does not define all needed symbols in libgcrypt.a + # As soon as this is fixed then re-enable asm. + if tc-is-cross-compiler ; then + if [[ $(tc-arch) == x86 ]] ; then + DISABLE_ASM="--disable-asm" + fi + fi + + if tc-is-cross-compiler ; then + # The libgcrypt configure code is really stupid and assumes + # that you have an underscore symbol whenever you cross-compile. + # Ask gcc to see what it does instead. + local symprefix=$($(tc-getCPP) -E - <<<__USER_LABEL_PREFIX__ | tail -1) + case ${symprefix} in + __USER_LABEL_PREFIX__) ;; # nothing we can do here + "") export ac_cv_sys_symbol_underscore=no ;; + _) export ac_cv_sys_symbol_underscore=yes ;; + *) die "unknown symbol prefix: ${symprefix}" ;; + esac + fi + + # --disable-padlock-support for bug #201917 + # --with-gpg-error-prefix for http://bugs.gentoo.org/267479 + econf \ + $DISABLE_ASM \ + --disable-padlock-support \ + --disable-dependency-tracking \ + --with-pic \ + --enable-noexecstack \ + --with-gpg-error-prefix=${ROOT}/usr +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog NEWS README* THANKS TODO +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/metadata.xml new file mode 100644 index 0000000000..b02ffbb5d3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libgcrypt/metadata.xml @@ -0,0 +1,5 @@ + + + + crypto + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/0.1.12-fbsd.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/0.1.12-fbsd.patch new file mode 100644 index 0000000000..57fd2ee4cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/0.1.12-fbsd.patch @@ -0,0 +1,97 @@ +Index: libusb-0.1.12/configure.in +=================================================================== +--- libusb-0.1.12.orig/configure.in ++++ libusb-0.1.12/configure.in +@@ -90,6 +90,8 @@ LINUX_API=0 + DARWIN_API=0 + BSD_API=0 + ++DEFINE_USB_HID_DESCRIPTOR=1 ++ + AC_MSG_CHECKING(for what USB OS support) + case $host in + *-linux*) +@@ -101,13 +103,40 @@ case $host in + AC_MSG_RESULT(Linux) + OSLIBS="" + ;; +- *-freebsd*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*) ++ *-freebsd*) ++ AC_DEFINE(BSD_API, 1) ++ AC_DEFINE(LINUX_API, 0) ++ AC_DEFINE(DARWIN_API, 0) ++ BSD_API=1 ++ os_support=bsd ++ AC_MSG_RESULT(FreeBSD) ++ OSLIBS="" ++ AC_CHECK_HEADERS([dev/usb/usbhid.h]) ++ if test "x$ac_cv_header_dev_usb_hisbhid_h" = "xyes"; then ++ AC_MSG_CHECKING([for usb_hid_descriptor]) ++ have_usb_hid_descriptor=no ++ AC_TRY_COMPILE([ ++ #include ++ #include ++ #include ++ ], [ ++ struct usb_hid_descriptor descr; ++ ], [ ++ have_usb_hid_descriptor=yes ++ ]) ++ AC_MSG_RESULT([$have_usb_hid_descriptor]) ++ if test "x$have_usb_hid_descriptor" = "xyes"; then ++ DEFINE_USB_HID_DESCRIPTOR=0 ++ fi ++ fi ++ ;; ++ *-dragonfly*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*) + AC_DEFINE(BSD_API, 1) + AC_DEFINE(LINUX_API, 0) + AC_DEFINE(DARWIN_API, 0) + BSD_API=1 + os_support=bsd +- AC_MSG_RESULT(FreeBSD, OpenBSD and/or NetBSD) ++ AC_MSG_RESULT(DragonFly, OpenBSD and/or NetBSD) + OSLIBS="" + ;; + *-darwin*) +@@ -128,6 +157,7 @@ esac + AC_SUBST(DARWIN_API) + AC_SUBST(LINUX_API) + AC_SUBST(BSD_API) ++AC_SUBST(DEFINE_USB_HID_DESCRIPTOR) + + AM_CONDITIONAL(LINUX_API, test "$os_support" = "linux") + AM_CONDITIONAL(BSD_API, test "$os_support" = "bsd") +Index: libusb-0.1.12/usb.h.in +=================================================================== +--- libusb-0.1.12.orig/usb.h.in ++++ libusb-0.1.12/usb.h.in +@@ -17,6 +17,12 @@ + + #include + ++#if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__) ++#include ++#include ++#include ++#endif ++ + /* + * USB spec information + * +@@ -75,6 +81,7 @@ struct usb_string_descriptor { + u_int16_t wData[1]; + }; + ++#if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__) + /* HID descriptor */ + struct usb_hid_descriptor { + u_int8_t bLength; +@@ -86,6 +93,7 @@ struct usb_hid_descriptor { + /* u_int16_t wDescriptorLength; */ + /* ... */ + }; ++#endif + + /* Endpoint descriptor */ + #define USB_MAXENDPOINTS 32 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch new file mode 100644 index 0000000000..563397d2fe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch @@ -0,0 +1,24 @@ +Patch-from: http://bugs.gentoo.org/show_bug.cgi?id=225879 +Gentoo-Bug: 225879 +Signed-off-by: Robin H. Johnson + +Prevents an infinite loop if device is removed during usb_bulk_read or +usb_bulk_write. + +diff -Naur libusb-0.1.12/linux.c libusb-0.1.12-new/linux.c +--- libusb-0.1.12/linux.c 2006-03-04 04:52:46.000000000 +0200 ++++ libusb-0.1.12-new/linux.c 2008-06-11 14:22:20.000000000 +0300 +@@ -220,6 +220,13 @@ + waiting = 1; + context = NULL; + while (!urb.usercontext && ((ret = ioctl(dev->fd, IOCTL_USB_REAPURBNDELAY, &context)) == -1) && waiting) { ++ if (ret == -1) ++ { ++ if (errno == ENODEV) ++ { ++ return -ENODEV; ++ } ++ } + tv.tv_sec = 0; + tv.tv_usec = 1000; // 1 msec + select(dev->fd + 1, NULL, &writefds, NULL, &tv); //sub second wait diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch new file mode 100644 index 0000000000..de1a8c7db6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch @@ -0,0 +1,20 @@ +--- libusb-0.1.12/Makefile.am 2006-03-04 13:52:46.000000000 +1100 ++++ libusb-0.1.12/Makefile.am.new 2007-11-08 16:25:38.000000000 +1100 +@@ -4,7 +4,7 @@ + # gnu strictness chokes on README being autogenerated + AUTOMAKE_OPTIONS = 1.4 foreign + +-SUBDIRS = . tests doc ++SUBDIRS = . doc + + AM_CFLAGS = -Werror + +@@ -19,7 +19,7 @@ + apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png libusb.pc.in + EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c + +-lib_LTLIBRARIES = libusb.la libusbpp.la ++lib_LTLIBRARIES = libusb.la + + pkgconfig_DATA = libusb.pc + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/libusb-0.1.12-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/libusb-0.1.12-r5.ebuild new file mode 100644 index 0000000000..bd97c3115f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/libusb-0.1.12-r5.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.9 2009/06/01 00:00:46 ranger Exp $ + +inherit eutils libtool autotools toolchain-funcs + +DESCRIPTION="Userspace access to USB devices" +HOMEPAGE="http://libusb.sourceforge.net/" +SRC_URI="mirror://sourceforge/libusb/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="debug doc nocxx" +RESTRICT="test" + +RDEPEND="!dev-libs/libusb-compat" +DEPEND="${RDEPEND} + doc? ( app-text/openjade + app-text/docbook-dsssl-stylesheets + app-text/docbook-sgml-utils + ~app-text/docbook-sgml-dtd-4.2 )" + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i -e 's:-Werror::' Makefile.am + sed -i 's:AC_LANG_CPLUSPLUS:AC_PROG_CXX:' configure.in #213800 + epatch "${FILESDIR}"/${PV}-fbsd.patch + use nocxx && epatch "${FILESDIR}"/${PN}-0.1.12-nocpp.patch + epatch "${FILESDIR}"/${PN}-0.1.12-no-infinite-bulk.patch + eautoreconf + elibtoolize + + # Ensure that the documentation actually finds the DTD it needs + docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd" + sysid='"-//OASIS//DTD DocBook V4.2//EN"' + sed -r -i -e \ + "s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \ + "${S}"/doc/manual.sgml +} + +src_compile() { + econf \ + $(use_enable debug debug all) \ + $(use_enable doc build-docs) + emake || die "emake failed" +} + +src_install() { + emake -j1 DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS NEWS README + use doc && dohtml doc/html/*.html + + use nocxx && rm -f "${D}"/usr/include/usbpp.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/libusb-0.1.12-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/libusb-0.1.12-r6.ebuild new file mode 100644 index 0000000000..bd97c3115f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libusb/libusb-0.1.12-r6.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.9 2009/06/01 00:00:46 ranger Exp $ + +inherit eutils libtool autotools toolchain-funcs + +DESCRIPTION="Userspace access to USB devices" +HOMEPAGE="http://libusb.sourceforge.net/" +SRC_URI="mirror://sourceforge/libusb/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="debug doc nocxx" +RESTRICT="test" + +RDEPEND="!dev-libs/libusb-compat" +DEPEND="${RDEPEND} + doc? ( app-text/openjade + app-text/docbook-dsssl-stylesheets + app-text/docbook-sgml-utils + ~app-text/docbook-sgml-dtd-4.2 )" + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i -e 's:-Werror::' Makefile.am + sed -i 's:AC_LANG_CPLUSPLUS:AC_PROG_CXX:' configure.in #213800 + epatch "${FILESDIR}"/${PV}-fbsd.patch + use nocxx && epatch "${FILESDIR}"/${PN}-0.1.12-nocpp.patch + epatch "${FILESDIR}"/${PN}-0.1.12-no-infinite-bulk.patch + eautoreconf + elibtoolize + + # Ensure that the documentation actually finds the DTD it needs + docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd" + sysid='"-//OASIS//DTD DocBook V4.2//EN"' + sed -r -i -e \ + "s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \ + "${S}"/doc/manual.sgml +} + +src_compile() { + econf \ + $(use_enable debug debug all) \ + $(use_enable doc build-docs) + emake || die "emake failed" +} + +src_install() { + emake -j1 DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS NEWS README + use doc && dohtml doc/html/*.html + + use nocxx && rm -f "${D}"/usr/include/usbpp.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/ChangeLog new file mode 100644 index 0000000000..7d23be34b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/ChangeLog @@ -0,0 +1,1200 @@ +# ChangeLog for dev-libs/libxml2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.304 2011/02/26 17:17:33 arfrever Exp $ + + 26 Feb 2011; Arfrever Frehtes Taifersar Arahesis + libxml2-2.7.8.ebuild, +files/libxml2-2.7.8-disable_static_modules.patch: + Don't install .a files in Python site-packages directories. + + 19 Feb 2011; Fabian Groffen libxml2-2.7.8.ebuild: + Drop --with-zlib argument for Prefix, it's no longer necessary + + 16 Feb 2011; Kacper Kowalik libxml2-2.7.8.ebuild: + ppc/ppc64 stable wrt #345555 + + 14 Feb 2011; Jeroen Roovers libxml2-2.7.8.ebuild: + Stable for HPPA (bug #345555). + + 13 Feb 2011; Raúl Porcel libxml2-2.7.8.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #345555 + + 13 Feb 2011; Markos Chandras libxml2-2.7.8.ebuild: + Stable on amd64 wrt bug #345555 + + 13 Feb 2011; Christian Faulhammer libxml2-2.7.8.ebuild: + stable x86, security bug 345555 + + 12 Feb 2011; Pacho Ramos + +files/libxml2-2.7.1-catalog_path.patch, +files/libxml2-2.7.2-winnt.patch, + libxml2-2.7.8.ebuild: + Apply fixes for PREFIX support (bug #317891), thanks a lot to Fabian Groffen + for the patch. + +*libxml2-2.7.8 (11 Feb 2011) + + 11 Feb 2011; Pacho Ramos -libxml2-2.7.6.ebuild, + +libxml2-2.7.8.ebuild, +files/libxml2-2.7.8-reactivate-script.patch, + +files/libxml2-2.7.8-xpath-freeing.patch, + +files/libxml2-2.7.8-xpath-freeing2.patch, + +files/libxml2-2.7.8-xpath-memory.patch: + Version bump including security fixes, bump to eapi3, remove old. + + 31 Dec 2010; Arfrever Frehtes Taifersar Arahesis + libxml2-2.7.7.ebuild: + Restrict Jython ABIs. + + 09 Aug 2010; Zac Medico libxml2-2.7.6.ebuild, + libxml2-2.7.7.ebuild: + Fix python dep so that if pyxml is pulled in, it pulls in python too + (without requiring python[xml] in this case). + + 09 Aug 2010; Zac Medico libxml2-2.7.6.ebuild, + libxml2-2.7.7.ebuild: + With USE=python, require either python[xml] or pyxml, in order to avoid + a "SAXReaderNotAvailable: No parsers found" exception raised from + xml.sax.make_parser(). This should solve stage3 libxml2 build failures. + + 30 May 2010; Raúl Porcel libxml2-2.7.7.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #317819 + + 17 May 2010; Jeroen Roovers libxml2-2.7.7.ebuild: + Stable for HPPA (bug #317819). + + 14 May 2010; Robin H. Johnson libxml2-2.7.7.ebuild: + Fix so that the catalyst autobuilds can continue safely. If the Python + binary is not present in $ROOT, python_execute_function returns + successfully but silently, WITHOUT running the command (with disasterous + side-effects). + + 11 May 2010; Brent Baude libxml2-2.7.7.ebuild: + stable ppc64, bug 317819 + + 11 May 2010; Pawel Hajdan jr libxml2-2.7.7.ebuild: + x86 stable wrt bug #317819 + + 10 May 2010; nixnut libxml2-2.7.7.ebuild: + ppc stable #317819 + + 04 May 2010; libxml2-2.7.7.ebuild: + amd64 stable, thanks to Roeland Douma (bug #317819) + + 24 Apr 2010; Raúl Porcel libxml2-2.7.6.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #309949 + + 11 Apr 2010; Pawel Hajdan jr libxml2-2.7.6.ebuild: + x86 stable wrt bug #309949 + + 06 Apr 2010; Gilles Dartiguelongue + -libxml2-2.7.4-r1.ebuild, -files/libxml2-2.7.4-parser-grow.patch, + libxml2-2.7.7.ebuild: + Enable multiple python ABI support, bug #312193. Clean up old revision. + + 24 Mar 2010; Brent Baude libxml2-2.7.6.ebuild: + stable ppc, bug 309949 + + 21 Mar 2010; Brent Baude libxml2-2.7.6.ebuild: + stable ppc64, bug 309949 + +*libxml2-2.7.7 (18 Mar 2010) + + 18 Mar 2010; Samuli Suominen +libxml2-2.7.7.ebuild: + Version bump wrt #309723. + + 18 Mar 2010; Markos Chandras libxml2-2.7.6.ebuild: + Stable on amd64 wrt bug #309949 + + 08 Mar 2010; Zac Medico libxml2-2.7.3-r2.ebuild, + libxml2-2.7.4-r1.ebuild, libxml2-2.7.6.ebuild: + Specify + +libxml2-2.7.6.ebuild: + Version bump, fixes Relax-NG validation problems. + + 08 Dec 2009; Gilles Dartiguelongue -libxml2-2.7.4.ebuild, + libxml2-2.7.4-r1.ebuild: + Make sure to remove unneeded /usr/share/doc directory, bug #295762 + +*libxml2-2.7.4-r1 (16 Sep 2009) + + 16 Sep 2009; Romain Perier + +libxml2-2.7.4-r1.ebuild, +files/libxml2-2.7.4-parser-grow.patch: + Fix inkscape extension loader problem per bug #285125, patch import from + upstream bug #595128, thanks to Andreas Proteus + for tests. + +*libxml2-2.7.4 (13 Sep 2009) + + 13 Sep 2009; Gilles Dartiguelongue -libxml2-2.7.3.ebuild, + -libxml2-2.7.3-r1.ebuild, +libxml2-2.7.4.ebuild: + Version bump, bug #284726. + + 30 Aug 2009; Brent Baude libxml2-2.7.3-r2.ebuild: + Marking libxml2-2.7.3-r2 ppc64 for bug 280617 + + 23 Aug 2009; nixnut libxml2-2.7.3-r2.ebuild: + ppc stable #280617 + + 14 Aug 2009; Markus Meier libxml2-2.7.3-r2.ebuild: + amd64 stable, bug #280617 + + 14 Aug 2009; Raúl Porcel libxml2-2.7.3-r2.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #280617 + + 13 Aug 2009; Christian Faulhammer + libxml2-2.7.3-r2.ebuild: + stable x86, security bug 280617 + + 12 Aug 2009; Jeroen Roovers libxml2-2.7.3-r2.ebuild: + Stable for HPPA (bug #280617). + +*libxml2-2.7.3-r2 (11 Aug 2009) + + 11 Aug 2009; Gilles Dartiguelongue + +libxml2-2.7.3-r2.ebuild, + +files/libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch: + Version bump. Fix CVE 2009-2414 and CVE 2009-2416, bug #280617. + + 31 May 2009; Gilles Dartiguelongue + libxml2-2.7.3-r1.ebuild: + Do not install 3 different documentation directories, bug #248127. + +*libxml2-2.7.3-r1 (27 Apr 2009) + + 27 Apr 2009; Gilles Dartiguelongue + -files/libxml2-2.7.2-CVE-2008-422x.patch, + -files/libxml2-2.7.2-old-sax-parser-behaviour-option.patch, + -files/libxml2-2.7.2-xmlAddChildList-pointer.patch, + -files/libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch, + +files/libxml2-2.7.3-printf-rename.patch, -libxml2-2.7.2-r1.ebuild, + -libxml2-2.7.2-r2.ebuild, +libxml2-2.7.3-r1.ebuild: + Fix macro conflict with wxGTK, bug #266653 + + 12 Apr 2009; Friedrich Oslage ChangeLog: + Stable on sparc, bug #260063 + + 18 Mar 2009; Jeroen Roovers libxml2-2.7.3.ebuild: + Stable for HPPA (maybe bug #260063). + + 17 Mar 2009; Raúl Porcel libxml2-2.7.3.ebuild: + alpha/sparc stable + + 17 Mar 2009; Raúl Porcel libxml2-2.7.2-r2.ebuild, + libxml2-2.7.3.ebuild: + arm/ia64/m68k/s390/sh stable + + 15 Mar 2009; Markus Meier libxml2-2.7.3.ebuild: + x86 stable, bug #260063 + + 11 Mar 2009; Daniel Gryniewicz libxml2-2.7.3.ebuild: + Marked stable on amd64 + + 06 Mar 2009; Brent Baude libxml2-2.7.3.ebuild: + Marking libxml2-2.7.3 ppc stable for bug 260063 + + 05 Mar 2009; Brent Baude libxml2-2.7.3.ebuild: + Marking libxml2-2.7.3 ppc64 stable for bug 260063 + + 31 Jan 2009; Tiago Cunha libxml2-2.7.2-r2.ebuild: + stable sparc, bug 249703 + + 31 Jan 2009; Tobias Klausmann + libxml2-2.7.2-r2.ebuild: + Stable on alpha, bug #249703 + + 29 Jan 2009; Gilles Dartiguelongue + libxml2-2.7.2-r1.ebuild, libxml2-2.7.2-r2.ebuild, libxml2-2.7.3.ebuild: + Applying suggested changes in bug #251550 comment #9. + +*libxml2-2.7.3 (26 Jan 2009) + + 26 Jan 2009; Mart Raudsepp +libxml2-2.7.3.ebuild: + Version bump. + + 26 Jan 2009; Gilles Dartiguelongue + -files/libxml2-2.6.30-CVE-2007-6284.patch, + -files/libxml2-2.6.32-CVE-2008-422x.patch, -libxml2-2.6.30-r1.ebuild, + -libxml2-2.6.31.ebuild, -libxml2-2.6.32.ebuild, -libxml2-2.6.32-r1.ebuild, + -libxml2-2.7.1.ebuild, -libxml2-2.7.2.ebuild, libxml2-2.7.2-r1.ebuild, + libxml2-2.7.2-r2.ebuild: + Clean up old security flawed revisions. Make sure python bindings are + optimized, bug #251550. + + 25 Jan 2009; Markus Meier libxml2-2.7.2-r2.ebuild: + x86 stable, bug #249703 + + 24 Jan 2009; Tobias Scherbaum + libxml2-2.7.2-r2.ebuild: + ppc stable, bug #249703 + + 23 Jan 2009; Brent Baude libxml2-2.7.2-r2.ebuild: + Marking libxml2-2.7.2-r2 ppc64 for bug 249703 + + 20 Jan 2009; Tobias Heinlein + libxml2-2.7.2-r2.ebuild: + amd64 stable wrt security bug 249703 + + 20 Jan 2009; Jeroen Roovers libxml2-2.7.2-r2.ebuild: + Stable for HPPA (bug #249703). + +*libxml2-2.7.2-r2 (11 Jan 2009) + + 11 Jan 2009; Mart Raudsepp + +files/libxml2-2.7.2-old-sax-parser-behaviour-option.patch, + +files/libxml2-2.7.2-xmlAddChildList-pointer.patch, + +files/libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch, + +libxml2-2.7.2-r2.ebuild: + Add a patch to allow a fix for bug 249703 - xml_parse_into_struct php + function breakage. Also a few more patches from upstream while at it. + + 23 Dec 2008; Robin H. Johnson + +files/libxml2-2.6.32-CVE-2008-422x.patch, +libxml2-2.6.32-r1.ebuild: + Backport the security fix from bug #245960 because libxml2-2.7.x causes + massive PHP breakage per bug #249703. + + 07 Dec 2008; Mike Frysinger libxml2-2.6.30-r1.ebuild, + libxml2-2.6.31.ebuild, libxml2-2.6.32.ebuild, libxml2-2.7.1.ebuild, + libxml2-2.7.2.ebuild, libxml2-2.7.2-r1.ebuild: + Remove unused bootstrap/build from IUSE. + + 24 Nov 2008; Brent Baude libxml2-2.7.2-r1.ebuild: + Marking libxml2-2.7.2-r1 ppc64 for bug 245960 + + 20 Nov 2008; Raúl Porcel libxml2-2.7.2-r1.ebuild: + alpha/arm/ia64 stable wrt #245960 + + 19 Nov 2008; Markus Meier libxml2-2.7.2-r1.ebuild: + amd64/x86 stable, bug #245960 + + 18 Nov 2008; Tobias Scherbaum + libxml2-2.7.2-r1.ebuild: + ppc stable, bug #245960 + + 18 Nov 2008; Jeroen Roovers libxml2-2.7.2-r1.ebuild: + Stable for HPPA (bug #245960). + + 18 Nov 2008; Ferris McCormick libxml2-2.7.2-r1.ebuild: + Sparc stable --- Security Bug #245960 --- looks good, all tests pass. + +*libxml2-2.7.2-r1 (18 Nov 2008) + + 18 Nov 2008; Mart Raudsepp + +files/libxml2-2.7.2-CVE-2008-422x.patch, +libxml2-2.7.2-r1.ebuild: + Fix for CVE-2008-4225 - possible infinite loop. Fix for CVE-2008-4226 - + possible integer overflow leading to memory corruption and potential + arbitrary code execution with huge XML files. Bug 245960 + + 13 Nov 2008; Brent Baude libxml2-2.6.32.ebuild: + Marking libxml2-2.6.32 ppc64 stable for bug 236971 + + 13 Nov 2008; Brent Baude libxml2-2.6.32.ebuild: + Marking libxml2-2.6.32 ppc64 stable for bug 236971 + + 05 Oct 2008; Jeroen Roovers libxml2-2.7.2.ebuild: + Stable for HPPA (bug #239346). + + 04 Oct 2008; Brent Baude libxml2-2.7.2.ebuild: + Marking libxml2-2.7.2 ppc64 for bug 239346 + + 04 Oct 2008; Brent Baude ChangeLog: + Marking libxml2-2.7.2 ~ppc64 for bug 239346 + + 04 Oct 2008; Tobias Scherbaum + libxml2-2.7.2.ebuild: + ppc stable, bug #239346 + + 04 Oct 2008; Raúl Porcel libxml2-2.7.2.ebuild: + alpha/ia64 stable wrt #239346 + + 04 Oct 2008; Markus Meier libxml2-2.7.2.ebuild: + amd64/x86 stable, bug #239346 + + 03 Oct 2008; Friedrich Oslage libxml2-2.7.2.ebuild: + Stable on sparc, security bug #239346 + +*libxml2-2.7.2 (03 Oct 2008) + + 03 Oct 2008; Mart Raudsepp +libxml2-2.7.2.ebuild: + New version with a small amount of bug fixes, including a fix for a DoS + problem (infinite loop with growing memory usage) when there is an entity + in an entity definition; bug 239346 + + 01 Oct 2008; Tobias Scherbaum + libxml2-2.7.1.ebuild: + ppc stable, bug #234099 + + 28 Sep 2008; Markus Meier libxml2-2.7.1.ebuild: + amd64 stable, bug #234099 + + 27 Sep 2008; Raúl Porcel libxml2-2.7.1.ebuild: + alpha/ia64/x86 stable wrt #234099 + + 27 Sep 2008; Markus Rothe libxml2-2.7.1.ebuild: + Stable on ppc64; bug #234099 + + 25 Sep 2008; Ferris McCormick libxml2-2.7.1.ebuild: + Sparc stable --- Security Bug #234099 --- tests are all fine. + + 25 Sep 2008; Jeroen Roovers libxml2-2.7.1.ebuild: + Stable for HPPA (bug #234099). + + 25 Sep 2008; Jeroen Roovers libxml2-2.6.32.ebuild: + Stable for HPPA (bug #236971). + +*libxml2-2.7.1 (25 Sep 2008) + + 25 Sep 2008; Mart Raudsepp + -files/libxml2-2.6.32-CVE-2008-3281.patch, -libxml2-2.6.32-r1.ebuild, + +libxml2-2.7.1.ebuild: + Version bump. Includes ABI compatible fix for CVE-2008-3281, security fix + for CVE-2008-3529 - xmlParseAttValueComplex() heap-based buffer overflow, + and various bug fixes and new API. Addresses bugs 234099, 235529, 237413 + and 237806 + +*libxml2-2.6.32-r1 (22 Aug 2008) + + 22 Aug 2008; Mart Raudsepp + +files/libxml2-2.6.32-CVE-2008-3281.patch, +libxml2-2.6.32-r1.ebuild: + Security (denial of service) fix - possible recursive evaluation of + entities in xmlStringLenDecodeEntities() allowing possible memory and CPU + exhaustion (CVE-2008-3281) + + 12 Aug 2008; Raúl Porcel libxml2-2.6.32.ebuild: + alpha/ia64/sparc stable wrt #229709 + + 10 Aug 2008; Markus Meier libxml2-2.6.32.ebuild: + x86 stable, bug #229709 + + 30 Jul 2008; Brent Baude libxml2-2.6.32.ebuild: + Marking libxml2-2.6.32 ppc stable for bug 229709 + + 26 Jul 2008; Olivier Crête libxml2-2.6.32.ebuild: + Stable on amd64, bug #229709 + + 26 Jun 2008; Rémi Cardona libxml2-2.6.32.ebuild: + download the correct testsuite tarball, see bug #229421 + +*libxml2-2.6.32 (27 May 2008) + + 27 May 2008; Rémi Cardona +libxml2-2.6.32.ebuild: + bump to 2.6.32, mostly bugfixes, no major new features + + 13 Apr 2008; Kenneth Prugh libxml2-2.6.31.ebuild: + amd64 stable, bug #217398 + + 13 Apr 2008; Markus Rothe libxml2-2.6.31.ebuild: + Stable on ppc64; bug #217398 + + 12 Apr 2008; Raúl Porcel libxml2-2.6.31.ebuild: + alpha/ia64/sparc/x86 stable wrt #217398 + + 12 Apr 2008; Jeroen Roovers libxml2-2.6.31.ebuild: + Stable for HPPA (bug #217398). + + 12 Apr 2008; nixnut libxml2-2.6.31.ebuild: + Stable on ppc wrt bug 217398 + + 09 Mar 2008; Mart Raudsepp + -files/libxml2-2.6.27-tar_in_tests.patch, -libxml2-2.6.28.ebuild, + -libxml2-2.6.29.ebuild, -libxml2-2.6.30.ebuild: + Remove security vulnerable old versions + +*libxml2-2.6.31 (28 Feb 2008) + + 28 Feb 2008; Gilles Dartiguelongue + +libxml2-2.6.31.ebuild: + bump to 2.6.31 and add examples use flag per bug #111508 + + 08 Feb 2008; Chris Gianelloni + libxml2-2.6.30-r1.ebuild: + Since libxml2 will never get pulled into stage2, change the check to be more + accurate by checking ROOT, instead. Thanks to Andrew Gaffney + for pointing this out. + + 05 Feb 2008; Chris Gianelloni + libxml2-2.6.30-r1.ebuild: + Added some code to skip the catalog generation on stage1/stage2, since we + won't necessarily have xmlcatalog in the seed stage and libxml2 wouldn't get + rebuilt until stage3, ending up with an empty catalog. This fixes bug + #208887. + + 11 Jan 2008; Saleem Abdulrasool + libxml2-2.6.28.ebuild, libxml2-2.6.29.ebuild: + Fix a few quoting issues + + 11 Jan 2008; Saleem Abdulrasool Manifest: + Fix digest + +*libxml2-2.6.30-r1 (11 Jan 2008) + + 11 Jan 2008; Daniel Gryniewicz + +files/libxml2-2.6.30-CVE-2007-6284.patch, +libxml2-2.6.30-r1.ebuild: + Fix CVE-2007-6284 - bug #202628 + + 27 Nov 2007; Jeroen Roovers libxml2-2.6.30.ebuild: + Stable for HPPA (bug #199322). + + 20 Nov 2007; Markus Rothe libxml2-2.6.30.ebuild: + Stable on ppc64; bug #199322 + + 19 Nov 2007; Joshua Kinard libxml2-2.6.30.ebuild: + Stable on mips, per #199322. + + 17 Nov 2007; Raúl Porcel libxml2-2.6.30.ebuild: + alpha/ia64/sparc stable wrt #199322 + + 17 Nov 2007; nixnut libxml2-2.6.30.ebuild: + Stable on ppc wrt bug 199322 + + 17 Nov 2007; Dawid Węgliński libxml2-2.6.30.ebuild: + Stable on x86 (bug #199322) + + 16 Nov 2007; Samuli Suominen libxml2-2.6.30.ebuild: + amd64 stable wrt #199322 + +*libxml2-2.6.30 (11 Sep 2007) + + 11 Sep 2007; Leonardo Boshell + +libxml2-2.6.30.ebuild: + New bug-fix release. + +*libxml2-2.6.29 (24 Jul 2007) + + 24 Jul 2007; Daniel Gryniewicz +libxml2-2.6.29.ebuild: + Bump to 2.6.29 + - Portability: patches from Andreas Stricke for WinCEi, + fix compilation warnings (William Brack), avoid warnings on Apple OS/X + (Wendy Doyle and Mark Rowe), Windows compilation and threading + improvements (Rob Richards), compilation against old Python versions, + new GNU tar changes (Ryan Hill) + - Documentation: xmlURIUnescapeString comment, + - Bugfixes: xmlBufferAdd problem (Richard Jones), 'make valgrind' + flag fix (Richard Jones), regexp interpretation of \, + htmlCreateDocParserCtxt (Jean-Daniel Dupas), configure.in + typo (Bjorn Reese), entity content failure, xmlListAppend() fix + (Georges-André Silber), XPath number serialization (William Brack), + nanohttp gzipped stream fix (William Brack and Alex Cornejo), + xmlCharEncFirstLine typo (Mark Rowe), uri bug (François Delyon), + XPath string value of PI nodes (William Brack), XPath node set + sorting bugs (William Brack), avoid outputting namespace decl + dups in the writer (Rob Richards), xmlCtxtReset bug, UTF-8 encoding + error handling, recustion on next in catalogs, fix a Relax-NG crash, + workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes, + invalid character in attribute detection bug, big comments before + internal subset streaming bug, HTML parsing of attributes with : in + the name + - Improvement: keep URI query parts in raw form (Richard Jones), + embed tag support in HTML (Michael Day) + + 02 Jun 2007; Brent Baude libxml2-2.6.28.ebuild: + Marking libxml2-2.6.28 ppc stable for bug #171107 + + 31 May 2007; Jeroen Roovers libxml2-2.6.28.ebuild: + Stable for HPPA (bug #171107). + + 31 May 2007; Daniel Gryniewicz libxml2-2.6.28.ebuild: + Marked stable on amd64 for bug #171107 + + 31 May 2007; Brent Baude libxml2-2.6.28.ebuild: + Marking libxml2-2.6.28 ppc64 stable for bug #171107 + + 30 May 2007; Raúl Porcel libxml2-2.6.28.ebuild: + alpha/ia64 stable wrt #171107 + + 29 May 2007; Andrej Kacian libxml2-2.6.28.ebuild: + Stable on x86, bug #171107. + + 29 May 2007; Gustavo Zacarias libxml2-2.6.28.ebuild: + Stable on sparc wrt #171107 + + 27 May 2007; Joshua Kinard libxml2-2.6.28.ebuild: + Stable on mips. + + 21 May 2007; -libxml2-2.6.26.ebuild: + Remove old + + 21 May 2007; Raúl Porcel libxml2-2.6.27.ebuild: + alpha stable wrt #164978 + + 12 May 2007; Joshua Kinard libxml2-2.6.27.ebuild: + Stable on mips. + +*libxml2-2.6.28 (23 Apr 2007) + + 23 Apr 2007; Daniel Gryniewicz +libxml2-2.6.28.ebuild: + Bump to 2.6.28 + + 04 Feb 2007; Jeroen Roovers libxml2-2.6.27.ebuild: + Stable for HPPA (bug #164978). + + 04 Feb 2007; Markus Rothe libxml2-2.6.27.ebuild: + Stable on ppc64; bug #164978 + + 03 Feb 2007; Andrej Kacian libxml2-2.6.27.ebuild: + Stable on x86, bug #164978. + + 03 Feb 2007; Tobias Scherbaum + libxml2-2.6.27.ebuild: + Stable on ppc wrt bug #164978. + + 03 Feb 2007; Olivier Crête libxml2-2.6.27.ebuild: + Stable on amd64 per bug #164978 + + 02 Feb 2007; Gustavo Zacarias libxml2-2.6.27.ebuild: + Stable on sparc wrt #164978 + + 18 Dec 2006; Leonardo Boshell + +files/libxml2-2.6.27-tar_in_tests.patch, libxml2-2.6.27.ebuild: + Added patch from Ryan Hill to fix some calls to 'tar' when running tests, + (bug #158386). + +*libxml2-2.6.27 (14 Dec 2006) + + 14 Dec 2006; Leonardo Boshell + +libxml2-2.6.27.ebuild: + New release. + + 27 Oct 2006; Fabian Groffen libxml2-2.6.23.ebuild, + libxml2-2.6.23-r1.ebuild, libxml2-2.6.24.ebuild, libxml2-2.6.26.ebuild: + Dropped ppc-macos keyword, see you in prefix. + + 17 Oct 2006; Roy Marples libxml2-2.6.26.ebuild: + Added ~sparc-fbsd keyword. + + 12 Oct 2006; Fernando J. Pereda libxml2-2.6.26.ebuild: + Stable on alpha + + 03 Sep 2006; Joshua Kinard libxml2-2.6.26.ebuild: + Marked stable on mips. + + 16 Aug 2006; Markus Rothe libxml2-2.6.26.ebuild: + Stable on ppc64 + + 17 Jul 2006; Daniel Gryniewicz libxml2-2.6.26.ebuild: + Marked stable on amd64 for bug #139612 + + 16 Jul 2006; Tobias Scherbaum + libxml2-2.6.26.ebuild: + hppa stable, bug #139612 + + 14 Jul 2006; Tobias Scherbaum + libxml2-2.6.26.ebuild: + ppc stable, bug #139612 + + 13 Jul 2006; Aron Griffis libxml2-2.6.26.ebuild: + Mark 2.6.26 stable on ia64 + + 12 Jul 2006; Chris Gianelloni libxml2-2.6.26.ebuild: + Stable on x86 wrt bug #139612. + + 10 Jul 2006; Gustavo Zacarias libxml2-2.6.26.ebuild: + Stable on sparc wrt #139612 + +*libxml2-2.6.26 (22 Jun 2006) + + 22 Jun 2006; Leonardo Boshell + +libxml2-2.6.26.ebuild: + New release. + +*libxml2-2.6.24 (17 May 2006) + + 17 May 2006; Leonardo Boshell + +files/libxml2-2.6.24-pythondir_fix.patch, +libxml2-2.6.24.ebuild: + New release. + + 30 Mar 2006; Diego Pettenò + libxml2-2.6.23-r1.ebuild: + Add ~x86-fbsd keyword. + + 20 Feb 2006; Joshua Kinard libxml2-2.6.23.ebuild: + Marked stable on mips. + + 04 Feb 2006; Aron Griffis libxml2-2.6.23.ebuild: + Mark 2.6.23 stable on alpha + + 31 Jan 2006; Kevin F. Quinn + libxml2-2.6.23-r1.ebuild: + fix stupid error - mv from distfiles is daft - fixed to cp + +*libxml2-2.6.23-r1 (30 Jan 2006) + + 30 Jan 2006; Kevin F. Quinn libxml2-2.6.23.ebuild, + +libxml2-2.6.23-r1.ebuild: + Add test tarballs to SRC_URI and unpack them - conditional on USE=test + Resolves bug #105170 + + 22 Jan 2006; Markus Rothe libxml2-2.6.23.ebuild: + Stable on ppc64 + + 22 Jan 2006; libxml2-2.6.23.ebuild: + Marked stable on amd64 per bug #119634 + + 22 Jan 2006; Tobias Scherbaum + libxml2-2.6.23.ebuild: + Marked ppc stable for bug #119634; Stabilize Gnome-2.12.2 + + 22 Jan 2006; Joshua Jackson libxml2-2.6.23.ebuild: + Stable on x86 for bug #119634; Stabilize Gnome-2.12.2 + + 20 Jan 2006; Gustavo Zacarias libxml2-2.6.23.ebuild: + Stable on sparc wrt #119634 + +*libxml2-2.6.23 (12 Jan 2006) + + 12 Jan 2006; Leonardo Boshell + +libxml2-2.6.23.ebuild: + Version bump. Dropped 'static' flag. + + 30 Nov 2005; Tom Gall libxml2-2.6.22.ebuild: + stable on ppc64 + + 11 Nov 2005; Michael Hanselmann libxml2-2.6.22.ebuild: + Stable on hppa, ppc. + + 06 Nov 2005; MATSUU Takuto libxml2-2.6.22.ebuild: + Stable on sh. + + 03 Nov 2005; Seemant Kulleen libxml2-2.6.22.ebuild: + stable on amd64 + + 02 Nov 2005; Gustavo Zacarias libxml2-2.6.22.ebuild: + Stable on sparc + + 01 Nov 2005; John N. Laliberte + libxml2-2.6.22.ebuild: + stable on x86 + +*libxml2-2.6.22 (14 Sep 2005) + + 14 Sep 2005; Leonardo Boshell + +libxml2-2.6.22.ebuild: + New version. + + 12 Sep 2005; Michael Hanselmann + libxml2-2.6.20-r2.ebuild: + Stable on ppc. + +*libxml2-2.6.21-r1 (12 Sep 2005) + + 12 Sep 2005; Leonardo Boshell + -libxml2-2.6.21.ebuild, +libxml2-2.6.21-r1.ebuild: + Don't pass --with-mem-debug, as it causes segmentation faults in programs + using the library (bug #105120). + + 10 Sep 2005; Aron Griffis libxml2-2.6.20-r2.ebuild: + Mark 2.6.20-r2 stable on alpha + + 07 Sep 2005; Aron Griffis libxml2-2.6.20-r2.ebuild: + Mark 2.6.20-r2 stable on ia64 + + 07 Sep 2005; Aaron Walker libxml2-2.6.20-r2.ebuild: + Stable on mips. + +*libxml2-2.6.21 (06 Sep 2005) + + 06 Sep 2005; Leonardo Boshell + +libxml2-2.6.21.ebuild: + New version. Re-added 'debug' USE flag for other switches. Apply the + 'readline' flag to --with-history switch. + + 06 Sep 2005; Markus Rothe libxml2-2.6.20-r2.ebuild: + Stable on ppc64 + + 05 Sep 2005; Gustavo Zacarias + libxml2-2.6.20-r2.ebuild: + Stable on sparc + + 05 Sep 2005; Leonardo Boshell + libxml2-2.6.20-r2.ebuild: + Stable on x86. + +*libxml2-2.6.20-r2 (03 Aug 2005) + + 03 Aug 2005; Leonardo Boshell + libxml2-2.6.20-r2.ebuild: + Drop the 'debug' USE flag. Its meaning doesn't really relate to the effect + of the switch --with-debug in libxml2, and some packages rely on the + debugging module, see bug #100898). Added 'static' USE flag. + + 31 Jul 2005; Tobias Scherbaum + libxml2-2.6.19.ebuild: + ppc stable + +*libxml2-2.6.20-r1 (29 Jul 2005) + + 29 Jul 2005; John N. Laliberte + -libxml2-2.6.20.ebuild, +libxml2-2.6.20-r1.ebuild: + add doc and debug useflags. thanks to Flameeyes, fixes #60049 + + 14 Jul 2005; Martin Schlemmer libxml2-2.6.20.ebuild: + Fix post install to use $ROOT. + +*libxml2-2.6.20 (13 Jul 2005) + + 13 Jul 2005; Aaron Walker +libxml2-2.6.20.ebuild: + Version bump. + + 11 Jul 2005; Stephen P. Becker libxml2-2.6.19.ebuild: + stable on mips + + 07 Jul 2005; Markus Rothe libxml2-2.6.19.ebuild: + Stable on ppc64 + + 06 Jul 2005; Rene Nussbaumer libxml2-2.6.19.ebuild: + Stable on hppa. + + 27 Jun 2005; Gustavo Zacarias libxml2-2.6.19.ebuild: + Stable on sparc + + 27 Jun 2005; Aron Griffis libxml2-2.6.19.ebuild: + Stable on alpha amd64 ia64 x86 + + 14 Jun 2005; Fernando J. Pereda libxml2-2.6.17.ebuild: + Stable on alpha + + 25 May 2005; Markus Rothe libxml2-2.6.17.ebuild: + Stable on ppc64 + + 08 May 2005; Marcus D. Hanwell libxml2-2.6.17.ebuild: + Stable on amd64. + + 25 Apr 2005; Gustavo Zacarias libxml2-2.6.17.ebuild: + Stable on sparc + + 26 Apr 2005; Mike Gardiner libxml2-2.6.17.ebuild: + Keyworded x86 ppc + +*libxml2-2.6.19 (23 Apr 2005) + + 23 Apr 2005; Martin Schlemmer +libxml2-2.6.19.ebuild: + Update version (mainly for gcc4 support). + + 21 Apr 2005; Kito libxml2-2.6.18.ebuild: + ~ppc-macos keyword + + 08 Apr 2005; Markus Rothe libxml2-2.6.16.ebuild: + Stable on ppc64 + + 01 Apr 2005; Simon Stelling libxml2-2.6.16.ebuild: + stable on amd64 + + 26 Mar 2005; Danny van Dyk libxml2-2.6.18.ebuild: + Fixed BUG #86766 (multilib-strict). + +*libxml2-2.6.18 (20 Mar 2005) + + 20 Mar 2005; Joe McCann +libxml2-2.6.18.ebuild: + new version + + 09 Mar 2005; Mike Gardiner libxml2-2.6.16.ebuild: + Keyworded ppc + + 07 Feb 2005; Bryan Østergaard libxml2-2.6.16.ebuild: + Stable on alpha. + + 06 Feb 2005; Joshua Kinard libxml2-2.6.16.ebuild: + Marked stable on mips. + + 26 Jan 2005; Gustavo Zacarias libxml2-2.6.16.ebuild: + Stable on sparc + +*libxml2-2.6.17 (25 Jan 2005) + + 25 Jan 2005; Mike Gardiner libxml2-2.6.16.ebuild, + +libxml2-2.6.17.ebuild: + New version, see bugs #79290 and #66696, marked 2.6.16 stable on x86 + + 03 Jan 2005; Joe McCann + +files/libxml2-2.6.16-xlattable.patch, libxml2-2.6.16.ebuild: + Patch to fix undefined var, bug #76447 + +*libxml2-2.6.16 (11 Dec 2004) + + 11 Dec 2004; Mike Gardiner +libxml2-2.6.16.ebuild: + New version + + 30 Nov 2004; Guy Martin libxml2-2.6.15-r1.ebuild: + Stable on hppa since bug with binutils is fixed. + + 01 Nov 2004; Markus Rothe + + libxml2-2.6.15-r1.ebuild: + Marked stable on ppc64. Bug #69154 + + 01 Nov 2004; Joshua Kinard libxml2-2.6.15-r1.ebuild: + Marked stable on mips. + + 31 Oct 2004; Bryan Østergaard + libxml2-2.6.15-r1.ebuild: + Stable on alpha, bug 69154. + + 30 Oct 2004; Michael Hanselmann + libxml2-2.6.15-r1.ebuild: + Stable on ppc. + + 30 Oct 2004; Gustavo Zacarias + libxml2-2.6.15-r1.ebuild: + Stable on sparc wrt #69154 + + 30 Oct 2004; Simon Stelling libxml2-2.6.15-r1.ebuild: + stable on amd64 for security reasons (bug #69154) + +*libxml2-2.6.15-r1 (30 Oct 2004) + + 30 Oct 2004; foser libxml2-2.6.15-r1.ebuild : + Add patch to fix scrollkeeper crash + +*libxml2-2.6.15 (30 Oct 2004) + + 30 Oct 2004; foser libxml2-2.6.15.ebuild : + New release, fixes security issues (#69154) + + 19 Sep 2004; Joshua Kinard libxml2-2.6.11.ebuild: + Marked stable on mips. + + 27 Aug 2004; Mike Frysinger libxml2-2.6.11.ebuild, + libxml2-2.6.12.ebuild: + Newer versions of libxml2 bomb with binutils on hppa for some reason ... + +*libxml2-2.6.12 (23 Aug 2004) + + 23 Aug 2004; Mike Gardiner +libxml2-2.6.12.ebuild: + New version 2.6.12 + + 18 Aug 2004; Aron Griffis libxml2-2.6.11.ebuild: + stable on alpha and ia64 + + 07 Aug 2004; Travis Tilley libxml2-2.6.11.ebuild: + stable on amd64 + + 05 Aug 2004; Gustavo Zacarias libxml2-2.6.11.ebuild: + Stable on sparc + + 31 Jul 2004; libxml2-2.6.11.ebuild: + stable on x86 for gnome 2.6.2 + + 27 Jul 2004; libxml2-2.6.11.ebuild, libxml2-2.6.6.ebuild, + libxml2-2.6.7.ebuild, libxml2-2.6.9.ebuild: + use gnuconfig_update, needed for uclibc and probably others likes mips/mips64 + etc.. + +*libxml2-2.6.11 (13 Jul 2004) + + 13 Jul 2004; Mike Gardiner +libxml2-2.6.11.ebuild: + New version, as requested in bug #56875 + + 23 Jun 2004; Aron Griffis libxml2-2.6.7.ebuild: + Stable on alpha and ia64 + + 19 Jun 2004; Tom Gall libxml2-2.6.9.ebuild: + stable on ppc64, bug #54140 + + 13 May 2004; Stephen P. Becker libxml2-2.6.7.ebuild: + Stable on mips. + + 02 May 2004; Michael McCabe libxml2-2.6.9.ebuild: + Added s390 keywords + + 27 Apr 2004; Gustavo Zacarias libxml2-2.6.7.ebuild: + Stable on sparc + +*libxml2-2.6.9 (25 Apr 2004) + + 25 Apr 2004; foser libxml2-2.6.9.ebuild : + New release + +*libxml2-2.6.7 (07 Mar 2004) + + 07 Mar 2004; foser libxml2-2.6.7.ebuild : + New release + + 24 Feb 2004; Christian Birchinger libxml2-2.6.6.ebuild: + Marked stable on all archs. Security update for Bug #42735 + + 17 Feb 2004; Joshua Kinard libxml2-2.6.6.ebuild: + Added ~mips to keywords. + +*libxml2-2.6.6 (14 Feb 2004) + + 14 Feb 2004; Alastair Tse libxml2-2.6.6.ebuild: + version bump + + 10 Feb 2004; Bartosch Pixa libxml2-2.6.4.ebuild: + set ppc in keywords + + 09 Feb 2004; libxml2-2.6.4.ebuild: + stable on hppa, again... + + 09 Feb 2004; libxml2-2.6.4.ebuild: + stable on hppa and sparc + + 08 Feb 2004; libxml2-2.6.4.ebuild: + x86 stable + + 28 Jan 2004; Aron Griffis libxml2-2.6.3.ebuild: + stable on alpha and ia64 + + 18 Jan 2004; libxml2-2.5.11.ebuild: + Added ~mips to KEYWORDS. + + 13 Jan 2004; libxml2-2.6.3.ebuild: + stable on sparc + +*libxml2-2.6.4 (10 Jan 2003) + + 10 Jan 2003; foser libxml2-2.6.4.ebuild : + New release + + 02 Jan 2004; Martin Schlemmer libxml2-2.6.2.ebuild, + libxml2-2.6.3.ebuild: + Run elibtoolize, as else we get references to PORTAGE_TMPDIR in + /usr/lib/python?.?/site-packages/libxml2mod.la among things. + + 13 Dec 2003; Guy Martin libxml2-2.5.11.ebuild: + Marked stable on hppa. + +*libxml2-2.6.3 (11 Dec 2003) + + 12 Jan 2003; Guy Martin libxml2-2.6.3.ebuild : + Marked stable on hppa. + + 11 Dec 2003; foser libxml2-2.6.3.ebuild : + New release + + 14 Nov 2003; Aron Griffis libxml2-2.6.2.ebuild: + Stable on ia64 + +*libxml2-2.6.2 (09 Nov 2003) + + 09 Nov 2003; Alastair Tse libxml2-2.6.2.ebuild: + version bump. should solve #33030 + + 04 Nov 2003; Christian Birchinger libxml2-2.5.11.ebuild: + Added sparc stable keyword + +*libxml2-2.6.1 (29 Oct 2003) + + 29 Oct 2003; foser libxml2-2.6.1.ebuild : + New version, readded ia64 keyword that seems to have vanished + esthetic ebuild cleanups + + 22 Oct 2003; Bartosch Pixa libxml2-2.5.11.ebuild: + set ppc in keywords + + 20 Oct 2003; Aron Griffis libxml2-2.5.11.ebuild: + Stable on alpha + + 05 Oct 2003; Mike Gardiner libxml2-2.5.11.ebuild: + Marked stable on x86 + + 23 Sep 2003; Bartosch Pixa libxml2-2.5.8.ebuild: + set ppc in keywords + + 21 Sep 2003; Alastair Tse libxml2-2.5.11.ebuild, + libxml2-2.5.8.ebuild: + add inherit for flag-o-matic + + 18 Sep 2003; Alastair Tse libxml2-2.5.11.ebuild, + libxml2-2.5.8.ebuild: + remove quotes in filter-flags + + 17 Sep 2003; Alastair Tse libxml2-2.5.11.ebuild, + libxml2-2.5.8.ebuild: + filter -funroll-loops and -fprefetch-loop-arrays to prevent problems down the + line with scrollkeeper and gconf (#26320). filters for all marchs + but possibly athlon-xp specific. + +*libxml2-2.5.11 (11 Sep 2003) + + 11 Sep 2003; Mike Gardiner libxml2-2.5.11.ebuild: + New version + + 07 Sep 2003; Mike Gardiner libxml2-2.5.10.ebuild, + libxml2-2.5.8.ebuild, libxml2-2.5.9.ebuild: + Added catalog initialisation, for if the catalog doesnt exist + +*libxml-2.5.10 (18 Aug 2003) + + 18 Aug 2003; foser libxml2-2.5.10.ebuild : + New version, removed alpha patch, is applied upstream now + +*libxml-2.5.9 (10 Aug 2003) + + 10 Aug 2003; foser libxml2-2.5.9.ebuild : + New version + + 09 Jul 2003; Christian Birchinger libxml2-2.5.7.ebuild: + Added sparc stable keyword + +*libxml2-2.5.8 (07 Jun 2003) + + 23 Jul 2003; Guy Martin libxml-2.5.8.ebuild : + Marked stable on hppa. + + 07 Jun 2003; foser libxml-2.5.8.ebuild : + New version, fix homepage, add ipv6 USE flag + + 24 Jun 2003; Aron Griffis libxml2-2.5.7.ebuild: + Mark stable on alpha + + 24 May 2003; Tavis Ormandy libxml2-2.5.4.ebuild, + libxml2-2.5.7.ebuild, files/libxml2-2.5.4-dec-alpha-compiler.diff, + files/libxml2-2.5.7-dec-alpha-compiler.diff: + ccc fixes, author assumes ccc == tru64 + + 08 May 2003; Christian Birchinger libxml2-2.5.6.ebuild: + Added stable sparc keyword + +*libxml2-2.5.7 (26 Apr 2003) + + 26 Apr 2003; Alastair Tse libxml2-2.4.23.ebuild, + libxml2-2.4.23.ebuild, libxml2-2.4.24.ebuild, libxml2-2.4.24.ebuild, + libxml2-2.4.28-r1.ebuild, libxml2-2.4.28-r1.ebuild, libxml2-2.4.28.ebuild, + libxml2-2.4.28.ebuild, libxml2-2.5.5.ebuild, libxml2-2.5.5.ebuild, + libxml2-2.5.7.ebuild: + version bump and cleanup + +*libxml2-2.5.6 (01 Apr 2003) + + 14 Jun 2003; Guy Martin libxml2-2.5.6.ebuild : + Added hppa to KEYWORDS. + + 01 Apr 2003; foser libxml2-2.5.6.ebuild : + New version + +*libxml2-2.5.5 (27 Mar 2003) + + 27 Mar 2003; Daniel Robbins libxml2-2.5.5.ebuild: + bumping into unstable x86. + + 13 Mar 2003; Olivier Reisch libxml2-2.5.4.ebuild: + Mark stable on ppc + +*libxml2-2.5.4 (03 Mar 2003) + + 19 Mar 2003; Guy Martin libxml2-2.5.4.ebuild : + Added hppa to keywords. + + 09 Mar 2003; Aron Griffis libxml2-2.5.4.ebuild: + Mark stable on alpha + + 03 Mar 2003; foser libxml2-2.5.4.ebuild : + New version + + 12 Feb 2003; Guy Martin : + Added hppa to keywords. + + 09 Feb 2003; Aron Griffis libxml2-2.5.2.ebuild : + Add ~alpha to KEYWORDS + +*libxml2-2.5.2 (05 Feb 2003) + + 08 Apr 2003; Todd Sunderlin libxml2-2.5.2.ebuild: + Marked stable for sparc. + + 07 Jan 2003; Jason Wever libxml2-2.5.2.ebuild : + Added ~sparc to keywords + + 05 Feb 2003; foser libxml2-2.5.1.ebuild : + New version + +*libxml2-2.5.1 (30 Jan 2003) + + 30 Jan 2003; foser libxml2-2.5.1.ebuild : + GNOME 2.2 RC2 commit + +*libxml2-2.4.30 (07 Jan 2003) + + 22 Feb 2003; Aron Griffis libxml2-2.4.30.ebuild : + Mark stable on alpha + + 07 Jan 2003; foser libxml2-2.4.30.ebuild : + New version + Added stripping of all unknown CFLAGS (bug #14265) + +*libxml2-2.4.28-r1 (22 Dec 2002) + + 22 Dec 2002; Martin Schlemmer libxml2-2.4.28-r1.ebuild : + + Force compile with zlib support, else gnome2 breaks (libgnomeprint for example + fails to compile with fresh or existing system). + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*libxml2-2.4.28 (26 Nov 2002) + + 26 Nov 2002; Dan Armak ChangeLog : + + A new version with a patch added that fixes the roblems with KDE doc + generation that have been present since version 2.4.26. This patch will + be present in 2.4.29. + +*libxml2-2.4.26 (27 Oct 2002) + + 07 Nov 2002; foser libxml2-2.4.26.ebuild : + Fixed the ebuild a bit. Now USE flags for deps. + + 27 Oct 2002; foser libxml2-2.4.26.ebuild : + Gnome 2.1 commit + +*libxml2-2.4.24 (06 Sep 2002) + + 17 Sep 2002; Spider libxml2-2.4.24.ebuild : ppc keyword + added + + 16 Sep 2002; Maarten Thibaut libxml2-2.4.24.ebuild ChangeLog : + Adding sparc/sparc64 keywords. Revamping ChangeLog layout. + + 06 Sep 2002; Spider libxml2-2.4.24.ebuild : + new verison, patched up python/Makefile to make it adhere to DESTDIR + +*libxml2-2.4.23 (07 Jul 2002) + + 01 Aug 2002; Mark Guertin libxml2-2.4.23.ebuild : + Added ppc to keywords + + 07 Jul 2002; Gabriele Giorgetti libxml2-2.4.23.ebuild : + new version + +*libxml2-2.4.22 (27 May 2002) + + 27 May 2002; Spider libxml2-2.4.22.ebuild : + version bump + +*libxml2-2.4.21-r1 (9 MAy 2002) + + 26 May 2002; Martin Schlemmer : + Libtoolize to fix .la files from python site packages. + +*libxml2-2.4.21 (9 MAy 2002) + + 9 May 2002; Spider : + bump version, change from .tar.gz to .tar.bz2 + +*libxml2-2.4.20 (16 Apr 2002) + + 16 Apr 2002; Seemant Kulleen libxml2-2.4.20.ebuild, + files/digest-libxml2-2.4.20 : + Quick version update. + +*libxml2-2.4.19 (27 Mar 2002) + + 27 Mar 2002; Seemant Kulleen libxml2-2.4.19.ebuild : + Copied 2.4.18's ebuild over. + +*libxml2-2.4.18 (21 March 2002) + +*libxml2-2.4.16 (3 March 2002) + +*libxml2-2.4.15 (17 Feb 2002) + +*libxml2-2.4.13 (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/Manifest new file mode 100644 index 0000000000..5889e00abc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/Manifest @@ -0,0 +1,3 @@ +DIST libxml2-2.7.8.tar.gz 4881808 RMD160 30709622cfe3e2175e73d6701b7e19a25ab5ac47 SHA1 859dd535edbb851cc15b64740ee06551a7a17d40 SHA256 cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec +DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 +DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch new file mode 100644 index 0000000000..25ea47832b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch @@ -0,0 +1,66 @@ +--- catalog.c ++++ catalog.c +@@ -68,10 +68,10 @@ + #define XML_URN_PUBID "urn:publicid:" + #define XML_CATAL_BREAK ((xmlChar *) -1) + #ifndef XML_XML_DEFAULT_CATALOG +-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" ++#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" + #endif + #ifndef XML_SGML_DEFAULT_CATALOG +-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog" ++#define XML_SGML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" + #endif + + #if defined(_WIN32) && defined(_MSC_VER) +@@ -76,7 +76,7 @@ + + #if defined(_WIN32) && defined(_MSC_VER) + #undef XML_XML_DEFAULT_CATALOG +-static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog"; ++static char XML_XML_DEFAULT_CATALOG[256] = "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"; + #if defined(_WIN32_WCE) + /* Windows CE don't have a A variant */ + #define GetModuleHandleA GetModuleHandle +--- xmlcatalog.c ++++ xmlcatalog.c +@@ -43,7 +43,7 @@ + + + #ifndef XML_SGML_DEFAULT_CATALOG +-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog" ++#define XML_SGML_DEFAULT_CATALOG "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" + #endif + + /************************************************************************ +--- runtest.c ++++ runtest.c +@@ -2747,7 +2747,7 @@ + */ + static int + uripMatch(const char * URI) { +- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) ++ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) + return(0); + /* Verify we received the escaped URL */ + if (strcmp(urip_rcvsURLs[urip_current], URI)) +@@ -2766,7 +2766,7 @@ + */ + static void * + uripOpen(const char * URI) { +- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) ++ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) + return(NULL); + /* Verify we received the escaped URL */ + if (strcmp(urip_rcvsURLs[urip_current], URI)) +--- xmllint.c ++++ xmllint.c +@@ -103,7 +103,7 @@ + #endif + + #ifndef XML_XML_DEFAULT_CATALOG +-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" ++#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" + #endif + + typedef enum { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.2-winnt.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.2-winnt.patch new file mode 100644 index 0000000000..0121e045c9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.2-winnt.patch @@ -0,0 +1,72 @@ +diff -ru -x '*.Po' -x '*.Plo' libxml2-2.7.2.orig/dict.c libxml2-2.7.2/dict.c +--- libxml2-2.7.2.orig/dict.c 2008-11-20 11:16:34 +0100 ++++ libxml2-2.7.2/dict.c 2008-11-20 09:50:19 +0100 +@@ -25,7 +25,7 @@ + #else + #ifdef HAVE_INTTYPES_H + #include +-#elif defined(WIN32) ++#elif defined(WIN32) || defined (__PARITY__) + typedef unsigned __int32 uint32_t; + #endif + #endif +diff -ru -x '*.Po' -x '*.Plo' libxml2-2.7.2.orig/include/wsockcompat.h libxml2-2.7.2/include/wsockcompat.h +--- libxml2-2.7.2.orig/include/wsockcompat.h 2008-11-20 11:16:34 +0100 ++++ libxml2-2.7.2/include/wsockcompat.h 2008-11-20 09:50:19 +0100 +@@ -26,7 +26,7 @@ + #endif + #endif + +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) || defined(__PARITY__) + /* Include here to ensure that it doesn't get included later + * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */ + #include +diff -ru -x '*.Po' -x '*.Plo' libxml2-2.7.2.orig/nanohttp.c libxml2-2.7.2/nanohttp.c +--- libxml2-2.7.2.orig/nanohttp.c 2008-11-20 11:16:34 +0100 ++++ libxml2-2.7.2/nanohttp.c 2008-11-20 09:50:19 +0100 +@@ -82,6 +82,9 @@ + #define XML_SOCKLEN_T unsigned int + #endif + ++#ifdef __PARITY__ ++# include ++#endif + + #include + #include +diff -ru -x '*.Po' -x '*.Plo' libxml2-2.7.2.orig/xmlIO.c libxml2-2.7.2/xmlIO.c +--- libxml2-2.7.2.orig/xmlIO.c 2008-11-20 10:11:21 +0100 ++++ libxml2-2.7.2/xmlIO.c 2008-11-20 10:54:34 +0100 +@@ -44,6 +44,7 @@ + #include /* for CP_UTF8 */ + #endif + ++#ifndef __PARITY__ + /* Figure a portable way to know if a file is a directory. */ + #ifndef HAVE_STAT + # ifdef HAVE__STAT +@@ -79,6 +80,7 @@ + # endif + # endif + #endif ++#endif /* __PARITY__ */ + + #include + #include +@@ -626,6 +628,7 @@ + { + #ifdef HAVE_STAT + int retval = -1; ++#ifndef __PARITY__ + wchar_t *wPath; + + wPath = __xmlIOWin32UTF8ToWChar(path); +@@ -634,6 +637,7 @@ + retval = _wstat(wPath,info); + xmlFree(wPath); + } ++#endif + /* maybe path in native encoding */ + if(retval < 0) + retval = stat(path,info); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-allocation-error-copying-entities.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-allocation-error-copying-entities.patch new file mode 100644 index 0000000000..c0d943311f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-allocation-error-copying-entities.patch @@ -0,0 +1,21 @@ +From 5bd3c061823a8499b27422aee04ea20aae24f03e Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Fri, 16 Dec 2011 10:53:35 +0000 +Subject: Fix an allocation error when copying entities + +--- +diff --git a/parser.c b/parser.c +index 4e5dcb9..c55e41d 100644 +--- a/parser.c ++++ b/parser.c +@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + + buffer[nbchars++] = '&'; + if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { +- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); + } + for (;i > 0;i--) + buffer[nbchars++] = *cur++; +-- +cgit v0.9.0.2 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch new file mode 100644 index 0000000000..5f47e1d619 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch @@ -0,0 +1,12 @@ +--- python/Makefile.am ++++ python/Makefile.am +@@ -21,7 +21,8 @@ + libxml.py \ + libxml2-python-api.xml + +-libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version ++libxml2mod_la_CPPFLAGS = -shared ++libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -shared + + if WITH_PYTHON + mylibs = \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-error-xpath.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-error-xpath.patch new file mode 100644 index 0000000000..a12a050741 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-error-xpath.patch @@ -0,0 +1,62 @@ +From 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Tue, 11 Oct 2011 08:34:34 +0000 +Subject: Fix missing error status in XPath evaluation + +Started by Chris Evans, I added a few more place where the +error should have been set in the evaluation context. +--- +diff --git a/xpath.c b/xpath.c +index bcee2ea..d9d902c 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value) + sizeof(ctxt->valueTab[0])); + if (tmp == NULL) { + xmlGenericError(xmlGenericErrorContext, "realloc failed !\n"); ++ ctxt->error = XPATH_MEMORY_ERROR; + return (0); + } + ctxt->valueMax *= 2; +@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (ch & 0xc0) != 0xc0 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + /* then skip over remaining bytes for this char */ +@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (*cptr++ & 0xc0) != 0x80 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + if (ch & 0x80) /* must have had error encountered */ +@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", + (char *) op->value4, (char *)op->value5); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + val = xmlXPathVariableLookupNS(ctxt->context, +@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); + xmlXPathPopFrame(ctxt, frame); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + } + xmlGenericError(xmlGenericErrorContext, + "XPath: unknown precompiled operation %d\n", op->op); ++ ctxt->error = XPATH_INVALID_OPERAND; + return (total); + } + +-- +cgit v0.9.0.2 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-hardening-xpath.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-hardening-xpath.patch new file mode 100644 index 0000000000..8e699ec8c0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-hardening-xpath.patch @@ -0,0 +1,224 @@ +From f5048b3e71fc30ad096970b8df6e7af073bae4cb Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 18 Aug 2011 09:10:13 +0000 +Subject: Hardening of XPath evaluation + +Add a mechanism of frame for XPath evaluation when entering a function +or a scoped evaluation, also fix a potential problem in predicate +evaluation. +--- +diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h +index 1a9e30e..ddd9dd8 100644 +--- a/include/libxml/xpath.h ++++ b/include/libxml/xpath.h +@@ -68,7 +68,8 @@ typedef enum { + XPATH_UNDEF_PREFIX_ERROR, + XPATH_ENCODING_ERROR, + XPATH_INVALID_CHAR_ERROR, +- XPATH_INVALID_CTXT ++ XPATH_INVALID_CTXT, ++ XPATH_STACK_ERROR + } xmlXPathError; + + /* +@@ -380,6 +381,8 @@ struct _xmlXPathParserContext { + xmlXPathCompExprPtr comp; /* the precompiled expression */ + int xptr; /* it this an XPointer expression */ + xmlNodePtr ancestor; /* used for walking preceding axis */ ++ ++ int valueFrame; /* used to limit Pop on the stack */ + }; + + /************************************************************************ +diff --git a/xpath.c b/xpath.c +index b59ac5a..bcee2ea 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = { + "Encoding error\n", + "Char out of XML range\n", + "Invalid or incomplete context\n", ++ "Stack usage errror\n", + "?? Unknown error ??\n" /* Must be last in the list! */ + }; + #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ +@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { + ************************************************************************/ + + /** ++ * xmlXPathSetFrame: ++ * @ctxt: an XPath parser context ++ * ++ * Set the callee evaluation frame ++ * ++ * Returns the previous frame value to be restored once done ++ */ ++static int ++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { ++ int ret; ++ ++ if (ctxt == NULL) ++ return(0); ++ ret = ctxt->valueFrame; ++ ctxt->valueFrame = ctxt->valueNr; ++ return(ret); ++} ++ ++/** ++ * xmlXPathPopFrame: ++ * @ctxt: an XPath parser context ++ * @frame: the previous frame value ++ * ++ * Remove the callee evaluation frame ++ */ ++static void ++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { ++ if (ctxt == NULL) ++ return; ++ if (ctxt->valueNr < ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ } ++ ctxt->valueFrame = frame; ++} ++ ++/** + * valuePop: + * @ctxt: an XPath evaluation context + * +@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt) + + if ((ctxt == NULL) || (ctxt->valueNr <= 0)) + return (NULL); ++ ++ if (ctxt->valueNr <= ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ return (NULL); ++ } ++ + ctxt->valueNr--; + if (ctxt->valueNr > 0) + ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; +@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) { + ret->valueNr = 0; + ret->valueMax = 10; + ret->value = NULL; ++ ret->valueFrame = 0; + + ret->context = ctxt; + ret->comp = comp; +@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; + xmlNodePtr oldContextNode, contextNode = NULL; + xmlXPathContextPtr xpctxt = ctxt->context; ++ int frame; + + #ifdef LIBXML_XPTR_ENABLED + /* +@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + */ + exprOp = &ctxt->comp->steps[op->ch2]; + for (i = 0; i < set->nodeNr; i++) { ++ xmlXPathObjectPtr tmp; ++ + if (set->nodeTab[i] == NULL) + continue; + +@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathNodeSetAddUnique(contextObj->nodesetval, + contextNode); + ++ frame = xmlXPathSetFrame(ctxt); + valuePush(ctxt, contextObj); + res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); ++ tmp = valuePop(ctxt); ++ xmlXPathPopFrame(ctxt, frame); + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { +- xmlXPathObjectPtr tmp; +- /* pop the result if any */ +- tmp = valuePop(ctxt); +- if (tmp != contextObj) { ++ while (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); +- valuePop(ctxt); ++ tmp = valuePop(ctxt); + } + goto evaluation_error; + } ++ /* push the result back onto the stack */ ++ valuePush(ctxt, tmp); + + if (res) + pos++; +@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlXPathFunction func; + const xmlChar *oldFunc, *oldFuncURI; + int i; ++ int frame; + ++ frame = xmlXPathSetFrame(ctxt); + if (op->ch1 != -1) + total += + xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); +@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } +- for (i = 0; i < op->value; i++) ++ for (i = 0; i < op->value; i++) { + if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } ++ } + if (op->cache != NULL) + XML_CAST_FPTR(func) = op->cache; + else { +@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + func(ctxt, op->value); + ctxt->context->function = oldFunc; + ctxt->context->functionURI = oldFuncURI; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + case XPATH_OP_ARG: +@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool) + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + #ifdef XPATH_STREAMING + if (ctxt->comp->stream) { +diff --git a/xpointer.c b/xpointer.c +index 7a42d02..37afa3a 100644 +--- a/xpointer.c ++++ b/xpointer.c +@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) { + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + SKIP_BLANKS; + if (CUR == '/') { +-- +cgit v0.9.0.2 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-reactivate-script.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-reactivate-script.patch new file mode 100644 index 0000000000..a0b62bca98 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-reactivate-script.patch @@ -0,0 +1,21 @@ +From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 04 Nov 2010 20:53:14 +0000 +Subject: Reactivate the shared library versionning script + +--- +diff --git a/configure.in b/configure.in +index 59d0629..a1d2c89 100644 +--- a/configure.in ++++ b/configure.in +@@ -84,7 +84,7 @@ else + esac + fi + AC_SUBST(VERSION_SCRIPT_FLAGS) +-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) ++AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) + + dnl + dnl We process the AC_ARG_WITH first so that later we can modify +-- +cgit v0.8.3.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-reallocation-failures.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-reallocation-failures.patch new file mode 100644 index 0000000000..a18756cb87 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-reallocation-failures.patch @@ -0,0 +1,101 @@ +From d7958b21e7f8c447a26bb2436f08402b2c308be4 Mon Sep 17 00:00:00 2001 +From: Chris Evans +Date: Wed, 23 Mar 2011 00:13:06 +0000 +Subject: Fix some potential problems on reallocation failures + +The count was incremented before the allocation +and not fixed in case of failure +* xpath.c: corrects a few instances where the available count of some + structure is updated before we know the allocation actually + succeeds +--- +diff --git a/xpath.c b/xpath.c +index 8b56189..608fe00 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) { + } else if (cur->nodeNr == cur->nodeMax) { + xmlNodePtr *temp; + +- cur->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "growing nodeset\n"); + return; + } ++ cur->nodeMax *= 2; + cur->nodeTab = temp; + } + cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns); +@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { + } else if (cur->nodeNr == cur->nodeMax) { + xmlNodePtr *temp; + +- cur->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "growing nodeset\n"); + return; + } + cur->nodeTab = temp; ++ cur->nodeMax *= 2; + } + if (val->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) val; +@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) { + } else if (val1->nodeNr == val1->nodeMax) { + xmlNodePtr *temp; + +- val1->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + val1->nodeTab = temp; ++ val1->nodeMax *= 2; + } + if (n2->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) n2; +@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2, + } else if (set1->nodeNr >= set1->nodeMax) { + xmlNodePtr *temp; + +- set1->nodeMax *= 2; + temp = (xmlNodePtr *) xmlRealloc( +- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); ++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + set1->nodeTab = temp; ++ set1->nodeMax *= 2; + } + if (n2->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) n2; +@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2, + } else if (set1->nodeNr >= set1->nodeMax) { + xmlNodePtr *temp; + +- set1->nodeMax *= 2; + temp = (xmlNodePtr *) xmlRealloc( +- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); ++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + set1->nodeTab = temp; ++ set1->nodeMax *= 2; + } + set1->nodeTab[set1->nodeNr++] = n2; + } +-- +cgit v0.9 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-stop-parse.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-stop-parse.patch new file mode 100644 index 0000000000..01ac5b791b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-stop-parse.patch @@ -0,0 +1,53 @@ +Index: third_party/libxml/src/parser.c +=================================================================== +--- third_party/libxml/src/parser.c (revision 100884) ++++ third_party/libxml/src/parser.c (working copy) +@@ -4827,7 +4827,8 @@ + (ctxt->sax->processingInstruction != NULL)) + ctxt->sax->processingInstruction(ctxt->userData, + target, NULL); +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + return; + } + buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); +@@ -4907,7 +4908,8 @@ + } else { + xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL); + } +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + } + } + +@@ -9466,6 +9468,8 @@ + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ return; + if (name == NULL) { + spacePop(ctxt); + return; +@@ -10845,6 +10849,8 @@ + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ goto done; + if (name == NULL) { + spacePop(ctxt); + ctxt->instate = XML_PARSER_EOF; +@@ -11031,7 +11037,9 @@ + else + xmlParseEndTag1(ctxt, 0); + #endif /* LIBXML_SAX1_ENABLED */ +- if (ctxt->nameNr == 0) { ++ if (ctxt->instate == XML_PARSER_EOF) { ++ /* Nothing */ ++ } else if (ctxt->nameNr == 0) { + ctxt->instate = XML_PARSER_EPILOG; + } else { + ctxt->instate = XML_PARSER_CONTENT; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-utf-8.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-utf-8.patch new file mode 100644 index 0000000000..45c91615a9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-utf-8.patch @@ -0,0 +1,22 @@ +Index: third_party/libxml/src/xmlsave.c +=================================================================== +--- third_party/libxml/src/xmlsave.c (revision 117989) ++++ third_party/libxml/src/xmlsave.c (working copy) +@@ -248,7 +248,7 @@ + /* + * We assume we have UTF-8 input. + */ +- if (outend - out < 10) break; ++ if (outend - out < 11) break; + + if (*in < 0xC0) { + xmlSaveErr(XML_SAVE_NOT_UTF8, NULL, NULL); +@@ -1928,7 +1928,7 @@ + /* + * We assume we have UTF-8 content. + */ +- unsigned char tmp[10]; ++ unsigned char tmp[12]; + int val = 0, l = 1; + + if (base != cur) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-freeing.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-freeing.patch new file mode 100644 index 0000000000..3509a48daf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-freeing.patch @@ -0,0 +1,32 @@ +From df83c17e5a2646bd923f75e5e507bc80d73c9722 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Wed, 17 Nov 2010 13:12:14 +0000 +Subject: Fix a potential freeing error in XPath + +--- +diff --git a/xpath.c b/xpath.c +index 81e33f6..1447be5 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { + xmlXPathObjectPtr tmp; +- /* pop the result */ ++ /* pop the result if any */ + tmp = valuePop(ctxt); +- xmlXPathReleaseObject(xpctxt, tmp); +- /* then pop off contextObj, which will be freed later */ +- valuePop(ctxt); ++ if (tmp != contextObj) ++ /* ++ * Free up the result ++ * then pop off contextObj, which will be freed later ++ */ ++ xmlXPathReleaseObject(xpctxt, tmp); ++ valuePop(ctxt); + goto evaluation_error; + } + +-- +cgit v0.8.3.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-freeing2.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-freeing2.patch new file mode 100644 index 0000000000..17059418b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-freeing2.patch @@ -0,0 +1,28 @@ +From fec31bcd452e77c10579467ca87a785b41115de6 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 18 Nov 2010 10:07:24 +0000 +Subject: Small fix for previous commit + +--- +diff --git a/xpath.c b/xpath.c +index 1447be5..8b56189 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr tmp; + /* pop the result if any */ + tmp = valuePop(ctxt); +- if (tmp != contextObj) ++ if (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); + valuePop(ctxt); ++ } + goto evaluation_error; + } + +-- +cgit v0.8.3.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-memory.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-memory.patch new file mode 100644 index 0000000000..f94350d277 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/files/libxml2-2.7.8-xpath-memory.patch @@ -0,0 +1,29 @@ +From 0cbeb50ee03ce582a0c979c70d8fbf030e270c37 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Mon, 15 Nov 2010 11:06:29 +0000 +Subject: Fix a potential memory access error + +in case of a previus allocation error +--- +diff --git a/xpath.c b/xpath.c +index 4d6826d..81e33f6 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -3575,13 +3575,13 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) { + } else if (cur->nodeNr == cur->nodeMax) { + xmlNodePtr *temp; + +- cur->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "growing nodeset\n"); + return; + } ++ cur->nodeMax *= 2; + cur->nodeTab = temp; + } + if (val->type == XML_NAMESPACE_DECL) { +-- +cgit v0.8.3.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild new file mode 100644 index 0000000000..e2249c4f38 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild,v 1.6 2012/01/16 02:59:51 jer Exp $ + +EAPI="3" +PYTHON_DEPEND="python? 2" +PYTHON_USE_WITH="-build xml" +PYTHON_USE_WITH_OPT="python" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython" + +inherit libtool flag-o-matic eutils python autotools prefix + +DESCRIPTION="Version 2 of the library to manipulate XML files" +HOMEPAGE="http://www.xmlsoft.org/" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="debug doc examples icu ipv6 python readline static-libs test" + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" + +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )" + +RDEPEND="sys-libs/zlib + icu? ( dev-libs/icu ) + readline? ( sys-libs/readline )" + +DEPEND="${RDEPEND} + hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" + +pkg_setup() { + if use python; then + python_pkg_setup + fi +} + +src_unpack() { + # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${P}.tar.gz + cd "${S}" + + if use test; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + fi +} + +src_prepare() { + # Patches needed for prefix support + epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch + epatch "${FILESDIR}"/${PN}-2.7.2-winnt.patch + + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c + + epunt_cxx + + # Reactivate the shared library versionning script + epatch "${FILESDIR}/${P}-reactivate-script.patch" + + # Fix a potential memory access error + epatch "${FILESDIR}/${P}-xpath-memory.patch" + + # Fix a potential freeing error in XPath + epatch "${FILESDIR}/${P}-xpath-freeing.patch" + epatch "${FILESDIR}/${P}-xpath-freeing2.patch" + + # Fix some potential problems on reallocation failures + epatch "${FILESDIR}/${P}-reallocation-failures.patch" + + epatch "${FILESDIR}/${P}-disable_static_modules.patch" + + # Hardening of XPath evaluation + epatch "${FILESDIR}/${P}-hardening-xpath.patch" + + # Fix missing error status in XPath evaluation + epatch "${FILESDIR}/${P}-error-xpath.patch" + + # Heap-based overflow in parsing long entity references + epatch "${FILESDIR}/${P}-allocation-error-copying-entities.patch" + + epatch "${FILESDIR}/${P}-stop-parse.patch" + epatch "${FILESDIR}/${P}-utf-8.patch" + + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + # We now need to run eautoreconf at the end to prevent maintainer mode. +# elibtoolize + + # Python bindings are built/tested/installed manually. + sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.am || die "sed failed" + + eautoreconf +} + +src_configure() { + # USE zlib support breaks gnome2 + # (libgnomeprint for instance fails to compile with + # fresh install, and existing) - (22 Dec 2002). + + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + + # --with-mem-debug causes unusual segmentation faults (bug #105120). + + local myconf="--with-html-subdir=${PF}/html + --docdir=${EPREFIX}/usr/share/doc/${PF} + $(use_with debug run-debug) + $(use_with icu) + $(use_with python) + $(use_with readline) + $(use_with readline history) + $(use_enable ipv6) + $(use_enable static-libs static)" + + # filter seemingly problematic CFLAGS (#26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + econf ${myconf} +} + +src_compile() { + default + + if use python; then + python_copy_sources python + building() { + emake PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \ + PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" + } + python_execute_function -s --source-dir python building + fi +} + +src_test() { + default + + if use python; then + testing() { + emake test + } + python_execute_function -s --source-dir python testing + fi +} + +src_install() { + emake DESTDIR="${D}" \ + EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ + install || die "Installation failed" + + # on windows, xmllint is installed by interix libxml2 in parent prefix. + # this is the version to use. the native winnt version does not support + # symlinks, which makes repoman fail if the portage tree is linked in + # from another location (which is my default). -- mduft + if [[ ${CHOST} == *-winnt* ]]; then + rm -rf "${ED}"/usr/bin/xmllint + rm -rf "${ED}"/usr/bin/xmlcatalog + fi + + if use python; then + installation() { + emake DESTDIR="${D}" \ + PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ + exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ + install + } + python_execute_function -s --source-dir python installation + + python_clean_installation_image + fi + + rm -rf "${ED}"/usr/share/doc/${P} + dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed" + + if ! use python; then + rm -rf "${ED}"/usr/share/doc/${PF}/python + rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV} + fi + + if ! use doc; then + rm -rf "${ED}"/usr/share/gtk-doc + rm -rf "${ED}"/usr/share/doc/${PF}/html + fi + + if ! use examples; then + rm -rf "${ED}/usr/share/doc/${PF}/examples" + rm -rf "${ED}/usr/share/doc/${PF}/python/examples" + fi + + if ! use static-libs; then + # Remove useless .la files + find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" + fi +} + +pkg_postinst() { + if use python; then + python_mod_optimize drv_libxml2.py libxml2.py + fi + + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [ "${ROOT}" != "/" ] + then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}etc/xml/catalog" + + # we dont want to clobber an existing catalog though, + # only ensure that one is there + # + if [ ! -e ${CATALOG} ]; then + [ -d "${EROOT}etc/xml" ] || mkdir -p "${EROOT}etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > ${CATALOG} + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} + +pkg_postrm() { + if use python; then + python_mod_cleanup drv_libxml2.py libxml2.py + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/metadata.xml new file mode 100644 index 0000000000..da6fd63d00 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libxml2/metadata.xml @@ -0,0 +1,5 @@ + + + +gnome + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/files/Fix-candidates-list-update-problem.path b/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/files/Fix-candidates-list-update-problem.path new file mode 100644 index 0000000000..40cd85d49c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/files/Fix-candidates-list-update-problem.path @@ -0,0 +1,83 @@ +--- src/input.c 2011/02/14 04:59:22 1.154 ++++ src/input.c 2011/03/09 05:45:49 1.155 +@@ -3004,9 +3004,6 @@ + take_action_list (MInputContext *ic, MPlist *action_list) + { + MInputContextInfo *ic_info = (MInputContextInfo *) ic->info; +- MPlist *candidate_list = ic->candidate_list; +- int candidate_index = ic->candidate_index; +- int candidate_show = ic->candidate_show; + MTextProperty *prop; + + MPLIST_DO (action_list, action_list) +@@ -3480,31 +3477,6 @@ + }; + } + } +- +- if (ic->candidate_list) +- { +- M17N_OBJECT_UNREF (ic->candidate_list); +- ic->candidate_list = NULL; +- } +- if (ic->cursor_pos > 0 +- && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1, +- Mcandidate_list))) +- { +- ic->candidate_list = mtext_property_value (prop); +- M17N_OBJECT_REF (ic->candidate_list); +- ic->candidate_index +- = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1, +- Mcandidate_index); +- ic->candidate_from = mtext_property_start (prop); +- ic->candidate_to = mtext_property_end (prop); +- } +- +- if (candidate_list != ic->candidate_list) +- ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED; +- if (candidate_index != ic->candidate_index) +- ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED; +- if (candidate_show != ic->candidate_show) +- ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED; + return 0; + } + +@@ -3914,7 +3886,37 @@ + ic_info->key_unhandled = 0; + + do { +- if (handle_key (ic) < 0) ++ MPlist *candidate_list = ic->candidate_list; ++ int candidate_index = ic->candidate_index; ++ int candidate_show = ic->candidate_show; ++ MTextProperty *prop; ++ int result = handle_key (ic); ++ ++ if (ic->candidate_list) ++ { ++ M17N_OBJECT_UNREF (ic->candidate_list); ++ ic->candidate_list = NULL; ++ } ++ if (ic->cursor_pos > 0 ++ && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1, ++ Mcandidate_list))) ++ { ++ ic->candidate_list = mtext_property_value (prop); ++ M17N_OBJECT_REF (ic->candidate_list); ++ ic->candidate_index ++ = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1, ++ Mcandidate_index); ++ ic->candidate_from = mtext_property_start (prop); ++ ic->candidate_to = mtext_property_end (prop); ++ } ++ if (candidate_list != ic->candidate_list) ++ ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED; ++ if (candidate_index != ic->candidate_index) ++ ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED; ++ if (candidate_show != ic->candidate_show) ++ ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED; ++ ++ if (result < 0) + { + /* KEY was not handled. Delete it from the current key sequence. */ + if (ic_info->used > 0) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/m17n-lib-1.6.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/m17n-lib-1.6.1-r1.ebuild new file mode 100644 index 0000000000..012c0f59c8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/m17n-lib-1.6.1-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +inherit flag-o-matic libtool + +DESCRIPTION="Multilingual Library for Unix/Linux" +HOMEPAGE="http://www.m17n.org/m17n-lib/" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" +IUSE="" + +RDEPEND=">=dev-db/m17n-db-${PV} + dev-libs/libxml2" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/Fix-candidates-list-update-problem.path + elibtoolize +} + +src_configure() { + append-flags -fPIC + + # The configure script warns that the --without-gui option is an + # unrecognized option, but it's not true. Actually, the "unrecognized" + # option effectively removes almost all optional modules of m17n-lib + # that we don't use (namely X11, Xaw, fribidi, freetype, xft2, and + # fontconfig modules). And as far as I know, there is no way to disable + # these modules except the --without-gui option. Note that the X11 and + # freetype modules in m17n-lib-1.6.1 does not compile on Chrome OS + # since they are not cross-compile friendly. + econf --without-gui || die +} + +src_compile() { + emake -j1 || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog NEWS README TODO || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/Manifest new file mode 100644 index 0000000000..9b39e92952 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/Manifest @@ -0,0 +1 @@ +DIST nspr-4.8.6.tar.gz 1202257 RMD160 31de6eeecd4cc2315cfb84d02cb9730cd3c09729 SHA1 54ca3cbe14cc8a2a59cb48d4961034ce35c8f223 SHA256 d9040bb01536fa63881c423c4fa831ea459696b32d2097f614842f824e1a9f6d diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-config-1.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-config-1.patch new file mode 100644 index 0000000000..a7d5361525 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-config-1.patch @@ -0,0 +1,11 @@ +--- mozilla/nsprpub/configure.orig 2006-01-14 22:41:37.000000000 +0000 ++++ mozilla/nsprpub/configure 2006-01-14 22:49:14.000000000 +0000 +@@ -3893,7 +3893,7 @@ + PR_MD_CSRCS=linux.c + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' ++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)' + _OPTIMIZE_FLAGS=-O2 + _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that + # combo is not yet good at debugging inlined diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-config.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-config.patch new file mode 100644 index 0000000000..ffbbf1ad81 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-config.patch @@ -0,0 +1,89 @@ +--- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 ++++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 +@@ -112,6 +112,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 ++++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 +@@ -102,6 +102,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 ++++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 +@@ -168,6 +168,7 @@ + else + OS_LIBS = -ldl + endif ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' + endif + + ifeq ($(OS_ARCH),HP-UX) +--- mozilla/nsprpub/config/Makefile.in.orig 2005-06-01 14:28:23.000000000 +0000 ++++ mozilla/nsprpub/config/Makefile.in 2006-01-15 04:13:42.000000000 +0000 +@@ -54,7 +54,7 @@ + # because it is included by every makefile. + DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config + +-RELEASE_BINS = nspr-config ++RELEASE_BINS = nspr-config nspr.pc + + include $(topsrcdir)/config/config.mk + +@@ -139,6 +139,7 @@ + + export:: $(TARGETS) + rm -f $(dist_bindir)/nspr-config ++ rm -f $(dist_bindir)/nspr.pc + + ifdef WRAP_SYSTEM_INCLUDES + export:: +--- mozilla/nsprpub/config/nspr.pc.in.orig 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/nsprpub/config/nspr.pc.in 2006-01-15 04:12:23.000000000 +0000 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ ++Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 @OS_LIBS@ -Wl,-R${libdir} ++Cflags: -I${includedir} +--- mozilla/nsprpub/configure.orig 2006-01-15 04:17:59.000000000 +0000 ++++ mozilla/nsprpub/configure 2006-01-15 04:21:35.000000000 +0000 +@@ -5899,6 +5899,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +--- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 ++++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 +@@ -122,7 +122,7 @@ + fi + + if test "$echo_libs" = "yes"; then +- libdirs=-L$libdir ++ libdirs="-Wl,-R$libdir -L$libdir" + if test -n "$lib_plds"; then + libdirs="$libdirs -lplds${major_version}" + fi diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-lang.patch new file mode 100644 index 0000000000..46fe15b810 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.6.1-lang.patch @@ -0,0 +1,41 @@ +The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in +option parsing, it may break. + +http://bugs.gentoo.org/103483 + +--- mozilla/nsprpub/configure ++++ mozilla/nsprpub/configure +@@ -54,6 +54,16 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + ++# NLS nuisances. ++# Only set these to C if already set. These must not be set unconditionally ++# because not all systems understand e.g. LANG=C (notably SCO). ++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! ++# Non-C LC_CTYPE values break the ctype check. ++if test "${LANG+set}" = set; then LANG=C; export LANG; fi ++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi ++if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= +@@ -452,16 +463,6 @@ + esac + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h + # AIX cpp loses on an empty file, so make sure it contains at least a newline. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.0-prtime.patch new file mode 100644 index 0000000000..ac509ef23d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.0-prtime.patch @@ -0,0 +1,26 @@ +--- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 ++++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 +@@ -1536,7 +1536,7 @@ + case TT_EET: zone_offset = 2 * 60; break; + case TT_JST: zone_offset = 9 * 60; break; + default: +- PR_ASSERT (0); ++ return PR_FAILURE; + break; + } + } +@@ -1578,11 +1578,12 @@ + struct tm localTime; + time_t secs; + +- PR_ASSERT(result->tm_month > -1 && ++ if (!(result->tm_month > -1 && + result->tm_mday > 0 && + result->tm_hour > -1 && + result->tm_min > -1 && +- result->tm_sec > -1); ++ result->tm_sec > -1)) ++ return PR_FAILURE; + + /* + * To obtain time_t from a tm structure representing the local diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.1-solaris.patch new file mode 100644 index 0000000000..5d9e810a5f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.1-solaris.patch @@ -0,0 +1,14 @@ +Same magic as haubi did for glib compilation, which works again here +resolving a linker problem on Solaris with GNU ld. Bug #222625 + +--- mozilla/nsprpub/pr/src/Makefile.in.orig 2008-06-22 22:24:56.671065000 +0200 ++++ mozilla/nsprpub/pr/src/Makefile.in 2008-06-23 14:38:52.320417000 +0200 +@@ -95,7 +95,7 @@ + endif + + ifdef USE_PTHREADS +-OS_LIBS = -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc ++OS_LIBS = -pthread ${LIBRT} -lsocket -lnsl -ldl -lc + else + ifdef LOCAL_THREADS_ONLY + OS_LIBS = -lsocket -lnsl -ldl -lc diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.4-solaris.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.4-solaris.patch new file mode 100644 index 0000000000..a0f14d555a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.7.4-solaris.patch @@ -0,0 +1,62 @@ +* drop Solaris linker stuff + +--- nspr-4.7.4/mozilla/nsprpub/configure.in ++++ nspr-4.7.4/mozilla/nsprpub/configure.in +@@ -1988,26 +1988,14 @@ + CPU_ARCH=`uname -p` + MDCPUCFG_H=_solaris.cfg + PR_MD_CSRCS=solaris.c +- LD=/usr/ccs/bin/ld + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + RESOLVE_LINK_SYMBOLS=1 +- case "${OS_RELEASE}" in +- 5.8|5.9) +- ;; +- *) +- # It is safe to use the -Bdirect linker flag on Solaris 10 or later. +- USE_B_DIRECT=1 +- ;; +- esac + if test -n "$GNU_CC"; then + DSO_CFLAGS=-fPIC + if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then + GCC_USE_GNU_LD=1 + fi +- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' +- if test -n "$USE_B_DIRECT"; then +- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect" +- fi ++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' + else + DSO_CFLAGS=-KPIC + DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore' +--- nspr-4.7.4/mozilla/nsprpub/configure ++++ nspr-4.7.4/mozilla/nsprpub/configure +@@ -4765,26 +4765,14 @@ + CPU_ARCH=`uname -p` + MDCPUCFG_H=_solaris.cfg + PR_MD_CSRCS=solaris.c +- LD=/usr/ccs/bin/ld + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + RESOLVE_LINK_SYMBOLS=1 +- case "${OS_RELEASE}" in +- 5.8|5.9) +- ;; +- *) +- # It is safe to use the -Bdirect linker flag on Solaris 10 or later. +- USE_B_DIRECT=1 +- ;; +- esac + if test -n "$GNU_CC"; then + DSO_CFLAGS=-fPIC + if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then + GCC_USE_GNU_LD=1 + fi +- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' +- if test -n "$USE_B_DIRECT"; then +- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect" +- fi ++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' + else + DSO_CFLAGS=-KPIC + DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore' diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-config.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-config.patch new file mode 100644 index 0000000000..e8fc6c112b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-config.patch @@ -0,0 +1,47 @@ +--- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 ++++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 +@@ -112,6 +112,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 ++++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 +@@ -102,6 +102,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 ++++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 +@@ -168,6 +168,7 @@ + else + OS_LIBS = -ldl + endif ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' + endif + + ifeq ($(OS_ARCH),HP-UX) +--- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 ++++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 +@@ -122,7 +122,7 @@ + fi + + if test "$echo_libs" = "yes"; then +- libdirs=-L$libdir ++ libdirs="-Wl,-R$libdir -L$libdir" + if test -n "$lib_plds"; then + libdirs="$libdirs -lplds${major_version}" + fi diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch new file mode 100644 index 0000000000..6564af9cbf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch @@ -0,0 +1,46 @@ +--- a/mozilla/nsprpub/Makefile.in ++++ b/mozilla/nsprpub/Makefile.in +@@ -40,18 +40,16 @@ + + MOD_DEPTH = . + topsrcdir = @top_srcdir@ + srcdir = @srcdir@ + VPATH = @srcdir@ + + include $(MOD_DEPTH)/config/autoconf.mk + +-MAKE := $(patsubst -j%,,$(MAKE)) -j1 +- + DIRS = config pr lib + + ifdef MOZILLA_CLIENT + # Make nsinstall use absolute symlinks by default for Mozilla OSX builds + # http://bugzilla.mozilla.org/show_bug.cgi?id=193164 + ifeq ($(OS_ARCH),Darwin) + ifndef NSDISTMODE + NSDISTMODE=absolute_symlink +--- a/mozilla/nsprpub/pr/src/Makefile.in ++++ b/mozilla/nsprpub/pr/src/Makefile.in +@@ -384,17 +384,20 @@ endif + # + + + # + # The Client build wants the shared libraries in $(dist_bindir) + # so we also install them there. + # + +-export:: $(TARGETS) ++export:: ++ $(MAKE) -C . build ++ ++build:: $(TARGETS) + $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) + ifdef SHARED_LIBRARY + ifeq ($(OS_ARCH),HP-UX) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir) + else + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir) + endif + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch new file mode 100644 index 0000000000..3309ae085f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch @@ -0,0 +1,126 @@ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 +@@ -162,3 +162,4 @@ + RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include + RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin + RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib ++RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in +--- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 +@@ -52,9 +52,10 @@ + + # autoconf.mk must be deleted last (from the top-level directory) + # because it is included by every makefile. +-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config ++DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc + + RELEASE_BINS = nspr-config ++RELEASE_PC = nspr.pc + + include $(topsrcdir)/config/config.mk + +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 +@@ -92,13 +92,13 @@ + + # Set variables that may be dependent upon other variables + if test -z "$exec_prefix"; then +- exec_prefix=@exec_prefix@ ++ exec_prefix=`pkg-config --variable=exec_prefix nspr` + fi + if test -z "$includedir"; then +- includedir=@includedir@ ++ includedir=`pkg-config --variable=includedir nspr` + fi + if test -z "$libdir"; then +- libdir=@libdir@ ++ libdir=`pkg-config --variable=libdir nspr` + fi + + if test "$echo_prefix" = "yes"; then +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ ++Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread ++Cflags: -I${includedir} ++ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 +@@ -211,7 +211,7 @@ + rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) + +$(LOOP_OVER_DIRS) + +-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) ++install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) + ifdef RELEASE_BINS + $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) + endif +@@ -221,6 +221,9 @@ + ifdef RELEASE_LIBS + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) + endif ++ifdef RELEASE_PC ++ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ ++endif + +$(LOOP_OVER_DIRS) + + release:: export +@@ -272,6 +275,23 @@ + fi + cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) + endif ++ifdef RELEASE_PC ++ @echo "Copying pkg-config files to release directory" ++ @if test -z "$(BUILD_NUMBER)"; then \ ++ echo "BUILD_NUMBER must be defined"; \ ++ false; \ ++ else \ ++ true; \ ++ fi ++ @if test ! -d $(RELEASE_PC_DEST); then \ ++ rm -rf $(RELEASE_PC_DEST); \ ++ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ ++ else \ ++ true; \ ++ fi ++ cp $(RELEASE_PC) $(RELEASE_PC_DEST) ++endif ++ + +$(LOOP_OVER_DIRS) + + alltags: +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure +--- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 +@@ -6037,6 +6037,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in +--- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 +@@ -2871,6 +2871,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch new file mode 100644 index 0000000000..5bd23741ea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch @@ -0,0 +1,126 @@ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 +@@ -162,3 +162,4 @@ + RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include + RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin + RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib ++RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in +--- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 +@@ -52,9 +52,10 @@ + + # autoconf.mk must be deleted last (from the top-level directory) + # because it is included by every makefile. +-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config ++DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc + + RELEASE_BINS = nspr-config ++RELEASE_PC = nspr.pc + + include $(topsrcdir)/config/config.mk + +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 +@@ -92,13 +92,13 @@ + + # Set variables that may be dependent upon other variables + if test -z "$exec_prefix"; then +- exec_prefix=@exec_prefix@ ++ exec_prefix=`pkg-config --variable=exec_prefix nspr` + fi + if test -z "$includedir"; then +- includedir=@includedir@ ++ includedir=`pkg-config --variable=includedir nspr` + fi + if test -z "$libdir"; then +- libdir=@libdir@ ++ libdir=`pkg-config --variable=libdir nspr` + fi + + if test "$echo_prefix" = "yes"; then +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ ++Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread ++Cflags: -I${includedir} ++ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 +@@ -211,7 +211,7 @@ + rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) + +$(LOOP_OVER_DIRS) + +-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) ++install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) + ifdef RELEASE_BINS + $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) + endif +@@ -221,6 +221,9 @@ + ifdef RELEASE_LIBS + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) + endif ++ifdef RELEASE_PC ++ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ ++endif + +$(LOOP_OVER_DIRS) + + release:: export +@@ -272,6 +275,23 @@ + fi + cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) + endif ++ifdef RELEASE_PC ++ @echo "Copying pkg-config files to release directory" ++ @if test -z "$(BUILD_NUMBER)"; then \ ++ echo "BUILD_NUMBER must be defined"; \ ++ false; \ ++ else \ ++ true; \ ++ fi ++ @if test ! -d $(RELEASE_PC_DEST); then \ ++ rm -rf $(RELEASE_PC_DEST); \ ++ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ ++ else \ ++ true; \ ++ fi ++ cp $(RELEASE_PC) $(RELEASE_PC_DEST) ++endif ++ + +$(LOOP_OVER_DIRS) + + alltags: +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure +--- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 +@@ -6037,6 +6037,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in +--- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 +@@ -2871,6 +2871,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.0-cross.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.0-cross.patch new file mode 100644 index 0000000000..0792dde8bf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.0-cross.patch @@ -0,0 +1,43 @@ +--- mozilla/nsprpub/configure.orig 2009-09-29 03:06:05.000000000 +0000 ++++ mozilla/nsprpub/configure 2009-09-29 03:07:19.000000000 +0000 +@@ -1129,16 +1129,16 @@ + fi + + if test -z "$SKIP_COMPILER_CHECKS"; then +-if test "$target" != "$host"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + +- echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 +-echo "configure:1142: checking for $host compiler" >&5 ++ echo $ac_n "checking for $build compiler""... $ac_c" 1>&6 ++echo "configure:1142: checking for $build compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -1189,8 +1189,8 @@ + CFLAGS="$HOST_CFLAGS" + LDFLAGS="$HOST_LDFLAGS" + +- echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1194: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++ echo $ac_n "checking whether the $build compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 ++echo "configure:1194: checking whether the $build compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- { echo "configure: error: installation or configuration problem: $host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } ++ { echo "configure: error: installation or configuration problem: $build compiler $HOST_CC cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.3-aix-gcc.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.3-aix-gcc.patch new file mode 100644 index 0000000000..4dc4ea335d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.3-aix-gcc.patch @@ -0,0 +1,145 @@ +NSPR does not know that gcc does work on AIX: +https://bugzilla.mozilla.org/show_bug.cgi?id=547991 + +--- ./mozilla/nsprpub/configure.in.orig 2010-02-23 14:36:55 +0100 ++++ ./mozilla/nsprpub/configure.in 2010-02-23 14:37:08 +0100 +@@ -871,8 +871,13 @@ + AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) + USE_IPV6=1 + AIX_LINK_OPTS='-brtl -bnso -berok' ++ if test -n "$GNU_CC"; then ++ LD='$(CC)' ++ DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib' ++ fi + ;; + esac ++ test -z "$GNU_CC" && + CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' +--- ./mozilla/nsprpub/configure.orig 2010-02-23 14:36:58 +0100 ++++ ./mozilla/nsprpub/configure 2010-02-23 14:37:08 +0100 +@@ -3099,8 +3099,13 @@ + + USE_IPV6=1 + AIX_LINK_OPTS='-brtl -bnso -berok' ++ if test -n "$GNU_CC"; then ++ LD='$(CC)' ++ DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib' ++ fi + ;; + esac ++ test -z "$GNU_CC" && + CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' +--- ./mozilla/nsprpub/lib/ds/Makefile.in.orig 2010-02-23 14:40:10 +0100 ++++ ./mozilla/nsprpub/lib/ds/Makefile.in 2010-02-23 14:40:58 +0100 +@@ -68,11 +68,19 @@ + endif # WINNT + + ifeq ($(OS_ARCH), AIX) ++ifndef NS_USE_GCC + ifeq ($(CLASSIC_NSPR),1) + OS_LIBS = -lc + else + OS_LIBS = -lc_r + endif ++else ++ifeq ($(CLASSIC_NSPR),1) ++OS_LIBS = ++else ++OS_LIBS = -pthread ++endif ++endif + endif + + ifeq ($(OS_ARCH),IRIX) +--- ./mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2010-02-23 14:45:41 +0100 ++++ ./mozilla/nsprpub/lib/libc/src/Makefile.in 2010-02-23 14:47:58 +0100 +@@ -77,11 +77,19 @@ + endif # WINNT + + ifeq ($(OS_ARCH), AIX) ++ifndef NS_USE_GCC + ifeq ($(CLASSIC_NSPR),1) + OS_LIBS = -lc + else + OS_LIBS = -lc_r + endif ++else ++ifeq ($(CLASSIC_NSPR),1) ++OS_LIBS = ++else ++OS_LIBS = -pthread ++endif ++endif + endif + + ifeq ($(OS_ARCH),IRIX) +--- ./mozilla/nsprpub/pr/src/Makefile.in.orig 2010-02-23 14:37:04 +0100 ++++ ./mozilla/nsprpub/pr/src/Makefile.in 2010-02-23 14:52:16 +0100 +@@ -110,19 +110,29 @@ + endif + + ifeq ($(OS_ARCH),AIX) ++ifndef NS_USE_GCC + DSO_LDOPTS += -binitfini::_PR_Fini ++endif + OS_LIBS = -lodm -lcfg + ifeq ($(CLASSIC_NSPR),1) + ifeq ($(OS_RELEASE),4.1) + OS_LIBS += -lsvld -lc + else ++ifndef NS_USE_GCC + OS_LIBS += -ldl -lc ++else ++OS_LIBS += -ldl ++endif + endif + else + ifeq ($(OS_RELEASE),4.1) + OS_LIBS += -lpthreads -lsvld -lC_r -lC -lc_r -lm /usr/lib/libc.a + else ++ifndef NS_USE_GCC + OS_LIBS += -lpthreads -ldl -lC_r -lC -lc_r -lm /usr/lib/libc.a ++else ++OS_LIBS += -pthread -ldl -lm ++endif + endif + endif + endif +--- mozilla/nsprpub/pr/tests/Makefile.in.orig 2010-02-23 15:14:03 +0100 ++++ mozilla/nsprpub/pr/tests/Makefile.in 2010-02-23 15:17:58 +0100 +@@ -341,9 +341,17 @@ + + # AIX + ifeq ($(OS_ARCH),AIX) ++ ifndef NS_USE_GCC + LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib ++ else ++ LDOPTS += -Wl,-blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib ++ endif + ifneq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) ++ ifndef NS_USE_GCC + LDOPTS += -brtl ++ else ++ LDOPTS += -Wl,-brtl ++ endif + EXTRA_LIBS = -ldl + endif + endif +--- mozilla/nsprpub/lib/tests/Makefile.in.orig 2010-02-23 15:35:37 +0100 ++++ mozilla/nsprpub/lib/tests/Makefile.in 2010-02-23 15:35:37 +0100 +@@ -127,7 +127,11 @@ + + # AIX + ifeq ($(OS_ARCH),AIX) ++ifndef NS_USE_GCC + LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib ++else ++LDOPTS += -Wl,-blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib ++endif + LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr + LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr + endif diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch new file mode 100644 index 0000000000..667e699c20 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch @@ -0,0 +1,43 @@ +NSPR does not set the soname on any platform yet: +https://bugzilla.mozilla.org/show_bug.cgi?id=452873 + +Supporting something like "soname" on AIX is tricky: +http://bugs.gentoo.org/show_bug.cgi?id=213277 + +--- mozilla/nsprpub/config/rules.mk.orig 2010-02-23 15:55:00 +0100 ++++ mozilla/nsprpub/config/rules.mk 2010-02-23 16:04:31 +0100 +@@ -132,14 +132,17 @@ + else + ifdef MKSHLIB + SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) ++ifeq ($(OS_ARCH), AIX) ++IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(DLL_SUFFIX) ++endif + endif + endif + + endif + endif + + ifndef TARGETS +-ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) ++ifeq (,$(filter-out WINNT WINCE OS2 AIX,$(OS_ARCH))) + TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) + ifndef BUILD_OPT + ifdef MSC_VER +@@ -327,6 +330,15 @@ + else + ifeq (,$(filter-out WIN95 WINCE,$(OS_TARGET))) + $(IMPORT_LIBRARY): $(SHARED_LIBRARY) ++else ++ifdef IMPORT_LIBRARY ++$(IMPORT_LIBRARY): $(SHARED_LIBRARY) ++ ( echo '#! $(notdir $(SHARED_LIBRARY))' \ ++ ; dump -Tv $(SHARED_LIBRARY) \ ++ | awk '{ if ($$4 == "EXP" && $$6 != "SECdef") { print $$8 } }' \ ++ | sort -u \ ++ ) > $@ ++endif + endif + endif + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch new file mode 100644 index 0000000000..1258b608aa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch @@ -0,0 +1,25 @@ +Don't use @executable_path, it messed up linking against nspr from e.g. +nss. + +--- mozilla/nsprpub/configure.in ++++ mozilla/nsprpub/configure.in +@@ -1007,7 +1007,7 @@ + ;; + esac + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' ++ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names' + _OPTIMIZE_FLAGS=-O2 + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + STRIP="$STRIP -x -S" +--- mozilla/nsprpub/configure ++++ mozilla/nsprpub/configure +@@ -1007,7 +1007,7 @@ + ;; + esac + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' ++ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names' + _OPTIMIZE_FLAGS=-O2 + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + STRIP="$STRIP -x -S" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.6-r1-cross.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.6-r1-cross.patch new file mode 100644 index 0000000000..8a73a4244e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.6-r1-cross.patch @@ -0,0 +1,54 @@ +diff -Naur nspr-4.8.6_orig/mozilla/nsprpub/configure nspr-4.8.6/mozilla/nsprpub/configure +--- nspr-4.8.6_orig/mozilla/nsprpub/configure 2011-07-06 16:06:57.000000000 -0700 ++++ nspr-4.8.6/mozilla/nsprpub/configure 2011-07-06 16:15:57.000000000 -0700 +@@ -1241,16 +1241,16 @@ + fi + + if test -z "$SKIP_COMPILER_CHECKS"; then +-if test "$target" != "$host"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + +- echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 +-echo "configure:1254: checking for $host compiler" >&5 ++ echo $ac_n "checking for $build compiler""... $ac_c" 1>&6 ++echo "configure:1254: checking for $build compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -1301,8 +1301,8 @@ + CFLAGS="$HOST_CFLAGS" + LDFLAGS="$HOST_LDFLAGS" + +- echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1306: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++ echo $ac_n "checking whether the $build compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 ++echo "configure:1306: checking whether the $build compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- { echo "configure: error: installation or configuration problem: $host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } ++ { echo "configure: error: installation or configuration problem: $build compiler $HOST_CC cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + +@@ -2703,6 +2703,9 @@ + i?86-apple-darwin*:powerpc-apple-darwin*) + cross_compiling=yes + ;; ++ x86_64-*:i686-*) ++ cross_compiling=yes ++ ;; + esac + + if test "$cross_compiling" = "yes"; then diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch new file mode 100644 index 0000000000..dd3b132cb0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch @@ -0,0 +1,28 @@ +Use CFLAGS when linking. Some flags can add functionality to generated +code that requires extra libs to be linked in (eg. libgomp when using +autoparallelization). Other flags are required when building and linking +(eg. -flto). + +https://bugs.gentoo.org/365975 + +--- a/mozilla/nsprpub/config/autoconf.mk.in ++++ b/mozilla/nsprpub/config/autoconf.mk.in +@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@ + DLLFLAGS = @DLLFLAGS@ + EXEFLAGS = @EXEFLAGS@ + OPTIMIZER = @OPTIMIZER@ ++LD_CFLAGS = @CFLAGS@ + + PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@ + PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@ +--- a/mozilla/nsprpub/config/config.mk ++++ b/mozilla/nsprpub/config/config.mk +@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ + NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ + $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) + +-LDFLAGS = $(OS_LDFLAGS) ++LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS) + + # Enable profile-guided optimization + ifdef MOZ_PROFILE_GENERATE diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch new file mode 100644 index 0000000000..6880141836 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch @@ -0,0 +1,91 @@ +# HG changeset patch +# Parent 6b1ef31834235cde5153f91a7443b29398b541d9 +# User Jory A. Pratt +Add initial support for x32 abi + +diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg +--- a/mozilla/nsprpub/pr/include/md/_linux.cfg ++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg +@@ -207,16 +207,63 @@ + #define PR_ALIGN_OF_POINTER 8 + #define PR_ALIGN_OF_WORD 8 + + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + + #elif defined(__x86_64__) + ++#ifdef __ILP32__ ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#else ++ + #define IS_LITTLE_ENDIAN 1 + #undef IS_BIG_ENDIAN + #define IS_64 + + #define PR_BYTES_PER_BYTE 1 + #define PR_BYTES_PER_SHORT 2 + #define PR_BYTES_PER_INT 4 + #define PR_BYTES_PER_INT64 8 +@@ -251,16 +298,18 @@ + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + #define PR_ALIGN_OF_WORD 8 + + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#endif ++ + #elif defined(__mc68000__) + + #undef IS_LITTLE_ENDIAN + #define IS_BIG_ENDIAN 1 + + #define PR_BYTES_PER_BYTE 1 + #define PR_BYTES_PER_SHORT 2 + #define PR_BYTES_PER_INT 4 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.9.2-r1-cross.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.9.2-r1-cross.patch new file mode 100644 index 0000000000..1484164c5a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/files/nspr-4.9.2-r1-cross.patch @@ -0,0 +1,99 @@ +diff -aurN nspr-4.9.2-unpatched/mozilla/nsprpub/configure nspr-4.9.2/mozilla/nsprpub/configure +--- nspr-4.9.2-unpatched/mozilla/nsprpub/configure 2012-12-27 23:18:54.513295786 -0800 ++++ nspr-4.9.2/mozilla/nsprpub/configure 2012-12-27 23:23:18.856135136 -0800 +@@ -1367,16 +1367,16 @@ + + if test -z "$SKIP_COMPILER_CHECKS"; then + +-if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build" -o -n "$CROSS_COMPILE"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + +- echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 +-echo "configure:1380: checking for $host compiler" >&5 ++ echo $ac_n "checking for $build compiler""... $ac_c" 1>&6 ++echo "configure:1380: checking for $build compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -1427,8 +1427,8 @@ + CFLAGS="$HOST_CFLAGS" + LDFLAGS="$HOST_LDFLAGS" + +- echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1432: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++ echo $ac_n "checking whether the $build compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 ++echo "configure:1432: checking whether the $build compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- { echo "configure: error: installation or configuration problem: $host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } ++ { echo "configure: error: installation or configuration problem: $build compiler $HOST_CC cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + +@@ -2835,6 +2835,9 @@ + i?86-apple-darwin*:powerpc-apple-darwin*) + cross_compiling=yes + ;; ++ x86_64-*:i686-*) ++ cross_compiling=yes ++ ;; + esac + + if test "$cross_compiling" = "yes"; then +diff -aurN nspr-4.9.2-unpatched/mozilla/nsprpub/configure.in nspr-4.9.2/mozilla/nsprpub/configure.in +--- nspr-4.9.2-unpatched/mozilla/nsprpub/configure.in 2012-12-27 23:18:54.513295786 -0800 ++++ nspr-4.9.2/mozilla/nsprpub/configure.in 2012-12-27 23:26:15.548033406 -0800 +@@ -547,15 +547,15 @@ + dnl Explicitly honor $CROSS_COMPILE to allow cross-compiling + dnl between toolkits on the same architecture, as when + dnl targeting the iOS Simulator from OS X. +-if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build" -o -n "$CROSS_COMPILE"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + +- AC_MSG_CHECKING([for $host compiler]) ++ AC_MSG_CHECKING([for $build compiler]) + AC_CHECK_PROGS(HOST_CC, $HOST_CC gcc cc /usr/ucb/cc, "") + if test -z "$HOST_CC"; then + AC_MSG_ERROR([no acceptable cc found in \$PATH]) +@@ -572,10 +572,10 @@ + CFLAGS="$HOST_CFLAGS" + LDFLAGS="$HOST_LDFLAGS" + +- AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) ++ AC_MSG_CHECKING([whether the $build compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) + AC_TRY_COMPILE([], [return(0);], + [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])], +- AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) ) ++ AC_MSG_ERROR([installation or configuration problem: $build compiler $HOST_CC cannot create executables.]) ) + + CC=$_SAVE_CC + CFLAGS=$_SAVE_CFLAGS +@@ -672,6 +672,9 @@ + dnl translated environment, making a cross compiler appear native. + cross_compiling=yes + ;; ++ x86_64-*:i686-*) ++ cross_compiling=yes ++ ;; + esac + + if test "$cross_compiling" = "yes"; then diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.8.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.8.6-r1.ebuild new file mode 100644 index 0000000000..65d6d7a254 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.8.6-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.6-r1.ebuild,v 1.1 2010/10/11 15:18:26 anarchy Exp $ + +EAPI=3 + +inherit eutils multilib toolchain-funcs versionator + +MIN_PV="$(get_version_component_range 2)" + +DESCRIPTION="Netscape Portable Runtime" +HOMEPAGE="http://www.mozilla.org/projects/nspr/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="debug" + +src_prepare() { + mkdir build inst + epatch "${FILESDIR}"/${PN}-4.8-config.patch + epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch + epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch + epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch + epatch "${FILESDIR}"/${PN}-4.8.6-r1-cross.patch + epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-3.patch + epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch + epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch + epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch + epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch + epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch + epatch "${FILESDIR}"/${PN}-4.8-parallel-fixup.patch + # make sure it won't find Perl out of Prefix + sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + mozilla/nsprpub/config/rules.mk + + # Disable useless rpath flags http://crosbug.com/38334 + find -name Makefile.in -exec \ + sed -i -e "/^DSO_LDOPTS.*-Wl,-R,'\$\$ORIGIN'/d" {} + +} + +src_configure() { + cd "${S}"/build + + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";; + *32-bit*|*ppc*|*i386*|*"RISC System/6000"*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + if tc-is-cross-compiler; then + myconf="${myconf} --with-arch=${ARCH}" + fi + + myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" + + export HOST_CC="${HOSTCC}" + export HOST_CFLAGS="-g" + export HOST_LDFLAGS="-g" + HOST_CC="$HOST_CC" HOST_CFLAGS="$HOST_CFLAGS" \ + HOST_LDFLAGS="$HOST_LDFLAGS" ECONF_SOURCE="../mozilla/nsprpub" \ + econf \ + $(use_enable debug) \ + $(use_enable !debug optimize) \ + ${myconf} || die "econf failed" +} + +src_compile() { + cd "${S}"/build + # Removed some cmdline args that forced CC and CXX, as our config + # changes above make them get set correctly, and forcing them here + # means that we compile a host tool (nsinstall) with the target + # compiler. + emake || die "failed to build" +} + +src_install () { + # Their build system is royally confusing, as usual + MINOR_VERSION=${MIN_PV} # Used for .so version + cd "${S}"/build + emake DESTDIR="${D}" install || die "emake install failed" + + cd "${ED}"/usr/$(get_libdir) + for file in *.a; do + einfo "removing static libraries as upstream has requested!" + rm -f ${file} || die "failed to remove static libraries." + done + + local n= + # aix-soname.patch does this already + [[ ${CHOST} == *-aix* ]] || + for file in *$(get_libname); do + n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) + mv ${file} ${n} || die "failed to mv files around" + ln -s ${n} ${file} || die "failed to symlink files." + if [[ ${CHOST} == *-darwin* ]]; then + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die + fi + done + + # install nspr-config + dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" + + # create pkg-config file + insinto /usr/$(get_libdir)/pkgconfig/ + doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file" + + # Remove stupid files in /usr/bin + rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" +} + +pkg_postinst() { + ewarn + ewarn "Please make sure you run revdep-rebuild after upgrade." + ewarn "This is *extremely* important to ensure your system nspr works properly." + ewarn +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.8.6-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.8.6-r5.ebuild new file mode 120000 index 0000000000..01ff24e76d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.8.6-r5.ebuild @@ -0,0 +1 @@ +nspr-4.8.6-r1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.9.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.9.2.ebuild new file mode 100644 index 0000000000..1bc6e7a10d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nspr/nspr-4.9.2.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.2.ebuild,v 1.8 2012/11/29 23:40:13 blueness Exp $ + +EAPI=3 + +inherit eutils multilib toolchain-funcs versionator + +MIN_PV="$(get_version_component_range 2)" + +DESCRIPTION="Netscape Portable Runtime" +HOMEPAGE="http://www.mozilla.org/projects/nspr/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="debug" + +src_prepare() { + mkdir build inst + epatch "${FILESDIR}"/${PN}-4.8-config.patch + epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch + epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch + epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch + epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch + epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch + epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch + # Patch needs updating + #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch + epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch + epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch + epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.2.patch + + # ChromeOS: Fix x64 -> x86 cross-compilation + epatch "${FILESDIR}"/${PN}-4.9.2-r1-cross.patch + + # make sure it won't find Perl out of Prefix + sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + "${S}"/mozilla/nsprpub/config/rules.mk || die +} + +src_configure() { + cd "${S}"/build + + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" + + export HOST_CC="${HOSTCC}" + export HOST_CFLAGS="-g" + export HOST_LDFLAGS="-g" + LC_ALL="C" HOST_CC="$HOST_CC" HOST_CFLAGS="$HOST_CFLAGS" \ + HOST_LDFLAGS="$HOST_LDFLAGS" ECONF_SOURCE="../mozilla/nsprpub" \ + econf \ + $(use_enable debug) \ + $(use_enable !debug optimize) \ + ${myconf} || die "econf failed" +} + +src_compile() { + cd "${S}"/build + if tc-is-cross-compiler; then + emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ + -C config nsinstall || die "failed to build" + mv config/{,native-}nsinstall + sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk + rm config/nsinstall.o + fi + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" +} + +src_install () { + # Their build system is royally confusing, as usual + MINOR_VERSION=${MIN_PV} # Used for .so version + cd "${S}"/build + emake DESTDIR="${D}" install || die "emake install failed" + + cd "${ED}"/usr/$(get_libdir) + for file in *.a; do + einfo "removing static libraries as upstream has requested!" + rm -f ${file} || die "failed to remove static libraries." + done + + local n= + # aix-soname.patch does this already + [[ ${CHOST} == *-aix* ]] || + for file in *$(get_libname); do + n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) + mv ${file} ${n} || die "failed to mv files around" + ln -s ${n} ${file} || die "failed to symlink files." + if [[ ${CHOST} == *-darwin* ]]; then + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die + fi + done + + # install nspr-config + dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" + + # Remove stupid files in /usr/bin + rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" +} + +pkg_postinst() { + ewarn + ewarn "Please make sure you run revdep-rebuild after upgrade." + ewarn "This is *extremely* important to ensure your system nspr works properly." + ewarn +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch new file mode 100644 index 0000000000..f0a3310c3c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch @@ -0,0 +1,33 @@ +--- mozilla/security/coreconf/SunOS5.mk.orig 2009-10-02 10:51:26.617090950 +0200 ++++ mozilla/security/coreconf/SunOS5.mk 2009-10-02 10:53:39.756260510 +0200 +@@ -37,6 +37,9 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + ++NS_USE_GCC = 1 ++GCC_USE_GNU_LD = 1 ++ + # + # Temporary define for the Client; to be removed when binary release is used + # +@@ -104,7 +107,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++#INCLUDES += -I/usr/dt/include -I/usr/openwin/include + + RANLIB = echo + CPU_ARCH = sparc +@@ -114,11 +117,6 @@ + NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) + + MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) +-ifdef NS_USE_GCC +-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1))) +- GCC_USE_GNU_LD = 1 +-endif +-endif + ifdef MAPFILE + ifdef NS_USE_GCC + ifdef GCC_USE_GNU_LD diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff new file mode 100644 index 0000000000..799fd7914a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff @@ -0,0 +1,245 @@ +diff -urN nss-3.12.5-orig/mozilla/security/nss/config/Makefile nss-3.12.5/mozilla/security/nss/config/Makefile +--- nss-3.12.5-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 +@@ -0,0 +1,40 @@ ++CORE_DEPTH = ../.. ++DEPTH = ../.. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` ++PREFIX = /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@exec_prefix@,\$${prefix}," \ ++ -e "s,@libdir@,\$${prefix}/gentoo/nss," \ ++ -e "s,@includedir@,\$${prefix}/include/nss," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in nss-3.12.5/mozilla/security/nss/config/nss-config.in +--- nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 +@@ -0,0 +1,145 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++ ++major_version=@NSS_MAJOR_VERSION@ ++minor_version=@NSS_MINOR_VERSION@ ++patch_version=@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_ssl=yes ++lib_smime=yes ++lib_nss=yes ++lib_nssutil=yes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac ++ ++ case $1 in ++ --prefix=*) ++ prefix=$optarg ++ ;; ++ --prefix) ++ echo_prefix=yes ++ ;; ++ --exec-prefix=*) ++ exec_prefix=$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=yes ++ ;; ++ --includedir=*) ++ includedir=$optarg ++ ;; ++ --includedir) ++ echo_includedir=yes ++ ;; ++ --libdir=*) ++ libdir=$optarg ++ ;; ++ --libdir) ++ echo_libdir=yes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ smime) ++ lib_smime=yes ++ ;; ++ nss) ++ lib_nss=yes ++ ;; ++ nssutil) ++ lib_nssutil=yes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=`pkg-config --variable=exec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=`pkg-config --variable=includedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=`pkg-config --variable=libdir nss` ++fi ++ ++if test "$echo_prefix" = "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" = "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" = "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" = "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" = "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" = "yes"; then ++ libdirs="-Wl,-R$libdir -L$libdir" ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs="$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" ++ fi ++ echo $libdirs ++fi ++ +diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.5/mozilla/security/nss/config/nss.pc.in +--- nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ ++Requires: nspr >= 4.8 ++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 ++Cflags: -I${includedir} ++ +diff -urN nss-3.12.5-orig/mozilla/security/nss/Makefile nss-3.12.5/mozilla/security/nss/Makefile +--- nss-3.12.5-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 ++++ nss-3.12.5/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 +@@ -78,7 +78,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_coreconf build_nspr build_dbm all ++nss_build_all: build_coreconf build_dbm all + + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + +@@ -140,12 +140,6 @@ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + +-build_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) +- +-clobber_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber +- + build_dbm: + ifndef NSS_DISABLE_DBM + cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs +diff -urN nss-3.12.5-orig/mozilla/security/nss/manifest.mn nss-3.12.5/mozilla/security/nss/manifest.mn +--- nss-3.12.5-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 ++++ nss-3.12.5/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 +@@ -42,6 +42,6 @@ + + RELEASE = nss + +-DIRS = lib cmd ++DIRS = lib cmd config + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch new file mode 100644 index 0000000000..bf2a865830 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch @@ -0,0 +1,10 @@ +--- nss-3.12.6b/mozilla/security/coreconf/Linux.mk-old 2010-02-11 12:43:26.000000000 -0600 ++++ nss-3.12.6b/mozilla/security/coreconf/Linux.mk 2010-02-14 09:13:53.962449644 -0600 +@@ -120,6 +120,7 @@ + ifdef MOZ_DEBUG_SYMBOLS + OPTIMIZER += -gstabs+ + endif ++OPTIMIZER += -fno-strict-aliasing + endif + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-abort-on-failed-urandom-access.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-abort-on-failed-urandom-access.patch new file mode 100644 index 0000000000..699a7d9d8e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-abort-on-failed-urandom-access.patch @@ -0,0 +1,21 @@ +diff -rupN nss-3.12.8/mozilla/security/nss/lib/freebl/unix_rand.c nss-3.12.8_patched/mozilla/security/nss/lib/freebl/unix_rand.c +--- nss-3.12.8/mozilla/security/nss/lib/freebl/unix_rand.c 2010-04-29 17:20:02.000000000 -0700 ++++ nss-3.12.8_patched/mozilla/security/nss/lib/freebl/unix_rand.c 2012-04-18 10:38:53.013840985 -0700 +@@ -949,6 +949,17 @@ void RNG_SystemInfoForRNG(void) + || defined(HPUX) + if (bytes) + return; ++ ++ /* ++ * Modified to abort the process on Chromium OS if it failed ++ * to read from /dev/urandom. ++ * ++ * See crosbug.com/29623 for details. ++ */ ++ fprintf(stderr, "[ERROR:%s(%d)] NSS failed to read from /dev/urandom. " ++ "Abort process.\n", __FILE__, __LINE__); ++ fflush(stderr); ++ abort(); + #endif + + #ifdef SOLARIS diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-bugzilla-802429.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-bugzilla-802429.patch new file mode 100644 index 0000000000..b5abe83370 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-bugzilla-802429.patch @@ -0,0 +1,166 @@ +--- a/mozilla/security/nss/lib/softoken/pk11pars.h 2012-10-19 17:49:36.824033689 -0700 ++++ a/mozilla/security/nss/lib/softoken/pk11pars.h 2012-10-19 17:50:01.484588609 -0700 +@@ -80,6 +80,8 @@ + SECMOD_ARG_ENTRY(FORTEZZA,SECMOD_FORTEZZA_FLAG), + SECMOD_ARG_ENTRY(RC5,SECMOD_RC5_FLAG), + SECMOD_ARG_ENTRY(SHA1,SECMOD_SHA1_FLAG), ++ SECMOD_ARG_ENTRY(SHA256,SECMOD_SHA256_FLAG), ++ SECMOD_ARG_ENTRY(SHA512,SECMOD_SHA512_FLAG), + SECMOD_ARG_ENTRY(MD5,SECMOD_MD5_FLAG), + SECMOD_ARG_ENTRY(MD2,SECMOD_MD2_FLAG), + SECMOD_ARG_ENTRY(SSL,SECMOD_SSL_FLAG), +diff --git a/mozilla/security/nss/lib/pk11wrap/pk11cert.c b/mozilla/security/nss/lib/pk11wrap/pk11cert.c +index 329a2e7..b2c91b2 100644 +--- a/mozilla/security/nss/lib/pk11wrap/pk11cert.c ++++ b/mozilla/security/nss/lib/pk11wrap/pk11cert.c +@@ -2663,7 +2663,7 @@ PK11_GetAllSlotsForCert(CERTCertificate *cert, void *arg) + nssCryptokiObject *instance = *ip; + PK11SlotInfo *slot = instance->token->pk11slot; + if (slot) { +- PK11_AddSlotToList(slotList, slot); ++ PK11_AddSlotToList(slotList, slot, PR_TRUE); + found = PR_TRUE; + } + } +diff --git a/mozilla/security/nss/lib/pk11wrap/pk11priv.h b/mozilla/security/nss/lib/pk11wrap/pk11priv.h +index 2c70cb0..c5b7a27 100644 +--- a/mozilla/security/nss/lib/pk11wrap/pk11priv.h ++++ b/mozilla/security/nss/lib/pk11wrap/pk11priv.h +@@ -28,7 +28,7 @@ SEC_BEGIN_PROTOS + PK11SlotList * PK11_NewSlotList(void); + PK11SlotList * PK11_GetPrivateKeyTokens(CK_MECHANISM_TYPE type, + PRBool needRW,void *wincx); +-SECStatus PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot); ++SECStatus PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot, PRBool sorted); + SECStatus PK11_DeleteSlotFromList(PK11SlotList *list,PK11SlotListElement *le); + PK11SlotListElement *PK11_FindSlotElement(PK11SlotList *list, + PK11SlotInfo *slot); +diff --git a/mozilla/security/nss/lib/pk11wrap/pk11slot.c b/mozilla/security/nss/lib/pk11wrap/pk11slot.c +index 4d8d0ec..6d6aeb0 100644 +--- a/mozilla/security/nss/lib/pk11wrap/pk11slot.c ++++ b/mozilla/security/nss/lib/pk11wrap/pk11slot.c +@@ -171,11 +171,16 @@ PK11_FreeSlotList(PK11SlotList *list) + + /* + * add a slot to a list ++ * "slot" is the slot to be added. Ownership is not transferred. ++ * "sorted" indicates whether or not the slot should be inserted according to ++ * cipherOrder of the associated module. PR_FALSE indicates that the slot ++ * should be inserted to the head of the list. + */ + SECStatus +-PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot) ++PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot, PRBool sorted) + { + PK11SlotListElement *le; ++ PK11SlotListElement *element; + + le = (PK11SlotListElement *) PORT_Alloc(sizeof(PK11SlotListElement)); + if (le == NULL) return SECFailure; +@@ -184,9 +189,23 @@ PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot) + le->prev = NULL; + le->refCount = 1; + PZ_Lock(list->lock); +- if (list->head) list->head->prev = le; else list->tail = le; +- le->next = list->head; +- list->head = le; ++ element = list->head; ++ /* Insertion sort, with higher cipherOrders are sorted first in the list */ ++ while (element && sorted && (element->slot->module->cipherOrder > ++ le->slot->module->cipherOrder)) { ++ element = element->next; ++ } ++ if (element) { ++ le->prev = element->prev; ++ element->prev = le; ++ le->next = element; ++ } else { ++ le->prev = list->tail; ++ le->next = NULL; ++ list->tail = le; ++ } ++ if (le->prev) le->prev->next = le; ++ if (list->head == element) list->head = le; + PZ_Unlock(list->lock); + + return SECSuccess; +@@ -208,11 +227,12 @@ PK11_DeleteSlotFromList(PK11SlotList *list,PK11SlotListElement *le) + } + + /* +- * Move a list to the end of the target list. NOTE: There is no locking +- * here... This assumes BOTH lists are private copy lists. ++ * Move a list to the end of the target list. ++ * NOTE: There is no locking here... This assumes BOTH lists are private copy ++ * lists. It also does not re-sort the target list. + */ + SECStatus +-PK11_MoveListToList(PK11SlotList *target,PK11SlotList *src) ++pk11_MoveListToList(PK11SlotList *target,PK11SlotList *src) + { + if (src->head == NULL) return SECSuccess; + +@@ -511,7 +531,7 @@ PK11_FindSlotsByNames(const char *dllName, const char* slotName, + ((NULL == slotName) || (0 == *slotName)) && + ((NULL == tokenName) || (0 == *tokenName)) ) { + /* default to softoken */ +- PK11_AddSlotToList(slotList, PK11_GetInternalKeySlot()); ++ PK11_AddSlotToList(slotList, PK11_GetInternalKeySlot(), PR_TRUE); + return slotList; + } + +@@ -539,7 +559,7 @@ PK11_FindSlotsByNames(const char *dllName, const char* slotName, + ( (!slotName) || (tmpSlot->slot_name && + (0==PORT_Strcmp(tmpSlot->slot_name, slotName)))) ) { + if (tmpSlot) { +- PK11_AddSlotToList(slotList, tmpSlot); ++ PK11_AddSlotToList(slotList, tmpSlot, PR_TRUE); + slotcount++; + } + } +@@ -910,7 +930,7 @@ PK11_LoadSlotList(PK11SlotInfo *slot, PK11PreSlotInfo *psi, int count) + CK_MECHANISM_TYPE mechanism = PK11_DefaultArray[i].mechanism; + PK11SlotList *slotList = PK11_GetSlotList(mechanism); + +- if (slotList) PK11_AddSlotToList(slotList,slot); ++ if (slotList) PK11_AddSlotToList(slotList,slot,PR_FALSE); + } + } + +@@ -937,7 +957,7 @@ PK11_UpdateSlotAttribute(PK11SlotInfo *slot, PK11DefaultArrayEntry *entry, + + /* add this slot to the list */ + if (slotList!=NULL) +- result = PK11_AddSlotToList(slotList, slot); ++ result = PK11_AddSlotToList(slotList, slot, PR_FALSE); + + } else { /* trying to turn off */ + +@@ -1910,12 +1930,12 @@ PK11_GetAllTokens(CK_MECHANISM_TYPE type, PRBool needRW, PRBool loadCerts, + || PK11_DoesMechanism(slot, type)) { + if (pk11_LoginStillRequired(slot,wincx)) { + if (PK11_IsFriendly(slot)) { +- PK11_AddSlotToList(friendlyList, slot); ++ PK11_AddSlotToList(friendlyList, slot, PR_TRUE); + } else { +- PK11_AddSlotToList(loginList, slot); ++ PK11_AddSlotToList(loginList, slot, PR_TRUE); + } + } else { +- PK11_AddSlotToList(list, slot); ++ PK11_AddSlotToList(list, slot, PR_TRUE); + } + } + } +@@ -1923,9 +1943,9 @@ PK11_GetAllTokens(CK_MECHANISM_TYPE type, PRBool needRW, PRBool loadCerts, + } + SECMOD_ReleaseReadLock(moduleLock); + +- PK11_MoveListToList(list,friendlyList); ++ pk11_MoveListToList(list,friendlyList); + PK11_FreeSlotList(friendlyList); +- PK11_MoveListToList(list,loginList); ++ pk11_MoveListToList(list,loginList); + PK11_FreeSlotList(loginList); + + return list; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-cert-initlocks.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-cert-initlocks.patch new file mode 100644 index 0000000000..df8f7da78c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-cert-initlocks.patch @@ -0,0 +1,11 @@ +diff -rupN nss-3.12.8/mozilla/security/nss/lib/certdb/certdb.c nss-3.12.8_patched/mozilla/security/nss/lib/certdb/certdb.c +--- nss-3.12.8/mozilla/security/nss/lib/certdb/certdb.c 2010-09-02 00:52:02.000000000 +0000 ++++ nss-3.12.8_patched/mozilla/security/nss/lib/certdb/certdb.c 2012-04-02 20:58:31.821621891 +0000 +@@ -3030,6 +3030,7 @@ cert_InitLocks(void) + PORT_Assert(certTrustLock != NULL); + if (!certTrustLock) { + PZ_DestroyLock(certRefCountLock); ++ certRefCountLock = NULL; + return SECFailure; + } + } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-cert-nicknames.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-cert-nicknames.patch new file mode 100644 index 0000000000..311af0f674 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-cert-nicknames.patch @@ -0,0 +1,121 @@ +diff -c -r mozilla/security/nss/lib.orig/nss/nss.def mozilla/security/nss/lib/nss/nss.def +*** mozilla/security/nss/lib.orig/nss/nss.def 2010-04-30 00:47:47.000000000 -0700 +--- mozilla/security/nss/lib/nss/nss.def 2011-11-29 16:33:32.828968066 -0800 +*************** +*** 647,652 **** +--- 647,653 ---- + PK11_GetPQGParamsFromPrivateKey; + PK11_GetPrivateKeyNickname; + PK11_GetPublicKeyNickname; ++ PK11_GetCertificateNickname; + PK11_GetSymKeyNickname; + PK11_ImportDERPrivateKeyInfoAndReturnKey; + PK11_ImportPrivateKeyInfoAndReturnKey; +*************** +*** 658,663 **** +--- 659,665 ---- + PK11_ProtectedAuthenticationPath; + PK11_SetPrivateKeyNickname; + PK11_SetPublicKeyNickname; ++ PK11_SetCertificateNickname; + PK11_SetSymKeyNickname; + SECKEY_DecodeDERSubjectPublicKeyInfo; + SECKEY_DestroyPublicKeyList; +diff -r -c mozilla/security/nss/lib.orig/pk11wrap/pk11akey.c mozilla/security/nss/lib/pk11wrap/pk11akey.c +*** mozilla/security/nss/lib.orig/pk11wrap/pk11akey.c 2011-11-29 12:16:56.000000000 -0800 +--- mozilla/security/nss/lib/pk11wrap/pk11akey.c 2011-11-29 13:16:22.672540042 -0800 +*************** +*** 1907,1912 **** +--- 1907,1919 ---- + return PK11_GetObjectNickname(pubKey->pkcs11Slot,pubKey->pkcs11ID); + } + ++ char * ++ PK11_GetCertificateNickname(CERTCertificate *certificate) ++ { ++ return PK11_GetObjectNickname(certificate->slot, ++ certificate->pkcs11ID); ++ } ++ + SECStatus + PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey, const char *nickname) + { +*************** +*** 1921,1926 **** +--- 1928,1940 ---- + pubKey->pkcs11ID,nickname); + } + ++ SECStatus ++ PK11_SetCertificateNickname(CERTCertificate *certificate, const char *nickname) ++ { ++ return PK11_SetObjectNickname(certificate->slot, ++ certificate->pkcs11ID,nickname); ++ } ++ + SECKEYPQGParams * + PK11_GetPQGParamsFromPrivateKey(SECKEYPrivateKey *privKey) + { +diff -r -c mozilla/security/nss/lib.orig/pk11wrap/pk11obj.c mozilla/security/nss/lib/pk11wrap/pk11obj.c +*** mozilla/security/nss/lib.orig/pk11wrap/pk11obj.c 2009-02-15 19:47:21.000000000 -0800 +--- mozilla/security/nss/lib/pk11wrap/pk11obj.c 2011-11-29 11:54:01.946485857 -0800 +*************** +*** 1396,1402 **** + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +! case PK11_TypeCert: /* don't handle cert case for now */ + default: + break; + } +--- 1396,1405 ---- + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +! case PK11_TypeCert: +! slot = ((CERTCertificate *)objSpec)->slot; +! handle = ((CERTCertificate *)objSpec)->pkcs11ID; +! break; + default: + break; + } +*************** +*** 1446,1452 **** + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +! case PK11_TypeCert: /* don't handle cert case for now */ + default: + break; + } +--- 1449,1458 ---- + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +! case PK11_TypeCert: +! slot = ((CERTCertificate *)objSpec)->slot; +! handle = ((CERTCertificate *)objSpec)->pkcs11ID; +! break; + default: + break; + } +diff -r -c mozilla/security/nss/lib.orig/pk11wrap/pk11pub.h mozilla/security/nss/lib/pk11wrap/pk11pub.h +*** mozilla/security/nss/lib.orig/pk11wrap/pk11pub.h 2010-04-25 16:37:39.000000000 -0700 +--- mozilla/security/nss/lib/pk11wrap/pk11pub.h 2011-11-29 11:53:04.605709449 -0800 +*************** +*** 462,472 **** +--- 462,475 ---- + char * PK11_GetSymKeyNickname(PK11SymKey *symKey); + char * PK11_GetPrivateKeyNickname(SECKEYPrivateKey *privKey); + char * PK11_GetPublicKeyNickname(SECKEYPublicKey *pubKey); ++ char * PK11_GetCertificateNickname(CERTCertificate *certificate); + SECStatus PK11_SetSymKeyNickname(PK11SymKey *symKey, const char *nickname); + SECStatus PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey, + const char *nickname); + SECStatus PK11_SetPublicKeyNickname(SECKEYPublicKey *pubKey, + const char *nickname); ++ SECStatus PK11_SetCertificateNickname(CERTCertificate *certificate, ++ const char *nickname); + + /* size to hold key in bytes */ + unsigned int PK11_GetKeyLength(PK11SymKey *key); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-mitm-root.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-mitm-root.patch new file mode 100644 index 0000000000..233259e82f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-mitm-root.patch @@ -0,0 +1,32 @@ +*** mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.c 2012-08-23 14:37:23.300678262 -0700 +--- mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.c.new 2012-08-23 17:52:26.209075001 -0700 +*************** +*** 275,292 **** + !(CERT_LIST_END(node, pk11CertList)); + node = CERT_LIST_NEXT(node)) { + +! PKIX_PL_NSSCALLRV +! (CERTSTORE, +! nssCert, +! CERT_NewTempCertificate, +! (dbHandle, +! &(node->cert->derCert), +! NULL, /* nickname */ +! PR_FALSE, +! PR_TRUE)); /* copyDER */ +! + if (!nssCert) { +! continue; /* just skip bad certs */ + } + + PKIX_CHECK_ONLY_FATAL(pkix_pl_Cert_CreateWithNSSCert +--- 275,283 ---- + !(CERT_LIST_END(node, pk11CertList)); + node = CERT_LIST_NEXT(node)) { + +! nssCert = CERT_DupCertificate(node->cert); + if (!nssCert) { +! continue; + } + + PKIX_CHECK_ONLY_FATAL(pkix_pl_Cert_CreateWithNSSCert diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-root-certs.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-root-certs.patch new file mode 100644 index 0000000000..7b5f4bad30 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-chromeos-root-certs.patch @@ -0,0 +1,15046 @@ +diff -prauN nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.c +--- nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-30 18:02:26.450122000 +0000 ++++ nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-30 18:05:39.120122002 +0000 +@@ -35,7 +35,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + #ifdef DEBUG +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $"; + #endif /* DEBUG */ + + #ifndef BUILTINS_H +@@ -786,210 +786,6 @@ static const CK_ATTRIBUTE_TYPE nss_built + static const CK_ATTRIBUTE_TYPE nss_builtins_types_243 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_244 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_245 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_246 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_247 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_248 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_249 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_250 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_251 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_252 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_253 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_254 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_255 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_256 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_257 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_258 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_259 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_260 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_261 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_262 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_263 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_264 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_265 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_266 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_267 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_268 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_269 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_270 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_271 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_272 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_273 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_274 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_275 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_276 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_277 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_278 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_279 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_280 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_281 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_282 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_283 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_284 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_285 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_286 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_287 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_288 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_289 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_290 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_291 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_292 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_293 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_294 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_295 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_296 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_297 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_298 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_299 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_300 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_301 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_302 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_303 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_304 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_305 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_306 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_307 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_308 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_309 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_310 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; + #ifdef DEBUG + static const NSSItem nss_builtins_items_0 [] = { + { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -998,7 +794,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"CVS ID", (PRUint32)7 }, + { (void *)"NSS", (PRUint32)4 }, +- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.1 $ $Date: 2010/08/27 15:46:44 $", (PRUint32)160 } ++ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $", (PRUint32)160 } + }; + #endif /* DEBUG */ + static const NSSItem nss_builtins_items_1 [] = { +@@ -1013,86 +809,6 @@ static const NSSItem nss_builtins_items_ + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GTE CyberTrust Root CA", (PRUint32)23 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\105\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\034\060\032\006\003\125" +-"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165" +-"\163\164\040\122\157\157\164" +-, (PRUint32)71 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\105\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\034\060\032\006\003\125" +-"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165" +-"\163\164\040\122\157\157\164" +-, (PRUint32)71 }, +- { (void *)"\002\002\001\243" +-, (PRUint32)4 }, +- { (void *)"\060\202\001\372\060\202\001\143\002\002\001\243\060\015\006\011" +-"\052\206\110\206\367\015\001\001\004\005\000\060\105\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\034\060\032\006\003\125\004\003\023\023\107" +-"\124\105\040\103\171\142\145\162\124\162\165\163\164\040\122\157" +-"\157\164\060\036\027\015\071\066\060\062\062\063\062\063\060\061" +-"\060\060\132\027\015\060\066\060\062\062\063\062\063\065\071\060" +-"\060\132\060\105\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\034\060\032\006" +-"\003\125\004\003\023\023\107\124\105\040\103\171\142\145\162\124" +-"\162\165\163\164\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\270\346\117\272\333\230\174\161\174\257" +-"\104\267\323\017\106\331\144\345\223\301\102\216\307\272\111\215" +-"\065\055\172\347\213\275\345\005\061\131\306\261\057\012\014\373" +-"\237\247\077\242\011\146\204\126\036\067\051\033\207\351\176\014" +-"\312\232\237\245\177\365\025\224\243\325\242\106\202\330\150\114" +-"\321\067\025\006\150\257\275\370\260\263\360\051\365\225\132\011" +-"\026\141\167\012\042\045\324\117\105\252\307\275\345\226\337\371" +-"\324\250\216\102\314\044\300\036\221\047\112\265\155\006\200\143" +-"\071\304\242\136\070\003\002\003\001\000\001\060\015\006\011\052" +-"\206\110\206\367\015\001\001\004\005\000\003\201\201\000\022\263" +-"\165\306\137\035\341\141\125\200\000\324\201\113\173\061\017\043" +-"\143\347\075\363\003\371\364\066\250\273\331\343\245\227\115\352" +-"\053\051\340\326\152\163\201\346\300\211\243\323\361\340\245\245" +-"\042\067\232\143\302\110\040\264\333\162\343\310\366\331\174\276" +-"\261\257\123\332\024\264\041\270\326\325\226\343\376\116\014\131" +-"\142\266\232\112\371\102\335\214\157\201\251\161\377\364\012\162" +-"\155\155\104\016\235\363\164\164\250\325\064\111\351\136\236\351" +-"\264\172\341\345\132\037\204\060\234\323\237\245\045\330" +-, (PRUint32)510 } +-}; +-static const NSSItem nss_builtins_items_3 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GTE CyberTrust Root CA", (PRUint32)23 }, +- { (void *)"\220\336\336\236\114\116\237\157\330\206\027\127\235\323\221\274" +-"\145\246\211\144" +-, (PRUint32)20 }, +- { (void *)"\304\327\360\262\243\305\175\141\147\360\004\315\103\323\272\130" +-, (PRUint32)16 }, +- { (void *)"\060\105\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\034\060\032\006\003\125" +-"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165" +-"\163\164\040\122\157\157\164" +-, (PRUint32)71 }, +- { (void *)"\002\002\001\243" +-, (PRUint32)4 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_4 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"GTE CyberTrust Global Root", (PRUint32)27 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +@@ -1156,7 +872,7 @@ static const NSSItem nss_builtins_items_ + "\037\042\265\315\225\255\272\247\314\371\253\013\172\177" + , (PRUint32)606 } + }; +-static const NSSItem nss_builtins_items_5 [] = { ++static const NSSItem nss_builtins_items_3 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1181,16 +897,16 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_6 [] = { ++static const NSSItem nss_builtins_items_4 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, ++ { (void *)"Thawte Personal Basic CA", (PRUint32)25 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101" ++ { (void *)"\060\201\313\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\032\060\030\006" +@@ -1198,15 +914,14 @@ static const NSSItem nss_builtins_items_ + "\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" +-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" +-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" +-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" +-"\056\143\157\155" +-, (PRUint32)212 }, ++"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" ++"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" ++"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" ++"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" ++, (PRUint32)206 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101" ++ { (void *)"\060\201\313\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\032\060\030\006" +@@ -1214,18 +929,17 @@ static const NSSItem nss_builtins_items_ + "\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" +-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" +-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" +-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" +-"\056\143\157\155" +-, (PRUint32)212 }, ++"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" ++"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" ++"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" ++"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" ++, (PRUint32)206 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000" ++ { (void *)"\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000" + "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" +-"\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061" ++"\201\313\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\032\060\030\006\003" +@@ -1233,62 +947,61 @@ static const NSSItem nss_builtins_items_ + "\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164" +-"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155" +-"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206" +-"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055" +-"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056" +-"\143\157\155\060\036\027\015\071\066\060\061\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\321\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\032" +-"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040" +-"\103\157\156\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124" +-"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106" +-"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011" +-"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157" +-"\156\141\154\055\146\162\145\145\155\141\151\154\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\324\151\327\324\260\224\144\133\161\351\107\330" +-"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337" +-"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176" +-"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104" +-"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170" +-"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156" +-"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152" +-"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345" +-"\132\304\034\271\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\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115" +-"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317" +-"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144" +-"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254" +-"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232" +-"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163" +-"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246" +-"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242" +-"\201" +-, (PRUint32)817 } ++"\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167\164" ++"\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151\143" ++"\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015\001" ++"\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141\163" ++"\151\143\100\164\150\141\167\164\145\056\143\157\155\060\036\027" ++"\015\071\066\060\061\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\313" ++"\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\032\060\030\006\003\125\004" ++"\012\023\021\124\150\141\167\164\145\040\103\157\156\163\165\154" ++"\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151\143\040\103" ++"\101\061\050\060\046\006\011\052\206\110\206\367\015\001\011\001" ++"\026\031\160\145\162\163\157\156\141\154\055\142\141\163\151\143" ++"\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\274\274\223\123\155\300\120\117" ++"\202\025\346\110\224\065\246\132\276\157\102\372\017\107\356\167" ++"\165\162\335\215\111\233\226\127\240\170\324\312\077\121\263\151" ++"\013\221\166\027\042\007\227\152\304\121\223\113\340\215\357\067" ++"\225\241\014\115\332\064\220\035\027\211\227\340\065\070\127\112" ++"\300\364\010\160\351\074\104\173\120\176\141\232\220\343\043\323" ++"\210\021\106\047\365\013\007\016\273\335\321\177\040\012\210\271" ++"\126\013\056\034\200\332\361\343\236\051\357\024\275\012\104\373" ++"\033\133\030\321\277\043\223\041\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\055\342\231\153\260\075\172\211\327\131\242" ++"\224\001\037\053\335\022\113\123\302\255\177\252\247\000\134\221" ++"\100\127\045\112\070\252\204\160\271\331\200\017\245\173\134\373" ++"\163\306\275\327\212\141\134\003\343\055\047\250\027\340\204\205" ++"\102\334\136\233\306\267\262\155\273\164\257\344\077\313\247\267" ++"\260\340\135\276\170\203\045\224\322\333\201\017\171\007\155\117" ++"\364\071\025\132\122\001\173\336\062\326\115\070\366\022\134\006" ++"\120\337\005\133\275\024\113\241\337\051\272\073\101\215\367\143" ++"\126\241\337\042\261" ++, (PRUint32)805 } + }; +-static const NSSItem nss_builtins_items_7 [] = { ++static const NSSItem nss_builtins_items_5 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, +- { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207" +-"\244\353\000\205" ++ { (void *)"Thawte Personal Basic CA", (PRUint32)25 }, ++ { (void *)"\100\347\214\035\122\075\034\331\225\117\254\032\032\263\275\074" ++"\272\241\133\374" + , (PRUint32)20 }, +- { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331" ++ { (void *)"\346\013\322\311\312\055\210\333\032\161\016\113\170\353\002\101" + , (PRUint32)16 }, +- { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101" ++ { (void *)"\060\201\313\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\032\060\030\006" +@@ -1296,11 +1009,263 @@ static const NSSItem nss_builtins_items_ + "\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" +-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" +-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" +-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" ++"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" ++"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" ++"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" ++"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" ++, (PRUint32)206 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_6 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Premium CA", (PRUint32)27 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\201\317\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" ++"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" ++"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" ++"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" ++"\157\155" ++, (PRUint32)210 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\317\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" ++"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" ++"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" ++"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" ++"\157\155" ++, (PRUint32)210 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\201\317\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\032\060\030\006\003" ++"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163" ++"\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167\164" ++"\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155\151" ++"\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206\367" ++"\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055\160" ++"\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143\157" ++"\155\060\036\027\015\071\066\060\061\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\317\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\032\060\030" ++"\006\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157" ++"\156\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141" ++"\167\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145" ++"\155\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110" ++"\206\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154" ++"\055\160\162\145\155\151\165\155\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" ++"\311\146\331\370\007\104\317\271\214\056\360\241\357\023\105\154" ++"\005\337\336\047\026\121\066\101\021\154\154\073\355\376\020\175" ++"\022\236\345\233\102\232\376\140\061\303\146\267\163\072\110\256" ++"\116\320\062\067\224\210\265\015\266\331\363\362\104\331\325\210" ++"\022\335\166\115\362\032\374\157\043\036\172\361\330\230\105\116" ++"\007\020\357\026\102\320\103\165\155\112\336\342\252\311\061\377" ++"\037\000\160\174\146\317\020\045\010\272\372\356\000\351\106\003" ++"\146\047\021\025\073\252\133\362\230\335\066\102\262\332\210\165" ++"\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\151\066\211" ++"\367\064\052\063\162\057\155\073\324\042\262\270\157\232\305\066" ++"\146\016\033\074\241\261\165\132\346\375\065\323\370\250\362\007" ++"\157\205\147\216\336\053\271\342\027\260\072\240\360\016\242\000" ++"\232\337\363\024\025\156\273\310\205\132\230\200\371\377\276\164" ++"\035\075\363\376\060\045\321\067\064\147\372\245\161\171\060\141" ++"\051\162\300\340\054\114\373\126\344\072\250\157\345\062\131\122" ++"\333\165\050\120\131\014\370\013\031\344\254\331\257\226\215\057" ++"\120\333\007\303\352\037\253\063\340\365\053\061\211" ++, (PRUint32)813 } ++}; ++static const NSSItem nss_builtins_items_7 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Premium CA", (PRUint32)27 }, ++ { (void *)"\066\206\065\143\375\121\050\307\276\246\360\005\317\351\264\066" ++"\150\010\154\316" ++, (PRUint32)20 }, ++ { (void *)"\072\262\336\042\232\040\223\111\371\355\310\322\212\347\150\015" ++, (PRUint32)16 }, ++ { (void *)"\060\201\317\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" ++"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" ++"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" ++"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" ++"\157\155" ++, (PRUint32)210 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_8 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\201\321\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" ++"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" ++"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" ++"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" ++"\056\143\157\155" ++, (PRUint32)212 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\321\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" ++"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" ++"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" ++"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" ++"\056\143\157\155" ++, (PRUint32)212 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\201\321\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\032\060\030\006\003" ++"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163" ++"\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164" ++"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155" ++"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206" ++"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055" ++"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056" ++"\143\157\155\060\036\027\015\071\066\060\061\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\321\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\032" ++"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040" ++"\103\157\156\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124" ++"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106" ++"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011" ++"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157" ++"\156\141\154\055\146\162\145\145\155\141\151\154\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\324\151\327\324\260\224\144\133\161\351\107\330" ++"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337" ++"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176" ++"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104" ++"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170" ++"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156" ++"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152" ++"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345" ++"\132\304\034\271\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\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115" ++"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317" ++"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144" ++"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254" ++"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232" ++"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163" ++"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246" ++"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242" ++"\201" ++, (PRUint32)817 } ++}; ++static const NSSItem nss_builtins_items_9 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Thawte Personal Freemail CA", (PRUint32)28 }, ++ { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207" ++"\244\353\000\205" ++, (PRUint32)20 }, ++ { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331" ++, (PRUint32)16 }, ++ { (void *)"\060\201\321\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\032\060\030\006" ++"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" ++"\163\165\154\164\151\156\147\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\044\060\042\006\003\125\004\003\023\033\124\150\141\167" ++"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145" ++"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110" ++"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154" ++"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" + "\056\143\157\155" + , (PRUint32)212 }, + { (void *)"\002\001\000" +@@ -1310,7 +1275,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_8 [] = { ++static const NSSItem nss_builtins_items_10 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1400,7 +1365,7 @@ static const NSSItem nss_builtins_items_ + "\243\377\212\043\056\160\107" + , (PRUint32)791 } + }; +-static const NSSItem nss_builtins_items_9 [] = { ++static const NSSItem nss_builtins_items_11 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1430,147 +1395,21 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_10 [] = { ++static const NSSItem nss_builtins_items_12 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Premium Server CA", (PRUint32)25 }, ++ { (void *)"Equifax Secure CA", (PRUint32)18 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\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" +-, (PRUint32)209 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\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" +-, (PRUint32)209 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\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" +-, (PRUint32)811 } +-}; +-static const NSSItem nss_builtins_items_11 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Premium Server CA", (PRUint32)25 }, +- { (void *)"\142\177\215\170\047\145\143\231\322\175\177\220\104\311\376\263" +-"\363\076\372\232" +-, (PRUint32)20 }, +- { (void *)"\006\237\151\171\026\146\220\002\033\214\214\242\303\007\157\072" +-, (PRUint32)16 }, +- { (void *)"\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" +-, (PRUint32)209 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_12 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Equifax Secure CA", (PRUint32)18 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141" +-"\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151" +-"\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151" +-"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)80 }, ++ { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" ++"\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141" ++"\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151" ++"\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151" ++"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171" ++, (PRUint32)80 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" + "\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141" +@@ -1754,7 +1593,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; + static const NSSItem nss_builtins_items_16 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -1853,7 +1692,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; + static const NSSItem nss_builtins_items_18 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -2130,7 +1969,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; + static const NSSItem nss_builtins_items_24 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -2506,129 +2345,6 @@ static const NSSItem nss_builtins_items_ + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 4 Public Primary Certification Authority - G2", (PRUint32)61 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125" +-"\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154" +-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151" +-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" +-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013" +-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145" +-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" +-"\167\157\162\153" +-, (PRUint32)196 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125" +-"\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154" +-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151" +-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" +-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013" +-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145" +-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" +-"\167\157\162\153" +-, (PRUint32)196 }, +- { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067" +-"\045\370" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365" +-"\353\023\107\370\177\304\040\067\045\370\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125" +-"\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\061\074\060\072\006\003\125\004\013\023\063\103\154\141" +-"\163\163\040\064\040\120\165\142\154\151\143\040\120\162\151\155" +-"\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157" +-"\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107\062" +-"\061\072\060\070\006\003\125\004\013\023\061\050\143\051\040\061" +-"\071\071\070\040\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151" +-"\172\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035" +-"\006\003\125\004\013\023\026\126\145\162\151\123\151\147\156\040" +-"\124\162\165\163\164\040\116\145\164\167\157\162\153\060\036\027" +-"\015\071\070\060\065\061\070\060\060\060\060\060\060\132\027\015" +-"\062\070\060\070\060\061\062\063\065\071\065\071\132\060\201\301" +-"\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060" +-"\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147\156" +-"\054\040\111\156\143\056\061\074\060\072\006\003\125\004\013\023" +-"\063\103\154\141\163\163\040\064\040\120\165\142\154\151\143\040" +-"\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143" +-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040" +-"\055\040\107\062\061\072\060\070\006\003\125\004\013\023\061\050" +-"\143\051\040\061\071\071\070\040\126\145\162\151\123\151\147\156" +-"\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165\164" +-"\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171" +-"\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151\123" +-"\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157\162" +-"\153\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\272\360" +-"\344\317\371\304\256\205\124\271\007\127\371\217\305\177\150\021" +-"\370\304\027\260\104\334\343\060\163\325\052\142\052\270\320\314" +-"\034\355\050\133\176\275\152\334\263\221\044\312\101\142\074\374" +-"\002\001\277\034\026\061\224\005\227\166\156\242\255\275\141\027" +-"\154\116\060\206\360\121\067\052\120\307\250\142\201\334\133\112" +-"\252\301\240\264\156\353\057\345\127\305\261\053\100\160\333\132" +-"\115\241\216\037\275\003\037\330\003\324\217\114\231\161\274\342" +-"\202\314\130\350\230\072\206\323\206\070\363\000\051\037\002\003" +-"\001\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\003\201\201\000\205\214\022\301\247\271\120\025\172\313" +-"\076\254\270\103\212\334\252\335\024\272\211\201\176\001\074\043" +-"\161\041\210\057\202\334\143\372\002\105\254\105\131\327\052\130" +-"\104\133\267\237\201\073\222\150\075\342\067\044\365\173\154\217" +-"\166\065\226\011\250\131\235\271\316\043\253\164\326\203\375\062" +-"\163\047\330\151\076\103\164\366\256\305\211\232\347\123\174\351" +-"\173\366\113\363\301\145\203\336\215\212\234\074\210\215\071\131" +-"\374\252\077\042\215\241\301\146\120\201\162\114\355\042\144\117" +-"\117\312\200\221\266\051" +-, (PRUint32)774 } +-}; +-static const NSSItem nss_builtins_items_31 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 4 Public Primary Certification Authority - G2", (PRUint32)61 }, +- { (void *)"\013\167\276\273\313\172\242\107\005\336\314\017\275\152\002\374" +-"\172\275\233\122" +-, (PRUint32)20 }, +- { (void *)"\046\155\054\031\230\266\160\150\070\120\124\031\354\220\064\140" +-, (PRUint32)16 }, +- { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125" +-"\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154" +-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151" +-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" +-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013" +-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145" +-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" +-"\167\157\162\153" +-, (PRUint32)196 }, +- { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067" +-"\045\370" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_32 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"GlobalSign Root CA", (PRUint32)19 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\127\061\013\060\011\006\003\125\004\006\023\002\102\105\061" +@@ -2706,7 +2422,7 @@ static const NSSItem nss_builtins_items_ + "\125\342\374\110\311\051\046\151\340" + , (PRUint32)889 } + }; +-static const NSSItem nss_builtins_items_33 [] = { ++static const NSSItem nss_builtins_items_31 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2731,7 +2447,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_34 [] = { ++static const NSSItem nss_builtins_items_32 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2815,7 +2531,7 @@ static const NSSItem nss_builtins_items_ + "\152\374\176\102\070\100\144\022\367\236\201\341\223\056" + , (PRUint32)958 } + }; +-static const NSSItem nss_builtins_items_35 [] = { ++static const NSSItem nss_builtins_items_33 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2839,7 +2555,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_36 [] = { ++static const NSSItem nss_builtins_items_34 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2924,7 +2640,7 @@ static const NSSItem nss_builtins_items_ + "\161\202\053\231\317\072\267\365\055\162\310" + , (PRUint32)747 } + }; +-static const NSSItem nss_builtins_items_37 [] = { ++static const NSSItem nss_builtins_items_35 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2955,7 +2671,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_38 [] = { ++static const NSSItem nss_builtins_items_36 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3040,7 +2756,7 @@ static const NSSItem nss_builtins_items_ + "\276\355\164\114\274\133\325\142\037\103\335" + , (PRUint32)747 } + }; +-static const NSSItem nss_builtins_items_39 [] = { ++static const NSSItem nss_builtins_items_37 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3071,7 +2787,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_40 [] = { ++static const NSSItem nss_builtins_items_38 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3156,7 +2872,7 @@ static const NSSItem nss_builtins_items_ + "\040\017\105\176\153\242\177\243\214\025\356" + , (PRUint32)747 } + }; +-static const NSSItem nss_builtins_items_41 [] = { ++static const NSSItem nss_builtins_items_39 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3187,7 +2903,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_42 [] = { ++static const NSSItem nss_builtins_items_40 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3294,7 +3010,7 @@ static const NSSItem nss_builtins_items_ + "\113\336\006\226\161\054\362\333\266\037\244\357\077\356" + , (PRUint32)1054 } + }; +-static const NSSItem nss_builtins_items_43 [] = { ++static const NSSItem nss_builtins_items_41 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3327,7 +3043,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_44 [] = { ++static const NSSItem nss_builtins_items_42 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3434,7 +3150,7 @@ static const NSSItem nss_builtins_items_ + "\311\130\020\371\252\357\132\266\317\113\113\337\052" + , (PRUint32)1053 } + }; +-static const NSSItem nss_builtins_items_45 [] = { ++static const NSSItem nss_builtins_items_43 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3467,7 +3183,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_46 [] = { ++static const NSSItem nss_builtins_items_44 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3574,7 +3290,7 @@ static const NSSItem nss_builtins_items_ + "\153\271\012\172\116\117\113\204\356\113\361\175\335\021" + , (PRUint32)1054 } + }; +-static const NSSItem nss_builtins_items_47 [] = { ++static const NSSItem nss_builtins_items_45 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3607,7 +3323,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_48 [] = { ++static const NSSItem nss_builtins_items_46 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3714,7 +3430,7 @@ static const NSSItem nss_builtins_items_ + "\367\146\103\363\236\203\076\040\252\303\065\140\221\316" + , (PRUint32)1054 } + }; +-static const NSSItem nss_builtins_items_49 [] = { ++static const NSSItem nss_builtins_items_47 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3745,9 +3461,9 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_50 [] = { ++static const NSSItem nss_builtins_items_48 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3865,7 +3581,7 @@ static const NSSItem nss_builtins_items_ + "\155\055\105\013\367\012\223\352\355\006\371\262" + , (PRUint32)1244 } + }; +-static const NSSItem nss_builtins_items_51 [] = { ++static const NSSItem nss_builtins_items_49 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -3897,159 +3613,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_52 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\311\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\110\060\106\006\003\125\004\013\024" +-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164" +-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057" +-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162" +-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056" +-"\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\063\060\061\006\003\125\004\003" +-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154" +-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)204 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\311\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\110\060\106\006\003\125\004\013\024" +-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164" +-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057" +-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162" +-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056" +-"\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\063\060\061\006\003\125\004\003" +-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154" +-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)204 }, +- { (void *)"\002\004\070\003\221\356" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070" +-"\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004" +-"\005\000\060\201\311\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\110\060\106\006\003\125\004" +-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156" +-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146" +-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171" +-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141" +-"\142\056\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\063\060\061\006\003\125" +-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040" +-"\103\154\151\145\156\164\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\061\060\061\062\061\071\062\064\063\060\132\027" +-"\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201" +-"\311\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\110\060\106\006\003\125\004\013\024\077\167" +-"\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103" +-"\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120" +-"\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146" +-"\056\040\154\151\155\151\164\163\040\154\151\141\142\056\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\063\060\061\006\003\125\004\003\023\052" +-"\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145" +-"\156\164\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\310\072\231\136\061\027\337\254\047" +-"\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150" +-"\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107" +-"\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226" +-"\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261" +-"\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164" +-"\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126" +-"\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346" +-"\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202" +-"\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004" +-"\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202" +-"\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244" +-"\201\333\060\201\330\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\110\060\106\006\003\125\004" +-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156" +-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146" +-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171" +-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141" +-"\142\056\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\063\060\061\006\003\125" +-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040" +-"\103\154\151\145\156\164\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\054\240" +-"\052\240\050\206\046\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" +-"\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125" +-"\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062" +-"\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061" +-"\062\061\071\062\064\063\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\304\373\234\051\173\227\315\114\226\374\356\133\263\312" +-"\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004" +-"\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231" +-"\164\213\225\352\114\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\004\005\000\003\201\201" +-"\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273" +-"\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002" +-"\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007" +-"\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363" +-"\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070" +-"\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003" +-"\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332" +-"\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134" +-"\354" +-, (PRUint32)1265 } +-}; +-static const NSSItem nss_builtins_items_53 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 }, +- { (void *)"\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125" +-"\262\371\365\200" +-, (PRUint32)20 }, +- { (void *)"\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364" +-, (PRUint32)16 }, +- { (void *)"\060\201\311\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\110\060\106\006\003\125\004\013\024" +-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164" +-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057" +-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162" +-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056" +-"\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\063\060\061\006\003\125\004\003" +-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154" +-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)204 }, +- { (void *)"\002\004\070\003\221\356" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_54 [] = { ++static const NSSItem nss_builtins_items_50 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4157,7 +3721,7 @@ static const NSSItem nss_builtins_items_ + "\275\114\105\236\141\272\277\204\201\222\003\321\322\151\174\305" + , (PRUint32)1120 } + }; +-static const NSSItem nss_builtins_items_55 [] = { ++static const NSSItem nss_builtins_items_51 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4188,7 +3752,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_56 [] = { ++static const NSSItem nss_builtins_items_52 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4270,7 +3834,7 @@ static const NSSItem nss_builtins_items_ + "\347\201\035\031\303\044\102\352\143\071\251" + , (PRUint32)891 } + }; +-static const NSSItem nss_builtins_items_57 [] = { ++static const NSSItem nss_builtins_items_53 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4295,7 +3859,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_58 [] = { ++static const NSSItem nss_builtins_items_54 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4363,7 +3927,7 @@ static const NSSItem nss_builtins_items_ + "\126\224\251\125" + , (PRUint32)660 } + }; +-static const NSSItem nss_builtins_items_59 [] = { ++static const NSSItem nss_builtins_items_55 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4388,7 +3952,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_60 [] = { ++static const NSSItem nss_builtins_items_56 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4455,7 +4019,7 @@ static const NSSItem nss_builtins_items_ + "\132\052\202\262\067\171" + , (PRUint32)646 } + }; +-static const NSSItem nss_builtins_items_61 [] = { ++static const NSSItem nss_builtins_items_57 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4480,254 +4044,21 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_62 [] = { ++static const NSSItem nss_builtins_items_58 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Equifax Secure eBusiness CA 2", (PRUint32)30 }, ++ { (void *)"AddTrust Low-Value Services Root", (PRUint32)33 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141" +-"\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004" +-"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162" +-"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062" +-, (PRUint32)80 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141" +-"\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004" +-"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162" +-"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062" +-, (PRUint32)80 }, +- { (void *)"\002\004\067\160\317\265" +-, (PRUint32)6 }, +- { (void *)"\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\067" +-"\160\317\265\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125" +-"\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151" +-"\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003" +-"\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143" +-"\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101" +-"\055\062\060\036\027\015\071\071\060\066\062\063\061\062\061\064" +-"\064\065\132\027\015\061\071\060\066\062\063\061\062\061\064\064" +-"\065\132\060\116\061\013\060\011\006\003\125\004\006\023\002\125" +-"\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151" +-"\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003" +-"\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143" +-"\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101" +-"\055\062\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\344" +-"\071\071\223\036\122\006\033\050\066\370\262\243\051\305\355\216" +-"\262\021\275\376\353\347\264\164\302\217\377\005\347\331\235\006" +-"\277\022\310\077\016\362\326\321\044\262\021\336\321\163\011\212" +-"\324\261\054\230\011\015\036\120\106\262\203\246\105\215\142\150" +-"\273\205\033\040\160\062\252\100\315\246\226\137\304\161\067\077" +-"\004\363\267\101\044\071\007\032\036\056\141\130\240\022\013\345" +-"\245\337\305\253\352\067\161\314\034\310\067\072\271\227\122\247" +-"\254\305\152\044\224\116\234\173\317\300\152\326\337\041\275\002" +-"\003\001\000\001\243\202\001\011\060\202\001\005\060\160\006\003" +-"\125\035\037\004\151\060\147\060\145\240\143\240\141\244\137\060" +-"\135\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027" +-"\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141\170" +-"\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004\013" +-"\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162\145" +-"\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062\061" +-"\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060\032" +-"\006\003\125\035\020\004\023\060\021\201\017\062\060\061\071\060" +-"\066\062\063\061\062\061\064\064\065\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\120\236\013\352\257\136\271\040\110\246\120\152" +-"\313\375\330\040\172\247\202\166\060\035\006\003\125\035\016\004" +-"\026\004\024\120\236\013\352\257\136\271\040\110\246\120\152\313" +-"\375\330\040\172\247\202\166\060\014\006\003\125\035\023\004\005" +-"\060\003\001\001\377\060\032\006\011\052\206\110\206\366\175\007" +-"\101\000\004\015\060\013\033\005\126\063\056\060\143\003\002\006" +-"\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000" +-"\003\201\201\000\014\206\202\255\350\116\032\365\216\211\047\342" +-"\065\130\075\051\264\007\217\066\120\225\277\156\301\236\353\304" +-"\220\262\205\250\273\267\102\340\017\007\071\337\373\236\220\262" +-"\321\301\076\123\237\003\104\260\176\113\364\157\344\174\037\347" +-"\342\261\344\270\232\357\303\275\316\336\013\062\064\331\336\050" +-"\355\063\153\304\324\327\075\022\130\253\175\011\055\313\160\365" +-"\023\212\224\241\047\244\326\160\305\155\224\265\311\175\235\240" +-"\322\306\010\111\331\146\233\246\323\364\013\334\305\046\127\341" +-"\221\060\352\315" +-, (PRUint32)804 } +-}; +-static const NSSItem nss_builtins_items_63 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Equifax Secure eBusiness CA 2", (PRUint32)30 }, +- { (void *)"\071\117\366\205\013\006\276\122\345\030\126\314\020\341\200\350" +-"\202\263\205\314" +-, (PRUint32)20 }, +- { (void *)"\252\277\277\144\227\332\230\035\157\306\010\072\225\160\063\312" +-, (PRUint32)16 }, +- { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141" +-"\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004" +-"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162" +-"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062" +-, (PRUint32)80 }, +- { (void *)"\002\004\067\160\317\265" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_64 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA", (PRUint32)18 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061" +-"\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123" +-"\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163" +-"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101" +-, (PRUint32)92 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061" +-"\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123" +-"\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163" +-"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101" +-, (PRUint32)92 }, +- { (void *)"\002\004\071\117\175\207" +-, (PRUint32)6 }, +- { (void *)"\060\202\005\054\060\202\004\024\240\003\002\001\002\002\004\071" +-"\117\175\207\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\127" +-"\127\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122" +-"\125\123\124\145\144\061\033\060\031\006\003\125\004\003\023\022" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\163\061\032\060\030\006\003\125\004\003\023\021\142\145\124" +-"\122\125\123\124\145\144\040\122\157\157\164\040\103\101\060\036" +-"\027\015\060\060\060\066\062\060\061\064\062\061\060\064\132\027" +-"\015\061\060\060\066\062\060\061\063\062\061\060\064\132\060\132" +-"\061\013\060\011\006\003\125\004\006\023\002\127\127\061\022\060" +-"\020\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145" +-"\144\061\033\060\031\006\003\125\004\003\023\022\142\145\124\122" +-"\125\123\124\145\144\040\122\157\157\164\040\103\101\163\061\032" +-"\060\030\006\003\125\004\003\023\021\142\145\124\122\125\123\124" +-"\145\144\040\122\157\157\164\040\103\101\060\202\001\042\060\015" +-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001" +-"\017\000\060\202\001\012\002\202\001\001\000\324\264\163\172\023" +-"\012\070\125\001\276\211\126\341\224\236\324\276\132\353\112\064" +-"\165\033\141\051\304\341\255\010\140\041\170\110\377\264\320\372" +-"\136\101\215\141\104\207\350\355\311\130\372\374\223\232\337\117" +-"\352\076\065\175\370\063\172\346\361\327\315\157\111\113\075\117" +-"\055\156\016\203\072\030\170\167\243\317\347\364\115\163\330\232" +-"\073\032\035\276\225\123\317\040\227\302\317\076\044\122\154\014" +-"\216\145\131\305\161\377\142\011\217\252\305\217\314\140\240\163" +-"\112\327\070\077\025\162\277\242\227\267\160\350\257\342\176\026" +-"\006\114\365\252\144\046\162\007\045\255\065\374\030\261\046\327" +-"\330\377\031\016\203\033\214\334\170\105\147\064\075\364\257\034" +-"\215\344\155\153\355\040\263\147\232\264\141\313\027\157\211\065" +-"\377\347\116\300\062\022\347\356\354\337\377\227\060\164\355\215" +-"\107\216\353\264\303\104\346\247\114\177\126\103\350\270\274\266" +-"\276\372\203\227\346\273\373\304\266\223\276\031\030\076\214\201" +-"\271\163\210\026\364\226\103\234\147\163\027\220\330\011\156\143" +-"\254\112\266\043\304\001\241\255\244\344\305\002\003\001\000\001" +-"\243\202\001\370\060\202\001\364\060\017\006\003\125\035\023\001" +-"\001\377\004\005\060\003\001\001\377\060\202\001\131\006\003\125" +-"\035\040\004\202\001\120\060\202\001\114\060\202\001\110\006\012" +-"\053\006\001\004\001\261\076\001\000\000\060\202\001\070\060\202" +-"\001\001\006\010\053\006\001\005\005\007\002\002\060\201\364\032" +-"\201\361\122\145\154\151\141\156\143\145\040\157\156\040\164\150" +-"\151\163\040\143\145\162\164\151\146\151\143\141\164\145\040\142" +-"\171\040\141\156\171\040\160\141\162\164\171\040\141\163\163\165" +-"\155\145\163\040\141\143\143\145\160\164\141\156\143\145\040\157" +-"\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154\151" +-"\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040\164" +-"\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164\151" +-"\157\156\163\040\157\146\040\165\163\145\054\040\141\156\144\040" +-"\143\145\162\164\151\146\151\143\141\164\151\157\156\040\160\162" +-"\141\143\164\151\143\145\040\163\164\141\164\145\155\145\156\164" +-"\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040\146" +-"\157\165\156\144\040\141\164\040\142\145\124\122\125\123\124\145" +-"\144\047\163\040\167\145\142\040\163\151\164\145\054\040\150\164" +-"\164\160\163\072\057\057\167\167\167\056\142\145\124\122\125\123" +-"\124\145\144\056\143\157\155\057\166\141\165\154\164\057\164\145" +-"\162\155\163\060\061\006\010\053\006\001\005\005\007\002\001\026" +-"\045\150\164\164\160\163\072\057\057\167\167\167\056\142\145\124" +-"\122\125\123\124\145\144\056\143\157\155\057\166\141\165\154\164" +-"\057\164\145\162\155\163\060\064\006\003\125\035\037\004\055\060" +-"\053\060\051\240\047\240\045\244\043\060\041\061\022\060\020\006" +-"\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144\061" +-"\013\060\011\006\003\125\004\006\023\002\127\127\060\035\006\003" +-"\125\035\016\004\026\004\024\052\271\233\151\056\073\233\330\315" +-"\336\052\061\004\064\153\312\007\030\253\147\060\037\006\003\125" +-"\035\043\004\030\060\026\200\024\052\271\233\151\056\073\233\330" +-"\315\336\052\061\004\064\153\312\007\030\253\147\060\016\006\003" +-"\125\035\017\001\001\377\004\004\003\002\001\376\060\015\006\011" +-"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000" +-"\171\141\333\243\136\156\026\261\352\166\121\371\313\025\233\313" +-"\151\276\346\201\153\237\050\037\145\076\335\021\205\222\324\350" +-"\101\277\176\063\275\043\347\361\040\277\244\264\246\031\001\306" +-"\214\215\065\174\145\244\117\011\244\326\330\043\025\005\023\247" +-"\103\171\257\333\243\016\233\173\170\032\363\004\206\132\306\366" +-"\214\040\107\070\111\120\006\235\162\147\072\360\230\003\255\226" +-"\147\104\374\077\020\015\206\115\344\000\073\051\173\316\073\073" +-"\231\206\141\045\100\204\334\023\142\267\372\312\131\326\003\036" +-"\326\123\001\315\155\114\150\125\100\341\356\153\307\052\000\000" +-"\110\202\263\012\001\303\140\052\014\367\202\065\356\110\206\226" +-"\344\164\324\075\352\001\161\272\004\165\100\247\251\177\071\071" +-"\232\125\227\051\145\256\031\125\045\005\162\107\323\350\030\334" +-"\270\351\257\103\163\001\022\164\243\341\134\137\025\135\044\363" +-"\371\344\364\266\147\147\022\347\144\042\212\366\245\101\246\034" +-"\266\140\143\105\212\020\264\272\106\020\256\101\127\145\154\077" +-"\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256" +-, (PRUint32)1328 } +-}; +-static const NSSItem nss_builtins_items_65 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA", (PRUint32)18 }, +- { (void *)"\133\315\315\314\146\366\334\344\104\037\343\175\134\303\023\114" +-"\106\364\160\070" +-, (PRUint32)20 }, +- { (void *)"\205\312\166\132\033\321\150\042\334\242\043\022\312\306\200\064" +-, (PRUint32)16 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061" +-"\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123" +-"\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163" +-"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101" +-, (PRUint32)92 }, +- { (void *)"\002\004\071\117\175\207" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_66 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"AddTrust Low-Value Services Root", (PRUint32)33 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061" +-"\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165" +-"\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024" +-"\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164" +-"\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101" +-"\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040" +-"\103\101\040\122\157\157\164" +-, (PRUint32)103 }, ++ { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061" ++"\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165" ++"\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024" ++"\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164" ++"\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101" ++"\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040" ++"\103\101\040\122\157\157\164" ++, (PRUint32)103 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061" + "\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165" +@@ -4807,7 +4138,7 @@ static const NSSItem nss_builtins_items_ + "\065\341\035\026\034\320\274\053\216\326\161\331" + , (PRUint32)1052 } + }; +-static const NSSItem nss_builtins_items_67 [] = { ++static const NSSItem nss_builtins_items_59 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4833,7 +4164,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_68 [] = { ++static const NSSItem nss_builtins_items_60 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4931,7 +4262,7 @@ static const NSSItem nss_builtins_items_ + "\027\132\173\320\274\307\217\116\206\004" + , (PRUint32)1082 } + }; +-static const NSSItem nss_builtins_items_69 [] = { ++static const NSSItem nss_builtins_items_61 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -4958,7 +4289,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_70 [] = { ++static const NSSItem nss_builtins_items_62 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5052,7 +4383,7 @@ static const NSSItem nss_builtins_items_ + "\116\072\063\014\053\263\055\220\006" + , (PRUint32)1049 } + }; +-static const NSSItem nss_builtins_items_71 [] = { ++static const NSSItem nss_builtins_items_63 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5078,7 +4409,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_72 [] = { ++static const NSSItem nss_builtins_items_64 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5173,7 +4504,7 @@ static const NSSItem nss_builtins_items_ + "\306\241" + , (PRUint32)1058 } + }; +-static const NSSItem nss_builtins_items_73 [] = { ++static const NSSItem nss_builtins_items_65 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5199,395 +4530,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_74 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Time Stamping CA", (PRUint32)24 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\213\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\024\060\022\006\003\125\004\007" +-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060" +-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035" +-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060" +-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101" +-, (PRUint32)142 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\213\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\024\060\022\006\003\125\004\007" +-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060" +-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035" +-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060" +-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101" +-, (PRUint32)142 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)"\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000" +-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" +-"\201\213\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\024\060\022\006\003\125\004\007\023" +-"\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015" +-"\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060" +-"\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035" +-"\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027" +-"\015\071\067\060\061\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\213" +-"\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\024\060\022\006\003\125\004\007\023\013\104" +-"\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003" +-"\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006" +-"\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162" +-"\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003" +-"\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145" +-"\163\164\141\155\160\151\156\147\040\103\101\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\326\053\130\170\141\105\206\123" +-"\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047" +-"\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237" +-"\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032" +-"\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376" +-"\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235" +-"\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213" +-"\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137" +-"\355\372\267\056\212\370\210\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\147\333\342\302\346\207\075\100\203\206\067" +-"\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302" +-"\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357" +-"\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333" +-"\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220" +-"\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354" +-"\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003" +-"\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031" +-"\011\254\211\111\323" +-, (PRUint32)677 } +-}; +-static const NSSItem nss_builtins_items_75 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Thawte Time Stamping CA", (PRUint32)24 }, +- { (void *)"\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105" +-"\010\116\326\126" +-, (PRUint32)20 }, +- { (void *)"\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040" +-, (PRUint32)16 }, +- { (void *)"\060\201\213\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\024\060\022\006\003\125\004\007" +-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060" +-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035" +-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060" +-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101" +-, (PRUint32)142 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_76 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125" +-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\123\123\114\137\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\062\060\060\060\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" +-, (PRUint32)189 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125" +-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\123\123\114\137\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\062\060\060\060\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" +-, (PRUint32)189 }, +- { (void *)"\002\004\070\233\021\074" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070" +-"\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004" +-"\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013" +-"\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006" +-"\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163" +-"\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060\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\060\060\060\062\060\064\061\067\062\060\060\060\132" +-"\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060" +-"\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164" +-"\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004" +-"\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156" +-"\145\164\057\123\123\114\137\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\062\060\060\060\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\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\307\301\137\116\161\361\316" +-"\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265" +-"\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236" +-"\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201" +-"\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113" +-"\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002" +-"\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266" +-"\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332" +-"\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202" +-"\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370" +-"\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035" +-"\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317" +-"\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023" +-"\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075" +-"\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165" +-"\163\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060" +-"\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" +-"\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060" +-"\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062" +-"\060\060\062\060\064\061\067\065\060\060\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\313\154\300\153\343\273\076\313\374\042" +-"\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035" +-"\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234" +-"\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023" +-"\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366" +-"\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064" +-"\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015" +-"\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232" +-"\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251" +-"\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337" +-"\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205" +-"\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021" +-"\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154" +-"\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124" +-"\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274" +-"\005\377\154\211\063\360\354\025\017" +-, (PRUint32)1177 } +-}; +-static const NSSItem nss_builtins_items_77 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 }, +- { (void *)"\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366" +-"\045\072\110\223" +-, (PRUint32)20 }, +- { (void *)"\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231" +-, (PRUint32)16 }, +- { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125" +-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\123\123\114\137\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\062\060\060\060\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" +-, (PRUint32)189 }, +- { (void *)"\002\004\070\233\021\074" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_78 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" +-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105" +-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" +-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" +-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" +-"\164\150\157\162\151\164\171" +-, (PRUint32)183 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" +-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105" +-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" +-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" +-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" +-"\164\150\157\162\151\164\171" +-, (PRUint32)183 }, +- { (void *)"\002\004\070\236\366\344" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070" +-"\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004" +-"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013" +-"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006" +-"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163" +-"\164\056\156\145\164\057\107\103\103\101\137\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\062\060\060\060" +-"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155" +-"\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105" +-"\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156" +-"\164\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\060\060\060" +-"\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062" +-"\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022" +-"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156" +-"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167" +-"\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103" +-"\101\137\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\062\060\060\060\040\105\156\164\162\165\163\164\056" +-"\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006" +-"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145" +-"\164\040\103\154\151\145\156\164\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\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\223\164\264" +-"\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162" +-"\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255" +-"\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124" +-"\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064" +-"\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045" +-"\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374" +-"\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047" +-"\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001" +-"\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206" +-"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335" +-"\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201" +-"\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003" +-"\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164" +-"\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145" +-"\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137" +-"\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\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145" +-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125" +-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040" +-"\103\154\151\145\156\164\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\053\006" +-"\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062" +-"\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060" +-"\062\060\067\061\066\064\066\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\204\213\164\375\305\215\300\377\047\155\040\067" +-"\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004" +-"\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105" +-"\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005" +-"\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007" +-"\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060" +-"\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001" +-"\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016" +-"\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022" +-"\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024" +-"\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276" +-"\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277" +-"\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172" +-"\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103" +-"\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235" +-"\316\145\146\227\256\046\136" +-, (PRUint32)1159 } +-}; +-static const NSSItem nss_builtins_items_79 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 }, +- { (void *)"\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266" +-"\266\360\277\163" +-, (PRUint32)20 }, +- { (void *)"\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056" +-, (PRUint32)16 }, +- { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" +-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" +-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" +-"\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105" +-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" +-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" +-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" +-"\164\150\157\162\151\164\171" +-, (PRUint32)183 }, +- { (void *)"\002\004\070\236\366\344" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_80 [] = { ++static const NSSItem nss_builtins_items_66 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5699,7 +4642,7 @@ static const NSSItem nss_builtins_items_ + "\036\177\132\264\074" + , (PRUint32)1173 } + }; +-static const NSSItem nss_builtins_items_81 [] = { ++static const NSSItem nss_builtins_items_67 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5730,7 +4673,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_82 [] = { ++static const NSSItem nss_builtins_items_68 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5825,7 +4768,7 @@ static const NSSItem nss_builtins_items_ + "\071\050\150\016\163\335\045\232\336\022" + , (PRUint32)1002 } + }; +-static const NSSItem nss_builtins_items_83 [] = { ++static const NSSItem nss_builtins_items_69 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5853,7 +4796,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_84 [] = { ++static const NSSItem nss_builtins_items_70 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -5980,7 +4923,7 @@ static const NSSItem nss_builtins_items_ + "\204\327\372\334\162\133\367\301\072\150" + , (PRUint32)1514 } + }; +-static const NSSItem nss_builtins_items_85 [] = { ++static const NSSItem nss_builtins_items_71 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6008,498 +4951,58 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_86 [] = { ++static const NSSItem nss_builtins_items_72 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA-Baltimore Implementation", (PRUint32)43 }, ++ { (void *)"RSA Security 2048 v3", (PRUint32)21 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055" +-"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055" +-"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\075\106" +-, (PRUint32)6 }, +- { (void *)"\060\202\005\152\060\202\004\122\240\003\002\001\002\002\004\074" +-"\265\075\106\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142" +-"\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004" +-"\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157" +-"\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\055\102\141\154\164\151\155\157\162\145\040\111\155\160\154" +-"\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062" +-"\060\064\061\061\060\067\063\070\065\061\132\027\015\062\062\060" +-"\064\061\061\060\067\063\070\065\061\132\060\146\061\022\060\020" +-"\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144" +-"\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060" +-"\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145" +-"\144\040\122\157\157\164\040\103\101\055\102\141\154\164\151\155" +-"\157\162\145\040\111\155\160\154\145\155\145\156\164\141\164\151" +-"\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\274\176\304\071\234\214\343\326\034\206\377\312\142" +-"\255\340\177\060\105\172\216\032\263\270\307\371\321\066\377\042" +-"\363\116\152\137\204\020\373\146\201\303\224\171\061\322\221\341" +-"\167\216\030\052\303\024\336\121\365\117\243\053\274\030\026\342" +-"\265\335\171\336\042\370\202\176\313\201\037\375\047\054\217\372" +-"\227\144\042\216\370\377\141\243\234\033\036\222\217\300\250\011" +-"\337\011\021\354\267\175\061\232\032\352\203\041\006\074\237\272" +-"\134\377\224\352\152\270\303\153\125\064\117\075\062\037\335\201" +-"\024\340\304\074\315\235\060\370\060\251\227\323\356\314\243\320" +-"\037\137\034\023\201\324\030\253\224\321\143\303\236\177\065\222" +-"\236\137\104\352\354\364\042\134\267\350\075\175\244\371\211\251" +-"\221\262\052\331\353\063\207\356\245\375\343\332\314\210\346\211" +-"\046\156\307\053\202\320\136\235\131\333\024\354\221\203\005\303" +-"\136\016\306\052\320\004\335\161\075\040\116\130\047\374\123\373" +-"\170\170\031\024\262\374\220\122\211\070\142\140\007\264\240\354" +-"\254\153\120\326\375\271\050\153\357\122\055\072\262\377\361\001" +-"\100\254\067\002\003\001\000\001\243\202\002\036\060\202\002\032" +-"\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001" +-"\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060\202" +-"\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076\000" +-"\000\001\011\050\203\221\061\060\202\001\217\060\202\001\110\006" +-"\010\053\006\001\005\005\007\002\002\060\202\001\072\032\202\001" +-"\066\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040" +-"\165\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164" +-"\151\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040" +-"\141\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156" +-"\164\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145" +-"\040\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160" +-"\154\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144" +-"\040\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151" +-"\164\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150" +-"\145\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\120\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145" +-"\156\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151" +-"\156\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145" +-"\156\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145" +-"\040\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145" +-"\124\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145" +-"\054\040\150\164\164\160\072\057\057\167\167\167\056\142\145\164" +-"\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165" +-"\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144" +-"\145\170\056\150\164\155\154\060\101\006\010\053\006\001\005\005" +-"\007\002\001\026\065\150\164\164\160\072\057\057\167\167\167\056" +-"\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160\162" +-"\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163\057" +-"\151\156\144\145\170\056\150\164\155\154\060\035\006\003\125\035" +-"\016\004\026\004\024\105\075\303\251\321\334\077\044\126\230\034" +-"\163\030\210\152\377\203\107\355\266\060\037\006\003\125\035\043" +-"\004\030\060\026\200\024\105\075\303\251\321\334\077\044\126\230" +-"\034\163\030\210\152\377\203\107\355\266\060\016\006\003\125\035" +-"\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\003\202\001\001\000\111\222" +-"\274\243\356\254\275\372\015\311\213\171\206\034\043\166\260\200" +-"\131\167\374\332\177\264\113\337\303\144\113\152\116\016\255\362" +-"\175\131\167\005\255\012\211\163\260\372\274\313\334\215\000\210" +-"\217\246\240\262\352\254\122\047\277\241\110\174\227\020\173\272" +-"\355\023\035\232\007\156\313\061\142\022\350\143\003\252\175\155" +-"\343\370\033\166\041\170\033\237\113\103\214\323\111\206\366\033" +-"\134\366\056\140\025\323\351\343\173\165\077\320\002\203\320\030" +-"\202\101\315\145\067\352\216\062\176\275\153\231\135\060\021\310" +-"\333\110\124\034\073\341\247\023\323\152\110\223\367\075\214\177" +-"\005\350\316\363\210\052\143\004\270\352\176\130\174\001\173\133" +-"\341\305\175\357\041\340\215\016\135\121\175\261\147\375\243\275" +-"\070\066\306\362\070\206\207\032\226\150\140\106\373\050\024\107" +-"\125\341\247\200\014\153\342\352\337\115\174\220\110\240\066\275" +-"\011\027\211\177\303\362\323\234\234\343\335\304\033\335\365\267" +-"\161\263\123\005\211\006\320\313\112\200\301\310\123\220\265\074" +-"\061\210\027\120\237\311\304\016\213\330\250\002\143\015" +-, (PRUint32)1390 } +-}; +-static const NSSItem nss_builtins_items_87 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA-Baltimore Implementation", (PRUint32)43 }, +- { (void *)"\334\273\236\267\031\113\304\162\005\301\021\165\051\206\203\133" +-"\123\312\344\370" +-, (PRUint32)20 }, +- { (void *)"\201\065\271\373\373\022\312\030\151\066\353\256\151\170\241\361" +-, (PRUint32)16 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055" +-"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\075\106" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_88 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - Entrust Implementation", (PRUint32)43 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\117\100" +-, (PRUint32)6 }, +- { (void *)"\060\202\006\121\060\202\005\071\240\003\002\001\002\002\004\074" +-"\265\117\100\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142" +-"\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004" +-"\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157" +-"\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160\154" +-"\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062" +-"\060\064\061\061\060\070\062\064\062\067\132\027\015\062\062\060" +-"\064\061\061\060\070\065\064\062\067\132\060\146\061\022\060\020" +-"\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144" +-"\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125" +-"\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060" +-"\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145" +-"\144\040\122\157\157\164\040\103\101\040\055\040\105\156\164\162" +-"\165\163\164\040\111\155\160\154\145\155\145\156\164\141\164\151" +-"\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\272\364\104\003\252\022\152\265\103\354\125\222\266" +-"\060\175\065\127\014\333\363\015\047\156\114\367\120\250\233\116" +-"\053\157\333\365\255\034\113\135\263\251\301\376\173\104\353\133" +-"\243\005\015\037\305\064\053\060\000\051\361\170\100\262\244\377" +-"\072\364\001\210\027\176\346\324\046\323\272\114\352\062\373\103" +-"\167\227\207\043\305\333\103\243\365\052\243\121\136\341\073\322" +-"\145\151\176\125\025\233\172\347\151\367\104\340\127\265\025\350" +-"\146\140\017\015\003\373\202\216\243\350\021\173\154\276\307\143" +-"\016\027\223\337\317\113\256\156\163\165\340\363\252\271\244\300" +-"\011\033\205\352\161\051\210\101\062\371\360\052\016\154\011\362" +-"\164\153\146\154\122\023\037\030\274\324\076\367\330\156\040\236" +-"\312\376\374\041\224\356\023\050\113\327\134\136\014\146\356\351" +-"\273\017\301\064\261\177\010\166\363\075\046\160\311\213\045\035" +-"\142\044\014\352\034\165\116\300\022\344\272\023\035\060\051\055" +-"\126\063\005\273\227\131\176\306\111\117\211\327\057\044\250\266" +-"\210\100\265\144\222\123\126\044\344\242\240\205\263\136\220\264" +-"\022\063\315\002\003\001\000\001\243\202\003\005\060\202\003\001" +-"\060\202\001\267\006\003\125\035\040\004\202\001\256\060\202\001" +-"\252\060\202\001\246\006\017\053\006\001\004\001\261\076\000\000" +-"\002\011\050\203\221\061\060\202\001\221\060\202\001\111\006\010" +-"\053\006\001\005\005\007\002\002\060\202\001\073\032\202\001\067" +-"\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040\165" +-"\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164\151" +-"\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040\141" +-"\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156\164" +-"\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145\040" +-"\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154" +-"\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040" +-"\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164" +-"\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150\145" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\120" +-"\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145\156" +-"\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151\156" +-"\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145\156" +-"\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040" +-"\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145\124" +-"\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145\054" +-"\040\150\164\164\160\163\072\057\057\167\167\167\056\142\145\164" +-"\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165" +-"\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144" +-"\145\170\056\150\164\155\154\060\102\006\010\053\006\001\005\005" +-"\007\002\001\026\066\150\164\164\160\163\072\057\057\167\167\167" +-"\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160" +-"\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163" +-"\057\151\156\144\145\170\056\150\164\155\154\060\021\006\011\140" +-"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201" +-"\211\006\003\125\035\037\004\201\201\060\177\060\175\240\173\240" +-"\171\244\167\060\165\061\022\060\020\006\003\125\004\012\023\011" +-"\142\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125" +-"\004\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157" +-"\157\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023" +-"\052\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160" +-"\154\145\155\145\156\164\141\164\151\157\156\061\015\060\013\006" +-"\003\125\004\003\023\004\103\122\114\061\060\053\006\003\125\035" +-"\020\004\044\060\042\200\017\062\060\060\062\060\064\061\061\060" +-"\070\062\064\062\067\132\201\017\062\060\062\062\060\064\061\061" +-"\060\070\065\064\062\067\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\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044" +-"\060\252\204\204\026\060\035\006\003\125\035\016\004\026\004\024" +-"\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044\060" +-"\252\204\204\026\060\014\006\003\125\035\023\004\005\060\003\001" +-"\001\377\060\035\006\011\052\206\110\206\366\175\007\101\000\004" +-"\020\060\016\033\010\126\066\056\060\072\064\056\060\003\002\004" +-"\220\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000" +-"\003\202\001\001\000\052\270\027\316\037\020\224\353\270\232\267" +-"\271\137\354\332\367\222\044\254\334\222\073\307\040\215\362\231" +-"\345\135\070\241\302\064\355\305\023\131\134\005\265\053\117\141" +-"\233\221\373\101\374\374\325\074\115\230\166\006\365\201\175\353" +-"\335\220\346\321\126\124\332\343\055\014\237\021\062\224\042\001" +-"\172\366\154\054\164\147\004\314\245\217\216\054\263\103\265\224" +-"\242\320\175\351\142\177\006\276\047\001\203\236\072\375\212\356" +-"\230\103\112\153\327\265\227\073\072\277\117\155\264\143\372\063" +-"\000\064\056\055\155\226\311\173\312\231\143\272\276\364\366\060" +-"\240\055\230\226\351\126\104\005\251\104\243\141\020\353\202\241" +-"\147\135\274\135\047\165\252\212\050\066\052\070\222\331\335\244" +-"\136\000\245\314\314\174\051\052\336\050\220\253\267\341\266\377" +-"\175\045\013\100\330\252\064\243\055\336\007\353\137\316\012\335" +-"\312\176\072\175\046\301\142\150\072\346\057\067\363\201\206\041" +-"\304\251\144\252\357\105\066\321\032\146\174\370\351\067\326\326" +-"\141\276\242\255\110\347\337\346\164\376\323\155\175\322\045\334" +-"\254\142\127\251\367" +-, (PRUint32)1621 } +-}; +-static const NSSItem nss_builtins_items_89 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - Entrust Implementation", (PRUint32)43 }, +- { (void *)"\162\231\171\023\354\233\015\256\145\321\266\327\262\112\166\243" +-"\256\302\356\026" +-, (PRUint32)20 }, +- { (void *)"\175\206\220\217\133\361\362\100\300\367\075\142\265\244\251\073" +-, (PRUint32)16 }, +- { (void *)"\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155" +-"\145\156\164\141\164\151\157\156" +-, (PRUint32)104 }, +- { (void *)"\002\004\074\265\117\100" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_90 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - RSA Implementation", (PRUint32)39 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141" +-"\164\151\157\156" +-, (PRUint32)100 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141" +-"\164\151\157\156" +-, (PRUint32)100 }, +- { (void *)"\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264" +-"\252\032" +-, (PRUint32)18 }, +- { (void *)"\060\202\005\150\060\202\004\120\240\003\002\001\002\002\020\073" +-"\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142" +-"\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125" +-"\123\124\145\144\061\033\060\031\006\003\125\004\013\023\022\142" +-"\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101" +-"\163\061\057\060\055\006\003\125\004\003\023\046\142\145\124\122" +-"\125\123\124\145\144\040\122\157\157\164\040\103\101\040\055\040" +-"\122\123\101\040\111\155\160\154\145\155\145\156\164\141\164\151" +-"\157\156\060\036\027\015\060\062\060\064\061\061\061\061\061\070" +-"\061\063\132\027\015\062\062\060\064\061\062\061\061\060\067\062" +-"\065\132\060\142\061\022\060\020\006\003\125\004\012\023\011\142" +-"\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004" +-"\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157" +-"\164\040\103\101\163\061\057\060\055\006\003\125\004\003\023\046" +-"\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103" +-"\101\040\055\040\122\123\101\040\111\155\160\154\145\155\145\156" +-"\164\141\164\151\157\156\060\202\001\042\060\015\006\011\052\206" +-"\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202" +-"\001\012\002\202\001\001\000\344\272\064\060\011\216\127\320\271" +-"\006\054\157\156\044\200\042\277\135\103\246\372\117\254\202\347" +-"\034\150\160\205\033\243\156\265\252\170\331\156\007\113\077\351" +-"\337\365\352\350\124\241\141\212\016\057\151\165\030\267\014\345" +-"\024\215\161\156\230\270\125\374\014\225\320\233\156\341\055\210" +-"\324\072\100\153\222\361\231\226\144\336\333\377\170\364\356\226" +-"\035\107\211\174\324\276\271\210\167\043\072\011\346\004\236\155" +-"\252\136\322\310\275\232\116\031\337\211\352\133\016\176\303\344" +-"\264\360\340\151\073\210\017\101\220\370\324\161\103\044\301\217" +-"\046\113\073\126\351\377\214\154\067\351\105\255\205\214\123\303" +-"\140\206\220\112\226\311\263\124\260\273\027\360\034\105\331\324" +-"\033\031\144\126\012\031\367\314\341\377\206\257\176\130\136\254" +-"\172\220\037\311\050\071\105\173\242\266\307\234\037\332\205\324" +-"\041\206\131\060\223\276\123\063\067\366\357\101\317\063\307\253" +-"\162\153\045\365\363\123\033\014\114\056\361\165\113\357\240\207" +-"\367\376\212\025\320\154\325\313\371\150\123\271\160\025\023\302" +-"\365\056\373\103\065\165\055\002\003\001\000\001\243\202\002\030" +-"\060\202\002\024\060\014\006\003\125\035\023\004\005\060\003\001" +-"\001\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060" +-"\202\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076" +-"\000\000\003\011\050\203\221\061\060\202\001\217\060\101\006\010" +-"\053\006\001\005\005\007\002\001\026\065\150\164\164\160\072\057" +-"\057\167\167\167\056\142\145\164\162\165\163\164\145\144\056\143" +-"\157\155\057\160\162\157\144\165\143\164\163\137\163\145\162\166" +-"\151\143\145\163\057\151\156\144\145\170\056\150\164\155\154\060" +-"\202\001\110\006\010\053\006\001\005\005\007\002\002\060\202\001" +-"\072\032\202\001\066\122\145\154\151\141\156\143\145\040\157\156" +-"\040\157\162\040\165\163\145\040\157\146\040\164\150\151\163\040" +-"\103\145\162\164\151\146\151\143\141\164\145\040\143\162\145\141" +-"\164\145\163\040\141\156\040\141\143\153\156\157\167\154\145\144" +-"\147\155\145\156\164\040\141\156\144\040\141\143\143\145\160\164" +-"\141\156\143\145\040\157\146\040\164\150\145\040\164\150\145\156" +-"\040\141\160\160\154\151\143\141\142\154\145\040\163\164\141\156" +-"\144\141\162\144\040\164\145\162\155\163\040\141\156\144\040\143" +-"\157\156\144\151\164\151\157\156\163\040\157\146\040\165\163\145" +-"\054\040\164\150\145\040\103\145\162\164\151\146\151\143\141\164" +-"\151\157\156\040\120\162\141\143\164\151\143\145\040\123\164\141" +-"\164\145\155\145\156\164\040\141\156\144\040\164\150\145\040\122" +-"\145\154\171\151\156\147\040\120\141\162\164\171\040\101\147\162" +-"\145\145\155\145\156\164\054\040\167\150\151\143\150\040\143\141" +-"\156\040\142\145\040\146\157\165\156\144\040\141\164\040\164\150" +-"\145\040\142\145\124\122\125\123\124\145\144\040\167\145\142\040" +-"\163\151\164\145\054\040\150\164\164\160\072\057\057\167\167\167" +-"\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160" +-"\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163" +-"\057\151\156\144\145\170\056\150\164\155\154\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\251\354\024\176\371\331\103\314\123\053\024" +-"\255\317\367\360\131\211\101\315\031\060\035\006\003\125\035\016" +-"\004\026\004\024\251\354\024\176\371\331\103\314\123\053\024\255" +-"\317\367\360\131\211\101\315\031\060\015\006\011\052\206\110\206" +-"\367\015\001\001\005\005\000\003\202\001\001\000\333\227\260\165" +-"\352\014\304\301\230\312\126\005\300\250\255\046\110\257\055\040" +-"\350\201\307\266\337\103\301\054\035\165\113\324\102\215\347\172" +-"\250\164\334\146\102\131\207\263\365\151\155\331\251\236\263\175" +-"\034\061\301\365\124\342\131\044\111\345\356\275\071\246\153\212" +-"\230\104\373\233\327\052\203\227\064\055\307\175\065\114\055\064" +-"\270\076\015\304\354\210\047\257\236\222\375\120\141\202\250\140" +-"\007\024\123\314\145\023\301\366\107\104\151\322\061\310\246\335" +-"\056\263\013\336\112\215\133\075\253\015\302\065\122\242\126\067" +-"\314\062\213\050\205\102\234\221\100\172\160\053\070\066\325\341" +-"\163\032\037\345\372\176\137\334\326\234\073\060\352\333\300\133" +-"\047\134\323\163\007\301\302\363\114\233\157\237\033\312\036\252" +-"\250\070\063\011\130\262\256\374\007\350\066\334\125\272\057\117" +-"\100\376\172\275\006\246\201\301\223\042\174\206\021\012\006\167" +-"\110\256\065\267\057\062\232\141\136\213\276\051\237\051\044\210" +-"\126\071\054\250\322\253\226\003\132\324\110\237\271\100\204\013" +-"\230\150\373\001\103\326\033\342\011\261\227\034" +-, (PRUint32)1388 } +-}; +-static const NSSItem nss_builtins_items_91 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"beTRUSTed Root CA - RSA Implementation", (PRUint32)39 }, +- { (void *)"\035\202\131\312\041\047\303\313\301\154\331\062\366\054\145\051" +-"\214\250\207\022" +-, (PRUint32)20 }, +- { (void *)"\206\102\005\011\274\247\235\354\035\363\056\016\272\330\035\320" +-, (PRUint32)16 }, +- { (void *)"\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124" +-"\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023" +-"\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040" +-"\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145" +-"\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040" +-"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141" +-"\164\151\157\156" +-, (PRUint32)100 }, +- { (void *)"\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264" +-"\252\032" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_92 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"RSA Security 2048 v3", (PRUint32)21 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" +-"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" +-"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" +-"\162\151\164\171\040\062\060\064\070\040\126\063" +-, (PRUint32)60 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" +-"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" +-"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" +-"\162\151\164\171\040\062\060\064\070\040\126\063" +-, (PRUint32)60 }, +- { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000" +-"\000\002" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012" +-"\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\072" +-"\061\031\060\027\006\003\125\004\012\023\020\122\123\101\040\123" +-"\145\143\165\162\151\164\171\040\111\156\143\061\035\060\033\006" +-"\003\125\004\013\023\024\122\123\101\040\123\145\143\165\162\151" +-"\164\171\040\062\060\064\070\040\126\063\060\036\027\015\060\061" +-"\060\062\062\062\062\060\063\071\062\063\132\027\015\062\066\060" +-"\062\062\062\062\060\063\071\062\063\132\060\072\061\031\060\027" +-"\006\003\125\004\012\023\020\122\123\101\040\123\145\143\165\162" +-"\151\164\171\040\111\156\143\061\035\060\033\006\003\125\004\013" +-"\023\024\122\123\101\040\123\145\143\165\162\151\164\171\040\062" +-"\060\064\070\040\126\063\060\202\001\042\060\015\006\011\052\206" +-"\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202" +-"\001\012\002\202\001\001\000\267\217\125\161\322\200\335\173\151" +-"\171\247\360\030\120\062\074\142\147\366\012\225\007\335\346\033" +-"\363\236\331\322\101\124\153\255\237\174\276\031\315\373\106\253" +-"\101\150\036\030\352\125\310\057\221\170\211\050\373\047\051\140" +-"\377\337\217\214\073\311\111\233\265\244\224\316\001\352\076\265" +-"\143\173\177\046\375\031\335\300\041\275\204\321\055\117\106\303" +-"\116\334\330\067\071\073\050\257\313\235\032\352\053\257\041\245" +-"\301\043\042\270\270\033\132\023\207\127\203\321\360\040\347\350" +-"\117\043\102\260\000\245\175\211\351\351\141\163\224\230\161\046" +-"\274\055\152\340\367\115\360\361\266\052\070\061\201\015\051\341" +-"\000\301\121\017\114\122\370\004\132\252\175\162\323\270\207\052" +-"\273\143\020\003\052\263\241\117\015\132\136\106\267\075\016\365" +-"\164\354\231\237\371\075\044\201\210\246\335\140\124\350\225\066" +-"\075\306\011\223\232\243\022\200\000\125\231\031\107\275\320\245" +-"\174\303\272\373\037\367\365\017\370\254\271\265\364\067\230\023" +-"\030\336\205\133\267\014\202\073\207\157\225\071\130\060\332\156" +-"\001\150\027\042\314\300\013\002\003\001\000\001\243\143\060\141" ++ { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" ++"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" ++"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" ++"\162\151\164\171\040\062\060\064\070\040\126\063" ++, (PRUint32)60 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101" ++"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060" ++"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165" ++"\162\151\164\171\040\062\060\064\070\040\126\063" ++, (PRUint32)60 }, ++ { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000" ++"\000\002" ++, (PRUint32)18 }, ++ { (void *)"\060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012" ++"\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002\060" ++"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\072" ++"\061\031\060\027\006\003\125\004\012\023\020\122\123\101\040\123" ++"\145\143\165\162\151\164\171\040\111\156\143\061\035\060\033\006" ++"\003\125\004\013\023\024\122\123\101\040\123\145\143\165\162\151" ++"\164\171\040\062\060\064\070\040\126\063\060\036\027\015\060\061" ++"\060\062\062\062\062\060\063\071\062\063\132\027\015\062\066\060" ++"\062\062\062\062\060\063\071\062\063\132\060\072\061\031\060\027" ++"\006\003\125\004\012\023\020\122\123\101\040\123\145\143\165\162" ++"\151\164\171\040\111\156\143\061\035\060\033\006\003\125\004\013" ++"\023\024\122\123\101\040\123\145\143\165\162\151\164\171\040\062" ++"\060\064\070\040\126\063\060\202\001\042\060\015\006\011\052\206" ++"\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202" ++"\001\012\002\202\001\001\000\267\217\125\161\322\200\335\173\151" ++"\171\247\360\030\120\062\074\142\147\366\012\225\007\335\346\033" ++"\363\236\331\322\101\124\153\255\237\174\276\031\315\373\106\253" ++"\101\150\036\030\352\125\310\057\221\170\211\050\373\047\051\140" ++"\377\337\217\214\073\311\111\233\265\244\224\316\001\352\076\265" ++"\143\173\177\046\375\031\335\300\041\275\204\321\055\117\106\303" ++"\116\334\330\067\071\073\050\257\313\235\032\352\053\257\041\245" ++"\301\043\042\270\270\033\132\023\207\127\203\321\360\040\347\350" ++"\117\043\102\260\000\245\175\211\351\351\141\163\224\230\161\046" ++"\274\055\152\340\367\115\360\361\266\052\070\061\201\015\051\341" ++"\000\301\121\017\114\122\370\004\132\252\175\162\323\270\207\052" ++"\273\143\020\003\052\263\241\117\015\132\136\106\267\075\016\365" ++"\164\354\231\237\371\075\044\201\210\246\335\140\124\350\225\066" ++"\075\306\011\223\232\243\022\200\000\125\231\031\107\275\320\245" ++"\174\303\272\373\037\367\365\017\370\254\271\265\364\067\230\023" ++"\030\336\205\133\267\014\202\073\207\157\225\071\130\060\332\156" ++"\001\150\027\042\314\300\013\002\003\001\000\001\243\143\060\141" + "\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001" + "\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001" + "\006\060\037\006\003\125\035\043\004\030\060\026\200\024\007\303" +@@ -6526,7 +5029,7 @@ static const NSSItem nss_builtins_items_ + "\354\040\005\141\336" + , (PRUint32)869 } + }; +-static const NSSItem nss_builtins_items_93 [] = { ++static const NSSItem nss_builtins_items_73 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6550,7 +5053,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_94 [] = { ++static const NSSItem nss_builtins_items_74 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6628,7 +5131,7 @@ static const NSSItem nss_builtins_items_ + "\302\005\146\200\241\313\346\063" + , (PRUint32)856 } + }; +-static const NSSItem nss_builtins_items_95 [] = { ++static const NSSItem nss_builtins_items_75 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6652,7 +5155,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_96 [] = { ++static const NSSItem nss_builtins_items_76 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6731,7 +5234,7 @@ static const NSSItem nss_builtins_items_ + "\342\042\051\256\175\203\100\250\272\154" + , (PRUint32)874 } + }; +-static const NSSItem nss_builtins_items_97 [] = { ++static const NSSItem nss_builtins_items_77 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6755,7 +5258,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_98 [] = { ++static const NSSItem nss_builtins_items_78 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6866,7 +5369,7 @@ static const NSSItem nss_builtins_items_ + "\244\346\216\330\371\051\110\212\316\163\376\054" + , (PRUint32)1388 } + }; +-static const NSSItem nss_builtins_items_99 [] = { ++static const NSSItem nss_builtins_items_79 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -6890,7 +5393,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_100 [] = { ++static const NSSItem nss_builtins_items_80 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7001,7 +5504,7 @@ static const NSSItem nss_builtins_items_ + "\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222" + , (PRUint32)1392 } + }; +-static const NSSItem nss_builtins_items_101 [] = { ++static const NSSItem nss_builtins_items_81 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7025,7 +5528,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_102 [] = { ++static const NSSItem nss_builtins_items_82 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7133,7 +5636,7 @@ static const NSSItem nss_builtins_items_ + "\152\372\246\070\254\037\304\204" + , (PRUint32)1128 } + }; +-static const NSSItem nss_builtins_items_103 [] = { ++static const NSSItem nss_builtins_items_83 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7159,12 +5662,12 @@ static const NSSItem nss_builtins_items_ + { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300" + "\063\167" + , (PRUint32)18 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_104 [] = { ++static const NSSItem nss_builtins_items_84 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7251,7 +5754,7 @@ static const NSSItem nss_builtins_items_ + "\200\072\231\355\165\314\106\173" + , (PRUint32)936 } + }; +-static const NSSItem nss_builtins_items_105 [] = { ++static const NSSItem nss_builtins_items_85 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7277,7 +5780,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_106 [] = { ++static const NSSItem nss_builtins_items_86 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7396,7 +5899,7 @@ static const NSSItem nss_builtins_items_ + "\105\217\046\221\242\216\376\251" + , (PRUint32)1448 } + }; +-static const NSSItem nss_builtins_items_107 [] = { ++static const NSSItem nss_builtins_items_87 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7422,7 +5925,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_108 [] = { ++static const NSSItem nss_builtins_items_88 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7510,7 +6013,7 @@ static const NSSItem nss_builtins_items_ + "\222\340\134\366\007\017" + , (PRUint32)934 } + }; +-static const NSSItem nss_builtins_items_109 [] = { ++static const NSSItem nss_builtins_items_89 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7537,7 +6040,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_110 [] = { ++static const NSSItem nss_builtins_items_90 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7629,7 +6132,7 @@ static const NSSItem nss_builtins_items_ + "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144" + , (PRUint32)864 } + }; +-static const NSSItem nss_builtins_items_111 [] = { ++static const NSSItem nss_builtins_items_91 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7660,7 +6163,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_112 [] = { ++static const NSSItem nss_builtins_items_92 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7752,7 +6255,7 @@ static const NSSItem nss_builtins_items_ + "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064" + , (PRUint32)864 } + }; +-static const NSSItem nss_builtins_items_113 [] = { ++static const NSSItem nss_builtins_items_93 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7783,7 +6286,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_114 [] = { ++static const NSSItem nss_builtins_items_94 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7854,7 +6357,7 @@ static const NSSItem nss_builtins_items_ + "\350\140\052\233\205\112\100\363\153\212\044\354\006\026\054\163" + , (PRUint32)784 } + }; +-static const NSSItem nss_builtins_items_115 [] = { ++static const NSSItem nss_builtins_items_95 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7877,7 +6380,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_116 [] = { ++static const NSSItem nss_builtins_items_96 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -7975,7 +6478,7 @@ static const NSSItem nss_builtins_items_ + "\225\351\066\226\230\156" + , (PRUint32)1078 } + }; +-static const NSSItem nss_builtins_items_117 [] = { ++static const NSSItem nss_builtins_items_97 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8002,7 +6505,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_118 [] = { ++static const NSSItem nss_builtins_items_98 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8101,7 +6604,7 @@ static const NSSItem nss_builtins_items_ + "\354\375\051" + , (PRUint32)1091 } + }; +-static const NSSItem nss_builtins_items_119 [] = { ++static const NSSItem nss_builtins_items_99 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8128,7 +6631,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_120 [] = { ++static const NSSItem nss_builtins_items_100 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8229,7 +6732,7 @@ static const NSSItem nss_builtins_items_ + "\160\136\310\304\170\260\142" + , (PRUint32)1095 } + }; +-static const NSSItem nss_builtins_items_121 [] = { ++static const NSSItem nss_builtins_items_101 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8257,7 +6760,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_122 [] = { ++static const NSSItem nss_builtins_items_102 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8435,7 +6938,7 @@ static const NSSItem nss_builtins_items_ + "\001\177\046\304\143\365\045\102\136\142\275" + , (PRUint32)2043 } + }; +-static const NSSItem nss_builtins_items_123 [] = { ++static const NSSItem nss_builtins_items_103 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8467,12 +6970,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)288 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_124 [] = { ++static const NSSItem nss_builtins_items_104 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8649,7 +7152,7 @@ static const NSSItem nss_builtins_items_ + "\206\063\076\346\057\110\156\257\124\220\116\255\261\045" + , (PRUint32)2030 } + }; +-static const NSSItem nss_builtins_items_125 [] = { ++static const NSSItem nss_builtins_items_105 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8681,12 +7184,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)278 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_126 [] = { ++static const NSSItem nss_builtins_items_106 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8863,7 +7366,7 @@ static const NSSItem nss_builtins_items_ + "\257\175\310\352\351\324\126\331\016\023\262\305\105\120" + , (PRUint32)2030 } + }; +-static const NSSItem nss_builtins_items_127 [] = { ++static const NSSItem nss_builtins_items_107 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -8895,12 +7398,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)278 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_128 [] = { ++static const NSSItem nss_builtins_items_108 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9078,7 +7581,7 @@ static const NSSItem nss_builtins_items_ + "\336\007\043\162\346\275\040\024\113\264\206" + , (PRUint32)2043 } + }; +-static const NSSItem nss_builtins_items_129 [] = { ++static const NSSItem nss_builtins_items_109 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9110,12 +7613,12 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)280 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_130 [] = { ++static const NSSItem nss_builtins_items_110 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9293,7 +7796,7 @@ static const NSSItem nss_builtins_items_ + "\311\024\025\014\343\007\203\233\046\165\357" + , (PRUint32)2043 } + }; +-static const NSSItem nss_builtins_items_131 [] = { ++static const NSSItem nss_builtins_items_111 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9325,250 +7828,28 @@ static const NSSItem nss_builtins_items_ + , (PRUint32)280 }, + { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_132 [] = { ++static const NSSItem nss_builtins_items_112 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"IPS Timestamping root", (PRUint32)22 }, ++ { (void *)"QuoVadis Root CA", (PRUint32)17 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105" +-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143" +-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011" +-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125" +-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164" +-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166" +-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125" +-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060" +-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023" +-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155" +-"\160\151\156\147\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\064\060\062" +-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011" +-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163" +-, (PRUint32)290 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105" +-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143" +-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011" +-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125" +-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164" +-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166" +-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125" +-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060" +-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023" +-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155" +-"\160\151\156\147\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\064\060\062" +-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011" +-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163" +-, (PRUint32)290 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)"\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123" +-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145" +-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102" +-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004" +-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040" +-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151" +-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004" +-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071" +-"\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053" +-"\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160" +-"\151\156\147\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\064\060\062\006" +-"\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155" +-"\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011\001" +-"\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145" +-"\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061" +-"\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070" +-"\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002" +-"\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162" +-"\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023" +-"\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003" +-"\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145" +-"\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162" +-"\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003" +-"\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160" +-"\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066" +-"\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013" +-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141" +-"\155\160\151\156\147\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\064\060" +-"\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124" +-"\151\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001" +-"\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\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" +-"\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215" +-"\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257" +-"\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070" +-"\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161" +-"\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265" +-"\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130" +-"\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233" +-"\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243" +-"\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006" +-"\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235" +-"\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120" +-"\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213" +-"\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077" +-"\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061" +-"\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020" +-"\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141" +-"\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145" +-"\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111" +-"\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154" +-"\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040" +-"\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151" +-"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103" +-"\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065" +-"\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040" +-"\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\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\064\060\062\006\003\125\004\003" +-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141" +-"\155\160\151\156\147\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\036\060" +-"\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160" +-"\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000" +-"\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014" +-"\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003" +-"\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003" +-"\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001" +-"\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006" +-"\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001" +-"\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001" +-"\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053" +-"\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110" +-"\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003" +-"\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151" +-"\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004" +-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160" +-"\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001" +-"\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156" +-"\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145" +-"\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072" +-"\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006" +-"\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164" +-"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057" +-"\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001" +-"\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057" +-"\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060" +-"\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164" +-"\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206" +-"\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072" +-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163" +-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124" +-"\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154" +-"\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065" +-"\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163" +-"\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145" +-"\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056" +-"\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102" +-"\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167" +-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057" +-"\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151" +-"\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170" +-"\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057" +-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062" +-"\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163" +-"\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240" +-"\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143" +-"\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062" +-"\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155" +-"\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005" +-"\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005" +-"\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163" +-"\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110" +-"\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314" +-"\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203" +-"\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067" +-"\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077" +-"\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114" +-"\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210" +-"\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001" +-"\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324" +-"\207\112\137\334\357\351\126\360\012\014\350\165" +-, (PRUint32)2108 } +-}; +-static const NSSItem nss_builtins_items_133 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"IPS Timestamping root", (PRUint32)22 }, +- { (void *)"\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313" +-"\361\266\304\322" +-, (PRUint32)20 }, +- { (void *)"\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233" +-, (PRUint32)16 }, +- { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105" +-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143" +-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011" +-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125" +-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164" +-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166" +-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125" +-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163" +-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060" +-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023" +-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155" +-"\160\151\156\147\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\064\060\062" +-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151" +-"\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011" +-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056" +-"\145\163" +-, (PRUint32)290 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_134 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"QuoVadis Root CA", (PRUint32)17 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061" +-"\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144" +-"\151\163\040\114\151\155\151\164\145\144\061\045\060\043\006\003" +-"\125\004\013\023\034\122\157\157\164\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\056\060\054\006\003\125\004\003\023\045\121\165\157\126" +-"\141\144\151\163\040\122\157\157\164\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)129 }, ++ { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061" ++"\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144" ++"\151\163\040\114\151\155\151\164\145\144\061\045\060\043\006\003" ++"\125\004\013\023\034\122\157\157\164\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\056\060\054\006\003\125\004\003\023\045\121\165\157\126" ++"\141\144\151\163\040\122\157\157\164\040\103\145\162\164\151\146" ++"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" ++"\171" ++, (PRUint32)129 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061" + "\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144" +@@ -9678,7 +7959,7 @@ static const NSSItem nss_builtins_items_ + "\112\164\066\371" + , (PRUint32)1492 } + }; +-static const NSSItem nss_builtins_items_135 [] = { ++static const NSSItem nss_builtins_items_113 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9706,7 +7987,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_136 [] = { ++static const NSSItem nss_builtins_items_114 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9822,7 +8103,7 @@ static const NSSItem nss_builtins_items_ + "\020\005\145\325\202\020\352\302\061\315\056" + , (PRUint32)1467 } + }; +-static const NSSItem nss_builtins_items_137 [] = { ++static const NSSItem nss_builtins_items_115 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9846,7 +8127,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_138 [] = { ++static const NSSItem nss_builtins_items_116 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -9977,7 +8258,7 @@ static const NSSItem nss_builtins_items_ + "\332" + , (PRUint32)1697 } + }; +-static const NSSItem nss_builtins_items_139 [] = { ++static const NSSItem nss_builtins_items_117 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10001,7 +8282,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_140 [] = { ++static const NSSItem nss_builtins_items_118 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10081,7 +8362,7 @@ static const NSSItem nss_builtins_items_ + "\057\317\246\356\311\160\042\024\275\375\276\154\013\003" + , (PRUint32)862 } + }; +-static const NSSItem nss_builtins_items_141 [] = { ++static const NSSItem nss_builtins_items_119 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10106,7 +8387,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_142 [] = { ++static const NSSItem nss_builtins_items_120 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10179,7 +8460,7 @@ static const NSSItem nss_builtins_items_ + "\127\275\125\232" + , (PRUint32)804 } + }; +-static const NSSItem nss_builtins_items_143 [] = { ++static const NSSItem nss_builtins_items_121 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10202,7 +8483,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_144 [] = { ++static const NSSItem nss_builtins_items_122 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10275,7 +8556,7 @@ static const NSSItem nss_builtins_items_ + "\160\254\337\114" + , (PRUint32)804 } + }; +-static const NSSItem nss_builtins_items_145 [] = { ++static const NSSItem nss_builtins_items_123 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10298,7 +8579,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_146 [] = { ++static const NSSItem nss_builtins_items_124 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10384,7 +8665,7 @@ static const NSSItem nss_builtins_items_ + "\025\301\044\174\062\174\003\035\073\241\130\105\062\223" + , (PRUint32)958 } + }; +-static const NSSItem nss_builtins_items_147 [] = { ++static const NSSItem nss_builtins_items_125 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10409,7 +8690,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_148 [] = { ++static const NSSItem nss_builtins_items_126 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10500,7 +8781,7 @@ static const NSSItem nss_builtins_items_ + "\151\003\142\270\231\005\005\075\153\170\022\275\260\157\145" + , (PRUint32)1071 } + }; +-static const NSSItem nss_builtins_items_149 [] = { ++static const NSSItem nss_builtins_items_127 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10524,7 +8805,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_150 [] = { ++static const NSSItem nss_builtins_items_128 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10628,7 +8909,7 @@ static const NSSItem nss_builtins_items_ + "\004\243\103\055\332\374\013\142\352\057\137\142\123" + , (PRUint32)1309 } + }; +-static const NSSItem nss_builtins_items_151 [] = { ++static const NSSItem nss_builtins_items_129 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10651,7 +8932,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_152 [] = { ++static const NSSItem nss_builtins_items_130 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10757,7 +9038,7 @@ static const NSSItem nss_builtins_items_ + "\364\010" + , (PRUint32)1122 } + }; +-static const NSSItem nss_builtins_items_153 [] = { ++static const NSSItem nss_builtins_items_131 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10787,7 +9068,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_154 [] = { ++static const NSSItem nss_builtins_items_132 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10901,7 +9182,7 @@ static const NSSItem nss_builtins_items_ + "\005\323\312\003\112\124" + , (PRUint32)1190 } + }; +-static const NSSItem nss_builtins_items_155 [] = { ++static const NSSItem nss_builtins_items_133 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -10933,7 +9214,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_156 [] = { ++static const NSSItem nss_builtins_items_134 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11040,7 +9321,7 @@ static const NSSItem nss_builtins_items_ + "\062\234\036\273\235\370\146\250" + , (PRUint32)1144 } + }; +-static const NSSItem nss_builtins_items_157 [] = { ++static const NSSItem nss_builtins_items_135 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11070,7 +9351,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_158 [] = { ++static const NSSItem nss_builtins_items_136 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11176,7 +9457,7 @@ static const NSSItem nss_builtins_items_ + "\275\023\122\035\250\076\315\000\037\310" + , (PRUint32)1130 } + }; +-static const NSSItem nss_builtins_items_159 [] = { ++static const NSSItem nss_builtins_items_137 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11206,7 +9487,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_160 [] = { ++static const NSSItem nss_builtins_items_138 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11315,7 +9596,7 @@ static const NSSItem nss_builtins_items_ + "\334" + , (PRUint32)1217 } + }; +-static const NSSItem nss_builtins_items_161 [] = { ++static const NSSItem nss_builtins_items_139 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11343,7 +9624,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_162 [] = { ++static const NSSItem nss_builtins_items_140 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11450,7 +9731,7 @@ static const NSSItem nss_builtins_items_ + "\166\135\165\220\032\365\046\217\360" + , (PRUint32)1225 } + }; +-static const NSSItem nss_builtins_items_163 [] = { ++static const NSSItem nss_builtins_items_141 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11477,7 +9758,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_164 [] = { ++static const NSSItem nss_builtins_items_142 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11627,7 +9908,7 @@ static const NSSItem nss_builtins_items_ + "\306\224\107\351\050" + , (PRUint32)1749 } + }; +-static const NSSItem nss_builtins_items_165 [] = { ++static const NSSItem nss_builtins_items_143 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11659,7 +9940,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_166 [] = { ++static const NSSItem nss_builtins_items_144 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11802,7 +10083,7 @@ static const NSSItem nss_builtins_items_ + "\210" + , (PRUint32)1665 } + }; +-static const NSSItem nss_builtins_items_167 [] = { ++static const NSSItem nss_builtins_items_145 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11833,7 +10114,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_168 [] = { ++static const NSSItem nss_builtins_items_146 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11952,7 +10233,7 @@ static const NSSItem nss_builtins_items_ + "\066\053\143\254\130\001\153\063\051\120\206\203\361\001\110" + , (PRUint32)1359 } + }; +-static const NSSItem nss_builtins_items_169 [] = { ++static const NSSItem nss_builtins_items_147 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -11981,7 +10262,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_170 [] = { ++static const NSSItem nss_builtins_items_148 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12101,7 +10382,7 @@ static const NSSItem nss_builtins_items_ + "\063\004\324" + , (PRUint32)1363 } + }; +-static const NSSItem nss_builtins_items_171 [] = { ++static const NSSItem nss_builtins_items_149 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12130,7 +10411,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_172 [] = { ++static const NSSItem nss_builtins_items_150 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12231,7 +10512,7 @@ static const NSSItem nss_builtins_items_ + "\264\003\045\274" + , (PRUint32)1076 } + }; +-static const NSSItem nss_builtins_items_173 [] = { ++static const NSSItem nss_builtins_items_151 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12260,7 +10541,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_174 [] = { ++static const NSSItem nss_builtins_items_152 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12353,7 +10634,7 @@ static const NSSItem nss_builtins_items_ + "\177\333\275\237" + , (PRUint32)1028 } + }; +-static const NSSItem nss_builtins_items_175 [] = { ++static const NSSItem nss_builtins_items_153 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12379,7 +10660,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_176 [] = { ++static const NSSItem nss_builtins_items_154 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12473,7 +10754,7 @@ static const NSSItem nss_builtins_items_ + "\037\027\224" + , (PRUint32)1043 } + }; +-static const NSSItem nss_builtins_items_177 [] = { ++static const NSSItem nss_builtins_items_155 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12499,7 +10780,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_178 [] = { ++static const NSSItem nss_builtins_items_156 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12654,7 +10935,7 @@ static const NSSItem nss_builtins_items_ + "\152\263\364\210\034\200\015\374\162\212\350\203\136" + , (PRUint32)1997 } + }; +-static const NSSItem nss_builtins_items_179 [] = { ++static const NSSItem nss_builtins_items_157 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12681,7 +10962,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_180 [] = { ++static const NSSItem nss_builtins_items_158 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12794,7 +11075,7 @@ static const NSSItem nss_builtins_items_ + "\245\206\054\174\364\022" + , (PRUint32)1398 } + }; +-static const NSSItem nss_builtins_items_181 [] = { ++static const NSSItem nss_builtins_items_159 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12819,7 +11100,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_182 [] = { ++static const NSSItem nss_builtins_items_160 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12923,7 +11204,7 @@ static const NSSItem nss_builtins_items_ + "\252\341\247\063\366\375\112\037\366\331\140" + , (PRUint32)1115 } + }; +-static const NSSItem nss_builtins_items_183 [] = { ++static const NSSItem nss_builtins_items_161 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12952,7 +11233,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_184 [] = { ++static const NSSItem nss_builtins_items_162 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13047,7 +11328,7 @@ static const NSSItem nss_builtins_items_ + "\117\041\145\073\112\177\107\243\373" + , (PRUint32)1001 } + }; +-static const NSSItem nss_builtins_items_185 [] = { ++static const NSSItem nss_builtins_items_163 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13075,7 +11356,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_186 [] = { ++static const NSSItem nss_builtins_items_164 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13198,7 +11479,7 @@ static const NSSItem nss_builtins_items_ + "\060\032\365\232\154\364\016\123\371\072\133\321\034" + , (PRUint32)1501 } + }; +-static const NSSItem nss_builtins_items_187 [] = { ++static const NSSItem nss_builtins_items_165 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13225,7 +11506,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_188 [] = { ++static const NSSItem nss_builtins_items_166 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13314,7 +11595,7 @@ static const NSSItem nss_builtins_items_ + "\346\120\262\247\372\012\105\057\242\360\362" + , (PRUint32)955 } + }; +-static const NSSItem nss_builtins_items_189 [] = { ++static const NSSItem nss_builtins_items_167 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13341,7 +11622,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_190 [] = { ++static const NSSItem nss_builtins_items_168 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13430,7 +11711,7 @@ static const NSSItem nss_builtins_items_ + "\225\155\336" + , (PRUint32)947 } + }; +-static const NSSItem nss_builtins_items_191 [] = { ++static const NSSItem nss_builtins_items_169 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13457,7 +11738,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_192 [] = { ++static const NSSItem nss_builtins_items_170 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13547,7 +11828,7 @@ static const NSSItem nss_builtins_items_ + "\370\351\056\023\243\167\350\037\112" + , (PRUint32)969 } + }; +-static const NSSItem nss_builtins_items_193 [] = { ++static const NSSItem nss_builtins_items_171 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13574,7 +11855,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_194 [] = { ++static const NSSItem nss_builtins_items_172 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13655,7 +11936,7 @@ static const NSSItem nss_builtins_items_ + "\227\277\242\216\264\124" + , (PRUint32)918 } + }; +-static const NSSItem nss_builtins_items_195 [] = { ++static const NSSItem nss_builtins_items_173 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13679,7 +11960,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_196 [] = { ++static const NSSItem nss_builtins_items_174 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13757,7 +12038,7 @@ static const NSSItem nss_builtins_items_ + "\013\004\216\007\333\051\266\012\356\235\202\065\065\020" + , (PRUint32)846 } + }; +-static const NSSItem nss_builtins_items_197 [] = { ++static const NSSItem nss_builtins_items_175 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13782,7 +12063,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_198 [] = { ++static const NSSItem nss_builtins_items_176 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13874,7 +12155,7 @@ static const NSSItem nss_builtins_items_ + "\363\267\240\247\315\345\172\063\066\152\372\232\053" + , (PRUint32)1037 } + }; +-static const NSSItem nss_builtins_items_199 [] = { ++static const NSSItem nss_builtins_items_177 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13900,7 +12181,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_200 [] = { ++static const NSSItem nss_builtins_items_178 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14002,7 +12283,7 @@ static const NSSItem nss_builtins_items_ + "\104\144\003\045\352\336\133\156\237\311\362\116\254\335\307" + , (PRUint32)1023 } + }; +-static const NSSItem nss_builtins_items_201 [] = { ++static const NSSItem nss_builtins_items_179 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14033,7 +12314,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_202 [] = { ++static const NSSItem nss_builtins_items_180 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14141,7 +12422,7 @@ static const NSSItem nss_builtins_items_ + "\167\161\307\372\221\372\057\121\236\351\071\122\266\347\004\102" + , (PRUint32)1088 } + }; +-static const NSSItem nss_builtins_items_203 [] = { ++static const NSSItem nss_builtins_items_181 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14173,7 +12454,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_204 [] = { ++static const NSSItem nss_builtins_items_182 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14290,7 +12571,7 @@ static const NSSItem nss_builtins_items_ + "\205\206\171\145\322" + , (PRUint32)1477 } + }; +-static const NSSItem nss_builtins_items_205 [] = { ++static const NSSItem nss_builtins_items_183 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14314,7 +12595,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_206 [] = { ++static const NSSItem nss_builtins_items_184 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14430,7 +12711,7 @@ static const NSSItem nss_builtins_items_ + "\111\044\133\311\260\320\127\301\372\076\172\341\227\311" + , (PRUint32)1470 } + }; +-static const NSSItem nss_builtins_items_207 [] = { ++static const NSSItem nss_builtins_items_185 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14454,7 +12735,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_208 [] = { ++static const NSSItem nss_builtins_items_186 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14571,7 +12852,7 @@ static const NSSItem nss_builtins_items_ + "\156" + , (PRUint32)1473 } + }; +-static const NSSItem nss_builtins_items_209 [] = { ++static const NSSItem nss_builtins_items_187 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14595,7 +12876,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_210 [] = { ++static const NSSItem nss_builtins_items_188 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14678,7 +12959,7 @@ static const NSSItem nss_builtins_items_ + "\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131" + , (PRUint32)896 } + }; +-static const NSSItem nss_builtins_items_211 [] = { ++static const NSSItem nss_builtins_items_189 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14704,7 +12985,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_212 [] = { ++static const NSSItem nss_builtins_items_190 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14808,7 +13089,7 @@ static const NSSItem nss_builtins_items_ + "\215\126\214\150" + , (PRUint32)1060 } + }; +-static const NSSItem nss_builtins_items_213 [] = { ++static const NSSItem nss_builtins_items_191 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14839,7 +13120,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_214 [] = { ++static const NSSItem nss_builtins_items_192 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14958,7 +13239,7 @@ static const NSSItem nss_builtins_items_ + "\254\021\326\250\355\143\152" + , (PRUint32)1239 } + }; +-static const NSSItem nss_builtins_items_215 [] = { ++static const NSSItem nss_builtins_items_193 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14991,7 +13272,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_216 [] = { ++static const NSSItem nss_builtins_items_194 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15076,7 +13357,7 @@ static const NSSItem nss_builtins_items_ + "\113\035\236\054\302\270\150\274\355\002\356\061" + , (PRUint32)956 } + }; +-static const NSSItem nss_builtins_items_217 [] = { ++static const NSSItem nss_builtins_items_195 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15101,7 +13382,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_218 [] = { ++static const NSSItem nss_builtins_items_196 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15186,7 +13467,7 @@ static const NSSItem nss_builtins_items_ + "\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026" + , (PRUint32)960 } + }; +-static const NSSItem nss_builtins_items_219 [] = { ++static const NSSItem nss_builtins_items_197 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15211,7 +13492,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_220 [] = { ++static const NSSItem nss_builtins_items_198 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15311,7 +13592,7 @@ static const NSSItem nss_builtins_items_ + "\145" + , (PRUint32)1057 } + }; +-static const NSSItem nss_builtins_items_221 [] = { ++static const NSSItem nss_builtins_items_199 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15340,166 +13621,21 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_222 [] = { ++static const NSSItem nss_builtins_items_200 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"DigiNotar Root CA", (PRUint32)18 }, ++ { (void *)"Network Solutions Certificate Authority", (PRUint32)40 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" +-"\074\114" +-, (PRUint32)18 }, +- { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014" +-"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" +-"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060" +-"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141" +-"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151" +-"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060" +-"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156" +-"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060" +-"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132" +-"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060" +-"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022" +-"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164" +-"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147" +-"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040" +-"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151" +-"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154" +-"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" +-"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" +-"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126" +-"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201" +-"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300" +-"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177" +-"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330" +-"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213" +-"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337" +-"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045" +-"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123" +-"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007" +-"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043" +-"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042" +-"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041" +-"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324" +-"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313" +-"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110" +-"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114" +-"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376" +-"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344" +-"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357" +-"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346" +-"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314" +-"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351" +-"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154" +-"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262" +-"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042" +-"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077" +-"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102" +-"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323" +-"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176" +-"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147" +-"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216" +-"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035" +-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" +-"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153" +-"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002" +-"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004" +-"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257" +-"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362" +-"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203" +-"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302" +-"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150" +-"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307" +-"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050" +-"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350" +-"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013" +-"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075" +-"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114" +-"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313" +-"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273" +-"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235" +-"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146" +-"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160" +-"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007" +-"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351" +-"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134" +-"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045" +-"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113" +-"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174" +-"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304" +-"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012" +-"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330" +-"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124" +-"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163" +-"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056" +-"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175" +-"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163" +-"\262\345\214\360\206\231\270\345\305\337\204\301\267\353" +-, (PRUint32)1422 } +-}; +-static const NSSItem nss_builtins_items_223 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"DigiNotar Root CA", (PRUint32)18 }, +- { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317" +-"\201\147\107\214" +-, (PRUint32)20 }, +- { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" +-"\074\114" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_224 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Network Solutions Certificate Authority", (PRUint32)40 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162" +-"\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056" +-"\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164" +-"\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103" +-"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" +-"\162\151\164\171" +-, (PRUint32)100 }, ++ { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" ++"\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162" ++"\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056" ++"\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164" ++"\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103" ++"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" ++"\162\151\164\171" ++, (PRUint32)100 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" + "\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162" +@@ -15577,7 +13713,7 @@ static const NSSItem nss_builtins_items_ + "\244\140\114\260\125\240\240\173\127\262" + , (PRUint32)1002 } + }; +-static const NSSItem nss_builtins_items_225 [] = { ++static const NSSItem nss_builtins_items_201 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15604,7 +13740,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_226 [] = { ++static const NSSItem nss_builtins_items_202 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15713,7 +13849,7 @@ static const NSSItem nss_builtins_items_ + "\333" + , (PRUint32)1217 } + }; +-static const NSSItem nss_builtins_items_227 [] = { ++static const NSSItem nss_builtins_items_203 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15741,7 +13877,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_228 [] = { ++static const NSSItem nss_builtins_items_204 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15815,7 +13951,7 @@ static const NSSItem nss_builtins_items_ + "\334\335\363\377\035\054\072\026\127\331\222\071\326" + , (PRUint32)653 } + }; +-static const NSSItem nss_builtins_items_229 [] = { ++static const NSSItem nss_builtins_items_205 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15844,7 +13980,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_230 [] = { ++static const NSSItem nss_builtins_items_206 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15936,7 +14072,7 @@ static const NSSItem nss_builtins_items_ + "\321\236\164\310\166\147" + , (PRUint32)1078 } + }; +-static const NSSItem nss_builtins_items_231 [] = { ++static const NSSItem nss_builtins_items_207 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15961,7 +14097,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_232 [] = { ++static const NSSItem nss_builtins_items_208 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16058,7 +14194,7 @@ static const NSSItem nss_builtins_items_ + "\253\205\322\140\126\132" + , (PRUint32)1030 } + }; +-static const NSSItem nss_builtins_items_233 [] = { ++static const NSSItem nss_builtins_items_209 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16086,7 +14222,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_234 [] = { ++static const NSSItem nss_builtins_items_210 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16171,7 +14307,7 @@ static const NSSItem nss_builtins_items_ + "\164" + , (PRUint32)897 } + }; +-static const NSSItem nss_builtins_items_235 [] = { ++static const NSSItem nss_builtins_items_211 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16197,7 +14333,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_236 [] = { ++static const NSSItem nss_builtins_items_212 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16294,7 +14430,7 @@ static const NSSItem nss_builtins_items_ + "\374\276\337\012\015" + , (PRUint32)1013 } + }; +-static const NSSItem nss_builtins_items_237 [] = { ++static const NSSItem nss_builtins_items_213 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16323,7 +14459,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_238 [] = { ++static const NSSItem nss_builtins_items_214 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16434,7 +14570,7 @@ static const NSSItem nss_builtins_items_ + "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224" + , (PRUint32)1151 } + }; +-static const NSSItem nss_builtins_items_239 [] = { ++static const NSSItem nss_builtins_items_215 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16466,7 +14602,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_240 [] = { ++static const NSSItem nss_builtins_items_216 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16620,7 +14756,7 @@ static const NSSItem nss_builtins_items_ + "\103\307\003\340\067\116\135\012\334\131\040\045" + , (PRUint32)1964 } + }; +-static const NSSItem nss_builtins_items_241 [] = { ++static const NSSItem nss_builtins_items_217 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16648,7 +14784,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_242 [] = { ++static const NSSItem nss_builtins_items_218 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16729,7 +14865,7 @@ static const NSSItem nss_builtins_items_ + "\300\226\130\057\352\273\106\327\273\344\331\056" + , (PRUint32)940 } + }; +-static const NSSItem nss_builtins_items_243 [] = { ++static const NSSItem nss_builtins_items_219 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16752,12 +14888,12 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_244 [] = { ++static const NSSItem nss_builtins_items_220 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.", (PRUint32)27 }, ++ { (void *)"AC Ra+z Certic+mara S.A.", (PRUint32)27 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\173\061\013\060\011\006\003\125\004\006\023\002\103\117\061" + "\107\060\105\006\003\125\004\012\014\076\123\157\143\151\145\144" +@@ -16886,12 +15022,12 @@ static const NSSItem nss_builtins_items_ + "\005\211\374\170\326\134\054\046\103\251" + , (PRUint32)1642 } + }; +-static const NSSItem nss_builtins_items_245 [] = { ++static const NSSItem nss_builtins_items_221 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.", (PRUint32)27 }, ++ { (void *)"AC Ra+z Certic+mara S.A.", (PRUint32)27 }, + { (void *)"\313\241\305\370\260\343\136\270\271\105\022\323\371\064\242\351" + "\006\020\323\066" + , (PRUint32)20 }, +@@ -16914,7 +15050,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_246 [] = { ++static const NSSItem nss_builtins_items_222 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17019,7 +15155,7 @@ static const NSSItem nss_builtins_items_ + "\334\144\047\027\214\132\267\332\164\050\315\227\344\275" + , (PRUint32)1198 } + }; +-static const NSSItem nss_builtins_items_247 [] = { ++static const NSSItem nss_builtins_items_223 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17046,7 +15182,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_248 [] = { ++static const NSSItem nss_builtins_items_224 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17151,7 +15287,7 @@ static const NSSItem nss_builtins_items_ + "\016\121\075\157\373\226\126\200\342\066\027\321\334\344" + , (PRUint32)1198 } + }; +-static const NSSItem nss_builtins_items_249 [] = { ++static const NSSItem nss_builtins_items_225 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17178,7 +15314,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_250 [] = { ++static const NSSItem nss_builtins_items_226 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17271,7 +15407,7 @@ static const NSSItem nss_builtins_items_ + "\230" + , (PRUint32)993 } + }; +-static const NSSItem nss_builtins_items_251 [] = { ++static const NSSItem nss_builtins_items_227 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17298,7 +15434,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_252 [] = { ++static const NSSItem nss_builtins_items_228 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17387,7 +15523,7 @@ static const NSSItem nss_builtins_items_ + "\126\144\127" + , (PRUint32)931 } + }; +-static const NSSItem nss_builtins_items_253 [] = { ++static const NSSItem nss_builtins_items_229 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17414,7 +15550,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_254 [] = { ++static const NSSItem nss_builtins_items_230 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17495,7 +15631,7 @@ static const NSSItem nss_builtins_items_ + "\000\147\240\161\000\202\110" + , (PRUint32)919 } + }; +-static const NSSItem nss_builtins_items_255 [] = { ++static const NSSItem nss_builtins_items_231 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17519,7 +15655,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_256 [] = { ++static const NSSItem nss_builtins_items_232 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17601,7 +15737,7 @@ static const NSSItem nss_builtins_items_ + "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217" + , (PRUint32)943 } + }; +-static const NSSItem nss_builtins_items_257 [] = { ++static const NSSItem nss_builtins_items_233 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17625,7 +15761,7 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_258 [] = { ++static const NSSItem nss_builtins_items_234 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17706,7 +15842,7 @@ static const NSSItem nss_builtins_items_ + "\246\210\070\316\125" + , (PRUint32)933 } + }; +-static const NSSItem nss_builtins_items_259 [] = { ++static const NSSItem nss_builtins_items_235 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17729,3139 +15865,576 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_260 [] = { ++static const NSSItem nss_builtins_items_236 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ePKI Root Certification Authority", (PRUint32)34 }, ++ { (void *)"Entrust.net 2048 2029", (PRUint32)22 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061" +-"\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150" +-"\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040" +-"\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145" +-"\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151" ++ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" ++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" ++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" ++"\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164" ++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" + "\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)96 }, ++"\040\050\062\060\064\070\051" ++, (PRUint32)183 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061" +-"\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150" +-"\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040" +-"\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145" +-"\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)96 }, +- { (void *)"\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322" +-"\274\235" +-, (PRUint32)18 }, +- { (void *)"\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025" +-"\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136" +-"\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060" +-"\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141" +-"\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164" +-"\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113" +-"\111\040\122\157\157\164\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\060\064\061\062\062\060\060\062\063\061\062\067\132\027" +-"\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136" +-"\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060" +-"\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141" +-"\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164" +-"\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113" +-"\111\040\122\157\157\164\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\202" +-"\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005" +-"\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341" +-"\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155" +-"\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007" +-"\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217" +-"\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376" +-"\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041" +-"\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225" +-"\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364" +-"\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327" +-"\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367" +-"\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020" +-"\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065" +-"\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047" +-"\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330" +-"\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111" +-"\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221" +-"\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162" +-"\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300" +-"\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243" +-"\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024" +-"\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224" +-"\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076" +-"\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101" +-"\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322" +-"\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172" +-"\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052" +-"\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107" +-"\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203" +-"\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215" +-"\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251" +-"\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132" +-"\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215" +-"\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002" +-"\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004" +-"\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125" +-"\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005" +-"\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060" +-"\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005" +-"\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307" +-"\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003" +-"\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201" +-"\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000" +-"\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022" +-"\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045" +-"\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312" +-"\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066" +-"\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017" +-"\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122" +-"\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227" +-"\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277" +-"\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322" +-"\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323" +-"\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066" +-"\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245" +-"\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355" +-"\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272" +-"\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224" +-"\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115" +-"\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001" +-"\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217" +-"\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341" +-"\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122" +-"\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200" +-"\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211" +-"\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263" +-"\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342" +-"\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374" +-"\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304" +-"\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156" +-"\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143" +-"\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203" +-"\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352" +-"\201\370\021\234" +-, (PRUint32)1460 } +-}; +-static const NSSItem nss_builtins_items_261 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ePKI Root Certification Authority", (PRUint32)34 }, +- { (void *)"\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342" +-"\075\151\306\360" +-, (PRUint32)20 }, +- { (void *)"\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263" +-, (PRUint32)16 }, +- { (void *)"\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061" +-"\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150" +-"\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040" +-"\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145" +-"\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151" ++ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" ++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" ++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" ++"\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164" ++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" + "\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)96 }, +- { (void *)"\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322" +-"\274\235" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_262 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3", (PRUint32)66 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172" +-"\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006" +-"\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102" +-"\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157" +-"\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155" +-"\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304" +-"\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125" +-"\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153" +-"\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101" +-"\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151" +-"\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043" +-"\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145" +-"\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153" +-"\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303" +-"\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303" +-"\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063" +-, (PRUint32)303 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172" +-"\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006" +-"\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102" +-"\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157" +-"\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155" +-"\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304" +-"\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125" +-"\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153" +-"\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101" +-"\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151" +-"\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043" +-"\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145" +-"\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153" +-"\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303" +-"\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303" +-"\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063" +-, (PRUint32)303 }, +- { (void *)"\002\001\021" +-, (PRUint32)3 }, +- { (void *)"\060\202\005\027\060\202\003\377\240\003\002\001\002\002\001\021" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122" +-"\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145" +-"\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003" +-"\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151" +-"\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154" +-"\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141" +-"\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260" +-"\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154" +-"\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040" +-"\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162" +-"\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164" +-"\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060" +-"\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162" +-"\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145" +-"\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234" +-"\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266" +-"\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155" +-"\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163" +-"\304\261\040\055\040\123\303\274\162\303\274\155\040\063\060\036" +-"\027\015\060\067\060\070\062\064\061\061\063\067\060\067\132\027" +-"\015\061\067\060\070\062\061\061\061\063\067\060\067\132\060\202" +-"\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145\040" +-"\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003\125" +-"\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151\154" +-"\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154\157" +-"\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141\040" +-"\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260\124" +-"\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154\165" +-"\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040\166" +-"\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162\141" +-"\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164\303" +-"\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060\041" +-"\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162\164" +-"\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145\172" +-"\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234\102" +-"\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266\153" +-"\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145" +-"\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304" +-"\261\040\055\040\123\303\274\162\303\274\155\040\063\060\202\001" +-"\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000" +-"\003\202\001\017\000\060\202\001\012\002\202\001\001\000\212\155" +-"\113\377\020\210\072\303\366\176\224\350\352\040\144\160\256\041" +-"\201\276\072\173\074\333\361\035\122\177\131\372\363\042\114\225" +-"\240\220\274\110\116\021\253\373\267\265\215\172\203\050\214\046" +-"\106\330\116\225\100\207\141\237\305\236\155\201\207\127\154\212" +-"\073\264\146\352\314\100\374\343\252\154\262\313\001\333\062\277" +-"\322\353\205\317\241\015\125\303\133\070\127\160\270\165\306\171" +-"\321\024\060\355\033\130\133\153\357\065\362\241\041\116\305\316" +-"\174\231\137\154\271\270\042\223\120\247\315\114\160\152\276\152" +-"\005\177\023\234\053\036\352\376\107\316\004\245\157\254\223\056" +-"\174\053\237\236\171\023\221\350\352\236\312\070\165\216\142\260" +-"\225\223\052\345\337\351\136\227\156\040\137\137\204\172\104\071" +-"\031\100\034\272\125\053\373\060\262\201\357\204\343\334\354\230" +-"\070\071\003\205\010\251\124\003\005\051\360\311\217\213\352\013" +-"\206\145\031\021\323\351\011\043\336\150\223\003\311\066\034\041" +-"\156\316\214\146\361\231\060\330\327\263\303\035\370\201\056\250" +-"\275\202\013\146\376\202\313\341\340\032\202\303\100\201\002\003" +-"\001\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026" +-"\004\024\275\210\207\311\217\366\244\012\013\252\353\305\376\221" +-"\043\235\253\112\212\062\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\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\005\005\000\003\202\001\001\000\035\174\372\111\217" +-"\064\351\267\046\222\026\232\005\164\347\113\320\155\071\154\303" +-"\046\366\316\270\061\274\304\337\274\052\370\067\221\030\334\004" +-"\310\144\231\053\030\155\200\003\131\311\256\370\130\320\076\355" +-"\303\043\237\151\074\206\070\034\236\357\332\047\170\321\204\067" +-"\161\212\074\113\071\317\176\105\006\326\055\330\212\115\170\022" +-"\326\255\302\323\313\322\320\101\363\046\066\112\233\225\154\014" +-"\356\345\321\103\047\146\301\210\367\172\263\040\154\352\260\151" +-"\053\307\040\350\014\003\304\101\005\231\342\077\344\153\370\240" +-"\206\201\307\204\306\037\325\113\201\022\262\026\041\054\023\241" +-"\200\262\136\014\112\023\236\040\330\142\100\253\220\352\144\112" +-"\057\254\015\001\022\171\105\250\057\207\031\150\310\342\205\307" +-"\060\262\165\371\070\077\262\300\223\264\153\342\003\104\316\147" +-"\240\337\211\326\255\214\166\243\023\303\224\141\053\153\331\154" +-"\301\007\012\042\007\205\154\205\044\106\251\276\077\213\170\204" +-"\202\176\044\014\235\375\201\067\343\045\250\355\066\116\225\054" +-"\311\234\220\332\354\251\102\074\255\266\002" +-, (PRUint32)1307 } +-}; +-static const NSSItem nss_builtins_items_263 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3", (PRUint32)66 }, +- { (void *)"\033\113\071\141\046\047\153\144\221\242\150\155\327\002\103\041" +-"\055\037\035\226" +-, (PRUint32)20 }, +- { (void *)"\355\101\365\214\120\305\053\234\163\346\356\154\353\302\250\046" +-, (PRUint32)16 }, +- { (void *)"\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172" +-"\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006" +-"\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102" +-"\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157" +-"\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155" +-"\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304" +-"\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125" +-"\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153" +-"\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101" +-"\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151" +-"\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043" +-"\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145" +-"\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153" +-"\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303" +-"\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303" +-"\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063" +-, (PRUint32)303 }, +- { (void *)"\002\001\021" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++"\040\050\062\060\064\070\051" ++, (PRUint32)183 }, ++ { (void *)"\002\004\070\143\336\370" ++, (PRUint32)6 }, ++ { (void *)"\060\202\004\052\060\202\003\022\240\003\002\001\002\002\004\070" ++"\143\336\370\060\015\006\011\052\206\110\206\367\015\001\001\005" ++"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013" ++"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006" ++"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163" ++"\164\056\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105" ++"\156\164\162\165\163\164\056\156\145\164\040\103\145\162\164\151" ++"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" ++"\164\171\040\050\062\060\064\070\051\060\036\027\015\071\071\061" ++"\062\062\064\061\067\065\060\065\061\132\027\015\062\071\060\067" ++"\062\064\061\064\061\065\061\062\132\060\201\264\061\024\060\022" ++"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156" ++"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167" ++"\056\145\156\164\162\165\163\164\056\156\145\164\057\103\120\123" ++"\137\062\060\064\070\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\063\060\061\006" ++"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145" ++"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040" ++"\101\165\164\150\157\162\151\164\171\040\050\062\060\064\070\051" ++"\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001" ++"\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001" ++"\000\255\115\113\251\022\206\262\352\243\040\007\025\026\144\052" ++"\053\113\321\277\013\112\115\216\355\200\166\245\147\267\170\100" ++"\300\163\102\310\150\300\333\123\053\335\136\270\166\230\065\223" ++"\213\032\235\174\023\072\016\037\133\267\036\317\345\044\024\036" ++"\261\201\251\215\175\270\314\153\113\003\361\002\014\334\253\245" ++"\100\044\000\177\164\224\241\235\010\051\263\210\013\365\207\167" ++"\235\125\315\344\303\176\327\152\144\253\205\024\206\225\133\227" ++"\062\120\157\075\310\272\146\014\343\374\275\270\111\301\166\211" ++"\111\031\375\300\250\275\211\243\147\057\306\237\274\161\031\140" ++"\270\055\351\054\311\220\166\146\173\224\342\257\170\326\145\123" ++"\135\074\326\234\262\317\051\003\371\057\244\120\262\324\110\316" ++"\005\062\125\212\375\262\144\114\016\344\230\007\165\333\177\337" ++"\271\010\125\140\205\060\051\371\173\110\244\151\206\343\065\077" ++"\036\206\135\172\172\025\275\357\000\216\025\042\124\027\000\220" ++"\046\223\274\016\111\150\221\277\370\107\323\235\225\102\301\016" ++"\115\337\157\046\317\303\030\041\142\146\103\160\326\325\300\007" ++"\341\002\003\001\000\001\243\102\060\100\060\016\006\003\125\035" ++"\017\001\001\377\004\004\003\002\001\006\060\017\006\003\125\035" ++"\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003\125" ++"\035\016\004\026\004\024\125\344\201\321\021\200\276\330\211\271" ++"\010\243\061\371\241\044\011\026\271\160\060\015\006\011\052\206" ++"\110\206\367\015\001\001\005\005\000\003\202\001\001\000\073\233" ++"\217\126\233\060\347\123\231\174\172\171\247\115\227\327\031\225" ++"\220\373\006\037\312\063\174\106\143\217\226\146\044\372\100\033" ++"\041\047\312\346\162\163\362\117\376\061\231\375\310\014\114\150" ++"\123\306\200\202\023\230\372\266\255\332\135\075\361\316\156\366" ++"\025\021\224\202\014\356\077\225\257\021\253\017\327\057\336\037" ++"\003\217\127\054\036\311\273\232\032\104\225\353\030\117\246\037" ++"\315\175\127\020\057\233\004\011\132\204\265\156\330\035\072\341" ++"\326\236\321\154\171\136\171\034\024\305\343\320\114\223\073\145" ++"\074\355\337\075\276\246\345\225\032\303\265\031\303\275\136\133" ++"\273\377\043\357\150\031\313\022\223\047\134\003\055\157\060\320" ++"\036\266\032\254\336\132\367\321\252\250\047\246\376\171\201\304" ++"\171\231\063\127\272\022\260\251\340\102\154\223\312\126\336\376" ++"\155\204\013\010\213\176\215\352\327\230\041\306\363\347\074\171" ++"\057\136\234\321\114\025\215\341\354\042\067\314\232\103\013\227" ++"\334\200\220\215\263\147\233\157\110\010\025\126\317\277\361\053" ++"\174\136\232\166\351\131\220\305\174\203\065\021\145\121" ++, (PRUint32)1070 } + }; +-static const NSSItem nss_builtins_items_264 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 2 CA 1", (PRUint32)21 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\062\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\062\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\001" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035" +-"\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163" +-"\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060" +-"\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040" +-"\103\154\141\163\163\040\062\040\103\101\040\061\060\036\027\015" +-"\060\066\061\060\061\063\061\060\062\065\060\071\132\027\015\061" +-"\066\061\060\061\063\061\060\062\065\060\071\132\060\113\061\013" +-"\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006" +-"\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123" +-"\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003" +-"\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141" +-"\163\163\040\062\040\103\101\040\061\060\202\001\042\060\015\006" +-"\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017" +-"\000\060\202\001\012\002\202\001\001\000\213\074\007\105\330\366" +-"\337\346\307\312\272\215\103\305\107\215\260\132\301\070\333\222" +-"\204\034\257\023\324\017\157\066\106\040\304\056\314\161\160\064" +-"\242\064\323\067\056\330\335\072\167\057\300\353\051\350\134\322" +-"\265\251\221\064\207\042\131\376\314\333\347\231\257\226\301\250" +-"\307\100\335\245\025\214\156\310\174\227\003\313\346\040\362\327" +-"\227\137\061\241\057\067\322\276\356\276\251\255\250\114\236\041" +-"\146\103\073\250\274\363\011\243\070\325\131\044\301\302\107\166" +-"\261\210\134\202\073\273\053\246\004\327\214\007\217\315\325\101" +-"\035\360\256\270\051\054\224\122\140\064\224\073\332\340\070\321" +-"\235\063\076\025\364\223\062\305\000\332\265\051\146\016\072\170" +-"\017\041\122\137\002\345\222\173\045\323\222\036\057\025\235\201" +-"\344\235\216\350\357\211\316\024\114\124\035\034\201\022\115\160" +-"\250\276\020\005\027\176\037\321\270\127\125\355\315\273\122\302" +-"\260\036\170\302\115\066\150\313\126\046\301\122\301\275\166\367" +-"\130\325\162\176\037\104\166\273\000\211\035\026\235\121\065\357" +-"\115\302\126\357\153\340\214\073\015\351\002\003\001\000\001\243" +-"\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\077" +-"\215\232\131\213\374\173\173\234\243\257\070\260\071\355\220\161" +-"\200\326\310\060\016\006\003\125\035\017\001\001\377\004\004\003" +-"\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\003\202\001\001\000\025\032\176\023\212\271\350\007\243" +-"\113\047\062\262\100\221\362\041\321\144\205\276\143\152\322\317" +-"\201\302\025\325\172\176\014\051\254\067\036\034\174\166\122\225" +-"\332\265\177\043\241\051\167\145\311\062\235\250\056\126\253\140" +-"\166\316\026\264\215\177\170\300\325\231\121\203\177\136\331\276" +-"\014\250\120\355\042\307\255\005\114\166\373\355\356\036\107\144" +-"\366\367\047\175\134\050\017\105\305\134\142\136\246\232\221\221" +-"\267\123\027\056\334\255\140\235\226\144\071\275\147\150\262\256" +-"\005\313\115\347\137\037\127\206\325\040\234\050\373\157\023\070" +-"\365\366\021\222\366\175\231\136\037\014\350\253\104\044\051\162" +-"\100\075\066\122\257\214\130\220\163\301\354\141\054\171\241\354" +-"\207\265\077\332\115\331\041\000\060\336\220\332\016\323\032\110" +-"\251\076\205\013\024\213\214\274\101\236\152\367\016\160\300\065" +-"\367\071\242\135\146\320\173\131\237\250\107\022\232\047\043\244" +-"\055\216\047\203\222\040\241\327\025\177\361\056\030\356\364\110" +-"\177\057\177\361\241\030\265\241\013\224\240\142\040\062\234\035" +-"\366\324\357\277\114\210\150" +-, (PRUint32)855 } +-}; +-static const NSSItem nss_builtins_items_265 [] = { ++static const NSSItem nss_builtins_items_237 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 2 CA 1", (PRUint32)21 }, +- { (void *)"\240\241\253\220\311\374\204\173\073\022\141\350\227\175\137\323" +-"\042\141\323\314" +-, (PRUint32)20 }, +- { (void *)"\270\010\232\360\003\314\033\015\310\154\013\166\241\165\144\043" +-, (PRUint32)16 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\062\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, ++ { (void *)"Entrust.net 2048 2029", (PRUint32)22 }, ++ { (void *)"\120\060\006\011\035\227\324\365\256\071\367\313\347\222\175\175" ++"\145\055\064\061" ++, (PRUint32)20 }, ++ { (void *)"\356\051\061\274\062\176\232\346\350\265\367\121\264\064\161\220" ++, (PRUint32)16 }, ++ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" ++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" ++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" ++"\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164" ++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" ++"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" ++"\040\050\062\060\064\070\051" ++, (PRUint32)183 }, ++ { (void *)"\002\004\070\143\336\370" ++, (PRUint32)6 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_266 [] = { ++static const NSSItem nss_builtins_items_238 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 3 CA 1", (PRUint32)21 }, ++ { (void *)"Entrust.net 2048 2030", (PRUint32)22 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\063\040\103\101\040\061" +-, (PRUint32)77 }, ++ { (void *)"\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165" ++"\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004" ++"\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165" ++"\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162" ++"\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051" ++"\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111" ++"\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162" ++"\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060" ++"\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040" ++"\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" ++"\062" ++, (PRUint32)193 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\063\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\002" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\002" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035" +-"\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163" +-"\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060" +-"\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040" +-"\103\154\141\163\163\040\063\040\103\101\040\061\060\036\027\015" +-"\060\065\060\065\060\071\061\064\061\063\060\063\132\027\015\061" +-"\065\060\065\060\071\061\064\061\063\060\063\132\060\113\061\013" +-"\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006" +-"\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123" +-"\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003" +-"\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141" +-"\163\163\040\063\040\103\101\040\061\060\202\001\042\060\015\006" +-"\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017" +-"\000\060\202\001\012\002\202\001\001\000\244\216\327\164\331\051" +-"\144\336\137\037\207\200\221\352\116\071\346\031\306\104\013\200" +-"\325\013\257\123\007\213\022\275\346\147\360\002\261\211\366\140" +-"\212\304\133\260\102\321\300\041\250\313\341\233\357\144\121\266" +-"\247\317\025\365\164\200\150\004\220\240\130\242\346\164\246\123" +-"\123\125\110\143\077\222\126\335\044\116\216\370\272\053\377\363" +-"\064\212\236\050\327\064\237\254\057\326\017\361\244\057\275\122" +-"\262\111\205\155\071\065\360\104\060\223\106\044\363\266\347\123" +-"\373\274\141\257\251\243\024\373\302\027\027\204\154\340\174\210" +-"\370\311\034\127\054\360\075\176\224\274\045\223\204\350\232\000" +-"\232\105\005\102\127\200\364\116\316\331\256\071\366\310\123\020" +-"\014\145\072\107\173\140\302\326\372\221\311\306\161\154\275\221" +-"\207\074\221\206\111\253\363\017\240\154\046\166\136\034\254\233" +-"\161\345\215\274\233\041\036\234\326\070\176\044\200\025\061\202" +-"\226\261\111\323\142\067\133\210\014\012\142\064\376\247\110\176" +-"\231\261\060\213\220\067\225\034\250\037\245\054\215\364\125\310" +-"\333\335\131\012\302\255\170\240\364\213\002\003\001\000\001\243" +-"\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\070" +-"\024\346\310\360\251\244\003\364\116\076\042\243\133\362\326\340" +-"\255\100\164\060\016\006\003\125\035\017\001\001\377\004\004\003" +-"\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\003\202\001\001\000\001\147\243\214\311\045\075\023\143" +-"\135\026\157\354\241\076\011\134\221\025\052\052\331\200\041\117" +-"\005\334\273\245\211\253\023\063\052\236\070\267\214\157\002\162" +-"\143\307\163\167\036\011\006\272\073\050\173\244\107\311\141\153" +-"\010\010\040\374\212\005\212\037\274\272\306\302\376\317\156\354" +-"\023\063\161\147\056\151\372\251\054\077\146\300\022\131\115\013" +-"\124\002\222\204\273\333\022\357\203\160\160\170\310\123\372\337" +-"\306\306\377\334\210\057\007\300\111\235\062\127\140\323\362\366" +-"\231\051\137\347\252\001\314\254\063\250\034\012\273\221\304\003" +-"\240\157\266\064\371\206\323\263\166\124\230\364\112\201\263\123" +-"\235\115\100\354\345\167\023\105\257\133\252\037\330\057\114\202" +-"\173\376\052\304\130\273\117\374\236\375\003\145\032\052\016\303" +-"\245\040\026\224\153\171\246\242\022\264\273\032\244\043\172\137" +-"\360\256\204\044\344\363\053\373\212\044\243\047\230\145\332\060" +-"\165\166\374\031\221\350\333\353\233\077\062\277\100\227\007\046" +-"\272\314\363\224\205\112\172\047\223\317\220\102\324\270\133\026" +-"\246\347\313\100\003\335\171" +-, (PRUint32)855 } +-}; +-static const NSSItem nss_builtins_items_267 [] = { ++ { (void *)"\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165" ++"\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004" ++"\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165" ++"\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162" ++"\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051" ++"\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111" ++"\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162" ++"\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060" ++"\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040" ++"\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" ++"\062" ++, (PRUint32)193 }, ++ { (void *)"\002\004\112\123\214\050" ++, (PRUint32)6 }, ++ { (void *)"\060\202\004\076\060\202\003\046\240\003\002\001\002\002\004\112" ++"\123\214\050\060\015\006\011\052\206\110\206\367\015\001\001\013" ++"\005\000\060\201\276\061\013\060\011\006\003\125\004\006\023\002" ++"\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156\164" ++"\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006\003" ++"\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156\164" ++"\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055\164" ++"\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060\050" ++"\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164\054" ++"\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164\150" ++"\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061" ++"\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165\163" ++"\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141" ++"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055" ++"\040\107\062\060\036\027\015\060\071\060\067\060\067\061\067\062" ++"\065\065\064\132\027\015\063\060\061\062\060\067\061\067\065\065" ++"\065\064\132\060\201\276\061\013\060\011\006\003\125\004\006\023" ++"\002\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156" ++"\164\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006" ++"\003\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156" ++"\164\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055" ++"\164\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060" ++"\050\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164" ++"\054\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164" ++"\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171" ++"\061\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165" ++"\163\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143" ++"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040" ++"\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206" ++"\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012" ++"\002\202\001\001\000\272\204\266\162\333\236\014\153\342\231\351" ++"\060\001\247\166\352\062\270\225\101\032\311\332\141\116\130\162" ++"\317\376\366\202\171\277\163\141\006\012\245\047\330\263\137\323" ++"\105\116\034\162\326\116\062\362\162\212\017\367\203\031\320\152" ++"\200\200\000\105\036\260\307\347\232\277\022\127\047\034\243\150" ++"\057\012\207\275\152\153\016\136\145\363\034\167\325\324\205\215" ++"\160\041\264\263\062\347\213\242\325\206\071\002\261\270\322\107" ++"\316\344\311\111\304\073\247\336\373\124\175\127\276\360\350\156" ++"\302\171\262\072\013\125\342\120\230\026\062\023\134\057\170\126" ++"\301\302\224\263\362\132\344\047\232\237\044\327\306\354\320\233" ++"\045\202\343\314\302\304\105\305\214\227\172\006\153\052\021\237" ++"\251\012\156\110\073\157\333\324\021\031\102\367\217\007\277\365" ++"\123\137\234\076\364\027\054\346\151\254\116\062\114\142\167\352" ++"\267\350\345\273\064\274\031\213\256\234\121\347\267\176\265\123" ++"\261\063\042\345\155\317\160\074\032\372\342\233\147\266\203\364" ++"\215\245\257\142\114\115\340\130\254\144\064\022\003\370\266\215" ++"\224\143\044\244\161\002\003\001\000\001\243\102\060\100\060\016" ++"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\017" ++"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" ++"\035\006\003\125\035\016\004\026\004\024\152\162\046\172\320\036" ++"\357\175\347\073\151\121\324\154\215\237\220\022\146\253\060\015" ++"\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001" ++"\001\000\171\237\035\226\306\266\171\077\042\215\207\323\207\003" ++"\004\140\152\153\232\056\131\211\163\021\254\103\321\365\023\377" ++"\215\071\053\300\362\275\117\160\214\251\057\352\027\304\013\124" ++"\236\324\033\226\230\063\074\250\255\142\242\000\166\253\131\151" ++"\156\006\035\176\304\271\104\215\230\257\022\324\141\333\012\031" ++"\106\107\363\353\367\143\301\100\005\100\245\322\267\364\265\232" ++"\066\277\251\210\166\210\004\125\004\053\234\207\177\032\067\074" ++"\176\055\245\032\330\324\211\136\312\275\254\075\154\330\155\257" ++"\325\363\166\017\315\073\210\070\042\235\154\223\232\304\075\277" ++"\202\033\145\077\246\017\135\252\374\345\262\025\312\265\255\306" ++"\274\075\320\204\350\352\006\162\260\115\071\062\170\277\076\021" ++"\234\013\244\235\232\041\363\360\233\013\060\170\333\301\334\207" ++"\103\376\274\143\232\312\305\302\034\311\307\215\377\073\022\130" ++"\010\346\266\075\354\172\054\116\373\203\226\316\014\074\151\207" ++"\124\163\244\163\302\223\377\121\020\254\025\124\001\330\374\005" ++"\261\211\241\177\164\203\232\111\327\334\116\173\212\110\157\213" ++"\105\366" ++, (PRUint32)1090 } ++}; ++static const NSSItem nss_builtins_items_239 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Buypass Class 3 CA 1", (PRUint32)21 }, +- { (void *)"\141\127\072\021\337\016\330\176\325\222\145\042\352\320\126\327" +-"\104\263\043\161" +-, (PRUint32)20 }, +- { (void *)"\337\074\163\131\201\347\071\120\201\004\114\064\242\313\263\173" +-, (PRUint32)16 }, +- { (void *)"\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061" +-"\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163" +-"\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035" +-"\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163" +-"\040\103\154\141\163\163\040\063\040\103\101\040\061" +-, (PRUint32)77 }, +- { (void *)"\002\001\002" +-, (PRUint32)3 }, ++ { (void *)"Entrust.net 2048 2030", (PRUint32)22 }, ++ { (void *)"\214\364\047\375\171\014\072\321\146\006\215\350\036\127\357\273" ++"\223\042\162\324" ++, (PRUint32)20 }, ++ { (void *)"\113\342\311\221\226\145\014\364\016\132\223\222\240\012\376\262" ++, (PRUint32)16 }, ++ { (void *)"\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165" ++"\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004" ++"\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165" ++"\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162" ++"\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051" ++"\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111" ++"\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162" ++"\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060" ++"\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040" ++"\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" ++"\062" ++, (PRUint32)193 }, ++ { (void *)"\002\004\112\123\214\050" ++, (PRUint32)6 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_268 [] = { ++static const NSSItem nss_builtins_items_240 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1", (PRUint32)48 }, ++ { (void *)"Thawte Premium Server primary 1024 2021", (PRUint32)40 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102" +-"\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162" +-"\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141" +-"\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060" +-"\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151" +-"\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145" +-"\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151" +-"\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023" +-"\002\124\122" +-, (PRUint32)131 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102" +-"\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162" +-"\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141" +-"\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060" +-"\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151" +-"\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145" +-"\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151" +-"\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023" +-"\002\124\122" +-, (PRUint32)131 }, +- { (void *)"\002\010\114\257\163\102\034\216\164\002" +-, (PRUint32)10 }, +- { (void *)"\060\202\005\347\060\202\003\317\240\003\002\001\002\002\010\114" +-"\257\163\102\034\216\164\002\060\015\006\011\052\206\110\206\367" +-"\015\001\001\005\005\000\060\201\200\061\070\060\066\006\003\125" +-"\004\003\014\057\105\102\107\040\105\154\145\153\164\162\157\156" +-"\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\061\067\060\065\006\003\125\004\012\014\056\105\102" +-"\107\040\102\151\154\151\305\237\151\155\040\124\145\153\156\157" +-"\154\157\152\151\154\145\162\151\040\166\145\040\110\151\172\155" +-"\145\164\154\145\162\151\040\101\056\305\236\056\061\013\060\011" +-"\006\003\125\004\006\023\002\124\122\060\036\027\015\060\066\060" +-"\070\061\067\060\060\062\061\060\071\132\027\015\061\066\060\070" +-"\061\064\060\060\063\061\060\071\132\060\201\200\061\070\060\066" +-"\006\003\125\004\003\014\057\105\102\107\040\105\154\145\153\164" +-"\162\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040" +-"\110\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261" +-"\143\304\261\163\304\261\061\067\060\065\006\003\125\004\012\014" +-"\056\105\102\107\040\102\151\154\151\305\237\151\155\040\124\145" +-"\153\156\157\154\157\152\151\154\145\162\151\040\166\145\040\110" +-"\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056\061" +-"\013\060\011\006\003\125\004\006\023\002\124\122\060\202\002\042" +-"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003" +-"\202\002\017\000\060\202\002\012\002\202\002\001\000\356\240\204" +-"\141\320\072\152\146\020\062\330\061\070\177\247\247\345\375\241" +-"\341\373\227\167\270\161\226\350\023\226\106\203\117\266\362\137" +-"\162\126\156\023\140\245\001\221\342\133\305\315\127\037\167\143" +-"\121\377\057\075\333\271\077\252\251\065\347\171\320\365\320\044" +-"\266\041\352\353\043\224\376\051\277\373\211\221\014\144\232\005" +-"\112\053\314\014\356\361\075\233\202\151\244\114\370\232\157\347" +-"\042\332\020\272\137\222\374\030\047\012\250\252\104\372\056\054" +-"\264\373\106\232\010\003\203\162\253\210\344\152\162\311\345\145" +-"\037\156\052\017\235\263\350\073\344\014\156\172\332\127\375\327" +-"\353\171\213\136\040\006\323\166\013\154\002\225\243\226\344\313" +-"\166\121\321\050\235\241\032\374\104\242\115\314\172\166\250\015" +-"\075\277\027\117\042\210\120\375\256\266\354\220\120\112\133\237" +-"\225\101\252\312\017\262\112\376\200\231\116\243\106\025\253\370" +-"\163\102\152\302\146\166\261\012\046\025\335\223\222\354\333\251" +-"\137\124\042\122\221\160\135\023\352\110\354\156\003\154\331\335" +-"\154\374\353\015\003\377\246\203\022\233\361\251\223\017\305\046" +-"\114\061\262\143\231\141\162\347\052\144\231\322\270\351\165\342" +-"\174\251\251\232\032\252\303\126\333\020\232\074\203\122\266\173" +-"\226\267\254\207\167\250\271\362\147\013\224\103\263\257\076\163" +-"\372\102\066\261\045\305\012\061\046\067\126\147\272\243\013\175" +-"\326\367\211\315\147\241\267\072\036\146\117\366\240\125\024\045" +-"\114\054\063\015\246\101\214\275\004\061\152\020\162\012\235\016" +-"\056\166\275\136\363\121\211\213\250\077\125\163\277\333\072\306" +-"\044\005\226\222\110\252\113\215\052\003\345\127\221\020\364\152" +-"\050\025\156\107\167\204\134\121\164\237\031\351\346\036\143\026" +-"\071\343\021\025\343\130\032\104\275\313\304\154\146\327\204\006" +-"\337\060\364\067\242\103\042\171\322\020\154\337\273\346\023\021" +-"\374\235\204\012\023\173\360\073\320\374\243\012\327\211\352\226" +-"\176\215\110\205\036\144\137\333\124\242\254\325\172\002\171\153" +-"\322\212\360\147\332\145\162\015\024\160\344\351\216\170\217\062" +-"\164\174\127\362\326\326\364\066\211\033\370\051\154\213\271\366" +-"\227\321\244\056\252\276\013\031\302\105\351\160\135\002\003\000" +-"\235\331\243\143\060\141\060\017\006\003\125\035\023\001\001\377" +-"\004\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001" +-"\377\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026" +-"\004\024\347\316\306\117\374\026\147\226\372\112\243\007\301\004" +-"\247\313\152\336\332\107\060\037\006\003\125\035\043\004\030\060" +-"\026\200\024\347\316\306\117\374\026\147\226\372\112\243\007\301" +-"\004\247\313\152\336\332\107\060\015\006\011\052\206\110\206\367" +-"\015\001\001\005\005\000\003\202\002\001\000\233\230\232\135\276" +-"\363\050\043\166\306\154\367\177\346\100\236\300\066\334\225\015" +-"\035\255\025\305\066\330\325\071\357\362\036\042\136\263\202\264" +-"\135\273\114\032\312\222\015\337\107\044\036\263\044\332\221\210" +-"\351\203\160\335\223\327\351\272\263\337\026\132\076\336\340\310" +-"\373\323\375\154\051\370\025\106\240\150\046\314\223\122\256\202" +-"\001\223\220\312\167\312\115\111\357\342\132\331\052\275\060\316" +-"\114\262\201\266\060\316\131\117\332\131\035\152\172\244\105\260" +-"\202\046\201\206\166\365\365\020\000\270\356\263\011\350\117\207" +-"\002\007\256\044\134\360\137\254\012\060\314\212\100\240\163\004" +-"\301\373\211\044\366\232\034\134\267\074\012\147\066\005\010\061" +-"\263\257\330\001\150\052\340\170\217\164\336\270\121\244\214\154" +-"\040\075\242\373\263\324\011\375\173\302\200\252\223\154\051\230" +-"\041\250\273\026\363\251\022\137\164\265\207\230\362\225\046\337" +-"\064\357\212\123\221\210\135\032\224\243\077\174\042\370\327\210" +-"\272\246\214\226\250\075\122\064\142\237\000\036\124\125\102\147" +-"\306\115\106\217\273\024\105\075\012\226\026\216\020\241\227\231" +-"\325\323\060\205\314\336\264\162\267\274\212\074\030\051\150\375" +-"\334\161\007\356\044\071\152\372\355\245\254\070\057\371\036\020" +-"\016\006\161\032\020\114\376\165\176\377\036\127\071\102\312\327" +-"\341\025\241\126\125\131\033\321\243\257\021\330\116\303\245\053" +-"\357\220\277\300\354\202\023\133\215\326\162\054\223\116\217\152" +-"\051\337\205\074\323\015\340\242\030\022\314\125\057\107\267\247" +-"\233\002\376\101\366\210\114\155\332\251\001\107\203\144\047\142" +-"\020\202\326\022\173\136\003\037\064\251\311\221\376\257\135\155" +-"\206\047\267\043\252\165\030\312\040\347\260\017\327\211\016\246" +-"\147\042\143\364\203\101\053\006\113\273\130\325\321\327\267\271" +-"\020\143\330\211\112\264\252\335\026\143\365\156\276\140\241\370" +-"\355\350\326\220\117\032\306\305\240\051\323\247\041\250\365\132" +-"\074\367\307\111\242\041\232\112\225\122\040\226\162\232\146\313" +-"\367\322\206\103\174\042\276\226\371\275\001\250\107\335\345\073" +-"\100\371\165\053\233\053\106\144\206\215\036\364\217\373\007\167" +-"\320\352\111\242\034\215\122\024\246\012\223" +-, (PRUint32)1515 } +-}; +-static const NSSItem nss_builtins_items_269 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1", (PRUint32)48 }, +- { (void *)"\214\226\272\353\335\053\007\007\110\356\060\062\146\240\363\230" +-"\156\174\256\130" +-, (PRUint32)20 }, +- { (void *)"\054\040\046\235\313\032\112\000\205\265\267\132\256\302\001\067" +-, (PRUint32)16 }, +- { (void *)"\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102" +-"\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162" +-"\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141" +-"\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060" +-"\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151" +-"\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145" +-"\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151" +-"\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023" +-"\002\124\122" +-, (PRUint32)131 }, +- { (void *)"\002\010\114\257\163\102\034\216\164\002" +-, (PRUint32)10 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_270 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"certSIGN ROOT CA", (PRUint32)17 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061" +-"\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111" +-"\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162" +-"\164\123\111\107\116\040\122\117\117\124\040\103\101" +-, (PRUint32)61 }, ++ { (void *)"\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" ++, (PRUint32)209 }, + { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061" +-"\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111" +-"\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162" +-"\164\123\111\107\116\040\122\117\117\124\040\103\101" +-, (PRUint32)61 }, +- { (void *)"\002\006\040\006\005\026\160\002" +-, (PRUint32)8 }, +- { (void *)"\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040" +-"\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001" +-"\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023" +-"\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145" +-"\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023" +-"\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103" +-"\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060" +-"\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064" +-"\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117" +-"\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123" +-"\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145" +-"\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202" +-"\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005" +-"\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267" +-"\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350" +-"\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127" +-"\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135" +-"\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020" +-"\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272" +-"\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263" +-"\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135" +-"\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001" +-"\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200" +-"\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020" +-"\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320" +-"\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045" +-"\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057" +-"\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020" +-"\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234" +-"\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002" +-"\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001" +-"\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017" +-"\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016" +-"\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262" +-"\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206" +-"\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211" +-"\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327" +-"\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044" +-"\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030" +-"\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124" +-"\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223" +-"\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031" +-"\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133" +-"\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367" +-"\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210" +-"\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240" +-"\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240" +-"\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160" +-"\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302" +-"\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210" +-"\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115" +-"\366\356\260\132\116\111\104\124\130\137\102\203" +-, (PRUint32)828 } +-}; +-static const NSSItem nss_builtins_items_271 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"certSIGN ROOT CA", (PRUint32)17 }, +- { (void *)"\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350" +-"\174\113\057\233" +-, (PRUint32)20 }, +- { (void *)"\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027" +-, (PRUint32)16 }, +- { (void *)"\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061" +-"\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111" +-"\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162" +-"\164\123\111\107\116\040\122\117\117\124\040\103\101" +-, (PRUint32)61 }, +- { (void *)"\002\006\040\006\005\026\160\002" +-, (PRUint32)8 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)"\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" ++, (PRUint32)209 }, ++ { (void *)"\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327" ++"\011\124" ++, (PRUint32)18 }, ++ { (void *)"\060\202\003\066\060\202\002\237\240\003\002\001\002\002\020\066" ++"\022\042\226\305\343\070\245\040\241\322\137\114\327\011\124\060" ++"\015\006\011\052\206\110\206\367\015\001\001\005\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\061\060\061\060\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\005\005\000\003\201\201\000\145\220\254\210\017\126" ++"\331\346\060\064\324\046\307\320\120\361\222\336\153\324\071\210" ++"\011\042\306\246\143\203\003\367\231\167\330\262\345\030\270\135" ++"\143\363\324\163\373\154\234\231\170\361\113\170\175\031\044\303" ++"\053\002\204\370\274\042\331\212\042\327\240\374\161\354\221\207" ++"\040\361\270\354\261\345\125\200\254\075\122\310\071\016\302\360" ++"\300\005\117\326\202\165\214\275\137\322\334\166\232\005\022\311" ++"\257\162\303\334\045\176\244\115\216\027\245\340\207\177\341\232" ++"\132\341\140\334\144\043\074\102\056\115" ++, (PRUint32)826 } + }; +-static const NSSItem nss_builtins_items_272 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CNNIC ROOT", (PRUint32)11 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061" +-"\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061" +-"\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040" +-"\122\117\117\124" +-, (PRUint32)52 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061" +-"\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061" +-"\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040" +-"\122\117\117\124" +-, (PRUint32)52 }, +- { (void *)"\002\004\111\063\000\001" +-, (PRUint32)6 }, +- { (void *)"\060\202\003\125\060\202\002\075\240\003\002\001\002\002\004\111" +-"\063\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\062\061\013\060\011\006\003\125\004\006\023\002\103" +-"\116\061\016\060\014\006\003\125\004\012\023\005\103\116\116\111" +-"\103\061\023\060\021\006\003\125\004\003\023\012\103\116\116\111" +-"\103\040\122\117\117\124\060\036\027\015\060\067\060\064\061\066" +-"\060\067\060\071\061\064\132\027\015\062\067\060\064\061\066\060" +-"\067\060\071\061\064\132\060\062\061\013\060\011\006\003\125\004" +-"\006\023\002\103\116\061\016\060\014\006\003\125\004\012\023\005" +-"\103\116\116\111\103\061\023\060\021\006\003\125\004\003\023\012" +-"\103\116\116\111\103\040\122\117\117\124\060\202\001\042\060\015" +-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001" +-"\017\000\060\202\001\012\002\202\001\001\000\323\065\367\077\163" +-"\167\255\350\133\163\027\302\321\157\355\125\274\156\352\350\244" +-"\171\262\154\303\243\357\341\237\261\073\110\205\365\232\134\041" +-"\042\020\054\305\202\316\332\343\232\156\067\341\207\054\334\271" +-"\014\132\272\210\125\337\375\252\333\037\061\352\001\361\337\071" +-"\001\301\023\375\110\122\041\304\125\337\332\330\263\124\166\272" +-"\164\261\267\175\327\300\350\366\131\305\115\310\275\255\037\024" +-"\332\337\130\104\045\062\031\052\307\176\176\216\256\070\260\060" +-"\173\107\162\011\061\360\060\333\303\033\166\051\273\151\166\116" +-"\127\371\033\144\242\223\126\267\157\231\156\333\012\004\234\021" +-"\343\200\037\313\143\224\020\012\251\341\144\202\061\371\214\047" +-"\355\246\231\000\366\160\223\030\370\241\064\206\243\335\172\302" +-"\030\171\366\172\145\065\317\220\353\275\063\223\237\123\253\163" +-"\073\346\233\064\040\057\035\357\251\035\143\032\240\200\333\003" +-"\057\371\046\032\206\322\215\273\251\276\122\072\207\147\110\015" +-"\277\264\240\330\046\276\043\137\163\067\177\046\346\222\004\243" +-"\177\317\040\247\267\363\072\312\313\231\313\002\003\001\000\001" +-"\243\163\060\161\060\021\006\011\140\206\110\001\206\370\102\001" +-"\001\004\004\003\002\000\007\060\037\006\003\125\035\043\004\030" +-"\060\026\200\024\145\362\061\255\052\367\367\335\122\226\012\307" +-"\002\301\016\357\246\325\073\021\060\017\006\003\125\035\023\001" +-"\001\377\004\005\060\003\001\001\377\060\013\006\003\125\035\017" +-"\004\004\003\002\001\376\060\035\006\003\125\035\016\004\026\004" +-"\024\145\362\061\255\052\367\367\335\122\226\012\307\002\301\016" +-"\357\246\325\073\021\060\015\006\011\052\206\110\206\367\015\001" +-"\001\005\005\000\003\202\001\001\000\113\065\356\314\344\256\277" +-"\303\156\255\237\225\073\113\077\133\036\337\127\051\242\131\312" +-"\070\342\271\032\377\236\346\156\062\335\036\256\352\065\267\365" +-"\223\221\116\332\102\341\303\027\140\120\362\321\134\046\271\202" +-"\267\352\155\344\234\204\347\003\171\027\257\230\075\224\333\307" +-"\272\000\347\270\277\001\127\301\167\105\062\014\073\361\264\034" +-"\010\260\375\121\240\241\335\232\035\023\066\232\155\267\307\074" +-"\271\341\305\331\027\372\203\325\075\025\240\074\273\036\013\342" +-"\310\220\077\250\206\014\374\371\213\136\205\313\117\133\113\142" +-"\021\107\305\105\174\005\057\101\261\236\020\151\033\231\226\340" +-"\125\171\373\116\206\231\270\224\332\206\070\152\223\243\347\313" +-"\156\345\337\352\041\125\211\234\175\175\177\230\365\000\211\356" +-"\343\204\300\134\226\265\305\106\352\106\340\205\125\266\033\311" +-"\022\326\301\315\315\200\363\002\001\074\310\151\313\105\110\143" +-"\330\224\320\354\205\016\073\116\021\145\364\202\214\246\075\256" +-"\056\042\224\011\310\134\352\074\201\135\026\052\003\227\026\125" +-"\011\333\212\101\202\236\146\233\021" +-, (PRUint32)857 } +-}; +-static const NSSItem nss_builtins_items_273 [] = { ++static const NSSItem nss_builtins_items_241 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CNNIC ROOT", (PRUint32)11 }, +- { (void *)"\213\257\114\233\035\360\052\222\367\332\022\216\271\033\254\364" +-"\230\140\113\157" +-, (PRUint32)20 }, +- { (void *)"\041\274\202\253\111\304\023\073\113\262\053\134\153\220\234\031" +-, (PRUint32)16 }, +- { (void *)"\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061" +-"\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061" +-"\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040" +-"\122\117\117\124" +-, (PRUint32)52 }, +- { (void *)"\002\004\111\063\000\001" +-, (PRUint32)6 }, ++ { (void *)"Thawte Premium Server primary 1024 2021", (PRUint32)40 }, ++ { (void *)"\340\253\005\224\040\162\124\223\005\140\142\002\066\160\367\315" ++"\056\374\146\146" ++, (PRUint32)20 }, ++ { (void *)"\246\153\140\220\043\233\077\055\273\230\157\326\247\031\015\106" ++, (PRUint32)16 }, ++ { (void *)"\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" ++, (PRUint32)209 }, ++ { (void *)"\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327" ++"\011\124" ++, (PRUint32)18 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_274 [] = { ++static const NSSItem nss_builtins_items_242 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ApplicationCA - Japanese Government", (PRUint32)36 }, ++ { (void *)"IPS Global CA Root 2048 2029", (PRUint32)29 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145" +-"\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060" +-"\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164" +-"\151\157\156\103\101" +-, (PRUint32)69 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145" +-"\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060" +-"\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164" +-"\151\157\156\103\101" +-, (PRUint32)69 }, +- { (void *)"\002\001\061" ++ { (void *)"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155" ++, (PRUint32)181 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155" ++, (PRUint32)181 }, ++ { (void *)"\002\001\000" + , (PRUint32)3 }, +- { (void *)"\060\202\003\240\060\202\002\210\240\003\002\001\002\002\001\061" ++ { (void *)"\060\202\006\007\060\202\004\357\240\003\002\001\002\002\001\000" + "\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061\034" +-"\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145\163" +-"\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060\024" +-"\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164\151" +-"\157\156\103\101\060\036\027\015\060\067\061\062\061\062\061\065" +-"\060\060\060\060\132\027\015\061\067\061\062\061\062\061\065\060" +-"\060\060\060\132\060\103\061\013\060\011\006\003\125\004\006\023" +-"\002\112\120\061\034\060\032\006\003\125\004\012\023\023\112\141" +-"\160\141\156\145\163\145\040\107\157\166\145\162\156\155\145\156" +-"\164\061\026\060\024\006\003\125\004\013\023\015\101\160\160\154" +-"\151\143\141\164\151\157\156\103\101\060\202\001\042\060\015\006" ++"\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123\061" ++"\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151\144" ++"\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162\151" ++"\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123\040" ++"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165" ++"\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160\163" ++"\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160\163" ++"\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160\163" ++"\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157\157" ++"\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001" ++"\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143\141" ++"\056\143\157\155\060\036\027\015\060\071\060\071\060\067\061\064" ++"\063\070\064\064\132\027\015\062\071\061\062\062\065\061\064\063" ++"\070\064\064\132\060\201\262\061\013\060\011\006\003\125\004\006" ++"\023\002\105\123\061\017\060\015\006\003\125\004\010\023\006\115" ++"\141\144\162\151\144\061\017\060\015\006\003\125\004\007\023\006" ++"\115\141\144\162\151\144\061\057\060\055\006\003\125\004\012\023" ++"\046\111\120\123\040\103\145\162\164\151\146\151\143\141\164\151" ++"\157\156\040\101\165\164\150\157\162\151\164\171\040\163\056\154" ++"\056\040\151\160\163\103\101\061\016\060\014\006\003\125\004\013" ++"\023\005\151\160\163\103\101\061\035\060\033\006\003\125\004\003" ++"\023\024\151\160\163\103\101\040\107\154\157\142\141\154\040\103" ++"\101\040\122\157\157\164\061\041\060\037\006\011\052\206\110\206" ++"\367\015\001\011\001\026\022\147\154\157\142\141\154\060\061\100" ++"\151\160\163\143\141\056\143\157\155\060\202\001\042\060\015\006" + "\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017" +-"\000\060\202\001\012\002\202\001\001\000\247\155\340\164\116\207" +-"\217\245\006\336\150\242\333\206\231\113\144\015\161\360\012\005" +-"\233\216\252\341\314\056\322\152\073\301\172\264\227\141\215\212" +-"\276\306\232\234\006\264\206\121\344\067\016\164\170\176\137\212" +-"\177\224\244\327\107\010\375\120\132\126\344\150\254\050\163\240" +-"\173\351\177\030\222\100\117\055\235\365\256\104\110\163\066\006" +-"\236\144\054\073\064\043\333\134\046\344\161\171\217\324\156\171" +-"\042\271\223\301\312\315\301\126\355\210\152\327\240\071\041\004" +-"\127\054\242\365\274\107\101\117\136\064\042\225\265\037\051\155" +-"\136\112\363\115\162\276\101\126\040\207\374\351\120\107\327\060" +-"\024\356\134\214\125\272\131\215\207\374\043\336\223\320\004\214" +-"\375\357\155\275\320\172\311\245\072\152\162\063\306\112\015\005" +-"\027\052\055\173\261\247\330\326\360\276\364\077\352\016\050\155" +-"\101\141\043\166\170\303\270\145\244\363\132\256\314\302\252\331" +-"\347\130\336\266\176\235\205\156\237\052\012\157\237\003\051\060" +-"\227\050\035\274\267\317\124\051\116\121\061\371\047\266\050\046" +-"\376\242\143\346\101\026\360\063\230\107\002\003\001\000\001\243" +-"\201\236\060\201\233\060\035\006\003\125\035\016\004\026\004\024" +-"\124\132\313\046\077\161\314\224\106\015\226\123\352\153\110\320" +-"\223\376\102\165\060\016\006\003\125\035\017\001\001\377\004\004" +-"\003\002\001\006\060\131\006\003\125\035\021\004\122\060\120\244" +-"\116\060\114\061\013\060\011\006\003\125\004\006\023\002\112\120" +-"\061\030\060\026\006\003\125\004\012\014\017\346\227\245\346\234" +-"\254\345\233\275\346\224\277\345\272\234\061\043\060\041\006\003" +-"\125\004\013\014\032\343\202\242\343\203\227\343\203\252\343\202" +-"\261\343\203\274\343\202\267\343\203\247\343\203\263\103\101\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\005\005\000\003" +-"\202\001\001\000\071\152\104\166\167\070\072\354\243\147\106\017" +-"\371\213\006\250\373\152\220\061\316\176\354\332\321\211\174\172" +-"\353\056\014\275\231\062\347\260\044\326\303\377\365\262\210\011" +-"\207\054\343\124\341\243\246\262\010\013\300\205\250\310\322\234" +-"\161\366\035\237\140\374\070\063\023\341\236\334\013\137\332\026" +-"\120\051\173\057\160\221\017\231\272\064\064\215\225\164\305\176" +-"\170\251\146\135\275\312\041\167\102\020\254\146\046\075\336\221" +-"\253\375\025\360\157\355\154\137\020\370\363\026\366\003\212\217" +-"\247\022\021\014\313\375\077\171\301\234\375\142\356\243\317\124" +-"\014\321\053\137\027\076\343\076\277\300\053\076\011\233\376\210" +-"\246\176\264\222\027\374\043\224\201\275\156\247\305\214\302\353" +-"\021\105\333\370\101\311\226\166\352\160\137\171\022\153\344\243" +-"\007\132\005\357\047\111\317\041\237\212\114\011\160\146\251\046" +-"\301\053\021\116\063\322\016\374\326\154\322\016\062\144\150\377" +-"\255\005\170\137\003\035\250\343\220\254\044\340\017\100\247\113" +-"\256\213\050\267\202\312\030\007\346\267\133\164\351\040\031\177" +-"\262\033\211\124" +-, (PRUint32)932 } +-}; +-static const NSSItem nss_builtins_items_275 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ApplicationCA - Japanese Government", (PRUint32)36 }, +- { (void *)"\177\212\260\317\320\121\207\152\146\363\066\017\107\310\215\214" +-"\323\065\374\164" +-, (PRUint32)20 }, +- { (void *)"\176\043\116\133\247\245\264\045\351\000\007\164\021\142\256\326" +-, (PRUint32)16 }, +- { (void *)"\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145" +-"\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060" +-"\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164" +-"\151\157\156\103\101" +-, (PRUint32)69 }, +- { (void *)"\002\001\061" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_276 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G3", (PRUint32)46 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\063" +-, (PRUint32)155 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\063" +-, (PRUint32)155 }, +- { (void *)"\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030" +-"\017\037" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\376\060\202\002\346\240\003\002\001\002\002\020\025" +-"\254\156\224\031\262\171\113\101\366\047\251\303\030\017\037\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201" +-"\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026" +-"\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163" +-"\164\040\111\156\143\056\061\071\060\067\006\003\125\004\013\023" +-"\060\050\143\051\040\062\060\060\070\040\107\145\157\124\162\165" +-"\163\164\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\066\060\064\006\003\125\004\003\023\055\107\145\157\124" +-"\162\165\163\164\040\120\162\151\155\141\162\171\040\103\145\162" +-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157" +-"\162\151\164\171\040\055\040\107\063\060\036\027\015\060\070\060" +-"\064\060\062\060\060\060\060\060\060\132\027\015\063\067\061\062" +-"\060\061\062\063\065\071\065\071\132\060\201\230\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\026\060\024\006\003\125" +-"\004\012\023\015\107\145\157\124\162\165\163\164\040\111\156\143" +-"\056\061\071\060\067\006\003\125\004\013\023\060\050\143\051\040" +-"\062\060\060\070\040\107\145\157\124\162\165\163\164\040\111\156" +-"\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151" +-"\172\145\144\040\165\163\145\040\157\156\154\171\061\066\060\064" +-"\006\003\125\004\003\023\055\107\145\157\124\162\165\163\164\040" +-"\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143" +-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040" +-"\055\040\107\063\060\202\001\042\060\015\006\011\052\206\110\206" +-"\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012" +-"\002\202\001\001\000\334\342\136\142\130\035\063\127\071\062\063" +-"\372\353\313\207\214\247\324\112\335\006\210\352\144\216\061\230" +-"\245\070\220\036\230\317\056\143\053\360\106\274\104\262\211\241" +-"\300\050\014\111\160\041\225\237\144\300\246\223\022\002\145\046" +-"\206\306\245\211\360\372\327\204\240\160\257\117\032\227\077\006" +-"\104\325\311\353\162\020\175\344\061\050\373\034\141\346\050\007" +-"\104\163\222\042\151\247\003\210\154\235\143\310\122\332\230\047" +-"\347\010\114\160\076\264\311\022\301\305\147\203\135\063\363\003" +-"\021\354\152\320\123\342\321\272\066\140\224\200\273\141\143\154" +-"\133\027\176\337\100\224\036\253\015\302\041\050\160\210\377\326" +-"\046\154\154\140\004\045\116\125\176\175\357\277\224\110\336\267" +-"\035\335\160\215\005\137\210\245\233\362\302\356\352\321\100\101" +-"\155\142\070\035\126\006\305\003\107\121\040\031\374\173\020\013" +-"\016\142\256\166\125\277\137\167\276\076\111\001\123\075\230\045" +-"\003\166\044\132\035\264\333\211\352\171\345\266\263\073\077\272" +-"\114\050\101\177\006\254\152\216\301\320\366\005\035\175\346\102" +-"\206\343\245\325\107\002\003\001\000\001\243\102\060\100\060\017" +-"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" +-"\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060" +-"\035\006\003\125\035\016\004\026\004\024\304\171\312\216\241\116" +-"\003\035\034\334\153\333\061\133\224\076\077\060\177\055\060\015" +-"\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001" +-"\001\000\055\305\023\317\126\200\173\172\170\275\237\256\054\231" +-"\347\357\332\337\224\136\011\151\247\347\156\150\214\275\162\276" +-"\107\251\016\227\022\270\112\361\144\323\071\337\045\064\324\301" +-"\315\116\201\360\017\004\304\044\263\064\226\306\246\252\060\337" +-"\150\141\163\327\371\216\205\211\357\016\136\225\050\112\052\047" +-"\217\020\216\056\174\206\304\002\236\332\014\167\145\016\104\015" +-"\222\375\375\263\026\066\372\021\015\035\214\016\007\211\152\051" +-"\126\367\162\364\335\025\234\167\065\146\127\253\023\123\330\216" +-"\301\100\305\327\023\026\132\162\307\267\151\001\304\172\261\203" +-"\001\150\175\215\101\241\224\030\301\045\134\374\360\376\203\002" +-"\207\174\015\015\317\056\010\134\112\100\015\076\354\201\141\346" +-"\044\333\312\340\016\055\007\262\076\126\334\215\365\101\205\007" +-"\110\233\014\013\313\111\077\175\354\267\375\313\215\147\211\032" +-"\253\355\273\036\243\000\010\010\027\052\202\134\061\135\106\212" +-"\055\017\206\233\164\331\105\373\324\100\261\172\252\150\055\206" +-"\262\231\042\341\301\053\307\234\370\363\137\250\202\022\353\031" +-"\021\055" +-, (PRUint32)1026 } +-}; +-static const NSSItem nss_builtins_items_277 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G3", (PRUint32)46 }, +- { (void *)"\003\236\355\270\013\347\240\074\151\123\211\073\040\322\331\062" +-"\072\114\052\375" +-, (PRUint32)20 }, +- { (void *)"\265\350\064\066\311\020\104\130\110\160\155\056\203\324\270\005" +-, (PRUint32)16 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\063" +-, (PRUint32)155 }, +- { (void *)"\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030" +-"\017\037" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++"\000\060\202\001\012\002\202\001\001\000\247\357\314\200\060\260" ++"\221\044\117\260\150\370\303\312\055\025\070\125\130\202\342\070" ++"\143\260\367\243\222\157\203\270\260\136\260\214\254\124\261\167" ++"\320\120\340\227\263\220\255\212\263\037\071\053\105\126\367\252" ++"\342\337\174\262\354\157\123\057\232\313\320\346\146\313\311\023" ++"\350\162\342\264\315\061\127\207\022\265\223\350\372\162\316\352" ++"\107\362\214\264\260\143\327\004\000\267\144\066\071\227\350\225" ++"\361\210\371\161\015\003\047\214\141\317\010\203\226\117\203\305" ++"\116\350\134\370\006\160\361\002\252\034\036\251\310\252\176\347" ++"\135\315\215\074\024\157\147\320\033\251\043\110\213\041\050\072" ++"\212\114\346\021\061\371\041\056\262\147\146\306\051\156\224\223" ++"\317\100\226\374\260\075\277\262\264\223\277\126\161\266\245\101" ++"\207\260\130\265\131\043\050\111\270\230\371\120\036\055\025\050" ++"\013\114\254\111\321\204\251\233\232\347\162\124\267\070\320\333" ++"\311\376\251\163\325\155\020\315\216\165\353\376\227\375\200\074" ++"\374\264\330\110\364\231\106\013\210\024\244\266\056\333\114\140" ++"\364\041\301\154\200\225\024\325\257\325\002\003\001\000\001\243" ++"\202\002\044\060\202\002\040\060\035\006\003\125\035\016\004\026" ++"\004\024\025\246\226\200\261\025\113\061\303\302\234\366\347\023" ++"\013\113\363\030\315\206\060\201\337\006\003\125\035\043\004\201" ++"\327\060\201\324\200\024\025\246\226\200\261\025\113\061\303\302" ++"\234\366\347\023\013\113\363\030\315\206\241\201\270\244\201\265" ++"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155\202\001\000\060\014\006\003\125\035\023\004" ++"\005\060\003\001\001\377\060\013\006\003\125\035\017\004\004\003" ++"\002\001\006\060\107\006\003\125\035\045\004\100\060\076\006\010" ++"\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005\007" ++"\003\002\006\010\053\006\001\005\005\007\003\003\006\010\053\006" ++"\001\005\005\007\003\004\006\010\053\006\001\005\005\007\003\010" ++"\006\012\053\006\001\004\001\202\067\012\003\004\060\035\006\003" ++"\125\035\021\004\026\060\024\201\022\147\154\157\142\141\154\060" ++"\061\100\151\160\163\143\141\056\143\157\155\060\035\006\003\125" ++"\035\022\004\026\060\024\201\022\147\154\157\142\141\154\060\061" ++"\100\151\160\163\143\141\056\143\157\155\060\101\006\003\125\035" ++"\037\004\072\060\070\060\066\240\064\240\062\206\060\150\164\164" ++"\160\072\057\057\143\162\154\147\154\157\142\141\154\060\061\056" ++"\151\160\163\143\141\056\143\157\155\057\143\162\154\057\143\162" ++"\154\147\154\157\142\141\154\060\061\056\143\162\154\060\070\006" ++"\010\053\006\001\005\005\007\001\001\004\054\060\052\060\050\006" ++"\010\053\006\001\005\005\007\060\001\206\034\150\164\164\160\072" ++"\057\057\143\162\154\147\154\157\142\141\154\060\061\056\151\160" ++"\163\143\141\056\143\157\155\060\015\006\011\052\206\110\206\367" ++"\015\001\001\005\005\000\003\202\001\001\000\030\364\256\376\200" ++"\017\216\301\167\157\242\132\107\110\237\043\125\241\123\153\371" ++"\135\247\060\245\044\276\103\057\370\301\321\127\371\076\054\200" ++"\045\314\106\251\066\363\111\133\035\366\174\327\143\263\115\076" ++"\170\366\247\264\002\167\370\171\015\076\152\313\030\140\270\375" ++"\000\257\014\335\124\343\124\217\042\075\363\020\157\021\015\265" ++"\036\172\215\047\314\010\270\133\303\270\032\137\053\247\140\077" ++"\000\034\367\017\134\102\146\144\236\207\022\200\160\211\340\372" ++"\127\050\016\116\037\020\057\331\005\200\266\200\057\034\151\360" ++"\366\266\145\064\005\157\312\331\076\370\324\135\067\062\307\270" ++"\053\314\377\163\223\000\161\340\001\310\252\103\275\251\361\316" ++"\372\200\371\361\103\022\221\246\145\345\140\007\115\107\272\053" ++"\057\004\366\112\205\051\210\145\020\311\262\123\142\234\154\233" ++"\140\134\032\033\323\256\305\035\162\231\006\377\005\314\206\046" ++"\163\264\324\124\005\335\036\153\000\073\267\211\350\343\221\002" ++"\040\022\353\357\351\376\012\051\043\201\043\243\000\332\160\314" ++"\222\137\067\043\320\034\173\065\134\003\172" ++, (PRUint32)1547 } + }; +-static const NSSItem nss_builtins_items_278 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G2", (PRUint32)28 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013" +-"\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164" +-"\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167" +-"\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040" +-"\103\101\040\055\040\107\062" +-, (PRUint32)135 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013" +-"\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164" +-"\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167" +-"\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040" +-"\103\101\040\055\040\107\062" +-, (PRUint32)135 }, +- { (void *)"\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256" +-"\327\126" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\210\060\202\002\015\240\003\002\001\002\002\020\065" +-"\374\046\134\331\204\117\311\075\046\075\127\233\256\327\126\060" +-"\012\006\010\052\206\110\316\075\004\003\003\060\201\204\061\013" +-"\060\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006" +-"\003\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156" +-"\143\056\061\070\060\066\006\003\125\004\013\023\057\050\143\051" +-"\040\062\060\060\067\040\164\150\141\167\164\145\054\040\111\156" +-"\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151" +-"\172\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042" +-"\006\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162" +-"\151\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040" +-"\107\062\060\036\027\015\060\067\061\061\060\065\060\060\060\060" +-"\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071\065" +-"\071\132\060\201\204\061\013\060\011\006\003\125\004\006\023\002" +-"\125\123\061\025\060\023\006\003\125\004\012\023\014\164\150\141" +-"\167\164\145\054\040\111\156\143\056\061\070\060\066\006\003\125" +-"\004\013\023\057\050\143\051\040\062\060\060\067\040\164\150\141" +-"\167\164\145\054\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\044\060\042\006\003\125\004\003\023\033\164\150" +-"\141\167\164\145\040\120\162\151\155\141\162\171\040\122\157\157" +-"\164\040\103\101\040\055\040\107\062\060\166\060\020\006\007\052" +-"\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000" +-"\004\242\325\234\202\173\225\235\361\122\170\207\376\212\026\277" +-"\005\346\337\243\002\117\015\007\306\000\121\272\014\002\122\055" +-"\042\244\102\071\304\376\217\352\311\301\276\324\115\377\237\172" +-"\236\342\261\174\232\255\247\206\011\163\207\321\347\232\343\172" +-"\245\252\156\373\272\263\160\300\147\210\242\065\324\243\232\261" +-"\375\255\302\357\061\372\250\271\363\373\010\306\221\321\373\051" +-"\225\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004" +-"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004" +-"\024\232\330\000\060\000\347\153\177\205\030\356\213\266\316\212" +-"\014\370\021\341\273\060\012\006\010\052\206\110\316\075\004\003" +-"\003\003\151\000\060\146\002\061\000\335\370\340\127\107\133\247" +-"\346\012\303\275\365\200\212\227\065\015\033\211\074\124\206\167" +-"\050\312\241\364\171\336\265\346\070\260\360\145\160\214\177\002" +-"\124\302\277\377\330\241\076\331\317\002\061\000\304\215\224\374" +-"\334\123\322\334\235\170\026\037\025\063\043\123\122\343\132\061" +-"\135\235\312\256\275\023\051\104\015\047\133\250\347\150\234\022" +-"\367\130\077\056\162\002\127\243\217\241\024\056" +-, (PRUint32)652 } +-}; +-static const NSSItem nss_builtins_items_279 [] = { ++static const NSSItem nss_builtins_items_243 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G2", (PRUint32)28 }, +- { (void *)"\252\333\274\042\043\217\304\001\241\047\273\070\335\364\035\333" +-"\010\236\360\022" +-, (PRUint32)20 }, +- { (void *)"\164\235\352\140\044\304\375\042\123\076\314\072\162\331\051\117" +-, (PRUint32)16 }, +- { (void *)"\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013" +-"\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164" +-"\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167" +-"\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040" +-"\103\101\040\055\040\107\062" +-, (PRUint32)135 }, +- { (void *)"\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256" +-"\327\126" +-, (PRUint32)18 }, ++ { (void *)"IPS Global CA Root 2048 2029", (PRUint32)29 }, ++ { (void *)"\074\161\327\016\065\245\332\250\262\343\201\055\303\147\164\027" ++"\365\231\015\363" ++, (PRUint32)20 }, ++ { (void *)"\045\052\306\305\211\150\071\371\125\162\002\026\136\243\236\322" ++, (PRUint32)16 }, ++ { (void *)"\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123" ++"\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151" ++"\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162" ++"\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123" ++"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" ++"\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160" ++"\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160" ++"\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160" ++"\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157" ++"\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143" ++"\141\056\143\157\155" ++, (PRUint32)181 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_280 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G3", (PRUint32)28 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040" +-"\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143" +-"\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172" +-"\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006" +-"\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151" +-"\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107" +-"\063" +-, (PRUint32)177 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040" +-"\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143" +-"\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172" +-"\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006" +-"\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151" +-"\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107" +-"\063" +-, (PRUint32)177 }, +- { (void *)"\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367" +-"\220\373" +-, (PRUint32)18 }, +- { (void *)"\060\202\004\052\060\202\003\022\240\003\002\001\002\002\020\140" +-"\001\227\267\106\247\352\264\264\232\326\113\057\367\220\373\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201" +-"\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025" +-"\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054" +-"\040\111\156\143\056\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" +-"\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060" +-"\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056\040" +-"\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144" +-"\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003\125" +-"\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155\141" +-"\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063\060" +-"\036\027\015\060\070\060\064\060\062\060\060\060\060\060\060\132" +-"\027\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060" +-"\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145" +-"\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062" +-"\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056" +-"\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145" +-"\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003" +-"\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155" +-"\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063" +-"\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001" +-"\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001" +-"\000\262\277\047\054\373\333\330\133\335\170\173\033\236\167\146" +-"\201\313\076\274\174\256\363\246\047\232\064\243\150\061\161\070" +-"\063\142\344\363\161\146\171\261\251\145\243\245\213\325\217\140" +-"\055\077\102\314\252\153\062\300\043\313\054\101\335\344\337\374" +-"\141\234\342\163\262\042\225\021\103\030\137\304\266\037\127\154" +-"\012\005\130\042\310\066\114\072\174\245\321\317\206\257\210\247" +-"\104\002\023\164\161\163\012\102\131\002\370\033\024\153\102\337" +-"\157\137\272\153\202\242\235\133\347\112\275\036\001\162\333\113" +-"\164\350\073\177\177\175\037\004\264\046\233\340\264\132\254\107" +-"\075\125\270\327\260\046\122\050\001\061\100\146\330\331\044\275" +-"\366\052\330\354\041\111\134\233\366\172\351\177\125\065\176\226" +-"\153\215\223\223\047\313\222\273\352\254\100\300\237\302\370\200" +-"\317\135\364\132\334\316\164\206\246\076\154\013\123\312\275\222" +-"\316\031\006\162\346\014\134\070\151\307\004\326\274\154\316\133" +-"\366\367\150\234\334\045\025\110\210\241\351\251\370\230\234\340" +-"\363\325\061\050\141\021\154\147\226\215\071\231\313\302\105\044" +-"\071\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035" +-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" +-"\035\016\004\026\004\024\255\154\252\224\140\234\355\344\377\372" +-"\076\012\164\053\143\003\367\266\131\277\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\003\202\001\001\000\032\100" +-"\330\225\145\254\011\222\211\306\071\364\020\345\251\016\146\123" +-"\135\170\336\372\044\221\273\347\104\121\337\306\026\064\012\357" +-"\152\104\121\352\053\007\212\003\172\303\353\077\012\054\122\026" +-"\240\053\103\271\045\220\077\160\251\063\045\155\105\032\050\073" +-"\047\317\252\303\051\102\033\337\073\114\300\063\064\133\101\210" +-"\277\153\053\145\257\050\357\262\365\303\252\146\316\173\126\356" +-"\267\310\313\147\301\311\234\032\030\270\304\303\111\003\361\140" +-"\016\120\315\106\305\363\167\171\367\266\025\340\070\333\307\057" +-"\050\240\014\077\167\046\164\331\045\022\332\061\332\032\036\334" +-"\051\101\221\042\074\151\247\273\002\362\266\134\047\003\211\364" +-"\006\352\233\344\162\202\343\241\011\301\351\000\031\323\076\324" +-"\160\153\272\161\246\252\130\256\364\273\351\154\266\357\207\314" +-"\233\273\377\071\346\126\141\323\012\247\304\134\114\140\173\005" +-"\167\046\172\277\330\007\122\054\142\367\160\143\331\071\274\157" +-"\034\302\171\334\166\051\257\316\305\054\144\004\136\210\066\156" +-"\061\324\100\032\142\064\066\077\065\001\256\254\143\240" +-, (PRUint32)1070 } +-}; +-static const NSSItem nss_builtins_items_281 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"thawte Primary Root CA - G3", (PRUint32)28 }, +- { (void *)"\361\213\123\215\033\351\003\266\246\360\126\103\133\027\025\211" +-"\312\363\153\362" +-, (PRUint32)20 }, +- { (void *)"\373\033\135\103\212\224\315\104\306\166\362\103\113\107\347\061" +-, (PRUint32)16 }, +- { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164" +-"\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040" +-"\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143" +-"\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172" +-"\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006" +-"\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151" +-"\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107" +-"\063" +-, (PRUint32)177 }, +- { (void *)"\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367" +-"\220\373" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_282 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G2", (PRUint32)46 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\062" +-, (PRUint32)155 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\062" +-, (PRUint32)155 }, +- { (void *)"\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076" +-"\303\153" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\256\060\202\002\065\240\003\002\001\002\002\020\074" +-"\262\364\110\012\000\342\376\353\044\073\136\140\076\303\153\060" +-"\012\006\010\052\206\110\316\075\004\003\003\060\201\230\061\013" +-"\060\011\006\003\125\004\006\023\002\125\123\061\026\060\024\006" +-"\003\125\004\012\023\015\107\145\157\124\162\165\163\164\040\111" +-"\156\143\056\061\071\060\067\006\003\125\004\013\023\060\050\143" +-"\051\040\062\060\060\067\040\107\145\157\124\162\165\163\164\040" +-"\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157" +-"\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\066" +-"\060\064\006\003\125\004\003\023\055\107\145\157\124\162\165\163" +-"\164\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171\040\055\040\107\062\060\036\027\015\060\067\061\061\060\065" +-"\060\060\060\060\060\060\132\027\015\063\070\060\061\061\070\062" +-"\063\065\071\065\071\132\060\201\230\061\013\060\011\006\003\125" +-"\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012\023" +-"\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061\071" +-"\060\067\006\003\125\004\013\023\060\050\143\051\040\062\060\060" +-"\067\040\107\145\157\124\162\165\163\164\040\111\156\143\056\040" +-"\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144" +-"\040\165\163\145\040\157\156\154\171\061\066\060\064\006\003\125" +-"\004\003\023\055\107\145\157\124\162\165\163\164\040\120\162\151" +-"\155\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151" +-"\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107" +-"\062\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005" +-"\053\201\004\000\042\003\142\000\004\025\261\350\375\003\025\103" +-"\345\254\353\207\067\021\142\357\322\203\066\122\175\105\127\013" +-"\112\215\173\124\073\072\156\137\025\002\300\120\246\317\045\057" +-"\175\312\110\270\307\120\143\034\052\041\010\174\232\066\330\013" +-"\376\321\046\305\130\061\060\050\045\363\135\135\243\270\266\245" +-"\264\222\355\154\054\237\353\335\103\211\242\074\113\110\221\035" +-"\120\354\046\337\326\140\056\275\041\243\102\060\100\060\017\006" +-"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016" +-"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035" +-"\006\003\125\035\016\004\026\004\024\025\137\065\127\121\125\373" +-"\045\262\255\003\151\374\001\243\372\276\021\125\325\060\012\006" +-"\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060" +-"\144\226\131\246\350\011\336\213\272\372\132\210\210\360\037\221" +-"\323\106\250\362\112\114\002\143\373\154\137\070\333\056\101\223" +-"\251\016\346\235\334\061\034\262\240\247\030\034\171\341\307\066" +-"\002\060\072\126\257\232\164\154\366\373\203\340\063\323\010\137" +-"\241\234\302\133\237\106\326\266\313\221\006\143\242\006\347\063" +-"\254\076\250\201\022\320\313\272\320\222\013\266\236\226\252\004" +-"\017\212" +-, (PRUint32)690 } +-}; +-static const NSSItem nss_builtins_items_283 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GeoTrust Primary Certification Authority - G2", (PRUint32)46 }, +- { (void *)"\215\027\204\325\067\363\003\175\354\160\376\127\213\121\232\231" +-"\346\020\327\260" +-, (PRUint32)20 }, +- { (void *)"\001\136\330\153\275\157\075\216\241\061\370\022\340\230\163\152" +-, (PRUint32)16 }, +- { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162" +-"\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004" +-"\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124" +-"\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040" +-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157" +-"\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145" +-"\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +-"\150\157\162\151\164\171\040\055\040\107\062" +-, (PRUint32)155 }, +- { (void *)"\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076" +-"\303\153" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_284 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Universal Root Certification Authority", (PRUint32)48 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023" +-"\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162" +-"\163\141\154\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)192 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023" +-"\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162" +-"\163\141\154\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)192 }, +- { (void *)"\002\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032" +-"\305\035" +-, (PRUint32)18 }, +- { (void *)"\060\202\004\271\060\202\003\241\240\003\002\001\002\002\020\100" +-"\032\304\144\041\263\023\041\003\016\273\344\022\032\305\035\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201" +-"\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027" +-"\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147" +-"\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013" +-"\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164" +-"\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004" +-"\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151" +-"\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162" +-"\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040" +-"\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126" +-"\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141" +-"\154\040\122\157\157\164\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\060\070\060\064\060\062\060\060\060\060\060\060\132\027" +-"\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060\201" +-"\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027" +-"\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147" +-"\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013" +-"\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164" +-"\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004" +-"\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151" +-"\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162" +-"\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040" +-"\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126" +-"\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141" +-"\154\040\122\157\157\164\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\202" +-"\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005" +-"\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\307" +-"\141\067\136\261\001\064\333\142\327\025\233\377\130\132\214\043" +-"\043\326\140\216\221\327\220\230\203\172\346\130\031\070\214\305" +-"\366\345\144\205\264\242\161\373\355\275\271\332\315\115\000\264" +-"\310\055\163\245\307\151\161\225\037\071\074\262\104\007\234\350" +-"\016\372\115\112\304\041\337\051\141\217\062\042\141\202\305\207" +-"\037\156\214\174\137\026\040\121\104\321\160\117\127\352\343\034" +-"\343\314\171\356\130\330\016\302\263\105\223\300\054\347\232\027" +-"\053\173\000\067\172\101\063\170\341\063\342\363\020\032\177\207" +-"\054\276\366\365\367\102\342\345\277\207\142\211\137\000\113\337" +-"\305\335\344\165\104\062\101\072\036\161\156\151\313\013\165\106" +-"\010\321\312\322\053\225\320\317\373\271\100\153\144\214\127\115" +-"\374\023\021\171\204\355\136\124\366\064\237\010\001\363\020\045" +-"\006\027\112\332\361\035\172\146\153\230\140\146\244\331\357\322" +-"\056\202\361\360\357\011\352\104\311\025\152\342\003\156\063\323" +-"\254\237\125\000\307\366\010\152\224\271\137\334\340\063\361\204" +-"\140\371\133\047\021\264\374\026\362\273\126\152\200\045\215\002" +-"\003\001\000\001\243\201\262\060\201\257\060\017\006\003\125\035" +-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\155\006\010\053" +-"\006\001\005\005\007\001\014\004\141\060\137\241\135\240\133\060" +-"\131\060\127\060\125\026\011\151\155\141\147\145\057\147\151\146" +-"\060\041\060\037\060\007\006\005\053\016\003\002\032\004\024\217" +-"\345\323\032\206\254\215\216\153\303\317\200\152\324\110\030\054" +-"\173\031\056\060\045\026\043\150\164\164\160\072\057\057\154\157" +-"\147\157\056\166\145\162\151\163\151\147\156\056\143\157\155\057" +-"\166\163\154\157\147\157\056\147\151\146\060\035\006\003\125\035" +-"\016\004\026\004\024\266\167\372\151\110\107\237\123\022\325\302" +-"\352\007\062\166\007\321\227\007\031\060\015\006\011\052\206\110" +-"\206\367\015\001\001\013\005\000\003\202\001\001\000\112\370\370" +-"\260\003\346\054\147\173\344\224\167\143\314\156\114\371\175\016" +-"\015\334\310\271\065\271\160\117\143\372\044\372\154\203\214\107" +-"\235\073\143\363\232\371\166\062\225\221\261\167\274\254\232\276" +-"\261\344\061\041\306\201\225\126\132\016\261\302\324\261\246\131" +-"\254\361\143\313\270\114\035\131\220\112\357\220\026\050\037\132" +-"\256\020\373\201\120\070\014\154\314\361\075\303\365\143\343\263" +-"\343\041\311\044\071\351\375\025\146\106\364\033\021\320\115\163" +-"\243\175\106\371\075\355\250\137\142\324\361\077\370\340\164\127" +-"\053\030\235\201\264\304\050\332\224\227\245\160\353\254\035\276" +-"\007\021\360\325\333\335\345\214\360\325\062\260\203\346\127\342" +-"\217\277\276\241\252\277\075\035\265\324\070\352\327\260\134\072" +-"\117\152\077\217\300\146\154\143\252\351\331\244\026\364\201\321" +-"\225\024\016\175\315\225\064\331\322\217\160\163\201\173\234\176" +-"\275\230\141\330\105\207\230\220\305\353\206\060\306\065\277\360" +-"\377\303\125\210\203\113\357\005\222\006\161\362\270\230\223\267" +-"\354\315\202\141\361\070\346\117\227\230\052\132\215" +-, (PRUint32)1213 } +-}; +-static const NSSItem nss_builtins_items_285 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Universal Root Certification Authority", (PRUint32)48 }, +- { (void *)"\066\171\312\065\146\207\162\060\115\060\245\373\207\073\017\247" +-"\173\267\015\124" +-, (PRUint32)20 }, +- { (void *)"\216\255\265\001\252\115\201\344\214\035\321\341\024\000\225\031" +-, (PRUint32)16 }, +- { (void *)"\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023" +-"\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162" +-"\163\141\154\040\122\157\157\164\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-, (PRUint32)192 }, +- { (void *)"\002\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032" +-"\305\035" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_286 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Class 3 Public Primary Certification Authority - G4", (PRUint32)61 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023" +-"\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040" +-"\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" +-"\165\164\150\157\162\151\164\171\040\055\040\107\064" +-, (PRUint32)205 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023" +-"\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040" +-"\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" +-"\165\164\150\157\162\151\164\171\040\055\040\107\064" +-, (PRUint32)205 }, +- { (void *)"\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207" +-"\254\263" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\204\060\202\003\012\240\003\002\001\002\002\020\057" +-"\200\376\043\214\016\042\017\110\147\022\050\221\207\254\263\060" +-"\012\006\010\052\206\110\316\075\004\003\003\060\201\312\061\013" +-"\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006" +-"\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040" +-"\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126" +-"\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145" +-"\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061" +-"\050\143\051\040\062\060\060\067\040\126\145\162\151\123\151\147" +-"\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165" +-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154" +-"\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151" +-"\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142" +-"\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162" +-"\151\164\171\040\055\040\107\064\060\036\027\015\060\067\061\061" +-"\060\065\060\060\060\060\060\060\132\027\015\063\070\060\061\061" +-"\070\062\063\065\071\065\071\132\060\201\312\061\013\060\011\006" +-"\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004" +-"\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143" +-"\056\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151" +-"\123\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157" +-"\162\153\061\072\060\070\006\003\125\004\013\023\061\050\143\051" +-"\040\062\060\060\067\040\126\145\162\151\123\151\147\156\054\040" +-"\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157" +-"\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\105" +-"\060\103\006\003\125\004\003\023\074\126\145\162\151\123\151\147" +-"\156\040\103\154\141\163\163\040\063\040\120\165\142\154\151\143" +-"\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +-"\040\055\040\107\064\060\166\060\020\006\007\052\206\110\316\075" +-"\002\001\006\005\053\201\004\000\042\003\142\000\004\247\126\172" +-"\174\122\332\144\233\016\055\134\330\136\254\222\075\376\001\346" +-"\031\112\075\024\003\113\372\140\047\040\331\203\211\151\372\124" +-"\306\232\030\136\125\052\144\336\006\366\215\112\073\255\020\074" +-"\145\075\220\210\004\211\340\060\141\263\256\135\001\247\173\336" +-"\174\262\276\312\145\141\000\206\256\332\217\173\320\211\255\115" +-"\035\131\232\101\261\274\107\200\334\236\142\303\371\243\201\262" +-"\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004" +-"\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001\014" +-"\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026\011" +-"\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007\006" +-"\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215\216" +-"\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026\043" +-"\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162\151" +-"\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157\056" +-"\147\151\146\060\035\006\003\125\035\016\004\026\004\024\263\026" +-"\221\375\356\246\156\344\265\056\111\217\207\170\201\200\354\345" +-"\261\265\060\012\006\010\052\206\110\316\075\004\003\003\003\150" +-"\000\060\145\002\060\146\041\014\030\046\140\132\070\173\126\102" +-"\340\247\374\066\204\121\221\040\054\166\115\103\075\304\035\204" +-"\043\320\254\326\174\065\006\316\315\151\275\220\015\333\154\110" +-"\102\035\016\252\102\002\061\000\234\075\110\071\043\071\130\032" +-"\025\022\131\152\236\357\325\131\262\035\122\054\231\161\315\307" +-"\051\337\033\052\141\173\161\321\336\363\300\345\015\072\112\252" +-"\055\247\330\206\052\335\056\020" +-, (PRUint32)904 } +-}; +-static const NSSItem nss_builtins_items_287 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"VeriSign Class 3 Public Primary Certification Authority - G4", (PRUint32)61 }, +- { (void *)"\042\325\330\337\217\002\061\321\215\367\235\267\317\212\055\144" +-"\311\077\154\072" +-, (PRUint32)20 }, +- { (void *)"\072\122\341\347\375\157\072\343\157\363\157\231\033\371\042\101" +-, (PRUint32)16 }, +- { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123" +-"\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125" +-"\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165" +-"\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003" +-"\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145" +-"\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106" +-"\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163" +-"\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023" +-"\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040" +-"\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171" +-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" +-"\165\164\150\157\162\151\164\171\040\055\040\107\064" +-, (PRUint32)205 }, +- { (void *)"\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207" +-"\254\263" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_288 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"NetLock Arany (Class Gold) Főtanúsítvány", (PRUint32)45 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145" +-"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003" +-"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303" +-"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143" +-"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145" +-"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141" +-"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303" +-"\272\163\303\255\164\166\303\241\156\171" +-, (PRUint32)170 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145" +-"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003" +-"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303" +-"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143" +-"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145" +-"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141" +-"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303" +-"\272\163\303\255\164\166\303\241\156\171" +-, (PRUint32)170 }, +- { (void *)"\002\006\111\101\054\344\000\020" +-, (PRUint32)8 }, +- { (void *)"\060\202\004\025\060\202\002\375\240\003\002\001\002\002\006\111" +-"\101\054\344\000\020\060\015\006\011\052\206\110\206\367\015\001" +-"\001\013\005\000\060\201\247\061\013\060\011\006\003\125\004\006" +-"\023\002\110\125\061\021\060\017\006\003\125\004\007\014\010\102" +-"\165\144\141\160\145\163\164\061\025\060\023\006\003\125\004\012" +-"\014\014\116\145\164\114\157\143\153\040\113\146\164\056\061\067" +-"\060\065\006\003\125\004\013\014\056\124\141\156\303\272\163\303" +-"\255\164\166\303\241\156\171\153\151\141\144\303\263\153\040\050" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\051\061\065\060\063\006\003\125\004\003" +-"\014\054\116\145\164\114\157\143\153\040\101\162\141\156\171\040" +-"\050\103\154\141\163\163\040\107\157\154\144\051\040\106\305\221" +-"\164\141\156\303\272\163\303\255\164\166\303\241\156\171\060\036" +-"\027\015\060\070\061\062\061\061\061\065\060\070\062\061\132\027" +-"\015\062\070\061\062\060\066\061\065\060\070\062\061\132\060\201" +-"\247\061\013\060\011\006\003\125\004\006\023\002\110\125\061\021" +-"\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145\163" +-"\164\061\025\060\023\006\003\125\004\012\014\014\116\145\164\114" +-"\157\143\153\040\113\146\164\056\061\067\060\065\006\003\125\004" +-"\013\014\056\124\141\156\303\272\163\303\255\164\166\303\241\156" +-"\171\153\151\141\144\303\263\153\040\050\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163" +-"\051\061\065\060\063\006\003\125\004\003\014\054\116\145\164\114" +-"\157\143\153\040\101\162\141\156\171\040\050\103\154\141\163\163" +-"\040\107\157\154\144\051\040\106\305\221\164\141\156\303\272\163" +-"\303\255\164\166\303\241\156\171\060\202\001\042\060\015\006\011" +-"\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000" +-"\060\202\001\012\002\202\001\001\000\304\044\136\163\276\113\155" +-"\024\303\241\364\343\227\220\156\322\060\105\036\074\356\147\331" +-"\144\340\032\212\177\312\060\312\203\343\040\301\343\364\072\323" +-"\224\137\032\174\133\155\277\060\117\204\047\366\237\037\111\274" +-"\306\231\012\220\362\017\365\177\103\204\067\143\121\213\172\245" +-"\160\374\172\130\315\216\233\355\303\106\154\204\160\135\332\363" +-"\001\220\043\374\116\060\251\176\341\047\143\347\355\144\074\240" +-"\270\311\063\143\376\026\220\377\260\270\375\327\250\300\300\224" +-"\103\013\266\325\131\246\236\126\320\044\037\160\171\257\333\071" +-"\124\015\145\165\331\025\101\224\001\257\136\354\366\215\361\377" +-"\255\144\376\040\232\327\134\353\376\246\037\010\144\243\213\166" +-"\125\255\036\073\050\140\056\207\045\350\252\257\037\306\144\106" +-"\040\267\160\177\074\336\110\333\226\123\267\071\167\344\032\342" +-"\307\026\204\166\227\133\057\273\031\025\205\370\151\205\365\231" +-"\247\251\362\064\247\251\266\246\003\374\157\206\075\124\174\166" +-"\004\233\153\371\100\135\000\064\307\056\231\165\235\345\210\003" +-"\252\115\370\003\322\102\166\300\033\002\003\000\250\213\243\105" +-"\060\103\060\022\006\003\125\035\023\001\001\377\004\010\060\006" +-"\001\001\377\002\001\004\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004" +-"\024\314\372\147\223\360\266\270\320\245\300\036\363\123\375\214" +-"\123\337\203\327\226\060\015\006\011\052\206\110\206\367\015\001" +-"\001\013\005\000\003\202\001\001\000\253\177\356\034\026\251\234" +-"\074\121\000\240\300\021\010\005\247\231\346\157\001\210\124\141" +-"\156\361\271\030\255\112\255\376\201\100\043\224\057\373\165\174" +-"\057\050\113\142\044\201\202\013\365\141\361\034\156\270\141\070" +-"\353\201\372\142\241\073\132\142\323\224\145\304\341\346\155\202" +-"\370\057\045\160\262\041\046\301\162\121\037\214\054\303\204\220" +-"\303\132\217\272\317\364\247\145\245\353\230\321\373\005\262\106" +-"\165\025\043\152\157\205\143\060\200\360\325\236\037\051\034\302" +-"\154\260\120\131\135\220\133\073\250\015\060\317\277\175\177\316" +-"\361\235\203\275\311\106\156\040\246\371\141\121\272\041\057\173" +-"\276\245\025\143\241\324\225\207\361\236\271\363\211\363\075\205" +-"\270\270\333\276\265\271\051\371\332\067\005\000\111\224\003\204" +-"\104\347\277\103\061\317\165\213\045\321\364\246\144\365\222\366" +-"\253\005\353\075\351\245\013\066\142\332\314\006\137\066\213\266" +-"\136\061\270\052\373\136\366\161\337\104\046\236\304\346\015\221" +-"\264\056\165\225\200\121\152\113\060\246\260\142\241\223\361\233" +-"\330\316\304\143\165\077\131\107\261" +-, (PRUint32)1049 } +-}; +-static const NSSItem nss_builtins_items_289 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"NetLock Arany (Class Gold) Főtanúsítvány", (PRUint32)45 }, +- { (void *)"\006\010\077\131\077\025\241\004\240\151\244\153\251\003\320\006" +-"\267\227\011\221" +-, (PRUint32)20 }, +- { (void *)"\305\241\267\377\163\335\326\327\064\062\030\337\374\074\255\210" +-, (PRUint32)16 }, +- { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145" +-"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003" +-"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303" +-"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164" +-"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143" +-"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145" +-"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141" +-"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303" +-"\272\163\303\255\164\166\303\241\156\171" +-, (PRUint32)170 }, +- { (void *)"\002\006\111\101\054\344\000\020" +-, (PRUint32)8 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_290 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Staat der Nederlanden Root CA - G2", (PRUint32)35 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061" +-"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040" +-"\122\157\157\164\040\103\101\040\055\040\107\062" +-, (PRUint32)92 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061" +-"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040" +-"\122\157\157\164\040\103\101\040\055\040\107\062" +-, (PRUint32)92 }, +- { (void *)"\002\004\000\230\226\214" +-, (PRUint32)6 }, +- { (void *)"\060\202\005\312\060\202\003\262\240\003\002\001\002\002\004\000" +-"\230\226\214\060\015\006\011\052\206\110\206\367\015\001\001\013" +-"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116" +-"\114\061\036\060\034\006\003\125\004\012\014\025\123\164\141\141" +-"\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145" +-"\156\061\053\060\051\006\003\125\004\003\014\042\123\164\141\141" +-"\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145" +-"\156\040\122\157\157\164\040\103\101\040\055\040\107\062\060\036" +-"\027\015\060\070\060\063\062\066\061\061\061\070\061\067\132\027" +-"\015\062\060\060\063\062\065\061\061\060\063\061\060\132\060\132" +-"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\036\060" +-"\034\006\003\125\004\012\014\025\123\164\141\141\164\040\144\145" +-"\162\040\116\145\144\145\162\154\141\156\144\145\156\061\053\060" +-"\051\006\003\125\004\003\014\042\123\164\141\141\164\040\144\145" +-"\162\040\116\145\144\145\162\154\141\156\144\145\156\040\122\157" +-"\157\164\040\103\101\040\055\040\107\062\060\202\002\042\060\015" +-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002" +-"\017\000\060\202\002\012\002\202\002\001\000\305\131\347\157\165" +-"\252\076\113\234\265\270\254\236\013\344\371\331\312\253\135\217" +-"\265\071\020\202\327\257\121\340\073\341\000\110\152\317\332\341" +-"\006\103\021\231\252\024\045\022\255\042\350\000\155\103\304\251" +-"\270\345\037\211\113\147\275\141\110\357\375\322\340\140\210\345" +-"\271\030\140\050\303\167\053\255\260\067\252\067\336\144\131\052" +-"\106\127\344\113\271\370\067\174\325\066\347\200\301\266\363\324" +-"\147\233\226\350\316\327\306\012\123\320\153\111\226\363\243\013" +-"\005\167\110\367\045\345\160\254\060\024\040\045\343\177\165\132" +-"\345\110\370\116\173\003\007\004\372\202\141\207\156\360\073\304" +-"\244\307\320\365\164\076\245\135\032\010\362\233\045\322\366\254" +-"\004\046\076\125\072\142\050\245\173\262\060\257\370\067\302\321" +-"\272\326\070\375\364\357\111\060\067\231\046\041\110\205\001\251" +-"\345\026\347\334\220\125\337\017\350\070\315\231\067\041\117\135" +-"\365\042\157\152\305\022\026\140\027\125\362\145\146\246\247\060" +-"\221\070\301\070\035\206\004\204\272\032\045\170\136\235\257\314" +-"\120\140\326\023\207\122\355\143\037\155\145\175\302\025\030\164" +-"\312\341\176\144\051\214\162\330\026\023\175\013\111\112\361\050" +-"\033\040\164\153\305\075\335\260\252\110\011\075\056\202\224\315" +-"\032\145\331\053\210\232\231\274\030\176\237\356\175\146\174\076" +-"\275\224\270\201\316\315\230\060\170\301\157\147\320\276\137\340" +-"\150\355\336\342\261\311\054\131\170\222\252\337\053\140\143\362" +-"\345\136\271\343\312\372\177\120\206\076\242\064\030\014\011\150" +-"\050\021\034\344\341\271\134\076\107\272\062\077\030\314\133\204" +-"\365\363\153\164\304\162\164\341\343\213\240\112\275\215\146\057" +-"\352\255\065\332\040\323\210\202\141\360\022\042\266\274\320\325" +-"\244\354\257\124\210\045\044\074\247\155\261\162\051\077\076\127" +-"\246\177\125\257\156\046\306\376\347\314\100\134\121\104\201\012" +-"\170\336\112\316\125\277\035\325\331\267\126\357\360\166\377\013" +-"\171\265\257\275\373\251\151\221\106\227\150\200\024\066\035\263" +-"\177\273\051\230\066\245\040\372\202\140\142\063\244\354\326\272" +-"\007\247\156\305\317\024\246\347\326\222\064\330\201\365\374\035" +-"\135\252\134\036\366\243\115\073\270\367\071\002\003\001\000\001" +-"\243\201\227\060\201\224\060\017\006\003\125\035\023\001\001\377" +-"\004\005\060\003\001\001\377\060\122\006\003\125\035\040\004\113" +-"\060\111\060\107\006\004\125\035\040\000\060\077\060\075\006\010" +-"\053\006\001\005\005\007\002\001\026\061\150\164\164\160\072\057" +-"\057\167\167\167\056\160\153\151\157\166\145\162\150\145\151\144" +-"\056\156\154\057\160\157\154\151\143\151\145\163\057\162\157\157" +-"\164\055\160\157\154\151\143\171\055\107\062\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" +-"\035\016\004\026\004\024\221\150\062\207\025\035\211\342\265\361" +-"\254\066\050\064\215\013\174\142\210\353\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\003\202\002\001\000\250\101" +-"\112\147\052\222\201\202\120\156\341\327\330\263\071\073\363\002" +-"\025\011\120\121\357\055\275\044\173\210\206\073\371\264\274\222" +-"\011\226\271\366\300\253\043\140\006\171\214\021\116\121\322\171" +-"\200\063\373\235\110\276\354\101\103\201\037\176\107\100\034\345" +-"\172\010\312\252\213\165\255\024\304\302\350\146\074\202\007\247" +-"\346\047\202\133\030\346\017\156\331\120\076\212\102\030\051\306" +-"\264\126\374\126\020\240\005\027\275\014\043\177\364\223\355\234" +-"\032\121\276\335\105\101\277\221\044\264\037\214\351\137\317\173" +-"\041\231\237\225\237\071\072\106\034\154\371\315\173\234\220\315" +-"\050\251\307\251\125\273\254\142\064\142\065\023\113\024\072\125" +-"\203\271\206\215\222\246\306\364\007\045\124\314\026\127\022\112" +-"\202\170\310\024\331\027\202\046\055\135\040\037\171\256\376\324" +-"\160\026\026\225\203\330\065\071\377\122\135\165\034\026\305\023" +-"\125\317\107\314\165\145\122\112\336\360\260\247\344\012\226\013" +-"\373\255\302\342\045\204\262\335\344\275\176\131\154\233\360\360" +-"\330\347\312\362\351\227\070\176\211\276\314\373\071\027\141\077" +-"\162\333\072\221\330\145\001\031\035\255\120\244\127\012\174\113" +-"\274\234\161\163\052\105\121\031\205\314\216\375\107\247\164\225" +-"\035\250\321\257\116\027\261\151\046\302\252\170\127\133\305\115" +-"\247\345\236\005\027\224\312\262\137\240\111\030\215\064\351\046" +-"\154\110\036\252\150\222\005\341\202\163\132\233\334\007\133\010" +-"\155\175\235\327\215\041\331\374\024\040\252\302\105\337\077\347" +-"\000\262\121\344\302\370\005\271\171\032\214\064\363\236\133\344" +-"\067\133\153\112\337\054\127\212\100\132\066\272\335\165\104\010" +-"\067\102\160\014\376\334\136\041\240\243\212\300\220\234\150\332" +-"\120\346\105\020\107\170\266\116\322\145\311\303\067\337\341\102" +-"\143\260\127\067\105\055\173\212\234\277\005\352\145\125\063\367" +-"\071\020\305\050\052\041\172\033\212\304\044\371\077\025\310\232" +-"\025\040\365\125\142\226\355\155\223\120\274\344\252\170\255\331" +-"\313\012\145\207\246\146\301\304\201\243\167\072\130\036\013\356" +-"\203\213\235\036\322\122\244\314\035\157\260\230\155\224\061\265" +-"\370\161\012\334\271\374\175\062\140\346\353\257\212\001" +-, (PRUint32)1486 } +-}; +-static const NSSItem nss_builtins_items_291 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Staat der Nederlanden Root CA - G2", (PRUint32)35 }, +- { (void *)"\131\257\202\171\221\206\307\264\165\007\313\317\003\127\106\353" +-"\004\335\267\026" +-, (PRUint32)20 }, +- { (void *)"\174\245\017\370\133\232\175\155\060\256\124\132\343\102\242\212" +-, (PRUint32)16 }, +- { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061" +-"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040" +-"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040" +-"\122\157\157\164\040\103\101\040\055\040\107\062" +-, (PRUint32)92 }, +- { (void *)"\002\004\000\230\226\214" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_292 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CA Disig", (PRUint32)9 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061" +-"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163" +-"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104" +-"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125" +-"\004\003\023\010\103\101\040\104\151\163\151\147" +-, (PRUint32)76 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061" +-"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163" +-"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104" +-"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125" +-"\004\003\023\010\103\101\040\104\151\163\151\147" +-, (PRUint32)76 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\001" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061\023" +-"\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163\154" +-"\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104\151" +-"\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125\004" +-"\003\023\010\103\101\040\104\151\163\151\147\060\036\027\015\060" +-"\066\060\063\062\062\060\061\063\071\063\064\132\027\015\061\066" +-"\060\063\062\062\060\061\063\071\063\064\132\060\112\061\013\060" +-"\011\006\003\125\004\006\023\002\123\113\061\023\060\021\006\003" +-"\125\004\007\023\012\102\162\141\164\151\163\154\141\166\141\061" +-"\023\060\021\006\003\125\004\012\023\012\104\151\163\151\147\040" +-"\141\056\163\056\061\021\060\017\006\003\125\004\003\023\010\103" +-"\101\040\104\151\163\151\147\060\202\001\042\060\015\006\011\052" +-"\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060" +-"\202\001\012\002\202\001\001\000\222\366\061\301\175\210\375\231" +-"\001\251\330\173\362\161\165\361\061\306\363\165\146\372\121\050" +-"\106\204\227\170\064\274\154\374\274\105\131\210\046\030\112\304" +-"\067\037\241\112\104\275\343\161\004\365\104\027\342\077\374\110" +-"\130\157\134\236\172\011\272\121\067\042\043\146\103\041\260\074" +-"\144\242\370\152\025\016\077\353\121\341\124\251\335\006\231\327" +-"\232\074\124\213\071\003\077\017\305\316\306\353\203\162\002\250" +-"\037\161\363\055\370\165\010\333\142\114\350\372\316\371\347\152" +-"\037\266\153\065\202\272\342\217\026\222\175\005\014\154\106\003" +-"\135\300\355\151\277\072\301\212\240\350\216\331\271\105\050\207" +-"\010\354\264\312\025\276\202\335\265\104\213\055\255\206\014\150" +-"\142\155\205\126\362\254\024\143\072\306\321\231\254\064\170\126" +-"\113\317\266\255\077\214\212\327\004\345\343\170\114\365\206\252" +-"\365\217\372\075\154\161\243\055\312\147\353\150\173\156\063\251" +-"\014\202\050\250\114\152\041\100\025\040\014\046\133\203\302\251" +-"\026\025\300\044\202\135\053\026\255\312\143\366\164\000\260\337" +-"\103\304\020\140\126\147\143\105\002\003\001\000\001\243\201\377" +-"\060\201\374\060\017\006\003\125\035\023\001\001\377\004\005\060" +-"\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\215" +-"\262\111\150\235\162\010\045\271\300\047\365\120\223\126\110\106" +-"\161\371\217\060\016\006\003\125\035\017\001\001\377\004\004\003" +-"\002\001\006\060\066\006\003\125\035\021\004\057\060\055\201\023" +-"\143\141\157\160\145\162\141\164\157\162\100\144\151\163\151\147" +-"\056\163\153\206\026\150\164\164\160\072\057\057\167\167\167\056" +-"\144\151\163\151\147\056\163\153\057\143\141\060\146\006\003\125" +-"\035\037\004\137\060\135\060\055\240\053\240\051\206\047\150\164" +-"\164\160\072\057\057\167\167\167\056\144\151\163\151\147\056\163" +-"\153\057\143\141\057\143\162\154\057\143\141\137\144\151\163\151" +-"\147\056\143\162\154\060\054\240\052\240\050\206\046\150\164\164" +-"\160\072\057\057\143\141\056\144\151\163\151\147\056\163\153\057" +-"\143\141\057\143\162\154\057\143\141\137\144\151\163\151\147\056" +-"\143\162\154\060\032\006\003\125\035\040\004\023\060\021\060\017" +-"\006\015\053\201\036\221\223\346\012\000\000\000\001\001\001\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202" +-"\001\001\000\135\064\164\141\114\257\073\330\377\237\155\130\066" +-"\034\075\013\201\015\022\053\106\020\200\375\347\074\047\320\172" +-"\310\251\266\176\164\060\063\243\072\212\173\164\300\171\171\102" +-"\223\155\377\261\051\024\202\253\041\214\057\027\371\077\046\057" +-"\365\131\306\357\200\006\267\232\111\051\354\316\176\161\074\152" +-"\020\101\300\366\323\232\262\174\132\221\234\300\254\133\310\115" +-"\136\367\341\123\377\103\167\374\236\113\147\154\327\363\203\321" +-"\240\340\177\045\337\270\230\013\232\062\070\154\060\240\363\377" +-"\010\025\063\367\120\112\173\076\243\076\040\251\334\057\126\200" +-"\012\355\101\120\260\311\364\354\262\343\046\104\000\016\157\236" +-"\006\274\042\226\123\160\145\304\120\012\106\153\244\057\047\201" +-"\022\047\023\137\020\241\166\316\212\173\067\352\303\071\141\003" +-"\225\230\072\347\154\210\045\010\374\171\150\015\207\175\142\370" +-"\264\137\373\305\330\114\275\130\274\077\103\133\324\036\001\115" +-"\074\143\276\043\357\214\315\132\120\270\150\124\371\012\231\063" +-"\021\000\341\236\302\106\167\202\365\131\006\214\041\114\207\011" +-"\315\345\250" +-, (PRUint32)1043 } +-}; +-static const NSSItem nss_builtins_items_293 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"CA Disig", (PRUint32)9 }, +- { (void *)"\052\310\325\213\127\316\277\057\111\257\362\374\166\217\121\024" +-"\142\220\172\101" +-, (PRUint32)20 }, +- { (void *)"\077\105\226\071\342\120\207\367\273\376\230\014\074\040\230\346" +-, (PRUint32)16 }, +- { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061" +-"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163" +-"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104" +-"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125" +-"\004\003\023\010\103\101\040\104\151\163\151\147" +-, (PRUint32)76 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_294 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Juur-SK", (PRUint32)8 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011" +-"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011" +-"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125" +-"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163" +-"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060" +-"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-, (PRUint32)95 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011" +-"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011" +-"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125" +-"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163" +-"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060" +-"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-, (PRUint32)95 }, +- { (void *)"\002\004\073\216\113\374" +-, (PRUint32)6 }, +- { (void *)"\060\202\004\346\060\202\003\316\240\003\002\001\002\002\004\073" +-"\216\113\374\060\015\006\011\052\206\110\206\367\015\001\001\005" +-"\005\000\060\135\061\030\060\026\006\011\052\206\110\206\367\015" +-"\001\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013" +-"\060\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006" +-"\003\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151" +-"\164\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061" +-"\020\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123" +-"\113\060\036\027\015\060\061\060\070\063\060\061\064\062\063\060" +-"\061\132\027\015\061\066\060\070\062\066\061\064\062\063\060\061" +-"\132\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001" +-"\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060" +-"\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003" +-"\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164" +-"\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020" +-"\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-"\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001" +-"\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001" +-"\000\201\161\066\076\063\007\326\343\060\215\023\176\167\062\106" +-"\313\317\031\262\140\061\106\227\206\364\230\106\244\302\145\105" +-"\317\323\100\174\343\132\042\250\020\170\063\314\210\261\323\201" +-"\112\366\142\027\173\137\115\012\056\320\317\213\043\356\117\002" +-"\116\273\353\016\312\275\030\143\350\200\034\215\341\034\215\075" +-"\340\377\133\137\352\144\345\227\350\077\231\177\014\012\011\063" +-"\000\032\123\247\041\341\070\113\326\203\033\255\257\144\302\371" +-"\034\172\214\146\110\115\146\037\030\012\342\076\273\037\007\145" +-"\223\205\271\032\260\271\304\373\015\021\366\365\326\371\033\307" +-"\054\053\267\030\121\376\340\173\366\250\110\257\154\073\117\057" +-"\357\370\321\107\036\046\127\360\121\035\063\226\377\357\131\075" +-"\332\115\321\025\064\307\352\077\026\110\173\221\034\200\103\017" +-"\075\270\005\076\321\263\225\315\330\312\017\302\103\147\333\267" +-"\223\340\042\202\056\276\365\150\050\203\271\301\073\151\173\040" +-"\332\116\234\155\341\272\315\217\172\154\260\011\042\327\213\013" +-"\333\034\325\132\046\133\015\300\352\345\140\320\237\376\065\337" +-"\077\002\003\001\000\001\243\202\001\254\060\202\001\250\060\017" +-"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" +-"\202\001\026\006\003\125\035\040\004\202\001\015\060\202\001\011" +-"\060\202\001\005\006\012\053\006\001\004\001\316\037\001\001\001" +-"\060\201\366\060\201\320\006\010\053\006\001\005\005\007\002\002" +-"\060\201\303\036\201\300\000\123\000\145\000\145\000\040\000\163" +-"\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141" +-"\000\141\000\164\000\040\000\157\000\156\000\040\000\166\000\344" +-"\000\154\000\152\000\141\000\163\000\164\000\141\000\164\000\165" +-"\000\144\000\040\000\101\000\123\000\055\000\151\000\163\000\040" +-"\000\123\000\145\000\162\000\164\000\151\000\146\000\151\000\164" +-"\000\163\000\145\000\145\000\162\000\151\000\155\000\151\000\163" +-"\000\153\000\145\000\163\000\153\000\165\000\163\000\040\000\141" +-"\000\154\000\141\000\155\000\055\000\123\000\113\000\040\000\163" +-"\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141" +-"\000\141\000\164\000\151\000\144\000\145\000\040\000\153\000\151" +-"\000\156\000\156\000\151\000\164\000\141\000\155\000\151\000\163" +-"\000\145\000\153\000\163\060\041\006\010\053\006\001\005\005\007" +-"\002\001\026\025\150\164\164\160\072\057\057\167\167\167\056\163" +-"\153\056\145\145\057\143\160\163\057\060\053\006\003\125\035\037" +-"\004\044\060\042\060\040\240\036\240\034\206\032\150\164\164\160" +-"\072\057\057\167\167\167\056\163\153\056\145\145\057\152\165\165" +-"\162\057\143\162\154\057\060\035\006\003\125\035\016\004\026\004" +-"\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030\077" +-"\157\357\351\175\276\060\037\006\003\125\035\043\004\030\060\026" +-"\200\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030" +-"\077\157\357\351\175\276\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\346\060\015\006\011\052\206\110\206\367\015" +-"\001\001\005\005\000\003\202\001\001\000\173\301\030\224\123\242" +-"\011\363\376\046\147\232\120\344\303\005\057\053\065\170\221\114" +-"\174\250\021\021\171\114\111\131\254\310\367\205\145\134\106\273" +-"\073\020\240\002\257\315\117\265\314\066\052\354\135\376\357\240" +-"\221\311\266\223\157\174\200\124\354\307\010\160\015\216\373\202" +-"\354\052\140\170\151\066\066\321\305\234\213\151\265\100\310\224" +-"\145\167\362\127\041\146\073\316\205\100\266\063\143\032\277\171" +-"\036\374\134\035\323\035\223\033\213\014\135\205\275\231\060\062" +-"\030\011\221\122\351\174\241\272\377\144\222\232\354\376\065\356" +-"\214\057\256\374\040\206\354\112\336\033\170\062\067\246\201\322" +-"\235\257\132\022\026\312\231\133\374\157\155\016\305\240\036\206" +-"\311\221\320\134\230\202\137\143\014\212\132\253\330\225\246\314" +-"\313\212\326\277\144\113\216\312\212\262\260\351\041\062\236\252" +-"\250\205\230\064\201\071\041\073\250\072\122\062\075\366\153\067" +-"\206\006\132\025\230\334\360\021\146\376\064\040\267\003\364\101" +-"\020\175\071\204\171\226\162\143\266\226\002\345\153\271\255\031" +-"\115\273\306\104\333\066\313\052\234\216" +-, (PRUint32)1258 } +-}; +-static const NSSItem nss_builtins_items_295 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Juur-SK", (PRUint32)8 }, +- { (void *)"\100\235\113\331\027\265\134\047\266\233\144\313\230\042\104\015" +-"\315\011\270\211" +-, (PRUint32)20 }, +- { (void *)"\252\216\135\331\370\333\012\130\267\215\046\207\154\202\065\125" +-, (PRUint32)16 }, +- { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011" +-"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011" +-"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125" +-"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163" +-"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060" +-"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113" +-, (PRUint32)95 }, +- { (void *)"\002\004\073\216\113\374" +-, (PRUint32)6 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_296 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Hongkong Post Root CA 1", (PRUint32)24 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061" +-, (PRUint32)73 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061" +-, (PRUint32)73 }, +- { (void *)"\002\002\003\350" +-, (PRUint32)4 }, +- { (void *)"\060\202\003\060\060\202\002\030\240\003\002\001\002\002\002\003" +-"\350\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000" +-"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061\060\036\027\015\060\063\060" +-"\065\061\065\060\065\061\063\061\064\132\027\015\062\063\060\065" +-"\061\065\060\064\065\062\062\071\132\060\107\061\013\060\011\006" +-"\003\125\004\006\023\002\110\113\061\026\060\024\006\003\125\004" +-"\012\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164" +-"\061\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153" +-"\157\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101" +-"\040\061\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\254\377\070\266\351\146\002\111\343\242\264\341\220" +-"\371\100\217\171\371\342\275\171\376\002\275\356\044\222\035\042" +-"\366\332\205\162\151\376\327\077\011\324\335\221\265\002\234\320" +-"\215\132\341\125\303\120\206\271\051\046\302\343\331\240\361\151" +-"\003\050\040\200\105\042\055\126\247\073\124\225\126\042\131\037" +-"\050\337\037\040\075\155\242\066\276\043\240\261\156\265\261\047" +-"\077\071\123\011\352\253\152\350\164\262\302\145\134\216\277\174" +-"\303\170\204\315\236\026\374\365\056\117\040\052\010\237\167\363" +-"\305\036\304\232\122\146\036\110\136\343\020\006\217\042\230\341" +-"\145\216\033\135\043\146\073\270\245\062\121\310\206\252\241\251" +-"\236\177\166\224\302\246\154\267\101\360\325\310\006\070\346\324" +-"\014\342\363\073\114\155\120\214\304\203\047\301\023\204\131\075" +-"\236\165\164\266\330\002\136\072\220\172\300\102\066\162\354\152" +-"\115\334\357\304\000\337\023\030\127\137\046\170\310\326\012\171" +-"\167\277\367\257\267\166\271\245\013\204\027\135\020\352\157\341" +-"\253\225\021\137\155\074\243\134\115\203\133\362\263\031\212\200" +-"\213\013\207\002\003\001\000\001\243\046\060\044\060\022\006\003" +-"\125\035\023\001\001\377\004\010\060\006\001\001\377\002\001\003" +-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\306" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003" +-"\202\001\001\000\016\106\325\074\256\342\207\331\136\201\213\002" +-"\230\101\010\214\114\274\332\333\356\047\033\202\347\152\105\354" +-"\026\213\117\205\240\363\262\160\275\132\226\272\312\156\155\356" +-"\106\213\156\347\052\056\226\263\031\063\353\264\237\250\262\067" +-"\356\230\250\227\266\056\266\147\047\324\246\111\375\034\223\145" +-"\166\236\102\057\334\042\154\232\117\362\132\025\071\261\161\327" +-"\053\121\350\155\034\230\300\331\052\364\241\202\173\325\311\101" +-"\242\043\001\164\070\125\213\017\271\056\147\242\040\004\067\332" +-"\234\013\323\027\041\340\217\227\171\064\157\204\110\002\040\063" +-"\033\346\064\104\237\221\160\364\200\136\204\103\302\051\322\154" +-"\022\024\344\141\215\254\020\220\236\204\120\273\360\226\157\105" +-"\237\212\363\312\154\117\372\021\072\025\025\106\303\315\037\203" +-"\133\055\101\022\355\120\147\101\023\075\041\253\224\212\252\116" +-"\174\301\261\373\247\326\265\047\057\227\253\156\340\035\342\321" +-"\034\054\037\104\342\374\276\221\241\234\373\326\051\123\163\206" +-"\237\123\330\103\016\135\326\143\202\161\035\200\164\312\366\342" +-"\002\153\331\132" +-, (PRUint32)820 } +-}; +-static const NSSItem nss_builtins_items_297 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Hongkong Post Root CA 1", (PRUint32)24 }, +- { (void *)"\326\332\250\040\215\011\322\025\115\044\265\057\313\064\156\262" +-"\130\262\212\130" +-, (PRUint32)20 }, +- { (void *)"\250\015\157\071\170\271\103\155\167\102\155\230\132\314\043\312" +-, (PRUint32)16 }, +- { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061" +-"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157" +-"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003" +-"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040" +-"\122\157\157\164\040\103\101\040\061" +-, (PRUint32)73 }, +- { (void *)"\002\002\003\350" +-, (PRUint32)4 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_298 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"SecureSign RootCA11", (PRUint32)20 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032" +-"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147" +-"\156\040\122\157\157\164\103\101\061\061" +-, (PRUint32)90 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032" +-"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147" +-"\156\040\122\157\157\164\103\101\061\061" +-, (PRUint32)90 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\155\060\202\002\125\240\003\002\001\002\002\001\001" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061\053" +-"\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162" +-"\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032\006" +-"\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147\156" +-"\040\122\157\157\164\103\101\061\061\060\036\027\015\060\071\060" +-"\064\060\070\060\064\065\066\064\067\132\027\015\062\071\060\064" +-"\060\070\060\064\065\066\064\067\132\060\130\061\013\060\011\006" +-"\003\125\004\006\023\002\112\120\061\053\060\051\006\003\125\004" +-"\012\023\042\112\141\160\141\156\040\103\145\162\164\151\146\151" +-"\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163\054" +-"\040\111\156\143\056\061\034\060\032\006\003\125\004\003\023\023" +-"\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164\103" +-"\101\061\061\060\202\001\042\060\015\006\011\052\206\110\206\367" +-"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002" +-"\202\001\001\000\375\167\252\245\034\220\005\073\313\114\233\063" +-"\213\132\024\105\244\347\220\026\321\337\127\322\041\020\244\027" +-"\375\337\254\326\037\247\344\333\174\367\354\337\270\003\332\224" +-"\130\375\135\162\174\214\077\137\001\147\164\025\226\343\002\074" +-"\207\333\256\313\001\216\302\363\146\306\205\105\364\002\306\072" +-"\265\142\262\257\372\234\277\244\346\324\200\060\230\363\015\266" +-"\223\217\251\324\330\066\362\260\374\212\312\054\241\025\063\225" +-"\061\332\300\033\362\356\142\231\206\143\077\277\335\223\052\203" +-"\250\166\271\023\037\267\316\116\102\205\217\042\347\056\032\362" +-"\225\011\262\005\265\104\116\167\241\040\275\251\362\116\012\175" +-"\120\255\365\005\015\105\117\106\161\375\050\076\123\373\004\330" +-"\055\327\145\035\112\033\372\317\073\260\061\232\065\156\310\213" +-"\006\323\000\221\362\224\010\145\114\261\064\006\000\172\211\342" +-"\360\307\003\131\317\325\326\350\247\062\263\346\230\100\206\305" +-"\315\047\022\213\314\173\316\267\021\074\142\140\007\043\076\053" +-"\100\156\224\200\011\155\266\263\157\167\157\065\010\120\373\002" +-"\207\305\076\211\002\003\001\000\001\243\102\060\100\060\035\006" +-"\003\125\035\016\004\026\004\024\133\370\115\117\262\245\206\324" +-"\072\322\361\143\232\240\276\011\366\127\267\336\060\016\006\003" +-"\125\035\017\001\001\377\004\004\003\002\001\006\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\005\005\000\003\202\001\001" +-"\000\240\241\070\026\146\056\247\126\037\041\234\006\372\035\355" +-"\271\042\305\070\046\330\116\117\354\243\177\171\336\106\041\241" +-"\207\167\217\007\010\232\262\244\305\257\017\062\230\013\174\146" +-"\051\266\233\175\045\122\111\103\253\114\056\053\156\172\160\257" +-"\026\016\343\002\154\373\102\346\030\235\105\330\125\310\350\073" +-"\335\347\341\364\056\013\034\064\134\154\130\112\373\214\210\120" +-"\137\225\034\277\355\253\042\265\145\263\205\272\236\017\270\255" +-"\345\172\033\212\120\072\035\275\015\274\173\124\120\013\271\102" +-"\257\125\240\030\201\255\145\231\357\276\344\234\277\304\205\253" +-"\101\262\124\157\334\045\315\355\170\342\216\014\215\011\111\335" +-"\143\173\132\151\226\002\041\250\275\122\131\351\175\065\313\310" +-"\122\312\177\201\376\331\153\323\367\021\355\045\337\370\347\371" +-"\244\372\162\227\204\123\015\245\320\062\030\121\166\131\024\154" +-"\017\353\354\137\200\214\165\103\203\303\205\230\377\114\236\055" +-"\015\344\167\203\223\116\265\226\007\213\050\023\233\214\031\215" +-"\101\047\111\100\356\336\346\043\104\071\334\241\042\326\272\003" +-"\362" +-, (PRUint32)881 } +-}; +-static const NSSItem nss_builtins_items_299 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"SecureSign RootCA11", (PRUint32)20 }, +- { (void *)"\073\304\237\110\370\363\163\240\234\036\275\370\133\261\303\145" +-"\307\330\021\263" +-, (PRUint32)20 }, +- { (void *)"\267\122\164\342\222\264\200\223\362\165\344\314\327\362\352\046" +-, (PRUint32)16 }, +- { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061" +-"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040" +-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145" +-"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032" +-"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147" +-"\156\040\122\157\157\164\103\101\061\061" +-, (PRUint32)90 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_300 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ACEDICOM Root", (PRUint32)14 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105" +-"\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003" +-"\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004" +-"\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125" +-"\004\006\023\002\105\123" +-, (PRUint32)70 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105" +-"\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003" +-"\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004" +-"\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125" +-"\004\006\023\002\105\123" +-, (PRUint32)70 }, +- { (void *)"\002\010\141\215\307\206\073\001\202\005" +-, (PRUint32)10 }, +- { (void *)"\060\202\005\265\060\202\003\235\240\003\002\001\002\002\010\141" +-"\215\307\206\073\001\202\005\060\015\006\011\052\206\110\206\367" +-"\015\001\001\005\005\000\060\104\061\026\060\024\006\003\125\004" +-"\003\014\015\101\103\105\104\111\103\117\115\040\122\157\157\164" +-"\061\014\060\012\006\003\125\004\013\014\003\120\113\111\061\017" +-"\060\015\006\003\125\004\012\014\006\105\104\111\103\117\115\061" +-"\013\060\011\006\003\125\004\006\023\002\105\123\060\036\027\015" +-"\060\070\060\064\061\070\061\066\062\064\062\062\132\027\015\062" +-"\070\060\064\061\063\061\066\062\064\062\062\132\060\104\061\026" +-"\060\024\006\003\125\004\003\014\015\101\103\105\104\111\103\117" +-"\115\040\122\157\157\164\061\014\060\012\006\003\125\004\013\014" +-"\003\120\113\111\061\017\060\015\006\003\125\004\012\014\006\105" +-"\104\111\103\117\115\061\013\060\011\006\003\125\004\006\023\002" +-"\105\123\060\202\002\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202" +-"\002\001\000\377\222\225\341\150\006\166\264\054\310\130\110\312" +-"\375\200\124\051\125\143\044\377\220\145\233\020\165\173\303\152" +-"\333\142\002\001\362\030\206\265\174\132\070\261\344\130\271\373" +-"\323\330\055\237\275\062\067\277\054\025\155\276\265\364\041\322" +-"\023\221\331\007\255\001\005\326\363\275\167\316\137\102\201\012" +-"\371\152\343\203\000\250\053\056\125\023\143\201\312\107\034\173" +-"\134\026\127\172\033\203\140\004\072\076\145\303\315\001\336\336" +-"\244\326\014\272\216\336\331\004\356\027\126\042\233\217\143\375" +-"\115\026\013\267\173\167\214\371\045\265\321\155\231\022\056\117" +-"\032\270\346\352\004\222\256\075\021\271\121\102\075\207\260\061" +-"\205\257\171\132\234\376\347\116\136\222\117\103\374\253\072\255" +-"\245\022\046\146\271\342\014\327\230\316\324\130\245\225\100\012" +-"\267\104\235\023\164\053\302\245\353\042\025\230\020\330\213\305" +-"\004\237\035\217\140\345\006\033\233\317\271\171\240\075\242\043" +-"\077\102\077\153\372\034\003\173\060\215\316\154\300\277\346\033" +-"\137\277\147\270\204\031\325\025\357\173\313\220\066\061\142\311" +-"\274\002\253\106\137\233\376\032\150\224\064\075\220\216\255\366" +-"\344\035\011\177\112\210\070\077\276\147\375\064\226\365\035\274" +-"\060\164\313\070\356\325\154\253\324\374\364\000\267\000\133\205" +-"\062\026\166\063\351\330\243\231\235\005\000\252\026\346\363\201" +-"\175\157\175\252\206\155\255\025\164\323\304\242\161\252\364\024" +-"\175\347\062\270\037\274\325\361\116\275\157\027\002\071\327\016" +-"\225\102\072\307\000\076\351\046\143\021\352\013\321\112\377\030" +-"\235\262\327\173\057\072\331\226\373\350\036\222\256\023\125\310" +-"\331\047\366\334\110\033\260\044\301\205\343\167\235\232\244\363" +-"\014\021\035\015\310\264\024\356\265\202\127\011\277\040\130\177" +-"\057\042\043\330\160\313\171\154\311\113\362\251\052\310\374\207" +-"\053\327\032\120\370\047\350\057\103\343\072\275\330\127\161\375" +-"\316\246\122\133\371\335\115\355\345\366\157\211\355\273\223\234" +-"\166\041\165\360\222\114\051\367\057\234\001\056\376\120\106\236" +-"\144\014\024\263\007\133\305\302\163\154\361\007\134\105\044\024" +-"\065\256\203\361\152\115\211\172\372\263\330\055\146\360\066\207" +-"\365\053\123\002\003\001\000\001\243\201\252\060\201\247\060\017" +-"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060" +-"\037\006\003\125\035\043\004\030\060\026\200\024\246\263\341\053" +-"\053\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120" +-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\206" +-"\060\035\006\003\125\035\016\004\026\004\024\246\263\341\053\053" +-"\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120\060" +-"\104\006\003\125\035\040\004\075\060\073\060\071\006\004\125\035" +-"\040\000\060\061\060\057\006\010\053\006\001\005\005\007\002\001" +-"\026\043\150\164\164\160\072\057\057\141\143\145\144\151\143\157" +-"\155\056\145\144\151\143\157\155\147\162\157\165\160\056\143\157" +-"\155\057\144\157\143\060\015\006\011\052\206\110\206\367\015\001" +-"\001\005\005\000\003\202\002\001\000\316\054\013\122\121\142\046" +-"\175\014\047\203\217\305\366\332\240\150\173\117\222\136\352\244" +-"\163\062\021\123\104\262\104\313\235\354\017\171\102\263\020\246" +-"\307\015\235\313\266\372\077\072\174\352\277\210\123\033\074\367" +-"\202\372\005\065\063\341\065\250\127\300\347\375\215\117\077\223" +-"\062\117\170\146\003\167\007\130\351\225\310\176\076\320\171\000" +-"\214\362\033\121\063\233\274\224\351\072\173\156\122\055\062\236" +-"\043\244\105\373\266\056\023\260\213\030\261\335\316\325\035\247" +-"\102\177\125\276\373\133\273\107\324\374\044\315\004\256\226\005" +-"\025\326\254\316\060\363\312\013\305\272\342\042\340\246\255\042" +-"\344\002\356\164\021\177\114\377\170\035\065\332\346\002\064\353" +-"\030\022\141\167\006\011\026\143\352\030\255\242\207\037\362\307" +-"\200\011\011\165\116\020\250\217\075\206\270\165\021\300\044\142" +-"\212\226\173\112\105\351\354\131\305\276\153\203\346\341\350\254" +-"\265\060\036\376\005\007\200\371\341\043\015\120\217\005\230\377" +-"\054\137\350\073\266\255\317\201\265\041\207\312\010\052\043\047" +-"\060\040\053\317\355\224\133\254\262\172\322\307\050\241\212\013" +-"\233\115\112\054\155\205\077\011\162\074\147\342\331\334\007\272" +-"\353\145\173\132\001\143\326\220\133\117\027\146\075\177\013\031" +-"\243\223\143\020\122\052\237\024\026\130\342\334\245\364\241\026" +-"\213\016\221\213\201\312\233\131\372\330\153\221\007\145\125\137" +-"\122\037\257\072\373\220\335\151\245\133\234\155\016\054\266\372" +-"\316\254\245\174\062\112\147\100\334\060\064\043\335\327\004\043" +-"\146\360\374\125\200\247\373\146\031\202\065\147\142\160\071\136" +-"\157\307\352\220\100\104\010\036\270\262\326\333\356\131\247\015" +-"\030\171\064\274\124\030\136\123\312\064\121\355\105\012\346\216" +-"\307\202\066\076\247\070\143\251\060\054\027\020\140\222\237\125" +-"\207\022\131\020\302\017\147\151\021\314\116\036\176\112\232\255" +-"\257\100\250\165\254\126\220\164\270\240\234\245\171\157\334\351" +-"\032\310\151\005\351\272\372\003\263\174\344\340\116\302\316\235" +-"\350\266\106\015\156\176\127\072\147\224\302\313\037\234\167\112" +-"\147\116\151\206\103\223\070\373\266\333\117\203\221\324\140\176" +-"\113\076\053\070\007\125\230\136\244" +-, (PRUint32)1465 } +-}; +-static const NSSItem nss_builtins_items_301 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"ACEDICOM Root", (PRUint32)14 }, +- { (void *)"\340\264\062\056\262\366\245\150\266\124\123\204\110\030\112\120" +-"\066\207\103\204" +-, (PRUint32)20 }, +- { (void *)"\102\201\240\342\034\343\125\020\336\125\211\102\145\226\042\346" +-, (PRUint32)16 }, +- { (void *)"\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105" +-"\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003" +-"\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004" +-"\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125" +-"\004\006\023\002\105\123" +-, (PRUint32)70 }, +- { (void *)"\002\010\141\215\307\206\073\001\202\005" +-, (PRUint32)10 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_302 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 1 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242" +-"\344\335" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\074\060\202\001\245\002\020\077\151\036\201\234\360" +-"\232\112\363\163\377\271\110\242\344\335\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006" +-"\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004" +-"\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143" +-"\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163" +-"\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155\141" +-"\162\171\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\066" +-"\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060" +-"\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125" +-"\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141" +-"\163\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155" +-"\141\162\171\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\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\345\031\277\155\243\126\141\055" +-"\231\110\161\366\147\336\271\215\353\267\236\206\200\012\221\016" +-"\372\070\045\257\106\210\202\345\163\250\240\233\044\135\015\037" +-"\314\145\156\014\260\320\126\204\030\207\232\006\233\020\241\163" +-"\337\264\130\071\153\156\301\366\025\325\250\250\077\252\022\006" +-"\215\061\254\177\260\064\327\217\064\147\210\011\315\024\021\342" +-"\116\105\126\151\037\170\002\200\332\334\107\221\051\273\066\311" +-"\143\134\305\340\327\055\207\173\241\267\062\260\173\060\272\052" +-"\057\061\252\356\243\147\332\333\002\003\001\000\001\060\015\006" +-"\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000" +-"\130\025\051\071\074\167\243\332\134\045\003\174\140\372\356\011" +-"\231\074\047\020\160\310\014\011\346\263\207\317\012\342\030\226" +-"\065\142\314\277\233\047\171\211\137\311\304\011\364\316\265\035" +-"\337\052\275\345\333\206\234\150\045\345\060\174\266\211\025\376" +-"\147\321\255\341\120\254\074\174\142\113\217\272\204\327\022\025" +-"\033\037\312\135\017\301\122\224\052\021\231\332\173\317\014\066" +-"\023\325\065\334\020\031\131\352\224\301\000\277\165\217\331\372" +-"\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133" +-, (PRUint32)576 } +-}; +-static const NSSItem nss_builtins_items_303 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 1 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)"\316\152\144\243\011\344\057\273\331\205\034\105\076\144\011\352" +-"\350\175\140\361" +-, (PRUint32)20 }, +- { (void *)"\206\254\336\053\305\155\303\331\214\050\210\323\215\026\023\036" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242" +-"\344\335" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_304 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 3 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277" +-"\022\276" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\074\060\202\001\245\002\020\074\221\061\313\037\366" +-"\320\033\016\232\270\320\104\277\022\276\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006" +-"\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004" +-"\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143" +-"\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163" +-"\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155\141" +-"\162\171\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\066" +-"\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060" +-"\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125" +-"\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156" +-"\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141" +-"\163\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155" +-"\141\162\171\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\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\311\134\131\236\362\033\212\001" +-"\024\264\020\337\004\100\333\343\127\257\152\105\100\217\204\014" +-"\013\321\063\331\331\021\317\356\002\130\037\045\367\052\250\104" +-"\005\252\354\003\037\170\177\236\223\271\232\000\252\043\175\326" +-"\254\205\242\143\105\307\162\047\314\364\114\306\165\161\322\071" +-"\357\117\102\360\165\337\012\220\306\216\040\157\230\017\370\254" +-"\043\137\160\051\066\244\311\206\347\261\232\040\313\123\245\205" +-"\347\075\276\175\232\376\044\105\063\334\166\025\355\017\242\161" +-"\144\114\145\056\201\150\105\247\002\003\001\000\001\060\015\006" +-"\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000" +-"\020\162\122\251\005\024\031\062\010\101\360\305\153\012\314\176" +-"\017\041\031\315\344\147\334\137\251\033\346\312\350\163\235\042" +-"\330\230\156\163\003\141\221\305\174\260\105\100\156\104\235\215" +-"\260\261\226\164\141\055\015\251\105\322\244\222\052\326\232\165" +-"\227\156\077\123\375\105\231\140\035\250\053\114\371\136\247\011" +-"\330\165\060\327\322\145\140\075\147\326\110\125\165\151\077\221" +-"\365\110\013\107\151\042\151\202\226\276\311\310\070\206\112\172" +-"\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220" +-, (PRUint32)576 } +-}; +-static const NSSItem nss_builtins_items_305 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign Class 3 Public Primary Certification Authority", (PRUint32)56 }, +- { (void *)"\241\333\143\223\221\157\027\344\030\125\011\100\004\025\307\002" +-"\100\260\256\153" +-, (PRUint32)20 }, +- { (void *)"\357\132\361\063\357\361\315\273\121\002\356\022\024\113\226\304" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151" +-"\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004" +-"\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151" +-"\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277" +-"\022\276" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_306 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Microsec e-Szigno Root CA 2009", (PRUint32)31 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151" +-"\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006" +-"\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145" +-"\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040" +-"\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015" +-"\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147" +-"\156\157\056\150\165" +-, (PRUint32)133 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151" +-"\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006" +-"\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145" +-"\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040" +-"\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015" +-"\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147" +-"\156\157\056\150\165" +-, (PRUint32)133 }, +- { (void *)"\002\011\000\302\176\103\004\116\107\077\031" +-, (PRUint32)11 }, +- { (void *)"\060\202\004\012\060\202\002\362\240\003\002\001\002\002\011\000" +-"\302\176\103\004\116\107\077\031\060\015\006\011\052\206\110\206" +-"\367\015\001\001\013\005\000\060\201\202\061\013\060\011\006\003" +-"\125\004\006\023\002\110\125\061\021\060\017\006\003\125\004\007" +-"\014\010\102\165\144\141\160\145\163\164\061\026\060\024\006\003" +-"\125\004\012\014\015\115\151\143\162\157\163\145\143\040\114\164" +-"\144\056\061\047\060\045\006\003\125\004\003\014\036\115\151\143" +-"\162\157\163\145\143\040\145\055\123\172\151\147\156\157\040\122" +-"\157\157\164\040\103\101\040\062\060\060\071\061\037\060\035\006" +-"\011\052\206\110\206\367\015\001\011\001\026\020\151\156\146\157" +-"\100\145\055\163\172\151\147\156\157\056\150\165\060\036\027\015" +-"\060\071\060\066\061\066\061\061\063\060\061\070\132\027\015\062" +-"\071\061\062\063\060\061\061\063\060\061\070\132\060\201\202\061" +-"\013\060\011\006\003\125\004\006\023\002\110\125\061\021\060\017" +-"\006\003\125\004\007\014\010\102\165\144\141\160\145\163\164\061" +-"\026\060\024\006\003\125\004\012\014\015\115\151\143\162\157\163" +-"\145\143\040\114\164\144\056\061\047\060\045\006\003\125\004\003" +-"\014\036\115\151\143\162\157\163\145\143\040\145\055\123\172\151" +-"\147\156\157\040\122\157\157\164\040\103\101\040\062\060\060\071" +-"\061\037\060\035\006\011\052\206\110\206\367\015\001\011\001\026" +-"\020\151\156\146\157\100\145\055\163\172\151\147\156\157\056\150" +-"\165\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001" +-"\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001" +-"\001\000\351\370\217\363\143\255\332\206\330\247\340\102\373\317" +-"\221\336\246\046\370\231\245\143\160\255\233\256\312\063\100\175" +-"\155\226\156\241\016\104\356\341\023\235\224\102\122\232\275\165" +-"\205\164\054\250\016\035\223\266\030\267\214\054\250\317\373\134" +-"\161\271\332\354\376\350\176\217\344\057\035\262\250\165\207\330" +-"\267\241\345\073\317\231\112\106\320\203\031\175\300\241\022\034" +-"\225\155\112\364\330\307\245\115\063\056\205\071\100\165\176\024" +-"\174\200\022\230\120\307\101\147\270\240\200\141\124\246\154\116" +-"\037\340\235\016\007\351\311\272\063\347\376\300\125\050\054\002" +-"\200\247\031\365\236\334\125\123\003\227\173\007\110\377\231\373" +-"\067\212\044\304\131\314\120\020\143\216\252\251\032\260\204\032" +-"\206\371\137\273\261\120\156\244\321\012\314\325\161\176\037\247" +-"\033\174\365\123\156\042\137\313\053\346\324\174\135\256\326\302" +-"\306\114\345\005\001\331\355\127\374\301\043\171\374\372\310\044" +-"\203\225\363\265\152\121\001\320\167\326\351\022\241\371\032\203" +-"\373\202\033\271\260\227\364\166\006\063\103\111\240\377\013\265" +-"\372\265\002\003\001\000\001\243\201\200\060\176\060\017\006\003" +-"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006" +-"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006" +-"\003\125\035\016\004\026\004\024\313\017\306\337\102\103\314\075" +-"\313\265\110\043\241\032\172\246\052\273\064\150\060\037\006\003" +-"\125\035\043\004\030\060\026\200\024\313\017\306\337\102\103\314" +-"\075\313\265\110\043\241\032\172\246\052\273\064\150\060\033\006" +-"\003\125\035\021\004\024\060\022\201\020\151\156\146\157\100\145" +-"\055\163\172\151\147\156\157\056\150\165\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\003\202\001\001\000\311\321" +-"\016\136\056\325\314\263\174\076\313\374\075\377\015\050\225\223" +-"\004\310\277\332\315\171\270\103\220\360\244\276\357\362\357\041" +-"\230\274\324\324\135\006\366\356\102\354\060\154\240\252\251\312" +-"\361\257\212\372\077\013\163\152\076\352\056\100\176\037\256\124" +-"\141\171\353\056\010\067\327\043\363\214\237\276\035\261\341\244" +-"\165\333\240\342\124\024\261\272\034\051\244\030\366\022\272\242" +-"\024\024\343\061\065\310\100\377\267\340\005\166\127\301\034\131" +-"\362\370\277\344\355\045\142\134\204\360\176\176\037\263\276\371" +-"\267\041\021\314\003\001\126\160\247\020\222\036\033\064\201\036" +-"\255\234\032\303\004\074\355\002\141\326\036\006\363\137\072\207" +-"\362\053\361\105\207\345\075\254\321\307\127\204\275\153\256\334" +-"\330\371\266\033\142\160\013\075\066\311\102\362\062\327\172\141" +-"\346\322\333\075\317\310\251\311\233\334\333\130\104\327\157\070" +-"\257\177\170\323\243\255\032\165\272\034\301\066\174\217\036\155" +-"\034\303\165\106\256\065\005\246\366\134\075\041\356\126\360\311" +-"\202\042\055\172\124\253\160\303\175\042\145\202\160\226" +-, (PRUint32)1038 } +-}; +-static const NSSItem nss_builtins_items_307 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Microsec e-Szigno Root CA 2009", (PRUint32)31 }, +- { (void *)"\211\337\164\376\134\364\017\112\200\371\343\067\175\124\332\221" +-"\341\001\061\216" +-, (PRUint32)20 }, +- { (void *)"\370\111\364\003\274\104\055\203\276\110\151\175\051\144\374\261" +-, (PRUint32)16 }, +- { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125" +-"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160" +-"\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151" +-"\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006" +-"\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145" +-"\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040" +-"\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015" +-"\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147" +-"\156\157\056\150\165" +-, (PRUint32)133 }, +- { (void *)"\002\011\000\302\176\103\004\116\107\077\031" +-, (PRUint32)11 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_308 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi", (PRUint32)52 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162" +-"\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156" +-"\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125" +-"\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040" +-"\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151" +-"\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154" +-"\141\171\151\143\151\163\151" +-, (PRUint32)119 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162" +-"\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156" +-"\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125" +-"\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040" +-"\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151" +-"\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154" +-"\141\171\151\143\151\163\151" +-, (PRUint32)119 }, +- { (void *)"\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333" +-"\254\265" +-, (PRUint32)18 }, +- { (void *)"\060\202\003\266\060\202\002\236\240\003\002\001\002\002\020\104" +-"\231\215\074\300\003\047\275\234\166\225\271\352\333\254\265\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\165" +-"\061\013\060\011\006\003\125\004\006\023\002\124\122\061\050\060" +-"\046\006\003\125\004\012\023\037\105\154\145\153\164\162\157\156" +-"\151\153\040\102\151\154\147\151\040\107\165\166\145\156\154\151" +-"\147\151\040\101\056\123\056\061\074\060\072\006\003\125\004\003" +-"\023\063\145\055\107\165\166\145\156\040\113\157\153\040\105\154" +-"\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146\151" +-"\153\141\040\110\151\172\155\145\164\040\123\141\147\154\141\171" +-"\151\143\151\163\151\060\036\027\015\060\067\060\061\060\064\061" +-"\061\063\062\064\070\132\027\015\061\067\060\061\060\064\061\061" +-"\063\062\064\070\132\060\165\061\013\060\011\006\003\125\004\006" +-"\023\002\124\122\061\050\060\046\006\003\125\004\012\023\037\105" +-"\154\145\153\164\162\157\156\151\153\040\102\151\154\147\151\040" +-"\107\165\166\145\156\154\151\147\151\040\101\056\123\056\061\074" +-"\060\072\006\003\125\004\003\023\063\145\055\107\165\166\145\156" +-"\040\113\157\153\040\105\154\145\153\164\162\157\156\151\153\040" +-"\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145\164" +-"\040\123\141\147\154\141\171\151\143\151\163\151\060\202\001\042" +-"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003" +-"\202\001\017\000\060\202\001\012\002\202\001\001\000\303\022\040" +-"\236\260\136\000\145\215\116\106\273\200\134\351\054\006\227\325" +-"\363\162\311\160\271\347\113\145\200\301\113\276\176\074\327\124" +-"\061\224\336\325\022\272\123\026\002\352\130\143\357\133\330\363" +-"\355\052\032\252\161\110\243\334\020\055\137\137\353\134\113\234" +-"\226\010\102\045\050\021\314\212\132\142\001\120\325\353\011\123" +-"\057\370\303\217\376\263\374\375\235\242\343\137\175\276\355\013" +-"\340\140\353\151\354\063\355\330\215\373\022\111\203\000\311\213" +-"\227\214\073\163\052\062\263\022\367\271\115\362\364\115\155\307" +-"\346\326\046\067\010\362\331\375\153\134\243\345\110\134\130\274" +-"\102\276\003\132\201\272\034\065\014\000\323\365\043\176\161\060" +-"\010\046\070\334\045\021\107\055\363\272\043\020\245\277\274\002" +-"\367\103\136\307\376\260\067\120\231\173\017\223\316\346\103\054" +-"\303\176\015\362\034\103\146\140\313\141\061\107\207\243\117\256" +-"\275\126\154\114\274\274\370\005\312\144\364\351\064\241\054\265" +-"\163\341\302\076\350\310\311\064\045\010\134\363\355\246\307\224" +-"\237\255\210\103\045\327\341\071\140\376\254\071\131\002\003\001" +-"\000\001\243\102\060\100\060\016\006\003\125\035\017\001\001\377" +-"\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377" +-"\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026" +-"\004\024\237\356\104\263\224\325\372\221\117\056\331\125\232\004" +-"\126\333\055\304\333\245\060\015\006\011\052\206\110\206\367\015" +-"\001\001\005\005\000\003\202\001\001\000\177\137\271\123\133\143" +-"\075\165\062\347\372\304\164\032\313\106\337\106\151\034\122\317" +-"\252\117\302\150\353\377\200\251\121\350\075\142\167\211\075\012" +-"\165\071\361\156\135\027\207\157\150\005\301\224\154\331\135\337" +-"\332\262\131\313\245\020\212\312\314\071\315\237\353\116\336\122" +-"\377\014\360\364\222\251\362\154\123\253\233\322\107\240\037\164" +-"\367\233\232\361\057\025\237\172\144\060\030\007\074\052\017\147" +-"\312\374\017\211\141\235\145\245\074\345\274\023\133\010\333\343" +-"\377\355\273\006\273\152\006\261\172\117\145\306\202\375\036\234" +-"\213\265\015\356\110\273\270\275\252\010\264\373\243\174\313\237" +-"\315\220\166\134\206\226\170\127\012\146\371\130\032\235\375\227" +-"\051\140\336\021\246\220\034\031\034\356\001\226\042\064\064\056" +-"\221\371\267\304\047\321\173\346\277\373\200\104\132\026\345\353" +-"\340\324\012\070\274\344\221\343\325\353\134\301\254\337\033\152" +-"\174\236\345\165\322\266\227\207\333\314\207\053\103\072\204\010" +-"\257\253\074\333\367\074\146\061\206\260\235\123\171\355\370\043" +-"\336\102\343\055\202\361\017\345\372\227" +-, (PRUint32)954 } +-}; +-static const NSSItem nss_builtins_items_309 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi", (PRUint32)52 }, +- { (void *)"\335\341\322\251\001\200\056\035\207\136\204\263\200\176\113\261" +-"\375\231\101\064" +-, (PRUint32)20 }, +- { (void *)"\075\101\051\313\036\252\021\164\315\135\260\142\257\260\103\133" +-, (PRUint32)16 }, +- { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061" +-"\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162" +-"\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156" +-"\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125" +-"\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040" +-"\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151" +-"\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154" +-"\141\171\151\143\151\163\151" +-, (PRUint32)119 }, +- { (void *)"\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333" +-"\254\265" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_310 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GlobalSign Root CA - R3", (PRUint32)24 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157" +-"\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040" +-"\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107" +-"\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125" +-"\004\003\023\012\107\154\157\142\141\154\123\151\147\156" +-, (PRUint32)78 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157" +-"\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040" +-"\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107" +-"\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125" +-"\004\003\023\012\107\154\157\142\141\154\123\151\147\156" +-, (PRUint32)78 }, +- { (void *)"\002\013\004\000\000\000\000\001\041\130\123\010\242" +-, (PRUint32)13 }, +- { (void *)"\060\202\003\137\060\202\002\107\240\003\002\001\002\002\013\004" +-"\000\000\000\000\001\041\130\123\010\242\060\015\006\011\052\206" +-"\110\206\367\015\001\001\013\005\000\060\114\061\040\060\036\006" +-"\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147\156" +-"\040\122\157\157\164\040\103\101\040\055\040\122\063\061\023\060" +-"\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123\151" +-"\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154\157" +-"\142\141\154\123\151\147\156\060\036\027\015\060\071\060\063\061" +-"\070\061\060\060\060\060\060\132\027\015\062\071\060\063\061\070" +-"\061\060\060\060\060\060\132\060\114\061\040\060\036\006\003\125" +-"\004\013\023\027\107\154\157\142\141\154\123\151\147\156\040\122" +-"\157\157\164\040\103\101\040\055\040\122\063\061\023\060\021\006" +-"\003\125\004\012\023\012\107\154\157\142\141\154\123\151\147\156" +-"\061\023\060\021\006\003\125\004\003\023\012\107\154\157\142\141" +-"\154\123\151\147\156\060\202\001\042\060\015\006\011\052\206\110" +-"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001" +-"\012\002\202\001\001\000\314\045\166\220\171\006\170\042\026\365" +-"\300\203\266\204\312\050\236\375\005\166\021\305\255\210\162\374" +-"\106\002\103\307\262\212\235\004\137\044\313\056\113\341\140\202" +-"\106\341\122\253\014\201\107\160\154\335\144\321\353\365\054\243" +-"\017\202\075\014\053\256\227\327\266\024\206\020\171\273\073\023" +-"\200\167\214\010\341\111\322\152\142\057\037\136\372\226\150\337" +-"\211\047\225\070\237\006\327\076\311\313\046\131\015\163\336\260" +-"\310\351\046\016\203\025\306\357\133\213\322\004\140\312\111\246" +-"\050\366\151\073\366\313\310\050\221\345\235\212\141\127\067\254" +-"\164\024\334\164\340\072\356\162\057\056\234\373\320\273\277\365" +-"\075\000\341\006\063\350\202\053\256\123\246\072\026\163\214\335" +-"\101\016\040\072\300\264\247\241\351\262\117\220\056\062\140\351" +-"\127\313\271\004\222\150\150\345\070\046\140\165\262\237\167\377" +-"\221\024\357\256\040\111\374\255\100\025\110\321\002\061\141\031" +-"\136\270\227\357\255\167\267\144\232\172\277\137\301\023\357\233" +-"\142\373\015\154\340\124\151\026\251\003\332\156\351\203\223\161" +-"\166\306\151\205\202\027\002\003\001\000\001\243\102\060\100\060" +-"\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060" +-"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377" +-"\060\035\006\003\125\035\016\004\026\004\024\217\360\113\177\250" +-"\056\105\044\256\115\120\372\143\232\213\336\342\335\033\274\060" +-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202" +-"\001\001\000\113\100\333\300\120\252\376\310\014\357\367\226\124" +-"\105\111\273\226\000\011\101\254\263\023\206\206\050\007\063\312" +-"\153\346\164\271\272\000\055\256\244\012\323\365\361\361\017\212" +-"\277\163\147\112\203\307\104\173\170\340\257\156\154\157\003\051" +-"\216\063\071\105\303\216\344\271\127\154\252\374\022\226\354\123" +-"\306\055\344\044\154\271\224\143\373\334\123\150\147\126\076\203" +-"\270\317\065\041\303\311\150\376\316\332\302\123\252\314\220\212" +-"\351\360\135\106\214\225\335\172\130\050\032\057\035\336\315\000" +-"\067\101\217\355\104\155\327\123\050\227\176\363\147\004\036\025" +-"\327\212\226\264\323\336\114\047\244\114\033\163\163\166\364\027" +-"\231\302\037\172\016\343\055\010\255\012\034\054\377\074\253\125" +-"\016\017\221\176\066\353\303\127\111\276\341\056\055\174\140\213" +-"\303\101\121\023\043\235\316\367\062\153\224\001\250\231\347\054" +-"\063\037\072\073\045\322\206\100\316\073\054\206\170\311\141\057" +-"\024\272\356\333\125\157\337\204\356\005\011\115\275\050\330\162" +-"\316\323\142\120\145\036\353\222\227\203\061\331\263\265\312\107" +-"\130\077\137" +-, (PRUint32)867 } +-}; +-static const NSSItem nss_builtins_items_311 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"GlobalSign Root CA - R3", (PRUint32)24 }, +- { (void *)"\326\233\126\021\110\360\034\167\305\105\170\301\011\046\337\133" +-"\205\151\166\255" +-, (PRUint32)20 }, +- { (void *)"\305\337\270\111\312\005\023\125\356\055\272\032\303\076\260\050" +-, (PRUint32)16 }, +- { (void *)"\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157" +-"\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040" +-"\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107" +-"\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125" +-"\004\003\023\012\107\154\157\142\141\154\123\151\147\156" +-, (PRUint32)78 }, +- { (void *)"\002\013\004\000\000\000\000\001\041\130\123\010\242" +-, (PRUint32)13 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; + +@@ -21112,79 +16685,11 @@ nss_builtins_data[] = { + { 11, nss_builtins_types_240, nss_builtins_items_240, {NULL} }, + { 13, nss_builtins_types_241, nss_builtins_items_241, {NULL} }, + { 11, nss_builtins_types_242, nss_builtins_items_242, {NULL} }, +- { 13, nss_builtins_types_243, nss_builtins_items_243, {NULL} }, +- { 11, nss_builtins_types_244, nss_builtins_items_244, {NULL} }, +- { 13, nss_builtins_types_245, nss_builtins_items_245, {NULL} }, +- { 11, nss_builtins_types_246, nss_builtins_items_246, {NULL} }, +- { 13, nss_builtins_types_247, nss_builtins_items_247, {NULL} }, +- { 11, nss_builtins_types_248, nss_builtins_items_248, {NULL} }, +- { 13, nss_builtins_types_249, nss_builtins_items_249, {NULL} }, +- { 11, nss_builtins_types_250, nss_builtins_items_250, {NULL} }, +- { 13, nss_builtins_types_251, nss_builtins_items_251, {NULL} }, +- { 11, nss_builtins_types_252, nss_builtins_items_252, {NULL} }, +- { 13, nss_builtins_types_253, nss_builtins_items_253, {NULL} }, +- { 11, nss_builtins_types_254, nss_builtins_items_254, {NULL} }, +- { 13, nss_builtins_types_255, nss_builtins_items_255, {NULL} }, +- { 11, nss_builtins_types_256, nss_builtins_items_256, {NULL} }, +- { 13, nss_builtins_types_257, nss_builtins_items_257, {NULL} }, +- { 11, nss_builtins_types_258, nss_builtins_items_258, {NULL} }, +- { 13, nss_builtins_types_259, nss_builtins_items_259, {NULL} }, +- { 11, nss_builtins_types_260, nss_builtins_items_260, {NULL} }, +- { 13, nss_builtins_types_261, nss_builtins_items_261, {NULL} }, +- { 11, nss_builtins_types_262, nss_builtins_items_262, {NULL} }, +- { 13, nss_builtins_types_263, nss_builtins_items_263, {NULL} }, +- { 11, nss_builtins_types_264, nss_builtins_items_264, {NULL} }, +- { 13, nss_builtins_types_265, nss_builtins_items_265, {NULL} }, +- { 11, nss_builtins_types_266, nss_builtins_items_266, {NULL} }, +- { 13, nss_builtins_types_267, nss_builtins_items_267, {NULL} }, +- { 11, nss_builtins_types_268, nss_builtins_items_268, {NULL} }, +- { 13, nss_builtins_types_269, nss_builtins_items_269, {NULL} }, +- { 11, nss_builtins_types_270, nss_builtins_items_270, {NULL} }, +- { 13, nss_builtins_types_271, nss_builtins_items_271, {NULL} }, +- { 11, nss_builtins_types_272, nss_builtins_items_272, {NULL} }, +- { 13, nss_builtins_types_273, nss_builtins_items_273, {NULL} }, +- { 11, nss_builtins_types_274, nss_builtins_items_274, {NULL} }, +- { 13, nss_builtins_types_275, nss_builtins_items_275, {NULL} }, +- { 11, nss_builtins_types_276, nss_builtins_items_276, {NULL} }, +- { 13, nss_builtins_types_277, nss_builtins_items_277, {NULL} }, +- { 11, nss_builtins_types_278, nss_builtins_items_278, {NULL} }, +- { 13, nss_builtins_types_279, nss_builtins_items_279, {NULL} }, +- { 11, nss_builtins_types_280, nss_builtins_items_280, {NULL} }, +- { 13, nss_builtins_types_281, nss_builtins_items_281, {NULL} }, +- { 11, nss_builtins_types_282, nss_builtins_items_282, {NULL} }, +- { 13, nss_builtins_types_283, nss_builtins_items_283, {NULL} }, +- { 11, nss_builtins_types_284, nss_builtins_items_284, {NULL} }, +- { 13, nss_builtins_types_285, nss_builtins_items_285, {NULL} }, +- { 11, nss_builtins_types_286, nss_builtins_items_286, {NULL} }, +- { 13, nss_builtins_types_287, nss_builtins_items_287, {NULL} }, +- { 11, nss_builtins_types_288, nss_builtins_items_288, {NULL} }, +- { 13, nss_builtins_types_289, nss_builtins_items_289, {NULL} }, +- { 11, nss_builtins_types_290, nss_builtins_items_290, {NULL} }, +- { 13, nss_builtins_types_291, nss_builtins_items_291, {NULL} }, +- { 11, nss_builtins_types_292, nss_builtins_items_292, {NULL} }, +- { 13, nss_builtins_types_293, nss_builtins_items_293, {NULL} }, +- { 11, nss_builtins_types_294, nss_builtins_items_294, {NULL} }, +- { 13, nss_builtins_types_295, nss_builtins_items_295, {NULL} }, +- { 11, nss_builtins_types_296, nss_builtins_items_296, {NULL} }, +- { 13, nss_builtins_types_297, nss_builtins_items_297, {NULL} }, +- { 11, nss_builtins_types_298, nss_builtins_items_298, {NULL} }, +- { 13, nss_builtins_types_299, nss_builtins_items_299, {NULL} }, +- { 11, nss_builtins_types_300, nss_builtins_items_300, {NULL} }, +- { 13, nss_builtins_types_301, nss_builtins_items_301, {NULL} }, +- { 11, nss_builtins_types_302, nss_builtins_items_302, {NULL} }, +- { 13, nss_builtins_types_303, nss_builtins_items_303, {NULL} }, +- { 11, nss_builtins_types_304, nss_builtins_items_304, {NULL} }, +- { 13, nss_builtins_types_305, nss_builtins_items_305, {NULL} }, +- { 11, nss_builtins_types_306, nss_builtins_items_306, {NULL} }, +- { 13, nss_builtins_types_307, nss_builtins_items_307, {NULL} }, +- { 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} }, +- { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} }, +- { 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} }, +- { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} } ++ { 13, nss_builtins_types_243, nss_builtins_items_243, {NULL} } + }; + const PRUint32 + #ifdef DEBUG +- nss_builtins_nObjects = 311+1; ++ nss_builtins_nObjects = 243+1; + #else +- nss_builtins_nObjects = 311; ++ nss_builtins_nObjects = 243; + #endif /* DEBUG */ +diff -prauN nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.txt nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +--- nss-3.12.8.prepatch/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-30 18:02:26.450122000 +0000 ++++ nss-3.12.8/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-30 18:03:33.620122001 +0000 +@@ -34,7 +34,7 @@ + # the terms of any one of the MPL, the GPL or the LGPL. + # + # ***** END LICENSE BLOCK ***** +-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.1 $ $Date: 2010/08/27 15:46:44 $" ++CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $" + + # + # certdata.txt +@@ -103,96 +103,6 @@ CKA_MODIFIABLE CK_BBOOL CK_FALSE + CKA_LABEL UTF8 "Mozilla Builtin Roots" + + # +-# Certificate "GTE CyberTrust Root CA" +-# +-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 Root CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\105\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\034\060\032\006\003\125 +-\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165 +-\163\164\040\122\157\157\164 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\105\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\034\060\032\006\003\125 +-\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165 +-\163\164\040\122\157\157\164 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\001\243 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\001\372\060\202\001\143\002\002\001\243\060\015\006\011 +-\052\206\110\206\367\015\001\001\004\005\000\060\105\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\034\060\032\006\003\125\004\003\023\023\107 +-\124\105\040\103\171\142\145\162\124\162\165\163\164\040\122\157 +-\157\164\060\036\027\015\071\066\060\062\062\063\062\063\060\061 +-\060\060\132\027\015\060\066\060\062\062\063\062\063\065\071\060 +-\060\132\060\105\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\034\060\032\006 +-\003\125\004\003\023\023\107\124\105\040\103\171\142\145\162\124 +-\162\165\163\164\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\270\346\117\272\333\230\174\161\174\257 +-\104\267\323\017\106\331\144\345\223\301\102\216\307\272\111\215 +-\065\055\172\347\213\275\345\005\061\131\306\261\057\012\014\373 +-\237\247\077\242\011\146\204\126\036\067\051\033\207\351\176\014 +-\312\232\237\245\177\365\025\224\243\325\242\106\202\330\150\114 +-\321\067\025\006\150\257\275\370\260\263\360\051\365\225\132\011 +-\026\141\167\012\042\045\324\117\105\252\307\275\345\226\337\371 +-\324\250\216\102\314\044\300\036\221\047\112\265\155\006\200\143 +-\071\304\242\136\070\003\002\003\001\000\001\060\015\006\011\052 +-\206\110\206\367\015\001\001\004\005\000\003\201\201\000\022\263 +-\165\306\137\035\341\141\125\200\000\324\201\113\173\061\017\043 +-\143\347\075\363\003\371\364\066\250\273\331\343\245\227\115\352 +-\053\051\340\326\152\163\201\346\300\211\243\323\361\340\245\245 +-\042\067\232\143\302\110\040\264\333\162\343\310\366\331\174\276 +-\261\257\123\332\024\264\041\270\326\325\226\343\376\116\014\131 +-\142\266\232\112\371\102\335\214\157\201\251\161\377\364\012\162 +-\155\155\104\016\235\363\164\164\250\325\064\111\351\136\236\351 +-\264\172\341\345\132\037\204\060\234\323\237\245\045\330 +-END +- +-# Trust for Certificate "GTE CyberTrust Root CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GTE CyberTrust Root CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\220\336\336\236\114\116\237\157\330\206\027\127\235\323\221\274 +-\145\246\211\144 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\304\327\360\262\243\305\175\141\147\360\004\315\103\323\272\130 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\105\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\034\060\032\006\003\125 +-\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165 +-\163\164\040\122\157\157\164 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\001\243 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "GTE CyberTrust Global Root" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -295,6 +205,275 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE ++ ++# ++# Certificate "Thawte Personal Basic CA" ++# ++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 Personal Basic CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\201\313\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151 ++\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015 ++\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141 ++\163\151\143\100\164\150\141\167\164\145\056\143\157\155 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\313\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151 ++\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015 ++\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141 ++\163\151\143\100\164\150\141\167\164\145\056\143\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\201\313\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\032\060\030\006\003 ++\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163 ++\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151\143 ++\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015\001 ++\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141\163 ++\151\143\100\164\150\141\167\164\145\056\143\157\155\060\036\027 ++\015\071\066\060\061\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\313 ++\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\032\060\030\006\003\125\004 ++\012\023\021\124\150\141\167\164\145\040\103\157\156\163\165\154 ++\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151\143\040\103 ++\101\061\050\060\046\006\011\052\206\110\206\367\015\001\011\001 ++\026\031\160\145\162\163\157\156\141\154\055\142\141\163\151\143 ++\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\274\274\223\123\155\300\120\117 ++\202\025\346\110\224\065\246\132\276\157\102\372\017\107\356\167 ++\165\162\335\215\111\233\226\127\240\170\324\312\077\121\263\151 ++\013\221\166\027\042\007\227\152\304\121\223\113\340\215\357\067 ++\225\241\014\115\332\064\220\035\027\211\227\340\065\070\127\112 ++\300\364\010\160\351\074\104\173\120\176\141\232\220\343\043\323 ++\210\021\106\047\365\013\007\016\273\335\321\177\040\012\210\271 ++\126\013\056\034\200\332\361\343\236\051\357\024\275\012\104\373 ++\033\133\030\321\277\043\223\041\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\055\342\231\153\260\075\172\211\327\131\242 ++\224\001\037\053\335\022\113\123\302\255\177\252\247\000\134\221 ++\100\127\045\112\070\252\204\160\271\331\200\017\245\173\134\373 ++\163\306\275\327\212\141\134\003\343\055\047\250\027\340\204\205 ++\102\334\136\233\306\267\262\155\273\164\257\344\077\313\247\267 ++\260\340\135\276\170\203\045\224\322\333\201\017\171\007\155\117 ++\364\071\025\132\122\001\173\336\062\326\115\070\366\022\134\006 ++\120\337\005\133\275\024\113\241\337\051\272\073\101\215\367\143 ++\126\241\337\042\261 ++END ++ ++# Trust for Certificate "Thawte Personal Basic CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Thawte Personal Basic CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\100\347\214\035\122\075\034\331\225\117\254\032\032\263\275\074 ++\272\241\133\374 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\346\013\322\311\312\055\210\333\032\161\016\113\170\353\002\101 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\313\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\145\162\163\157\156\141\154\040\102\141\163\151 ++\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015 ++\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141 ++\163\151\143\100\164\150\141\167\164\145\056\143\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Thawte Personal Premium CA" ++# ++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 Personal Premium CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\201\317\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167 ++\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155 ++\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206 ++\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055 ++\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143 ++\157\155 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\317\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167 ++\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155 ++\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206 ++\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055 ++\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143 ++\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\201\317\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\032\060\030\006\003 ++\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163 ++\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167\164 ++\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155\151 ++\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206\367 ++\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055\160 ++\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143\157 ++\155\060\036\027\015\071\066\060\061\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\317\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\032\060\030 ++\006\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157 ++\156\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141 ++\167\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145 ++\155\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110 ++\206\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154 ++\055\160\162\145\155\151\165\155\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 ++\311\146\331\370\007\104\317\271\214\056\360\241\357\023\105\154 ++\005\337\336\047\026\121\066\101\021\154\154\073\355\376\020\175 ++\022\236\345\233\102\232\376\140\061\303\146\267\163\072\110\256 ++\116\320\062\067\224\210\265\015\266\331\363\362\104\331\325\210 ++\022\335\166\115\362\032\374\157\043\036\172\361\330\230\105\116 ++\007\020\357\026\102\320\103\165\155\112\336\342\252\311\061\377 ++\037\000\160\174\146\317\020\045\010\272\372\356\000\351\106\003 ++\146\047\021\025\073\252\133\362\230\335\066\102\262\332\210\165 ++\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\151\066\211 ++\367\064\052\063\162\057\155\073\324\042\262\270\157\232\305\066 ++\146\016\033\074\241\261\165\132\346\375\065\323\370\250\362\007 ++\157\205\147\216\336\053\271\342\027\260\072\240\360\016\242\000 ++\232\337\363\024\025\156\273\310\205\132\230\200\371\377\276\164 ++\035\075\363\376\060\045\321\067\064\147\372\245\161\171\060\141 ++\051\162\300\340\054\114\373\126\344\072\250\157\345\062\131\122 ++\333\165\050\120\131\014\370\013\031\344\254\331\257\226\215\057 ++\120\333\007\303\352\037\253\063\340\365\053\061\211 ++END ++ ++# Trust for Certificate "Thawte Personal Premium CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Thawte Personal Premium CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\066\206\065\143\375\121\050\307\276\246\360\005\317\351\264\066 ++\150\010\154\316 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\072\262\336\042\232\040\223\111\371\355\310\322\212\347\150\015 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\317\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\032\060\030\006 ++\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156 ++\163\165\154\164\151\156\147\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\043\060\041\006\003\125\004\003\023\032\124\150\141\167 ++\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155 ++\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206 ++\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055 ++\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143 ++\157\155 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -564,170 +743,34 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # +-# Certificate "Thawte Premium Server CA" ++# Certificate "Equifax Secure CA" + # + 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_LABEL UTF8 "Equifax Secure 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 ++\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 ++\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 ++\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 ++\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 ++\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 + 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 ++\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 ++\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 ++\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 ++\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 ++\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 + 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" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_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_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Equifax Secure CA" +-# +-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 "Equifax Secure CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 +-\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 +-\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141 +-\170\061\055\060\053\006\003\125\004\013\023\044\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151 +-\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\065\336\364\317 ++\002\004\065\336\364\317 + END + CKA_VALUE MULTILINE_OCTAL + \060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\065 +@@ -918,7 +961,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Digital Signature Trust Co. Global CA 3" +@@ -1027,7 +1070,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Verisign Class 1 Public Primary Certification Authority" +@@ -1334,7 +1377,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Verisign Class 1 Public Primary Certification Authority - G2" +@@ -1736,139 +1779,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Verisign Class 4 Public Primary Certification Authority - G2" +-# +-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 "Verisign Class 4 Public Primary Certification Authority - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125 +-\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154 +-\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151 +-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +-\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013 +-\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145 +-\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164 +-\167\157\162\153 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125 +-\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154 +-\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151 +-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +-\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013 +-\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145 +-\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164 +-\167\157\162\153 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067 +-\045\370 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365 +-\353\023\107\370\177\304\040\067\045\370\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +-\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\061\074\060\072\006\003\125\004\013\023\063\103\154\141 +-\163\163\040\064\040\120\165\142\154\151\143\040\120\162\151\155 +-\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157 +-\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107\062 +-\061\072\060\070\006\003\125\004\013\023\061\050\143\051\040\061 +-\071\071\070\040\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 +-\172\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035 +-\006\003\125\004\013\023\026\126\145\162\151\123\151\147\156\040 +-\124\162\165\163\164\040\116\145\164\167\157\162\153\060\036\027 +-\015\071\070\060\065\061\070\060\060\060\060\060\060\132\027\015 +-\062\070\060\070\060\061\062\063\065\071\065\071\132\060\201\301 +-\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060 +-\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147\156 +-\054\040\111\156\143\056\061\074\060\072\006\003\125\004\013\023 +-\063\103\154\141\163\163\040\064\040\120\165\142\154\151\143\040 +-\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143 +-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040 +-\055\040\107\062\061\072\060\070\006\003\125\004\013\023\061\050 +-\143\051\040\061\071\071\070\040\126\145\162\151\123\151\147\156 +-\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165\164 +-\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171 +-\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151\123 +-\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157\162 +-\153\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\272\360 +-\344\317\371\304\256\205\124\271\007\127\371\217\305\177\150\021 +-\370\304\027\260\104\334\343\060\163\325\052\142\052\270\320\314 +-\034\355\050\133\176\275\152\334\263\221\044\312\101\142\074\374 +-\002\001\277\034\026\061\224\005\227\166\156\242\255\275\141\027 +-\154\116\060\206\360\121\067\052\120\307\250\142\201\334\133\112 +-\252\301\240\264\156\353\057\345\127\305\261\053\100\160\333\132 +-\115\241\216\037\275\003\037\330\003\324\217\114\231\161\274\342 +-\202\314\130\350\230\072\206\323\206\070\363\000\051\037\002\003 +-\001\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\003\201\201\000\205\214\022\301\247\271\120\025\172\313 +-\076\254\270\103\212\334\252\335\024\272\211\201\176\001\074\043 +-\161\041\210\057\202\334\143\372\002\105\254\105\131\327\052\130 +-\104\133\267\237\201\073\222\150\075\342\067\044\365\173\154\217 +-\166\065\226\011\250\131\235\271\316\043\253\164\326\203\375\062 +-\163\047\330\151\076\103\164\366\256\305\211\232\347\123\174\351 +-\173\366\113\363\301\145\203\336\215\212\234\074\210\215\071\131 +-\374\252\077\042\215\241\301\146\120\201\162\114\355\042\144\117 +-\117\312\200\221\266\051 +-END +- +-# Trust for Certificate "Verisign Class 4 Public Primary Certification Authority - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Verisign Class 4 Public Primary Certification Authority - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\013\167\276\273\313\172\242\107\005\336\314\017\275\152\002\374 +-\172\275\233\122 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\046\155\054\031\230\266\160\150\070\120\124\031\354\220\064\140 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125 +-\004\013\023\063\103\154\141\163\163\040\064\040\120\165\142\154 +-\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151 +-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +-\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013 +-\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145 +-\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164 +-\167\157\162\153 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067 +-\045\370 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "GlobalSign Root CA" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -3079,7 +2989,7 @@ END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_TRUE + + # + # Certificate "Entrust.net Secure Server CA" +@@ -3242,168 +3152,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Entrust.net Secure Personal CA" +-# +-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 Personal CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\311\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\110\060\106\006\003\125\004\013\024 +-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164 +-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057 +-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162 +-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056 +-\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\063\060\061\006\003\125\004\003 +-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154 +-\151\145\156\164\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\311\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\110\060\106\006\003\125\004\013\024 +-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164 +-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057 +-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162 +-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056 +-\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\063\060\061\006\003\125\004\003 +-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154 +-\151\145\156\164\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\070\003\221\356 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070 +-\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004 +-\005\000\060\201\311\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\110\060\106\006\003\125\004 +-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156 +-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146 +-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171 +-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141 +-\142\056\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\063\060\061\006\003\125 +-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040 +-\103\154\151\145\156\164\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\061\060\061\062\061\071\062\064\063\060\132\027 +-\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201 +-\311\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\110\060\106\006\003\125\004\013\024\077\167 +-\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103 +-\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120 +-\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146 +-\056\040\154\151\155\151\164\163\040\154\151\141\142\056\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\063\060\061\006\003\125\004\003\023\052 +-\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145 +-\156\164\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\310\072\231\136\061\027\337\254\047 +-\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150 +-\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107 +-\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226 +-\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261 +-\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164 +-\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126 +-\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346 +-\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202 +-\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004 +-\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202 +-\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244 +-\201\333\060\201\330\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\110\060\106\006\003\125\004 +-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156 +-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146 +-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171 +-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141 +-\142\056\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\063\060\061\006\003\125 +-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040 +-\103\154\151\145\156\164\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\054\240 +-\052\240\050\206\046\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 +-\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125 +-\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062 +-\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061 +-\062\061\071\062\064\063\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\304\373\234\051\173\227\315\114\226\374\356\133\263\312 +-\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004 +-\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231 +-\164\213\225\352\114\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\004\005\000\003\201\201 +-\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273 +-\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002 +-\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007 +-\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363 +-\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070 +-\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003 +-\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332 +-\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134 +-\354 +-END +- +-# Trust for Certificate "Entrust.net Secure Personal CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_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 Personal CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125 +-\262\371\365\200 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\311\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\110\060\106\006\003\125\004\013\024 +-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164 +-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057 +-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162 +-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056 +-\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\063\060\061\006\003\125\004\003 +-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154 +-\151\145\156\164\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\070\003\221\356 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "Entrust.net Premium 2048 Secure Server CA" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -3875,288 +3623,35 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Equifax Secure eBusiness CA 2" ++# Certificate "AddTrust Low-Value Services Root" + # + 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 "Equifax Secure eBusiness CA 2" ++CKA_LABEL UTF8 "AddTrust Low-Value Services Root" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141 +-\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004 +-\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162 +-\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062 ++\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 ++\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 ++\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 ++\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 ++\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 ++\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 ++\103\101\040\122\157\157\164 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141 +-\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004 +-\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162 +-\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062 ++\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 ++\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 ++\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 ++\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 ++\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 ++\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 ++\103\101\040\122\157\157\164 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\067\160\317\265 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\067 +-\160\317\265\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125 +-\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003 +-\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143 +-\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101 +-\055\062\060\036\027\015\071\071\060\066\062\063\061\062\061\064 +-\064\065\132\027\015\061\071\060\066\062\063\061\062\061\064\064 +-\065\132\060\116\061\013\060\011\006\003\125\004\006\023\002\125 +-\123\061\027\060\025\006\003\125\004\012\023\016\105\161\165\151 +-\146\141\170\040\123\145\143\165\162\145\061\046\060\044\006\003 +-\125\004\013\023\035\105\161\165\151\146\141\170\040\123\145\143 +-\165\162\145\040\145\102\165\163\151\156\145\163\163\040\103\101 +-\055\062\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\344 +-\071\071\223\036\122\006\033\050\066\370\262\243\051\305\355\216 +-\262\021\275\376\353\347\264\164\302\217\377\005\347\331\235\006 +-\277\022\310\077\016\362\326\321\044\262\021\336\321\163\011\212 +-\324\261\054\230\011\015\036\120\106\262\203\246\105\215\142\150 +-\273\205\033\040\160\062\252\100\315\246\226\137\304\161\067\077 +-\004\363\267\101\044\071\007\032\036\056\141\130\240\022\013\345 +-\245\337\305\253\352\067\161\314\034\310\067\072\271\227\122\247 +-\254\305\152\044\224\116\234\173\317\300\152\326\337\041\275\002 +-\003\001\000\001\243\202\001\011\060\202\001\005\060\160\006\003 +-\125\035\037\004\151\060\147\060\145\240\143\240\141\244\137\060 +-\135\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027 +-\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141\170 +-\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004\013 +-\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162\145 +-\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062\061 +-\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060\032 +-\006\003\125\035\020\004\023\060\021\201\017\062\060\061\071\060 +-\066\062\063\061\062\061\064\064\065\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\120\236\013\352\257\136\271\040\110\246\120\152 +-\313\375\330\040\172\247\202\166\060\035\006\003\125\035\016\004 +-\026\004\024\120\236\013\352\257\136\271\040\110\246\120\152\313 +-\375\330\040\172\247\202\166\060\014\006\003\125\035\023\004\005 +-\060\003\001\001\377\060\032\006\011\052\206\110\206\366\175\007 +-\101\000\004\015\060\013\033\005\126\063\056\060\143\003\002\006 +-\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +-\003\201\201\000\014\206\202\255\350\116\032\365\216\211\047\342 +-\065\130\075\051\264\007\217\066\120\225\277\156\301\236\353\304 +-\220\262\205\250\273\267\102\340\017\007\071\337\373\236\220\262 +-\321\301\076\123\237\003\104\260\176\113\364\157\344\174\037\347 +-\342\261\344\270\232\357\303\275\316\336\013\062\064\331\336\050 +-\355\063\153\304\324\327\075\022\130\253\175\011\055\313\160\365 +-\023\212\224\241\047\244\326\160\305\155\224\265\311\175\235\240 +-\322\306\010\111\331\146\233\246\323\364\013\334\305\046\127\341 +-\221\060\352\315 +-END +- +-# Trust for Certificate "Equifax Secure eBusiness CA 2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Equifax Secure eBusiness CA 2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\071\117\366\205\013\006\276\122\345\030\126\314\020\341\200\350 +-\202\263\205\314 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\252\277\277\144\227\332\230\035\157\306\010\072\225\160\063\312 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141 +-\170\040\123\145\143\165\162\145\061\046\060\044\006\003\125\004 +-\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162 +-\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\067\160\317\265 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "beTRUSTed Root CA" +-# +-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 "beTRUSTed Root CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061 +-\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123 +-\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163 +-\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061 +-\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123 +-\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163 +-\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\071\117\175\207 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\054\060\202\004\024\240\003\002\001\002\002\004\071 +-\117\175\207\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\127 +-\127\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122 +-\125\123\124\145\144\061\033\060\031\006\003\125\004\003\023\022 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\163\061\032\060\030\006\003\125\004\003\023\021\142\145\124 +-\122\125\123\124\145\144\040\122\157\157\164\040\103\101\060\036 +-\027\015\060\060\060\066\062\060\061\064\062\061\060\064\132\027 +-\015\061\060\060\066\062\060\061\063\062\061\060\064\132\060\132 +-\061\013\060\011\006\003\125\004\006\023\002\127\127\061\022\060 +-\020\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145 +-\144\061\033\060\031\006\003\125\004\003\023\022\142\145\124\122 +-\125\123\124\145\144\040\122\157\157\164\040\103\101\163\061\032 +-\060\030\006\003\125\004\003\023\021\142\145\124\122\125\123\124 +-\145\144\040\122\157\157\164\040\103\101\060\202\001\042\060\015 +-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 +-\017\000\060\202\001\012\002\202\001\001\000\324\264\163\172\023 +-\012\070\125\001\276\211\126\341\224\236\324\276\132\353\112\064 +-\165\033\141\051\304\341\255\010\140\041\170\110\377\264\320\372 +-\136\101\215\141\104\207\350\355\311\130\372\374\223\232\337\117 +-\352\076\065\175\370\063\172\346\361\327\315\157\111\113\075\117 +-\055\156\016\203\072\030\170\167\243\317\347\364\115\163\330\232 +-\073\032\035\276\225\123\317\040\227\302\317\076\044\122\154\014 +-\216\145\131\305\161\377\142\011\217\252\305\217\314\140\240\163 +-\112\327\070\077\025\162\277\242\227\267\160\350\257\342\176\026 +-\006\114\365\252\144\046\162\007\045\255\065\374\030\261\046\327 +-\330\377\031\016\203\033\214\334\170\105\147\064\075\364\257\034 +-\215\344\155\153\355\040\263\147\232\264\141\313\027\157\211\065 +-\377\347\116\300\062\022\347\356\354\337\377\227\060\164\355\215 +-\107\216\353\264\303\104\346\247\114\177\126\103\350\270\274\266 +-\276\372\203\227\346\273\373\304\266\223\276\031\030\076\214\201 +-\271\163\210\026\364\226\103\234\147\163\027\220\330\011\156\143 +-\254\112\266\043\304\001\241\255\244\344\305\002\003\001\000\001 +-\243\202\001\370\060\202\001\364\060\017\006\003\125\035\023\001 +-\001\377\004\005\060\003\001\001\377\060\202\001\131\006\003\125 +-\035\040\004\202\001\120\060\202\001\114\060\202\001\110\006\012 +-\053\006\001\004\001\261\076\001\000\000\060\202\001\070\060\202 +-\001\001\006\010\053\006\001\005\005\007\002\002\060\201\364\032 +-\201\361\122\145\154\151\141\156\143\145\040\157\156\040\164\150 +-\151\163\040\143\145\162\164\151\146\151\143\141\164\145\040\142 +-\171\040\141\156\171\040\160\141\162\164\171\040\141\163\163\165 +-\155\145\163\040\141\143\143\145\160\164\141\156\143\145\040\157 +-\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154\151 +-\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040\164 +-\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164\151 +-\157\156\163\040\157\146\040\165\163\145\054\040\141\156\144\040 +-\143\145\162\164\151\146\151\143\141\164\151\157\156\040\160\162 +-\141\143\164\151\143\145\040\163\164\141\164\145\155\145\156\164 +-\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040\146 +-\157\165\156\144\040\141\164\040\142\145\124\122\125\123\124\145 +-\144\047\163\040\167\145\142\040\163\151\164\145\054\040\150\164 +-\164\160\163\072\057\057\167\167\167\056\142\145\124\122\125\123 +-\124\145\144\056\143\157\155\057\166\141\165\154\164\057\164\145 +-\162\155\163\060\061\006\010\053\006\001\005\005\007\002\001\026 +-\045\150\164\164\160\163\072\057\057\167\167\167\056\142\145\124 +-\122\125\123\124\145\144\056\143\157\155\057\166\141\165\154\164 +-\057\164\145\162\155\163\060\064\006\003\125\035\037\004\055\060 +-\053\060\051\240\047\240\045\244\043\060\041\061\022\060\020\006 +-\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144\061 +-\013\060\011\006\003\125\004\006\023\002\127\127\060\035\006\003 +-\125\035\016\004\026\004\024\052\271\233\151\056\073\233\330\315 +-\336\052\061\004\064\153\312\007\030\253\147\060\037\006\003\125 +-\035\043\004\030\060\026\200\024\052\271\233\151\056\073\233\330 +-\315\336\052\061\004\064\153\312\007\030\253\147\060\016\006\003 +-\125\035\017\001\001\377\004\004\003\002\001\376\060\015\006\011 +-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000 +-\171\141\333\243\136\156\026\261\352\166\121\371\313\025\233\313 +-\151\276\346\201\153\237\050\037\145\076\335\021\205\222\324\350 +-\101\277\176\063\275\043\347\361\040\277\244\264\246\031\001\306 +-\214\215\065\174\145\244\117\011\244\326\330\043\025\005\023\247 +-\103\171\257\333\243\016\233\173\170\032\363\004\206\132\306\366 +-\214\040\107\070\111\120\006\235\162\147\072\360\230\003\255\226 +-\147\104\374\077\020\015\206\115\344\000\073\051\173\316\073\073 +-\231\206\141\045\100\204\334\023\142\267\372\312\131\326\003\036 +-\326\123\001\315\155\114\150\125\100\341\356\153\307\052\000\000 +-\110\202\263\012\001\303\140\052\014\367\202\065\356\110\206\226 +-\344\164\324\075\352\001\161\272\004\165\100\247\251\177\071\071 +-\232\125\227\051\145\256\031\125\045\005\162\107\323\350\030\334 +-\270\351\257\103\163\001\022\164\243\341\134\137\025\135\044\363 +-\371\344\364\266\147\147\022\347\144\042\212\366\245\101\246\034 +-\266\140\143\105\212\020\264\272\106\020\256\101\127\145\154\077 +-\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256 +-END +- +-# Trust for Certificate "beTRUSTed Root CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\133\315\315\314\146\366\334\344\104\037\343\175\134\303\023\114 +-\106\364\160\070 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\205\312\166\132\033\321\150\042\334\242\043\022\312\306\200\064 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061 +-\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123 +-\124\145\144\061\033\060\031\006\003\125\004\003\023\022\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\163 +-\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\071\117\175\207 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "AddTrust Low-Value Services Root" +-# +-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 "AddTrust Low-Value Services Root" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 +-\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 +-\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 +-\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 +-\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 +-\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 +-\103\101\040\122\157\157\164 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061 +-\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165 +-\163\164\040\101\102\061\035\060\033\006\003\125\004\013\023\024 +-\101\144\144\124\162\165\163\164\040\124\124\120\040\116\145\164 +-\167\157\162\153\061\041\060\037\006\003\125\004\003\023\030\101 +-\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040 +-\103\101\040\122\157\157\164 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 ++\002\001\001 + END + CKA_VALUE MULTILINE_OCTAL + \060\202\004\030\060\202\003\000\240\003\002\001\002\002\001\001 +@@ -4654,424 +4149,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Thawte Time Stamping CA" +-# +-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 Time Stamping CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\213\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\024\060\022\006\003\125\004\007 +-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060 +-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035 +-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060 +-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\040\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\213\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\024\060\022\006\003\125\004\007 +-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060 +-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035 +-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060 +-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000 +-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 +-\201\213\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\024\060\022\006\003\125\004\007\023 +-\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015 +-\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060 +-\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035 +-\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027 +-\015\071\067\060\061\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\213 +-\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\024\060\022\006\003\125\004\007\023\013\104 +-\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003 +-\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006 +-\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162 +-\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003 +-\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145 +-\163\164\141\155\160\151\156\147\040\103\101\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\326\053\130\170\141\105\206\123 +-\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047 +-\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237 +-\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032 +-\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376 +-\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235 +-\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213 +-\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137 +-\355\372\267\056\212\370\210\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\147\333\342\302\346\207\075\100\203\206\067 +-\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302 +-\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357 +-\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333 +-\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220 +-\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354 +-\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003 +-\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031 +-\011\254\211\111\323 +-END +- +-# Trust for Certificate "Thawte Time Stamping CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Thawte Time Stamping CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105 +-\010\116\326\126 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\213\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\024\060\022\006\003\125\004\007 +-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060 +-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035 +-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060 +-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Entrust.net Global Secure Server CA" +-# +-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 Global Secure Server CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125 +-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\123\123\114\137\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\062\060\060\060\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\272\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125 +-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\123\123\114\137\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\062\060\060\060\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\070\233\021\074 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070 +-\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004 +-\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013 +-\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006 +-\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163 +-\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060\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\060\060\060\062\060\064\061\067\062\060\060\060\132 +-\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060 +-\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164 +-\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004 +-\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156 +-\145\164\057\123\123\114\137\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\062\060\060\060\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\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\307\301\137\116\161\361\316 +-\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265 +-\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236 +-\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201 +-\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113 +-\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002 +-\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266 +-\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332 +-\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202 +-\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370 +-\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035 +-\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317 +-\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023 +-\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075 +-\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165 +-\163\164\056\156\145\164\057\123\123\114\137\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\062\060\060\060 +-\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 +-\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060 +-\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062 +-\060\060\062\060\064\061\067\065\060\060\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\313\154\300\153\343\273\076\313\374\042 +-\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035 +-\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234 +-\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023 +-\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366 +-\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064 +-\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015 +-\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232 +-\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251 +-\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337 +-\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205 +-\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021 +-\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154 +-\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124 +-\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274 +-\005\377\154\211\063\360\354\025\017 +-END +- +-# Trust for Certificate "Entrust.net Global Secure Server CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Entrust.net Global Secure Server CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366 +-\045\072\110\223 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125 +-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\123\123\114\137\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\062\060\060\060\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\070\233\021\074 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Entrust.net Global Secure Personal CA" +-# +-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 Global Secure Personal CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 +-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105 +-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 +-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 +-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\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\264\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 +-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105 +-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 +-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 +-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\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\070\236\366\344 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070 +-\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004 +-\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013 +-\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006 +-\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163 +-\164\056\156\145\164\057\107\103\103\101\137\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\062\060\060\060 +-\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155 +-\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105 +-\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156 +-\164\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\060\060\060 +-\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062 +-\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022 +-\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156 +-\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167 +-\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103 +-\101\137\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\062\060\060\060\040\105\156\164\162\165\163\164\056 +-\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006 +-\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145 +-\164\040\103\154\151\145\156\164\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\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\223\164\264 +-\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162 +-\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255 +-\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124 +-\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064 +-\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045 +-\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374 +-\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047 +-\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001 +-\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206 +-\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335 +-\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201 +-\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003 +-\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164 +-\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145 +-\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137 +-\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\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145 +-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125 +-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040 +-\103\154\151\145\156\164\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\053\006 +-\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062 +-\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060 +-\062\060\067\061\066\064\066\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\204\213\164\375\305\215\300\377\047\155\040\067 +-\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004 +-\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105 +-\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005 +-\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007 +-\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060 +-\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001 +-\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016 +-\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022 +-\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024 +-\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276 +-\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277 +-\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172 +-\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103 +-\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235 +-\316\145\146\227\256\046\136 +-END +- +-# Trust for Certificate "Entrust.net Global Secure Personal CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266 +-\266\360\277\163 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 +-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 +-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 +-\156\145\164\057\107\103\103\101\137\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\062\060\060\060\040\105 +-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 +-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 +-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\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\070\236\366\344 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "Entrust Root Certification Authority" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -5523,500 +4600,30 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "beTRUSTed Root CA-Baltimore Implementation" ++# Certificate "RSA Security 2048 v3" + # + 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 "beTRUSTed Root CA-Baltimore Implementation" ++CKA_LABEL UTF8 "RSA Security 2048 v3" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055 +-\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 ++\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 ++\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 ++\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 ++\162\151\164\171\040\062\060\064\070\040\126\063 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055 +-\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 ++\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 ++\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 ++\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 ++\162\151\164\171\040\062\060\064\070\040\126\063 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\075\106 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\152\060\202\004\122\240\003\002\001\002\002\004\074 +-\265\075\106\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142 +-\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004 +-\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157 +-\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\055\102\141\154\164\151\155\157\162\145\040\111\155\160\154 +-\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062 +-\060\064\061\061\060\067\063\070\065\061\132\027\015\062\062\060 +-\064\061\061\060\067\063\070\065\061\132\060\146\061\022\060\020 +-\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144 +-\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060 +-\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145 +-\144\040\122\157\157\164\040\103\101\055\102\141\154\164\151\155 +-\157\162\145\040\111\155\160\154\145\155\145\156\164\141\164\151 +-\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 +-\001\001\000\274\176\304\071\234\214\343\326\034\206\377\312\142 +-\255\340\177\060\105\172\216\032\263\270\307\371\321\066\377\042 +-\363\116\152\137\204\020\373\146\201\303\224\171\061\322\221\341 +-\167\216\030\052\303\024\336\121\365\117\243\053\274\030\026\342 +-\265\335\171\336\042\370\202\176\313\201\037\375\047\054\217\372 +-\227\144\042\216\370\377\141\243\234\033\036\222\217\300\250\011 +-\337\011\021\354\267\175\061\232\032\352\203\041\006\074\237\272 +-\134\377\224\352\152\270\303\153\125\064\117\075\062\037\335\201 +-\024\340\304\074\315\235\060\370\060\251\227\323\356\314\243\320 +-\037\137\034\023\201\324\030\253\224\321\143\303\236\177\065\222 +-\236\137\104\352\354\364\042\134\267\350\075\175\244\371\211\251 +-\221\262\052\331\353\063\207\356\245\375\343\332\314\210\346\211 +-\046\156\307\053\202\320\136\235\131\333\024\354\221\203\005\303 +-\136\016\306\052\320\004\335\161\075\040\116\130\047\374\123\373 +-\170\170\031\024\262\374\220\122\211\070\142\140\007\264\240\354 +-\254\153\120\326\375\271\050\153\357\122\055\072\262\377\361\001 +-\100\254\067\002\003\001\000\001\243\202\002\036\060\202\002\032 +-\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 +-\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060\202 +-\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076\000 +-\000\001\011\050\203\221\061\060\202\001\217\060\202\001\110\006 +-\010\053\006\001\005\005\007\002\002\060\202\001\072\032\202\001 +-\066\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040 +-\165\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164 +-\151\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040 +-\141\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156 +-\164\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145 +-\040\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160 +-\154\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144 +-\040\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151 +-\164\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150 +-\145\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040 +-\120\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145 +-\156\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151 +-\156\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145 +-\156\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145 +-\040\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145 +-\124\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145 +-\054\040\150\164\164\160\072\057\057\167\167\167\056\142\145\164 +-\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165 +-\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144 +-\145\170\056\150\164\155\154\060\101\006\010\053\006\001\005\005 +-\007\002\001\026\065\150\164\164\160\072\057\057\167\167\167\056 +-\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160\162 +-\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163\057 +-\151\156\144\145\170\056\150\164\155\154\060\035\006\003\125\035 +-\016\004\026\004\024\105\075\303\251\321\334\077\044\126\230\034 +-\163\030\210\152\377\203\107\355\266\060\037\006\003\125\035\043 +-\004\030\060\026\200\024\105\075\303\251\321\334\077\044\126\230 +-\034\163\030\210\152\377\203\107\355\266\060\016\006\003\125\035 +-\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\003\202\001\001\000\111\222 +-\274\243\356\254\275\372\015\311\213\171\206\034\043\166\260\200 +-\131\167\374\332\177\264\113\337\303\144\113\152\116\016\255\362 +-\175\131\167\005\255\012\211\163\260\372\274\313\334\215\000\210 +-\217\246\240\262\352\254\122\047\277\241\110\174\227\020\173\272 +-\355\023\035\232\007\156\313\061\142\022\350\143\003\252\175\155 +-\343\370\033\166\041\170\033\237\113\103\214\323\111\206\366\033 +-\134\366\056\140\025\323\351\343\173\165\077\320\002\203\320\030 +-\202\101\315\145\067\352\216\062\176\275\153\231\135\060\021\310 +-\333\110\124\034\073\341\247\023\323\152\110\223\367\075\214\177 +-\005\350\316\363\210\052\143\004\270\352\176\130\174\001\173\133 +-\341\305\175\357\041\340\215\016\135\121\175\261\147\375\243\275 +-\070\066\306\362\070\206\207\032\226\150\140\106\373\050\024\107 +-\125\341\247\200\014\153\342\352\337\115\174\220\110\240\066\275 +-\011\027\211\177\303\362\323\234\234\343\335\304\033\335\365\267 +-\161\263\123\005\211\006\320\313\112\200\301\310\123\220\265\074 +-\061\210\027\120\237\311\304\016\213\330\250\002\143\015 +-END +- +-# Trust for Certificate "beTRUSTed Root CA-Baltimore Implementation" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA-Baltimore Implementation" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\334\273\236\267\031\113\304\162\005\301\021\165\051\206\203\133 +-\123\312\344\370 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\201\065\271\373\373\022\312\030\151\066\353\256\151\170\241\361 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\055 +-\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\075\106 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "beTRUSTed Root CA - Entrust Implementation" +-# +-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 "beTRUSTed Root CA - Entrust Implementation" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\117\100 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\006\121\060\202\005\071\240\003\002\001\002\002\004\074 +-\265\117\100\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142 +-\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004 +-\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157 +-\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023\052 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160\154 +-\145\155\145\156\164\141\164\151\157\156\060\036\027\015\060\062 +-\060\064\061\061\060\070\062\064\062\067\132\027\015\062\062\060 +-\064\061\061\060\070\065\064\062\067\132\060\146\061\022\060\020 +-\006\003\125\004\012\023\011\142\145\124\122\125\123\124\145\144 +-\061\033\060\031\006\003\125\004\013\023\022\142\145\124\122\125 +-\123\124\145\144\040\122\157\157\164\040\103\101\163\061\063\060 +-\061\006\003\125\004\003\023\052\142\145\124\122\125\123\124\145 +-\144\040\122\157\157\164\040\103\101\040\055\040\105\156\164\162 +-\165\163\164\040\111\155\160\154\145\155\145\156\164\141\164\151 +-\157\156\060\202\001\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 +-\001\001\000\272\364\104\003\252\022\152\265\103\354\125\222\266 +-\060\175\065\127\014\333\363\015\047\156\114\367\120\250\233\116 +-\053\157\333\365\255\034\113\135\263\251\301\376\173\104\353\133 +-\243\005\015\037\305\064\053\060\000\051\361\170\100\262\244\377 +-\072\364\001\210\027\176\346\324\046\323\272\114\352\062\373\103 +-\167\227\207\043\305\333\103\243\365\052\243\121\136\341\073\322 +-\145\151\176\125\025\233\172\347\151\367\104\340\127\265\025\350 +-\146\140\017\015\003\373\202\216\243\350\021\173\154\276\307\143 +-\016\027\223\337\317\113\256\156\163\165\340\363\252\271\244\300 +-\011\033\205\352\161\051\210\101\062\371\360\052\016\154\011\362 +-\164\153\146\154\122\023\037\030\274\324\076\367\330\156\040\236 +-\312\376\374\041\224\356\023\050\113\327\134\136\014\146\356\351 +-\273\017\301\064\261\177\010\166\363\075\046\160\311\213\045\035 +-\142\044\014\352\034\165\116\300\022\344\272\023\035\060\051\055 +-\126\063\005\273\227\131\176\306\111\117\211\327\057\044\250\266 +-\210\100\265\144\222\123\126\044\344\242\240\205\263\136\220\264 +-\022\063\315\002\003\001\000\001\243\202\003\005\060\202\003\001 +-\060\202\001\267\006\003\125\035\040\004\202\001\256\060\202\001 +-\252\060\202\001\246\006\017\053\006\001\004\001\261\076\000\000 +-\002\011\050\203\221\061\060\202\001\221\060\202\001\111\006\010 +-\053\006\001\005\005\007\002\002\060\202\001\073\032\202\001\067 +-\122\145\154\151\141\156\143\145\040\157\156\040\157\162\040\165 +-\163\145\040\157\146\040\164\150\151\163\040\103\145\162\164\151 +-\146\151\143\141\164\145\040\143\162\145\141\164\145\163\040\141 +-\156\040\141\143\153\156\157\167\154\145\144\147\155\145\156\164 +-\040\141\156\144\040\141\143\143\145\160\164\141\156\143\145\040 +-\157\146\040\164\150\145\040\164\150\145\156\040\141\160\160\154 +-\151\143\141\142\154\145\040\163\164\141\156\144\141\162\144\040 +-\164\145\162\155\163\040\141\156\144\040\143\157\156\144\151\164 +-\151\157\156\163\040\157\146\040\165\163\145\054\040\164\150\145 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\120 +-\162\141\143\164\151\143\145\040\123\164\141\164\145\155\145\156 +-\164\040\141\156\144\040\164\150\145\040\122\145\154\171\151\156 +-\147\040\120\141\162\164\171\040\101\147\162\145\145\155\145\156 +-\164\054\040\167\150\151\143\150\040\143\141\156\040\142\145\040 +-\146\157\165\156\144\040\141\164\040\164\150\145\040\142\145\124 +-\122\125\123\124\145\144\040\167\145\142\040\163\151\164\145\054 +-\040\150\164\164\160\163\072\057\057\167\167\167\056\142\145\164 +-\162\165\163\164\145\144\056\143\157\155\057\160\162\157\144\165 +-\143\164\163\137\163\145\162\166\151\143\145\163\057\151\156\144 +-\145\170\056\150\164\155\154\060\102\006\010\053\006\001\005\005 +-\007\002\001\026\066\150\164\164\160\163\072\057\057\167\167\167 +-\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160 +-\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163 +-\057\151\156\144\145\170\056\150\164\155\154\060\021\006\011\140 +-\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201 +-\211\006\003\125\035\037\004\201\201\060\177\060\175\240\173\240 +-\171\244\167\060\165\061\022\060\020\006\003\125\004\012\023\011 +-\142\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125 +-\004\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157 +-\157\164\040\103\101\163\061\063\060\061\006\003\125\004\003\023 +-\052\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\040\055\040\105\156\164\162\165\163\164\040\111\155\160 +-\154\145\155\145\156\164\141\164\151\157\156\061\015\060\013\006 +-\003\125\004\003\023\004\103\122\114\061\060\053\006\003\125\035 +-\020\004\044\060\042\200\017\062\060\060\062\060\064\061\061\060 +-\070\062\064\062\067\132\201\017\062\060\062\062\060\064\061\061 +-\060\070\065\064\062\067\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\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044 +-\060\252\204\204\026\060\035\006\003\125\035\016\004\026\004\024 +-\175\160\345\256\070\213\006\077\252\034\032\217\371\317\044\060 +-\252\204\204\026\060\014\006\003\125\035\023\004\005\060\003\001 +-\001\377\060\035\006\011\052\206\110\206\366\175\007\101\000\004 +-\020\060\016\033\010\126\066\056\060\072\064\056\060\003\002\004 +-\220\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +-\003\202\001\001\000\052\270\027\316\037\020\224\353\270\232\267 +-\271\137\354\332\367\222\044\254\334\222\073\307\040\215\362\231 +-\345\135\070\241\302\064\355\305\023\131\134\005\265\053\117\141 +-\233\221\373\101\374\374\325\074\115\230\166\006\365\201\175\353 +-\335\220\346\321\126\124\332\343\055\014\237\021\062\224\042\001 +-\172\366\154\054\164\147\004\314\245\217\216\054\263\103\265\224 +-\242\320\175\351\142\177\006\276\047\001\203\236\072\375\212\356 +-\230\103\112\153\327\265\227\073\072\277\117\155\264\143\372\063 +-\000\064\056\055\155\226\311\173\312\231\143\272\276\364\366\060 +-\240\055\230\226\351\126\104\005\251\104\243\141\020\353\202\241 +-\147\135\274\135\047\165\252\212\050\066\052\070\222\331\335\244 +-\136\000\245\314\314\174\051\052\336\050\220\253\267\341\266\377 +-\175\045\013\100\330\252\064\243\055\336\007\353\137\316\012\335 +-\312\176\072\175\046\301\142\150\072\346\057\067\363\201\206\041 +-\304\251\144\252\357\105\066\321\032\146\174\370\351\067\326\326 +-\141\276\242\255\110\347\337\346\164\376\323\155\175\322\045\334 +-\254\142\127\251\367 +-END +- +-# Trust for Certificate "beTRUSTed Root CA - Entrust Implementation" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA - Entrust Implementation" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\162\231\171\023\354\233\015\256\145\321\266\327\262\112\166\243 +-\256\302\356\026 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\175\206\220\217\133\361\362\100\300\367\075\142\265\244\251\073 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\146\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\063\060\061\006\003\125\004\003\023\052\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155 +-\145\156\164\141\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\074\265\117\100 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "beTRUSTed Root CA - RSA Implementation" +-# +-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 "beTRUSTed Root CA - RSA Implementation" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141 +-\164\151\157\156 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141 +-\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264 +-\252\032 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\150\060\202\004\120\240\003\002\001\002\002\020\073 +-\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142 +-\061\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125 +-\123\124\145\144\061\033\060\031\006\003\125\004\013\023\022\142 +-\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101 +-\163\061\057\060\055\006\003\125\004\003\023\046\142\145\124\122 +-\125\123\124\145\144\040\122\157\157\164\040\103\101\040\055\040 +-\122\123\101\040\111\155\160\154\145\155\145\156\164\141\164\151 +-\157\156\060\036\027\015\060\062\060\064\061\061\061\061\061\070 +-\061\063\132\027\015\062\062\060\064\061\062\061\061\060\067\062 +-\065\132\060\142\061\022\060\020\006\003\125\004\012\023\011\142 +-\145\124\122\125\123\124\145\144\061\033\060\031\006\003\125\004 +-\013\023\022\142\145\124\122\125\123\124\145\144\040\122\157\157 +-\164\040\103\101\163\061\057\060\055\006\003\125\004\003\023\046 +-\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040\103 +-\101\040\055\040\122\123\101\040\111\155\160\154\145\155\145\156 +-\164\141\164\151\157\156\060\202\001\042\060\015\006\011\052\206 +-\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 +-\001\012\002\202\001\001\000\344\272\064\060\011\216\127\320\271 +-\006\054\157\156\044\200\042\277\135\103\246\372\117\254\202\347 +-\034\150\160\205\033\243\156\265\252\170\331\156\007\113\077\351 +-\337\365\352\350\124\241\141\212\016\057\151\165\030\267\014\345 +-\024\215\161\156\230\270\125\374\014\225\320\233\156\341\055\210 +-\324\072\100\153\222\361\231\226\144\336\333\377\170\364\356\226 +-\035\107\211\174\324\276\271\210\167\043\072\011\346\004\236\155 +-\252\136\322\310\275\232\116\031\337\211\352\133\016\176\303\344 +-\264\360\340\151\073\210\017\101\220\370\324\161\103\044\301\217 +-\046\113\073\126\351\377\214\154\067\351\105\255\205\214\123\303 +-\140\206\220\112\226\311\263\124\260\273\027\360\034\105\331\324 +-\033\031\144\126\012\031\367\314\341\377\206\257\176\130\136\254 +-\172\220\037\311\050\071\105\173\242\266\307\234\037\332\205\324 +-\041\206\131\060\223\276\123\063\067\366\357\101\317\063\307\253 +-\162\153\045\365\363\123\033\014\114\056\361\165\113\357\240\207 +-\367\376\212\025\320\154\325\313\371\150\123\271\160\025\023\302 +-\365\056\373\103\065\165\055\002\003\001\000\001\243\202\002\030 +-\060\202\002\024\060\014\006\003\125\035\023\004\005\060\003\001 +-\001\377\060\202\001\265\006\003\125\035\040\004\202\001\254\060 +-\202\001\250\060\202\001\244\006\017\053\006\001\004\001\261\076 +-\000\000\003\011\050\203\221\061\060\202\001\217\060\101\006\010 +-\053\006\001\005\005\007\002\001\026\065\150\164\164\160\072\057 +-\057\167\167\167\056\142\145\164\162\165\163\164\145\144\056\143 +-\157\155\057\160\162\157\144\165\143\164\163\137\163\145\162\166 +-\151\143\145\163\057\151\156\144\145\170\056\150\164\155\154\060 +-\202\001\110\006\010\053\006\001\005\005\007\002\002\060\202\001 +-\072\032\202\001\066\122\145\154\151\141\156\143\145\040\157\156 +-\040\157\162\040\165\163\145\040\157\146\040\164\150\151\163\040 +-\103\145\162\164\151\146\151\143\141\164\145\040\143\162\145\141 +-\164\145\163\040\141\156\040\141\143\153\156\157\167\154\145\144 +-\147\155\145\156\164\040\141\156\144\040\141\143\143\145\160\164 +-\141\156\143\145\040\157\146\040\164\150\145\040\164\150\145\156 +-\040\141\160\160\154\151\143\141\142\154\145\040\163\164\141\156 +-\144\141\162\144\040\164\145\162\155\163\040\141\156\144\040\143 +-\157\156\144\151\164\151\157\156\163\040\157\146\040\165\163\145 +-\054\040\164\150\145\040\103\145\162\164\151\146\151\143\141\164 +-\151\157\156\040\120\162\141\143\164\151\143\145\040\123\164\141 +-\164\145\155\145\156\164\040\141\156\144\040\164\150\145\040\122 +-\145\154\171\151\156\147\040\120\141\162\164\171\040\101\147\162 +-\145\145\155\145\156\164\054\040\167\150\151\143\150\040\143\141 +-\156\040\142\145\040\146\157\165\156\144\040\141\164\040\164\150 +-\145\040\142\145\124\122\125\123\124\145\144\040\167\145\142\040 +-\163\151\164\145\054\040\150\164\164\160\072\057\057\167\167\167 +-\056\142\145\164\162\165\163\164\145\144\056\143\157\155\057\160 +-\162\157\144\165\143\164\163\137\163\145\162\166\151\143\145\163 +-\057\151\156\144\145\170\056\150\164\155\154\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\251\354\024\176\371\331\103\314\123\053\024 +-\255\317\367\360\131\211\101\315\031\060\035\006\003\125\035\016 +-\004\026\004\024\251\354\024\176\371\331\103\314\123\053\024\255 +-\317\367\360\131\211\101\315\031\060\015\006\011\052\206\110\206 +-\367\015\001\001\005\005\000\003\202\001\001\000\333\227\260\165 +-\352\014\304\301\230\312\126\005\300\250\255\046\110\257\055\040 +-\350\201\307\266\337\103\301\054\035\165\113\324\102\215\347\172 +-\250\164\334\146\102\131\207\263\365\151\155\331\251\236\263\175 +-\034\061\301\365\124\342\131\044\111\345\356\275\071\246\153\212 +-\230\104\373\233\327\052\203\227\064\055\307\175\065\114\055\064 +-\270\076\015\304\354\210\047\257\236\222\375\120\141\202\250\140 +-\007\024\123\314\145\023\301\366\107\104\151\322\061\310\246\335 +-\056\263\013\336\112\215\133\075\253\015\302\065\122\242\126\067 +-\314\062\213\050\205\102\234\221\100\172\160\053\070\066\325\341 +-\163\032\037\345\372\176\137\334\326\234\073\060\352\333\300\133 +-\047\134\323\163\007\301\302\363\114\233\157\237\033\312\036\252 +-\250\070\063\011\130\262\256\374\007\350\066\334\125\272\057\117 +-\100\376\172\275\006\246\201\301\223\042\174\206\021\012\006\167 +-\110\256\065\267\057\062\232\141\136\213\276\051\237\051\044\210 +-\126\071\054\250\322\253\226\003\132\324\110\237\271\100\204\013 +-\230\150\373\001\103\326\033\342\011\261\227\034 +-END +- +-# Trust for Certificate "beTRUSTed Root CA - RSA Implementation" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "beTRUSTed Root CA - RSA Implementation" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\035\202\131\312\041\047\303\313\301\154\331\062\366\054\145\051 +-\214\250\207\022 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\206\102\005\011\274\247\235\354\035\363\056\016\272\330\035\320 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\142\061\022\060\020\006\003\125\004\012\023\011\142\145\124 +-\122\125\123\124\145\144\061\033\060\031\006\003\125\004\013\023 +-\022\142\145\124\122\125\123\124\145\144\040\122\157\157\164\040 +-\103\101\163\061\057\060\055\006\003\125\004\003\023\046\142\145 +-\124\122\125\123\124\145\144\040\122\157\157\164\040\103\101\040 +-\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141 +-\164\151\157\156 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264 +-\252\032 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "RSA Security 2048 v3" +-# +-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 Security 2048 v3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 +-\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 +-\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 +-\162\151\164\171\040\062\060\064\070\040\126\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101 +-\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060 +-\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165 +-\162\151\164\171\040\062\060\064\070\040\126\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000 +-\000\002 ++\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000 ++\000\002 + END + CKA_VALUE MULTILINE_OCTAL + \060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012 +@@ -6763,9 +5370,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300 + \063\167 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8171,9 +6778,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8395,9 +7002,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8619,9 +7226,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -8844,9 +7451,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -9069,241 +7676,9 @@ END + CKA_SERIAL_NUMBER MULTILINE_OCTAL + \002\001\000 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "IPS Timestamping root" +-# +-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 "IPS Timestamping root" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105 +-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143 +-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011 +-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125 +-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164 +-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166 +-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125 +-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060 +-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023 +-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155 +-\160\151\156\147\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\064\060\062 +-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011 +-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105 +-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143 +-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011 +-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125 +-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164 +-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166 +-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125 +-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060 +-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023 +-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155 +-\160\151\156\147\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\064\060\062 +-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011 +-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123 +-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145 +-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102 +-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004 +-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040 +-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151 +-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004 +-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071 +-\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053 +-\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160 +-\151\156\147\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\064\060\062\006 +-\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155 +-\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011\001 +-\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145 +-\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061 +-\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070 +-\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002 +-\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162 +-\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023 +-\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003 +-\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145 +-\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162 +-\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003 +-\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160 +-\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066 +-\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013 +-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141 +-\155\160\151\156\147\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\064\060 +-\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124 +-\151\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001 +-\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\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 +-\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215 +-\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257 +-\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070 +-\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161 +-\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265 +-\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130 +-\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233 +-\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243 +-\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006 +-\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235 +-\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120 +-\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213 +-\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077 +-\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061 +-\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020 +-\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141 +-\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145 +-\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111 +-\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154 +-\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040 +-\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151 +-\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103 +-\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065 +-\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040 +-\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\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\064\060\062\006\003\125\004\003 +-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141 +-\155\160\151\156\147\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\036\060 +-\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160 +-\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000 +-\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014 +-\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003 +-\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003 +-\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001 +-\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006 +-\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001 +-\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001 +-\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053 +-\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110 +-\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003 +-\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151 +-\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004 +-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160 +-\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001 +-\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156 +-\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145 +-\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072 +-\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006 +-\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164 +-\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057 +-\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001 +-\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057 +-\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060 +-\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164 +-\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206 +-\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072 +-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163 +-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124 +-\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154 +-\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065 +-\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163 +-\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145 +-\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056 +-\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102 +-\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167 +-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057 +-\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151 +-\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170 +-\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057 +-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062 +-\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163 +-\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240 +-\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143 +-\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062 +-\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155 +-\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005 +-\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005 +-\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163 +-\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110 +-\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314 +-\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203 +-\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067 +-\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077 +-\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114 +-\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210 +-\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001 +-\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324 +-\207\112\137\334\357\351\126\360\012\014\350\165 +-END +- +-# Trust for Certificate "IPS Timestamping root" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "IPS Timestamping root" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313 +-\361\266\304\322 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105 +-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143 +-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011 +-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125 +-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164 +-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166 +-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125 +-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163 +-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060 +-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023 +-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155 +-\160\151\156\147\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\064\060\062 +-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151 +-\155\145\163\164\141\155\160\151\156\147\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\036\060\034\006\011\052\206\110\206\367\015\001\011 +-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056 +-\145\163 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\000 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -15535,161 +13910,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "DigiNotar Root CA" +-# +-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 "DigiNotar Root CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 +-\074\114 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014 +-\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137 +-\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060 +-\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141 +-\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151 +-\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060 +-\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156 +-\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060 +-\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132 +-\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060 +-\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022 +-\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164 +-\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147 +-\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040 +-\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151 +-\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154 +-\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 +-\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 +-\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126 +-\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201 +-\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300 +-\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177 +-\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330 +-\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213 +-\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337 +-\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045 +-\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123 +-\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007 +-\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043 +-\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042 +-\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041 +-\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324 +-\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313 +-\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110 +-\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114 +-\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376 +-\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344 +-\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357 +-\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346 +-\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314 +-\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351 +-\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154 +-\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262 +-\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042 +-\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077 +-\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102 +-\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323 +-\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176 +-\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147 +-\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216 +-\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 +-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 +-\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153 +-\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002 +-\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004 +-\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257 +-\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362 +-\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203 +-\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302 +-\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150 +-\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307 +-\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050 +-\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350 +-\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013 +-\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075 +-\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114 +-\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313 +-\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273 +-\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235 +-\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146 +-\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160 +-\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007 +-\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351 +-\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134 +-\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045 +-\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113 +-\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174 +-\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304 +-\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012 +-\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330 +-\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124 +-\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163 +-\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056 +-\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175 +-\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163 +-\262\345\214\360\206\231\270\345\305\337\204\301\267\353 +-END +- +-# Trust for Certificate "DigiNotar Root CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "DigiNotar Root CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317 +-\201\147\107\214 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 +-\074\114 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "Network Solutions Certificate Authority" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -17057,13 +15277,13 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "AC Raiz Certicamara S.A." ++# Certificate "AC Ra+z Certic+mara S.A." + # + 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 "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A." ++CKA_LABEL UTF8 "AC Ra+z Certic+mara S.A." + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL + \060\173\061\013\060\011\006\003\125\004\006\023\002\103\117\061 +@@ -17196,12 +15416,12 @@ CKA_VALUE MULTILINE_OCTAL + \005\211\374\170\326\134\054\046\103\251 + END + +-# Trust for Certificate "AC Raiz Certicamara S.A." ++# Trust for Certificate "AC Ra+z Certic+mara S.A." + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A." ++CKA_LABEL UTF8 "AC Ra+z Certic+mara S.A." + CKA_CERT_SHA1_HASH MULTILINE_OCTAL + \313\241\305\370\260\343\136\270\271\105\022\323\371\064\242\351 + \006\020\323\066 +@@ -18114,3397 +16334,613 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "ePKI Root Certification Authority" ++# Certificate "Entrust.net 2048 2029" + # + 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 "ePKI Root Certification Authority" ++CKA_LABEL UTF8 "Entrust.net 2048 2029" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +-\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 ++\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 ++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 ++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 ++\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164 ++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 + \143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 ++\040\050\062\060\064\070\051 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +-\120\113\111\040\122\157\157\164\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\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 +-\274\235 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025 +-\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136 +-\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 +-\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 +-\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 +-\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 +-\111\040\122\157\157\164\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\060\064\061\062\062\060\060\062\063\061\062\067\132\027 +-\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136 +-\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 +-\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 +-\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 +-\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 +-\111\040\122\157\157\164\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\202 +-\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +-\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341 +-\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155 +-\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007 +-\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217 +-\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376 +-\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041 +-\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225 +-\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364 +-\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327 +-\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367 +-\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020 +-\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065 +-\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047 +-\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330 +-\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111 +-\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221 +-\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162 +-\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300 +-\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243 +-\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024 +-\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224 +-\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076 +-\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101 +-\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322 +-\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172 +-\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052 +-\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107 +-\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203 +-\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215 +-\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251 +-\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132 +-\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215 +-\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002 +-\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004 +-\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125 +-\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005 +-\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060 +-\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005 +-\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307 +-\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 +-\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201 +-\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000 +-\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022 +-\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045 +-\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312 +-\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066 +-\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017 +-\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122 +-\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227 +-\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277 +-\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322 +-\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323 +-\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066 +-\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245 +-\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355 +-\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272 +-\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224 +-\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115 +-\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001 +-\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217 +-\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341 +-\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122 +-\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200 +-\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211 +-\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263 +-\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342 +-\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374 +-\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304 +-\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156 +-\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143 +-\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203 +-\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352 +-\201\370\021\234 +-END +- +-# Trust for Certificate "ePKI Root Certification Authority" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "ePKI Root Certification Authority" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342 +-\075\151\306\360 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +-\120\113\111\040\122\157\157\164\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\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 +-\274\235 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3" +-# +-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 "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172 +-\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006 +-\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102 +-\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157 +-\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155 +-\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304 +-\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125 +-\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153 +-\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101 +-\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151 +-\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043 +-\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145 +-\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153 +-\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303 +-\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303 +-\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172 +-\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006 +-\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102 +-\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157 +-\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155 +-\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304 +-\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125 +-\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153 +-\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101 +-\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151 +-\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043 +-\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145 +-\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153 +-\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303 +-\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303 +-\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\021 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\027\060\202\003\377\240\003\002\001\002\002\001\021 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122 +-\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145 +-\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003 +-\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151 +-\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154 +-\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141 +-\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260 +-\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154 +-\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040 +-\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162 +-\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164 +-\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060 +-\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162 +-\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145 +-\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234 +-\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266 +-\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155 +-\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163 +-\304\261\040\055\040\123\303\274\162\303\274\155\040\063\060\036 +-\027\015\060\067\060\070\062\064\061\061\063\067\060\067\132\027 +-\015\061\067\060\070\062\061\061\061\063\067\060\067\132\060\202 +-\001\053\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +-\030\060\026\006\003\125\004\007\014\017\107\145\142\172\145\040 +-\055\040\113\157\143\141\145\154\151\061\107\060\105\006\003\125 +-\004\012\014\076\124\303\274\162\153\151\171\145\040\102\151\154 +-\151\155\163\145\154\040\166\145\040\124\145\153\156\157\154\157 +-\152\151\153\040\101\162\141\305\237\164\304\261\162\155\141\040 +-\113\165\162\165\155\165\040\055\040\124\303\234\102\304\260\124 +-\101\113\061\110\060\106\006\003\125\004\013\014\077\125\154\165 +-\163\141\154\040\105\154\145\153\164\162\157\156\151\153\040\166 +-\145\040\113\162\151\160\164\157\154\157\152\151\040\101\162\141 +-\305\237\164\304\261\162\155\141\040\105\156\163\164\151\164\303 +-\274\163\303\274\040\055\040\125\105\113\101\105\061\043\060\041 +-\006\003\125\004\013\014\032\113\141\155\165\040\123\145\162\164 +-\151\146\151\153\141\163\171\157\156\040\115\145\162\153\145\172 +-\151\061\112\060\110\006\003\125\004\003\014\101\124\303\234\102 +-\304\260\124\101\113\040\125\105\113\101\105\040\113\303\266\153 +-\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145 +-\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304 +-\261\040\055\040\123\303\274\162\303\274\155\040\063\060\202\001 +-\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000 +-\003\202\001\017\000\060\202\001\012\002\202\001\001\000\212\155 +-\113\377\020\210\072\303\366\176\224\350\352\040\144\160\256\041 +-\201\276\072\173\074\333\361\035\122\177\131\372\363\042\114\225 +-\240\220\274\110\116\021\253\373\267\265\215\172\203\050\214\046 +-\106\330\116\225\100\207\141\237\305\236\155\201\207\127\154\212 +-\073\264\146\352\314\100\374\343\252\154\262\313\001\333\062\277 +-\322\353\205\317\241\015\125\303\133\070\127\160\270\165\306\171 +-\321\024\060\355\033\130\133\153\357\065\362\241\041\116\305\316 +-\174\231\137\154\271\270\042\223\120\247\315\114\160\152\276\152 +-\005\177\023\234\053\036\352\376\107\316\004\245\157\254\223\056 +-\174\053\237\236\171\023\221\350\352\236\312\070\165\216\142\260 +-\225\223\052\345\337\351\136\227\156\040\137\137\204\172\104\071 +-\031\100\034\272\125\053\373\060\262\201\357\204\343\334\354\230 +-\070\071\003\205\010\251\124\003\005\051\360\311\217\213\352\013 +-\206\145\031\021\323\351\011\043\336\150\223\003\311\066\034\041 +-\156\316\214\146\361\231\060\330\327\263\303\035\370\201\056\250 +-\275\202\013\146\376\202\313\341\340\032\202\303\100\201\002\003 +-\001\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026 +-\004\024\275\210\207\311\217\366\244\012\013\252\353\305\376\221 +-\043\235\253\112\212\062\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\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\005\005\000\003\202\001\001\000\035\174\372\111\217 +-\064\351\267\046\222\026\232\005\164\347\113\320\155\071\154\303 +-\046\366\316\270\061\274\304\337\274\052\370\067\221\030\334\004 +-\310\144\231\053\030\155\200\003\131\311\256\370\130\320\076\355 +-\303\043\237\151\074\206\070\034\236\357\332\047\170\321\204\067 +-\161\212\074\113\071\317\176\105\006\326\055\330\212\115\170\022 +-\326\255\302\323\313\322\320\101\363\046\066\112\233\225\154\014 +-\356\345\321\103\047\146\301\210\367\172\263\040\154\352\260\151 +-\053\307\040\350\014\003\304\101\005\231\342\077\344\153\370\240 +-\206\201\307\204\306\037\325\113\201\022\262\026\041\054\023\241 +-\200\262\136\014\112\023\236\040\330\142\100\253\220\352\144\112 +-\057\254\015\001\022\171\105\250\057\207\031\150\310\342\205\307 +-\060\262\165\371\070\077\262\300\223\264\153\342\003\104\316\147 +-\240\337\211\326\255\214\166\243\023\303\224\141\053\153\331\154 +-\301\007\012\042\007\205\154\205\044\106\251\276\077\213\170\204 +-\202\176\044\014\235\375\201\067\343\045\250\355\066\116\225\054 +-\311\234\220\332\354\251\102\074\255\266\002 +-END +- +-# Trust for Certificate "TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\033\113\071\141\046\047\153\144\221\242\150\155\327\002\103\041 +-\055\037\035\226 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\355\101\365\214\120\305\053\234\163\346\356\154\353\302\250\046 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\202\001\053\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\030\060\026\006\003\125\004\007\014\017\107\145\142\172 +-\145\040\055\040\113\157\143\141\145\154\151\061\107\060\105\006 +-\003\125\004\012\014\076\124\303\274\162\153\151\171\145\040\102 +-\151\154\151\155\163\145\154\040\166\145\040\124\145\153\156\157 +-\154\157\152\151\153\040\101\162\141\305\237\164\304\261\162\155 +-\141\040\113\165\162\165\155\165\040\055\040\124\303\234\102\304 +-\260\124\101\113\061\110\060\106\006\003\125\004\013\014\077\125 +-\154\165\163\141\154\040\105\154\145\153\164\162\157\156\151\153 +-\040\166\145\040\113\162\151\160\164\157\154\157\152\151\040\101 +-\162\141\305\237\164\304\261\162\155\141\040\105\156\163\164\151 +-\164\303\274\163\303\274\040\055\040\125\105\113\101\105\061\043 +-\060\041\006\003\125\004\013\014\032\113\141\155\165\040\123\145 +-\162\164\151\146\151\153\141\163\171\157\156\040\115\145\162\153 +-\145\172\151\061\112\060\110\006\003\125\004\003\014\101\124\303 +-\234\102\304\260\124\101\113\040\125\105\113\101\105\040\113\303 +-\266\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\040\055\040\123\303\274\162\303\274\155\040\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\021 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Buypass Class 2 CA 1" +-# +-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 "Buypass Class 2 CA 1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\062\040\103\101\040\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\062\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\001 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035 +-\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163 +-\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060 +-\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040 +-\103\154\141\163\163\040\062\040\103\101\040\061\060\036\027\015 +-\060\066\061\060\061\063\061\060\062\065\060\071\132\027\015\061 +-\066\061\060\061\063\061\060\062\065\060\071\132\060\113\061\013 +-\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006 +-\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123 +-\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003 +-\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141 +-\163\163\040\062\040\103\101\040\061\060\202\001\042\060\015\006 +-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 +-\000\060\202\001\012\002\202\001\001\000\213\074\007\105\330\366 +-\337\346\307\312\272\215\103\305\107\215\260\132\301\070\333\222 +-\204\034\257\023\324\017\157\066\106\040\304\056\314\161\160\064 +-\242\064\323\067\056\330\335\072\167\057\300\353\051\350\134\322 +-\265\251\221\064\207\042\131\376\314\333\347\231\257\226\301\250 +-\307\100\335\245\025\214\156\310\174\227\003\313\346\040\362\327 +-\227\137\061\241\057\067\322\276\356\276\251\255\250\114\236\041 +-\146\103\073\250\274\363\011\243\070\325\131\044\301\302\107\166 +-\261\210\134\202\073\273\053\246\004\327\214\007\217\315\325\101 +-\035\360\256\270\051\054\224\122\140\064\224\073\332\340\070\321 +-\235\063\076\025\364\223\062\305\000\332\265\051\146\016\072\170 +-\017\041\122\137\002\345\222\173\045\323\222\036\057\025\235\201 +-\344\235\216\350\357\211\316\024\114\124\035\034\201\022\115\160 +-\250\276\020\005\027\176\037\321\270\127\125\355\315\273\122\302 +-\260\036\170\302\115\066\150\313\126\046\301\122\301\275\166\367 +-\130\325\162\176\037\104\166\273\000\211\035\026\235\121\065\357 +-\115\302\126\357\153\340\214\073\015\351\002\003\001\000\001\243 +-\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\077 +-\215\232\131\213\374\173\173\234\243\257\070\260\071\355\220\161 +-\200\326\310\060\016\006\003\125\035\017\001\001\377\004\004\003 +-\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\003\202\001\001\000\025\032\176\023\212\271\350\007\243 +-\113\047\062\262\100\221\362\041\321\144\205\276\143\152\322\317 +-\201\302\025\325\172\176\014\051\254\067\036\034\174\166\122\225 +-\332\265\177\043\241\051\167\145\311\062\235\250\056\126\253\140 +-\166\316\026\264\215\177\170\300\325\231\121\203\177\136\331\276 +-\014\250\120\355\042\307\255\005\114\166\373\355\356\036\107\144 +-\366\367\047\175\134\050\017\105\305\134\142\136\246\232\221\221 +-\267\123\027\056\334\255\140\235\226\144\071\275\147\150\262\256 +-\005\313\115\347\137\037\127\206\325\040\234\050\373\157\023\070 +-\365\366\021\222\366\175\231\136\037\014\350\253\104\044\051\162 +-\100\075\066\122\257\214\130\220\163\301\354\141\054\171\241\354 +-\207\265\077\332\115\331\041\000\060\336\220\332\016\323\032\110 +-\251\076\205\013\024\213\214\274\101\236\152\367\016\160\300\065 +-\367\071\242\135\146\320\173\131\237\250\107\022\232\047\043\244 +-\055\216\047\203\222\040\241\327\025\177\361\056\030\356\364\110 +-\177\057\177\361\241\030\265\241\013\224\240\142\040\062\234\035 +-\366\324\357\277\114\210\150 +-END +- +-# Trust for Certificate "Buypass Class 2 CA 1" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Buypass Class 2 CA 1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\240\241\253\220\311\374\204\173\073\022\141\350\227\175\137\323 +-\042\141\323\314 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\270\010\232\360\003\314\033\015\310\154\013\166\241\165\144\043 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\062\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Buypass Class 3 CA 1" +-# +-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 "Buypass Class 3 CA 1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\063\040\103\101\040\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\063\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\002 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\002 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035 +-\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163 +-\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060 +-\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040 +-\103\154\141\163\163\040\063\040\103\101\040\061\060\036\027\015 +-\060\065\060\065\060\071\061\064\061\063\060\063\132\027\015\061 +-\065\060\065\060\071\061\064\061\063\060\063\132\060\113\061\013 +-\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006 +-\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123 +-\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003 +-\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141 +-\163\163\040\063\040\103\101\040\061\060\202\001\042\060\015\006 +-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 +-\000\060\202\001\012\002\202\001\001\000\244\216\327\164\331\051 +-\144\336\137\037\207\200\221\352\116\071\346\031\306\104\013\200 +-\325\013\257\123\007\213\022\275\346\147\360\002\261\211\366\140 +-\212\304\133\260\102\321\300\041\250\313\341\233\357\144\121\266 +-\247\317\025\365\164\200\150\004\220\240\130\242\346\164\246\123 +-\123\125\110\143\077\222\126\335\044\116\216\370\272\053\377\363 +-\064\212\236\050\327\064\237\254\057\326\017\361\244\057\275\122 +-\262\111\205\155\071\065\360\104\060\223\106\044\363\266\347\123 +-\373\274\141\257\251\243\024\373\302\027\027\204\154\340\174\210 +-\370\311\034\127\054\360\075\176\224\274\045\223\204\350\232\000 +-\232\105\005\102\127\200\364\116\316\331\256\071\366\310\123\020 +-\014\145\072\107\173\140\302\326\372\221\311\306\161\154\275\221 +-\207\074\221\206\111\253\363\017\240\154\046\166\136\034\254\233 +-\161\345\215\274\233\041\036\234\326\070\176\044\200\025\061\202 +-\226\261\111\323\142\067\133\210\014\012\142\064\376\247\110\176 +-\231\261\060\213\220\067\225\034\250\037\245\054\215\364\125\310 +-\333\335\131\012\302\255\170\240\364\213\002\003\001\000\001\243 +-\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\070 +-\024\346\310\360\251\244\003\364\116\076\042\243\133\362\326\340 +-\255\100\164\060\016\006\003\125\035\017\001\001\377\004\004\003 +-\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\003\202\001\001\000\001\147\243\214\311\045\075\023\143 +-\135\026\157\354\241\076\011\134\221\025\052\052\331\200\041\117 +-\005\334\273\245\211\253\023\063\052\236\070\267\214\157\002\162 +-\143\307\163\167\036\011\006\272\073\050\173\244\107\311\141\153 +-\010\010\040\374\212\005\212\037\274\272\306\302\376\317\156\354 +-\023\063\161\147\056\151\372\251\054\077\146\300\022\131\115\013 +-\124\002\222\204\273\333\022\357\203\160\160\170\310\123\372\337 +-\306\306\377\334\210\057\007\300\111\235\062\127\140\323\362\366 +-\231\051\137\347\252\001\314\254\063\250\034\012\273\221\304\003 +-\240\157\266\064\371\206\323\263\166\124\230\364\112\201\263\123 +-\235\115\100\354\345\167\023\105\257\133\252\037\330\057\114\202 +-\173\376\052\304\130\273\117\374\236\375\003\145\032\052\016\303 +-\245\040\026\224\153\171\246\242\022\264\273\032\244\043\172\137 +-\360\256\204\044\344\363\053\373\212\044\243\047\230\145\332\060 +-\165\166\374\031\221\350\333\353\233\077\062\277\100\227\007\046 +-\272\314\363\224\205\112\172\047\223\317\220\102\324\270\133\026 +-\246\347\313\100\003\335\171 +-END +- +-# Trust for Certificate "Buypass Class 3 CA 1" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Buypass Class 3 CA 1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\141\127\072\021\337\016\330\176\325\222\145\042\352\320\126\327 +-\104\263\043\161 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\337\074\163\131\201\347\071\120\201\004\114\064\242\313\263\173 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061 +-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163 +-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035 +-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163 +-\040\103\154\141\163\163\040\063\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\002 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "EBG Elektronik Sertifika Hizmet Saglayicisi" +-# +-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 "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102 +-\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162 +-\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141 +-\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060 +-\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151 +-\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145 +-\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151 +-\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023 +-\002\124\122 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102 +-\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162 +-\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141 +-\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060 +-\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151 +-\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145 +-\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151 +-\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023 +-\002\124\122 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\114\257\163\102\034\216\164\002 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\347\060\202\003\317\240\003\002\001\002\002\010\114 +-\257\163\102\034\216\164\002\060\015\006\011\052\206\110\206\367 +-\015\001\001\005\005\000\060\201\200\061\070\060\066\006\003\125 +-\004\003\014\057\105\102\107\040\105\154\145\153\164\162\157\156 +-\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\061\067\060\065\006\003\125\004\012\014\056\105\102 +-\107\040\102\151\154\151\305\237\151\155\040\124\145\153\156\157 +-\154\157\152\151\154\145\162\151\040\166\145\040\110\151\172\155 +-\145\164\154\145\162\151\040\101\056\305\236\056\061\013\060\011 +-\006\003\125\004\006\023\002\124\122\060\036\027\015\060\066\060 +-\070\061\067\060\060\062\061\060\071\132\027\015\061\066\060\070 +-\061\064\060\060\063\061\060\071\132\060\201\200\061\070\060\066 +-\006\003\125\004\003\014\057\105\102\107\040\105\154\145\153\164 +-\162\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040 +-\110\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261 +-\143\304\261\163\304\261\061\067\060\065\006\003\125\004\012\014 +-\056\105\102\107\040\102\151\154\151\305\237\151\155\040\124\145 +-\153\156\157\154\157\152\151\154\145\162\151\040\166\145\040\110 +-\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056\061 +-\013\060\011\006\003\125\004\006\023\002\124\122\060\202\002\042 +-\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +-\202\002\017\000\060\202\002\012\002\202\002\001\000\356\240\204 +-\141\320\072\152\146\020\062\330\061\070\177\247\247\345\375\241 +-\341\373\227\167\270\161\226\350\023\226\106\203\117\266\362\137 +-\162\126\156\023\140\245\001\221\342\133\305\315\127\037\167\143 +-\121\377\057\075\333\271\077\252\251\065\347\171\320\365\320\044 +-\266\041\352\353\043\224\376\051\277\373\211\221\014\144\232\005 +-\112\053\314\014\356\361\075\233\202\151\244\114\370\232\157\347 +-\042\332\020\272\137\222\374\030\047\012\250\252\104\372\056\054 +-\264\373\106\232\010\003\203\162\253\210\344\152\162\311\345\145 +-\037\156\052\017\235\263\350\073\344\014\156\172\332\127\375\327 +-\353\171\213\136\040\006\323\166\013\154\002\225\243\226\344\313 +-\166\121\321\050\235\241\032\374\104\242\115\314\172\166\250\015 +-\075\277\027\117\042\210\120\375\256\266\354\220\120\112\133\237 +-\225\101\252\312\017\262\112\376\200\231\116\243\106\025\253\370 +-\163\102\152\302\146\166\261\012\046\025\335\223\222\354\333\251 +-\137\124\042\122\221\160\135\023\352\110\354\156\003\154\331\335 +-\154\374\353\015\003\377\246\203\022\233\361\251\223\017\305\046 +-\114\061\262\143\231\141\162\347\052\144\231\322\270\351\165\342 +-\174\251\251\232\032\252\303\126\333\020\232\074\203\122\266\173 +-\226\267\254\207\167\250\271\362\147\013\224\103\263\257\076\163 +-\372\102\066\261\045\305\012\061\046\067\126\147\272\243\013\175 +-\326\367\211\315\147\241\267\072\036\146\117\366\240\125\024\045 +-\114\054\063\015\246\101\214\275\004\061\152\020\162\012\235\016 +-\056\166\275\136\363\121\211\213\250\077\125\163\277\333\072\306 +-\044\005\226\222\110\252\113\215\052\003\345\127\221\020\364\152 +-\050\025\156\107\167\204\134\121\164\237\031\351\346\036\143\026 +-\071\343\021\025\343\130\032\104\275\313\304\154\146\327\204\006 +-\337\060\364\067\242\103\042\171\322\020\154\337\273\346\023\021 +-\374\235\204\012\023\173\360\073\320\374\243\012\327\211\352\226 +-\176\215\110\205\036\144\137\333\124\242\254\325\172\002\171\153 +-\322\212\360\147\332\145\162\015\024\160\344\351\216\170\217\062 +-\164\174\127\362\326\326\364\066\211\033\370\051\154\213\271\366 +-\227\321\244\056\252\276\013\031\302\105\351\160\135\002\003\000 +-\235\331\243\143\060\141\060\017\006\003\125\035\023\001\001\377 +-\004\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001 +-\377\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026 +-\004\024\347\316\306\117\374\026\147\226\372\112\243\007\301\004 +-\247\313\152\336\332\107\060\037\006\003\125\035\043\004\030\060 +-\026\200\024\347\316\306\117\374\026\147\226\372\112\243\007\301 +-\004\247\313\152\336\332\107\060\015\006\011\052\206\110\206\367 +-\015\001\001\005\005\000\003\202\002\001\000\233\230\232\135\276 +-\363\050\043\166\306\154\367\177\346\100\236\300\066\334\225\015 +-\035\255\025\305\066\330\325\071\357\362\036\042\136\263\202\264 +-\135\273\114\032\312\222\015\337\107\044\036\263\044\332\221\210 +-\351\203\160\335\223\327\351\272\263\337\026\132\076\336\340\310 +-\373\323\375\154\051\370\025\106\240\150\046\314\223\122\256\202 +-\001\223\220\312\167\312\115\111\357\342\132\331\052\275\060\316 +-\114\262\201\266\060\316\131\117\332\131\035\152\172\244\105\260 +-\202\046\201\206\166\365\365\020\000\270\356\263\011\350\117\207 +-\002\007\256\044\134\360\137\254\012\060\314\212\100\240\163\004 +-\301\373\211\044\366\232\034\134\267\074\012\147\066\005\010\061 +-\263\257\330\001\150\052\340\170\217\164\336\270\121\244\214\154 +-\040\075\242\373\263\324\011\375\173\302\200\252\223\154\051\230 +-\041\250\273\026\363\251\022\137\164\265\207\230\362\225\046\337 +-\064\357\212\123\221\210\135\032\224\243\077\174\042\370\327\210 +-\272\246\214\226\250\075\122\064\142\237\000\036\124\125\102\147 +-\306\115\106\217\273\024\105\075\012\226\026\216\020\241\227\231 +-\325\323\060\205\314\336\264\162\267\274\212\074\030\051\150\375 +-\334\161\007\356\044\071\152\372\355\245\254\070\057\371\036\020 +-\016\006\161\032\020\114\376\165\176\377\036\127\071\102\312\327 +-\341\025\241\126\125\131\033\321\243\257\021\330\116\303\245\053 +-\357\220\277\300\354\202\023\133\215\326\162\054\223\116\217\152 +-\051\337\205\074\323\015\340\242\030\022\314\125\057\107\267\247 +-\233\002\376\101\366\210\114\155\332\251\001\107\203\144\047\142 +-\020\202\326\022\173\136\003\037\064\251\311\221\376\257\135\155 +-\206\047\267\043\252\165\030\312\040\347\260\017\327\211\016\246 +-\147\042\143\364\203\101\053\006\113\273\130\325\321\327\267\271 +-\020\143\330\211\112\264\252\335\026\143\365\156\276\140\241\370 +-\355\350\326\220\117\032\306\305\240\051\323\247\041\250\365\132 +-\074\367\307\111\242\041\232\112\225\122\040\226\162\232\146\313 +-\367\322\206\103\174\042\276\226\371\275\001\250\107\335\345\073 +-\100\371\165\053\233\053\106\144\206\215\036\364\217\373\007\167 +-\320\352\111\242\034\215\122\024\246\012\223 +-END +- +-# Trust for Certificate "EBG Elektronik Sertifika Hizmet Saglayicisi" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\214\226\272\353\335\053\007\007\110\356\060\062\146\240\363\230 +-\156\174\256\130 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\054\040\046\235\313\032\112\000\205\265\267\132\256\302\001\067 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\200\061\070\060\066\006\003\125\004\003\014\057\105\102 +-\107\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162 +-\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141 +-\304\237\154\141\171\304\261\143\304\261\163\304\261\061\067\060 +-\065\006\003\125\004\012\014\056\105\102\107\040\102\151\154\151 +-\305\237\151\155\040\124\145\153\156\157\154\157\152\151\154\145 +-\162\151\040\166\145\040\110\151\172\155\145\164\154\145\162\151 +-\040\101\056\305\236\056\061\013\060\011\006\003\125\004\006\023 +-\002\124\122 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\114\257\163\102\034\216\164\002 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "certSIGN ROOT CA" +-# +-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 "certSIGN ROOT CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +-\164\123\111\107\116\040\122\117\117\124\040\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +-\164\123\111\107\116\040\122\117\117\124\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\040\006\005\026\160\002 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040 +-\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001 +-\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023 +-\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145 +-\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023 +-\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103 +-\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060 +-\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064 +-\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117 +-\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123 +-\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145 +-\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202 +-\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +-\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267 +-\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350 +-\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127 +-\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135 +-\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020 +-\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272 +-\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263 +-\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135 +-\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001 +-\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200 +-\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020 +-\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320 +-\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045 +-\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057 +-\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020 +-\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234 +-\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002 +-\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001 +-\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017 +-\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016 +-\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262 +-\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206 +-\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211 +-\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327 +-\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044 +-\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030 +-\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124 +-\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223 +-\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031 +-\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133 +-\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367 +-\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210 +-\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240 +-\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240 +-\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160 +-\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302 +-\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210 +-\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115 +-\366\356\260\132\116\111\104\124\130\137\102\203 +-END +- +-# Trust for Certificate "certSIGN ROOT CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "certSIGN ROOT CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350 +-\174\113\057\233 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +-\164\123\111\107\116\040\122\117\117\124\040\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\040\006\005\026\160\002 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "CNNIC ROOT" +-# +-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 "CNNIC ROOT" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061 +-\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061 +-\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040 +-\122\117\117\124 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061 +-\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061 +-\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040 +-\122\117\117\124 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\111\063\000\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\125\060\202\002\075\240\003\002\001\002\002\004\111 +-\063\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\062\061\013\060\011\006\003\125\004\006\023\002\103 +-\116\061\016\060\014\006\003\125\004\012\023\005\103\116\116\111 +-\103\061\023\060\021\006\003\125\004\003\023\012\103\116\116\111 +-\103\040\122\117\117\124\060\036\027\015\060\067\060\064\061\066 +-\060\067\060\071\061\064\132\027\015\062\067\060\064\061\066\060 +-\067\060\071\061\064\132\060\062\061\013\060\011\006\003\125\004 +-\006\023\002\103\116\061\016\060\014\006\003\125\004\012\023\005 +-\103\116\116\111\103\061\023\060\021\006\003\125\004\003\023\012 +-\103\116\116\111\103\040\122\117\117\124\060\202\001\042\060\015 +-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 +-\017\000\060\202\001\012\002\202\001\001\000\323\065\367\077\163 +-\167\255\350\133\163\027\302\321\157\355\125\274\156\352\350\244 +-\171\262\154\303\243\357\341\237\261\073\110\205\365\232\134\041 +-\042\020\054\305\202\316\332\343\232\156\067\341\207\054\334\271 +-\014\132\272\210\125\337\375\252\333\037\061\352\001\361\337\071 +-\001\301\023\375\110\122\041\304\125\337\332\330\263\124\166\272 +-\164\261\267\175\327\300\350\366\131\305\115\310\275\255\037\024 +-\332\337\130\104\045\062\031\052\307\176\176\216\256\070\260\060 +-\173\107\162\011\061\360\060\333\303\033\166\051\273\151\166\116 +-\127\371\033\144\242\223\126\267\157\231\156\333\012\004\234\021 +-\343\200\037\313\143\224\020\012\251\341\144\202\061\371\214\047 +-\355\246\231\000\366\160\223\030\370\241\064\206\243\335\172\302 +-\030\171\366\172\145\065\317\220\353\275\063\223\237\123\253\163 +-\073\346\233\064\040\057\035\357\251\035\143\032\240\200\333\003 +-\057\371\046\032\206\322\215\273\251\276\122\072\207\147\110\015 +-\277\264\240\330\046\276\043\137\163\067\177\046\346\222\004\243 +-\177\317\040\247\267\363\072\312\313\231\313\002\003\001\000\001 +-\243\163\060\161\060\021\006\011\140\206\110\001\206\370\102\001 +-\001\004\004\003\002\000\007\060\037\006\003\125\035\043\004\030 +-\060\026\200\024\145\362\061\255\052\367\367\335\122\226\012\307 +-\002\301\016\357\246\325\073\021\060\017\006\003\125\035\023\001 +-\001\377\004\005\060\003\001\001\377\060\013\006\003\125\035\017 +-\004\004\003\002\001\376\060\035\006\003\125\035\016\004\026\004 +-\024\145\362\061\255\052\367\367\335\122\226\012\307\002\301\016 +-\357\246\325\073\021\060\015\006\011\052\206\110\206\367\015\001 +-\001\005\005\000\003\202\001\001\000\113\065\356\314\344\256\277 +-\303\156\255\237\225\073\113\077\133\036\337\127\051\242\131\312 +-\070\342\271\032\377\236\346\156\062\335\036\256\352\065\267\365 +-\223\221\116\332\102\341\303\027\140\120\362\321\134\046\271\202 +-\267\352\155\344\234\204\347\003\171\027\257\230\075\224\333\307 +-\272\000\347\270\277\001\127\301\167\105\062\014\073\361\264\034 +-\010\260\375\121\240\241\335\232\035\023\066\232\155\267\307\074 +-\271\341\305\331\027\372\203\325\075\025\240\074\273\036\013\342 +-\310\220\077\250\206\014\374\371\213\136\205\313\117\133\113\142 +-\021\107\305\105\174\005\057\101\261\236\020\151\033\231\226\340 +-\125\171\373\116\206\231\270\224\332\206\070\152\223\243\347\313 +-\156\345\337\352\041\125\211\234\175\175\177\230\365\000\211\356 +-\343\204\300\134\226\265\305\106\352\106\340\205\125\266\033\311 +-\022\326\301\315\315\200\363\002\001\074\310\151\313\105\110\143 +-\330\224\320\354\205\016\073\116\021\145\364\202\214\246\075\256 +-\056\042\224\011\310\134\352\074\201\135\026\052\003\227\026\125 +-\011\333\212\101\202\236\146\233\021 +-END +- +-# Trust for Certificate "CNNIC ROOT" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "CNNIC ROOT" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\213\257\114\233\035\360\052\222\367\332\022\216\271\033\254\364 +-\230\140\113\157 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\041\274\202\253\111\304\023\073\113\262\053\134\153\220\234\031 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061 +-\016\060\014\006\003\125\004\012\023\005\103\116\116\111\103\061 +-\023\060\021\006\003\125\004\003\023\012\103\116\116\111\103\040 +-\122\117\117\124 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\111\063\000\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "ApplicationCA - Japanese Government" +-# +-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 "ApplicationCA - Japanese Government" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145 +-\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060 +-\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164 +-\151\157\156\103\101 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145 +-\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060 +-\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164 +-\151\157\156\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\061 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\240\060\202\002\210\240\003\002\001\002\002\001\061 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061\034 +-\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145\163 +-\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060\024 +-\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164\151 +-\157\156\103\101\060\036\027\015\060\067\061\062\061\062\061\065 +-\060\060\060\060\132\027\015\061\067\061\062\061\062\061\065\060 +-\060\060\060\132\060\103\061\013\060\011\006\003\125\004\006\023 +-\002\112\120\061\034\060\032\006\003\125\004\012\023\023\112\141 +-\160\141\156\145\163\145\040\107\157\166\145\162\156\155\145\156 +-\164\061\026\060\024\006\003\125\004\013\023\015\101\160\160\154 +-\151\143\141\164\151\157\156\103\101\060\202\001\042\060\015\006 +-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 +-\000\060\202\001\012\002\202\001\001\000\247\155\340\164\116\207 +-\217\245\006\336\150\242\333\206\231\113\144\015\161\360\012\005 +-\233\216\252\341\314\056\322\152\073\301\172\264\227\141\215\212 +-\276\306\232\234\006\264\206\121\344\067\016\164\170\176\137\212 +-\177\224\244\327\107\010\375\120\132\126\344\150\254\050\163\240 +-\173\351\177\030\222\100\117\055\235\365\256\104\110\163\066\006 +-\236\144\054\073\064\043\333\134\046\344\161\171\217\324\156\171 +-\042\271\223\301\312\315\301\126\355\210\152\327\240\071\041\004 +-\127\054\242\365\274\107\101\117\136\064\042\225\265\037\051\155 +-\136\112\363\115\162\276\101\126\040\207\374\351\120\107\327\060 +-\024\356\134\214\125\272\131\215\207\374\043\336\223\320\004\214 +-\375\357\155\275\320\172\311\245\072\152\162\063\306\112\015\005 +-\027\052\055\173\261\247\330\326\360\276\364\077\352\016\050\155 +-\101\141\043\166\170\303\270\145\244\363\132\256\314\302\252\331 +-\347\130\336\266\176\235\205\156\237\052\012\157\237\003\051\060 +-\227\050\035\274\267\317\124\051\116\121\061\371\047\266\050\046 +-\376\242\143\346\101\026\360\063\230\107\002\003\001\000\001\243 +-\201\236\060\201\233\060\035\006\003\125\035\016\004\026\004\024 +-\124\132\313\046\077\161\314\224\106\015\226\123\352\153\110\320 +-\223\376\102\165\060\016\006\003\125\035\017\001\001\377\004\004 +-\003\002\001\006\060\131\006\003\125\035\021\004\122\060\120\244 +-\116\060\114\061\013\060\011\006\003\125\004\006\023\002\112\120 +-\061\030\060\026\006\003\125\004\012\014\017\346\227\245\346\234 +-\254\345\233\275\346\224\277\345\272\234\061\043\060\041\006\003 +-\125\004\013\014\032\343\202\242\343\203\227\343\203\252\343\202 +-\261\343\203\274\343\202\267\343\203\247\343\203\263\103\101\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\005\005\000\003 +-\202\001\001\000\071\152\104\166\167\070\072\354\243\147\106\017 +-\371\213\006\250\373\152\220\061\316\176\354\332\321\211\174\172 +-\353\056\014\275\231\062\347\260\044\326\303\377\365\262\210\011 +-\207\054\343\124\341\243\246\262\010\013\300\205\250\310\322\234 +-\161\366\035\237\140\374\070\063\023\341\236\334\013\137\332\026 +-\120\051\173\057\160\221\017\231\272\064\064\215\225\164\305\176 +-\170\251\146\135\275\312\041\167\102\020\254\146\046\075\336\221 +-\253\375\025\360\157\355\154\137\020\370\363\026\366\003\212\217 +-\247\022\021\014\313\375\077\171\301\234\375\142\356\243\317\124 +-\014\321\053\137\027\076\343\076\277\300\053\076\011\233\376\210 +-\246\176\264\222\027\374\043\224\201\275\156\247\305\214\302\353 +-\021\105\333\370\101\311\226\166\352\160\137\171\022\153\344\243 +-\007\132\005\357\047\111\317\041\237\212\114\011\160\146\251\046 +-\301\053\021\116\063\322\016\374\326\154\322\016\062\144\150\377 +-\255\005\170\137\003\035\250\343\220\254\044\340\017\100\247\113 +-\256\213\050\267\202\312\030\007\346\267\133\164\351\040\031\177 +-\262\033\211\124 +-END +- +-# Trust for Certificate "ApplicationCA - Japanese Government" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "ApplicationCA - Japanese Government" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\177\212\260\317\320\121\207\152\146\363\066\017\107\310\215\214 +-\323\065\374\164 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\176\043\116\133\247\245\264\045\351\000\007\164\021\142\256\326 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\103\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\034\060\032\006\003\125\004\012\023\023\112\141\160\141\156\145 +-\163\145\040\107\157\166\145\162\156\155\145\156\164\061\026\060 +-\024\006\003\125\004\013\023\015\101\160\160\154\151\143\141\164 +-\151\157\156\103\101 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\061 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "GeoTrust Primary Certification Authority - G3" +-# +-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 "GeoTrust Primary Certification Authority - G3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030 +-\017\037 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\376\060\202\002\346\240\003\002\001\002\002\020\025 +-\254\156\224\031\262\171\113\101\366\047\251\303\030\017\037\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 +-\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026 +-\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163 +-\164\040\111\156\143\056\061\071\060\067\006\003\125\004\013\023 +-\060\050\143\051\040\062\060\060\070\040\107\145\157\124\162\165 +-\163\164\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\066\060\064\006\003\125\004\003\023\055\107\145\157\124 +-\162\165\163\164\040\120\162\151\155\141\162\171\040\103\145\162 +-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 +-\162\151\164\171\040\055\040\107\063\060\036\027\015\060\070\060 +-\064\060\062\060\060\060\060\060\060\132\027\015\063\067\061\062 +-\060\061\062\063\065\071\065\071\132\060\201\230\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\026\060\024\006\003\125 +-\004\012\023\015\107\145\157\124\162\165\163\164\040\111\156\143 +-\056\061\071\060\067\006\003\125\004\013\023\060\050\143\051\040 +-\062\060\060\070\040\107\145\157\124\162\165\163\164\040\111\156 +-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 +-\172\145\144\040\165\163\145\040\157\156\154\171\061\066\060\064 +-\006\003\125\004\003\023\055\107\145\157\124\162\165\163\164\040 +-\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143 +-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040 +-\055\040\107\063\060\202\001\042\060\015\006\011\052\206\110\206 +-\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012 +-\002\202\001\001\000\334\342\136\142\130\035\063\127\071\062\063 +-\372\353\313\207\214\247\324\112\335\006\210\352\144\216\061\230 +-\245\070\220\036\230\317\056\143\053\360\106\274\104\262\211\241 +-\300\050\014\111\160\041\225\237\144\300\246\223\022\002\145\046 +-\206\306\245\211\360\372\327\204\240\160\257\117\032\227\077\006 +-\104\325\311\353\162\020\175\344\061\050\373\034\141\346\050\007 +-\104\163\222\042\151\247\003\210\154\235\143\310\122\332\230\047 +-\347\010\114\160\076\264\311\022\301\305\147\203\135\063\363\003 +-\021\354\152\320\123\342\321\272\066\140\224\200\273\141\143\154 +-\133\027\176\337\100\224\036\253\015\302\041\050\160\210\377\326 +-\046\154\154\140\004\045\116\125\176\175\357\277\224\110\336\267 +-\035\335\160\215\005\137\210\245\233\362\302\356\352\321\100\101 +-\155\142\070\035\126\006\305\003\107\121\040\031\374\173\020\013 +-\016\142\256\166\125\277\137\167\276\076\111\001\123\075\230\045 +-\003\166\044\132\035\264\333\211\352\171\345\266\263\073\077\272 +-\114\050\101\177\006\254\152\216\301\320\366\005\035\175\346\102 +-\206\343\245\325\107\002\003\001\000\001\243\102\060\100\060\017 +-\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +-\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +-\035\006\003\125\035\016\004\026\004\024\304\171\312\216\241\116 +-\003\035\034\334\153\333\061\133\224\076\077\060\177\055\060\015 +-\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001 +-\001\000\055\305\023\317\126\200\173\172\170\275\237\256\054\231 +-\347\357\332\337\224\136\011\151\247\347\156\150\214\275\162\276 +-\107\251\016\227\022\270\112\361\144\323\071\337\045\064\324\301 +-\315\116\201\360\017\004\304\044\263\064\226\306\246\252\060\337 +-\150\141\163\327\371\216\205\211\357\016\136\225\050\112\052\047 +-\217\020\216\056\174\206\304\002\236\332\014\167\145\016\104\015 +-\222\375\375\263\026\066\372\021\015\035\214\016\007\211\152\051 +-\126\367\162\364\335\025\234\167\065\146\127\253\023\123\330\216 +-\301\100\305\327\023\026\132\162\307\267\151\001\304\172\261\203 +-\001\150\175\215\101\241\224\030\301\045\134\374\360\376\203\002 +-\207\174\015\015\317\056\010\134\112\100\015\076\354\201\141\346 +-\044\333\312\340\016\055\007\262\076\126\334\215\365\101\205\007 +-\110\233\014\013\313\111\077\175\354\267\375\313\215\147\211\032 +-\253\355\273\036\243\000\010\010\027\052\202\134\061\135\106\212 +-\055\017\206\233\164\331\105\373\324\100\261\172\252\150\055\206 +-\262\231\042\341\301\053\307\234\370\363\137\250\202\022\353\031 +-\021\055 +-END +- +-# Trust for Certificate "GeoTrust Primary Certification Authority - G3" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\003\236\355\270\013\347\240\074\151\123\211\073\040\322\331\062 +-\072\114\052\375 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\265\350\064\066\311\020\104\130\110\160\155\056\203\324\270\005 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030 +-\017\037 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "thawte Primary Root CA - G2" +-# +-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 Primary Root CA - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 +-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 +-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 +-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 +-\103\101\040\055\040\107\062 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 +-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 +-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 +-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 +-\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256 +-\327\126 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\210\060\202\002\015\240\003\002\001\002\002\020\065 +-\374\046\134\331\204\117\311\075\046\075\127\233\256\327\126\060 +-\012\006\010\052\206\110\316\075\004\003\003\060\201\204\061\013 +-\060\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006 +-\003\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156 +-\143\056\061\070\060\066\006\003\125\004\013\023\057\050\143\051 +-\040\062\060\060\067\040\164\150\141\167\164\145\054\040\111\156 +-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 +-\172\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042 +-\006\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162 +-\151\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040 +-\107\062\060\036\027\015\060\067\061\061\060\065\060\060\060\060 +-\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071\065 +-\071\132\060\201\204\061\013\060\011\006\003\125\004\006\023\002 +-\125\123\061\025\060\023\006\003\125\004\012\023\014\164\150\141 +-\167\164\145\054\040\111\156\143\056\061\070\060\066\006\003\125 +-\004\013\023\057\050\143\051\040\062\060\060\067\040\164\150\141 +-\167\164\145\054\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\044\060\042\006\003\125\004\003\023\033\164\150 +-\141\167\164\145\040\120\162\151\155\141\162\171\040\122\157\157 +-\164\040\103\101\040\055\040\107\062\060\166\060\020\006\007\052 +-\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000 +-\004\242\325\234\202\173\225\235\361\122\170\207\376\212\026\277 +-\005\346\337\243\002\117\015\007\306\000\121\272\014\002\122\055 +-\042\244\102\071\304\376\217\352\311\301\276\324\115\377\237\172 +-\236\342\261\174\232\255\247\206\011\163\207\321\347\232\343\172 +-\245\252\156\373\272\263\160\300\147\210\242\065\324\243\232\261 +-\375\255\302\357\061\372\250\271\363\373\010\306\221\321\373\051 +-\225\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004 +-\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004 +-\024\232\330\000\060\000\347\153\177\205\030\356\213\266\316\212 +-\014\370\021\341\273\060\012\006\010\052\206\110\316\075\004\003 +-\003\003\151\000\060\146\002\061\000\335\370\340\127\107\133\247 +-\346\012\303\275\365\200\212\227\065\015\033\211\074\124\206\167 +-\050\312\241\364\171\336\265\346\070\260\360\145\160\214\177\002 +-\124\302\277\377\330\241\076\331\317\002\061\000\304\215\224\374 +-\334\123\322\334\235\170\026\037\025\063\043\123\122\343\132\061 +-\135\235\312\256\275\023\051\104\015\047\133\250\347\150\234\022 +-\367\130\077\056\162\002\127\243\217\241\024\056 +-END +- +-# Trust for Certificate "thawte Primary Root CA - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "thawte Primary Root CA - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\252\333\274\042\043\217\304\001\241\047\273\070\335\364\035\333 +-\010\236\360\022 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\164\235\352\140\044\304\375\042\123\076\314\072\162\331\051\117 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 +-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 +-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 +-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 +-\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256 +-\327\126 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "thawte Primary Root CA - G3" +-# +-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 Primary Root CA - G3" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040 +-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 +-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 +-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 +-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 +-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 +-\063 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040 +-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 +-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 +-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 +-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 +-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 +-\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367 +-\220\373 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\052\060\202\003\022\240\003\002\001\002\002\020\140 +-\001\227\267\106\247\352\264\264\232\326\113\057\367\220\373\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 +-\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025 +-\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054 +-\040\111\156\143\056\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 +-\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060 +-\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056\040 +-\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144 +-\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003\125 +-\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155\141 +-\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063\060 +-\036\027\015\060\070\060\064\060\062\060\060\060\060\060\060\132 +-\027\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060 +-\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145 +-\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062 +-\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056 +-\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145 +-\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003 +-\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155 +-\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063 +-\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001 +-\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001 +-\000\262\277\047\054\373\333\330\133\335\170\173\033\236\167\146 +-\201\313\076\274\174\256\363\246\047\232\064\243\150\061\161\070 +-\063\142\344\363\161\146\171\261\251\145\243\245\213\325\217\140 +-\055\077\102\314\252\153\062\300\043\313\054\101\335\344\337\374 +-\141\234\342\163\262\042\225\021\103\030\137\304\266\037\127\154 +-\012\005\130\042\310\066\114\072\174\245\321\317\206\257\210\247 +-\104\002\023\164\161\163\012\102\131\002\370\033\024\153\102\337 +-\157\137\272\153\202\242\235\133\347\112\275\036\001\162\333\113 +-\164\350\073\177\177\175\037\004\264\046\233\340\264\132\254\107 +-\075\125\270\327\260\046\122\050\001\061\100\146\330\331\044\275 +-\366\052\330\354\041\111\134\233\366\172\351\177\125\065\176\226 +-\153\215\223\223\047\313\222\273\352\254\100\300\237\302\370\200 +-\317\135\364\132\334\316\164\206\246\076\154\013\123\312\275\222 +-\316\031\006\162\346\014\134\070\151\307\004\326\274\154\316\133 +-\366\367\150\234\334\045\025\110\210\241\351\251\370\230\234\340 +-\363\325\061\050\141\021\154\147\226\215\071\231\313\302\105\044 +-\071\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 +-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 +-\035\016\004\026\004\024\255\154\252\224\140\234\355\344\377\372 +-\076\012\164\053\143\003\367\266\131\277\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\003\202\001\001\000\032\100 +-\330\225\145\254\011\222\211\306\071\364\020\345\251\016\146\123 +-\135\170\336\372\044\221\273\347\104\121\337\306\026\064\012\357 +-\152\104\121\352\053\007\212\003\172\303\353\077\012\054\122\026 +-\240\053\103\271\045\220\077\160\251\063\045\155\105\032\050\073 +-\047\317\252\303\051\102\033\337\073\114\300\063\064\133\101\210 +-\277\153\053\145\257\050\357\262\365\303\252\146\316\173\126\356 +-\267\310\313\147\301\311\234\032\030\270\304\303\111\003\361\140 +-\016\120\315\106\305\363\167\171\367\266\025\340\070\333\307\057 +-\050\240\014\077\167\046\164\331\045\022\332\061\332\032\036\334 +-\051\101\221\042\074\151\247\273\002\362\266\134\047\003\211\364 +-\006\352\233\344\162\202\343\241\011\301\351\000\031\323\076\324 +-\160\153\272\161\246\252\130\256\364\273\351\154\266\357\207\314 +-\233\273\377\071\346\126\141\323\012\247\304\134\114\140\173\005 +-\167\046\172\277\330\007\122\054\142\367\160\143\331\071\274\157 +-\034\302\171\334\166\051\257\316\305\054\144\004\136\210\066\156 +-\061\324\100\032\142\064\066\077\065\001\256\254\143\240 +-END +- +-# Trust for Certificate "thawte Primary Root CA - G3" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "thawte Primary Root CA - G3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\361\213\123\215\033\351\003\266\246\360\126\103\133\027\025\211 +-\312\363\153\362 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\373\033\135\103\212\224\315\104\306\166\362\103\113\107\347\061 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 +-\145\054\040\111\156\143\056\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\070\060\066\006\003\125\004\013\023\057\050\143\051\040 +-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 +-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 +-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 +-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 +-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 +-\063 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367 +-\220\373 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "GeoTrust Primary Certification Authority - G2" +-# +-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 "GeoTrust Primary Certification Authority - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\062 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076 +-\303\153 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\256\060\202\002\065\240\003\002\001\002\002\020\074 +-\262\364\110\012\000\342\376\353\044\073\136\140\076\303\153\060 +-\012\006\010\052\206\110\316\075\004\003\003\060\201\230\061\013 +-\060\011\006\003\125\004\006\023\002\125\123\061\026\060\024\006 +-\003\125\004\012\023\015\107\145\157\124\162\165\163\164\040\111 +-\156\143\056\061\071\060\067\006\003\125\004\013\023\060\050\143 +-\051\040\062\060\060\067\040\107\145\157\124\162\165\163\164\040 +-\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157 +-\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\066 +-\060\064\006\003\125\004\003\023\055\107\145\157\124\162\165\163 +-\164\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +-\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +-\171\040\055\040\107\062\060\036\027\015\060\067\061\061\060\065 +-\060\060\060\060\060\060\132\027\015\063\070\060\061\061\070\062 +-\063\065\071\065\071\132\060\201\230\061\013\060\011\006\003\125 +-\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012\023 +-\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061\071 +-\060\067\006\003\125\004\013\023\060\050\143\051\040\062\060\060 +-\067\040\107\145\157\124\162\165\163\164\040\111\156\143\056\040 +-\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144 +-\040\165\163\145\040\157\156\154\171\061\066\060\064\006\003\125 +-\004\003\023\055\107\145\157\124\162\165\163\164\040\120\162\151 +-\155\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151 +-\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 +-\062\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005 +-\053\201\004\000\042\003\142\000\004\025\261\350\375\003\025\103 +-\345\254\353\207\067\021\142\357\322\203\066\122\175\105\127\013 +-\112\215\173\124\073\072\156\137\025\002\300\120\246\317\045\057 +-\175\312\110\270\307\120\143\034\052\041\010\174\232\066\330\013 +-\376\321\046\305\130\061\060\050\045\363\135\135\243\270\266\245 +-\264\222\355\154\054\237\353\335\103\211\242\074\113\110\221\035 +-\120\354\046\337\326\140\056\275\041\243\102\060\100\060\017\006 +-\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016 +-\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035 +-\006\003\125\035\016\004\026\004\024\025\137\065\127\121\125\373 +-\045\262\255\003\151\374\001\243\372\276\021\125\325\060\012\006 +-\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060 +-\144\226\131\246\350\011\336\213\272\372\132\210\210\360\037\221 +-\323\106\250\362\112\114\002\143\373\154\137\070\333\056\101\223 +-\251\016\346\235\334\061\034\262\240\247\030\034\171\341\307\066 +-\002\060\072\126\257\232\164\154\366\373\203\340\063\323\010\137 +-\241\234\302\133\237\106\326\266\313\221\006\143\242\006\347\063 +-\254\076\250\201\022\320\313\272\320\222\013\266\236\226\252\004 +-\017\212 +-END +- +-# Trust for Certificate "GeoTrust Primary Certification Authority - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\215\027\204\325\067\363\003\175\354\160\376\127\213\121\232\231 +-\346\020\327\260 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\001\136\330\153\275\157\075\216\241\061\370\022\340\230\163\152 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 +-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 +-\013\023\060\050\143\051\040\062\060\060\067\040\107\145\157\124 +-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 +-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 +-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 +-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +-\150\157\162\151\164\171\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076 +-\303\153 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "VeriSign Universal Root Certification Authority" +-# +-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 "VeriSign Universal Root Certification Authority" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023 +-\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162 +-\163\141\154\040\122\157\157\164\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\275\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023 +-\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162 +-\163\141\154\040\122\157\157\164\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\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032 +-\305\035 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\271\060\202\003\241\240\003\002\001\002\002\020\100 +-\032\304\144\041\263\023\041\003\016\273\344\022\032\305\035\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 +-\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027 +-\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147 +-\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013 +-\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164 +-\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004 +-\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151 +-\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162 +-\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040 +-\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126 +-\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141 +-\154\040\122\157\157\164\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\060\070\060\064\060\062\060\060\060\060\060\060\132\027 +-\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060\201 +-\275\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027 +-\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147 +-\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013 +-\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164 +-\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004 +-\013\023\061\050\143\051\040\062\060\060\070\040\126\145\162\151 +-\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162 +-\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040 +-\157\156\154\171\061\070\060\066\006\003\125\004\003\023\057\126 +-\145\162\151\123\151\147\156\040\125\156\151\166\145\162\163\141 +-\154\040\122\157\157\164\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\202 +-\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +-\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\307 +-\141\067\136\261\001\064\333\142\327\025\233\377\130\132\214\043 +-\043\326\140\216\221\327\220\230\203\172\346\130\031\070\214\305 +-\366\345\144\205\264\242\161\373\355\275\271\332\315\115\000\264 +-\310\055\163\245\307\151\161\225\037\071\074\262\104\007\234\350 +-\016\372\115\112\304\041\337\051\141\217\062\042\141\202\305\207 +-\037\156\214\174\137\026\040\121\104\321\160\117\127\352\343\034 +-\343\314\171\356\130\330\016\302\263\105\223\300\054\347\232\027 +-\053\173\000\067\172\101\063\170\341\063\342\363\020\032\177\207 +-\054\276\366\365\367\102\342\345\277\207\142\211\137\000\113\337 +-\305\335\344\165\104\062\101\072\036\161\156\151\313\013\165\106 +-\010\321\312\322\053\225\320\317\373\271\100\153\144\214\127\115 +-\374\023\021\171\204\355\136\124\366\064\237\010\001\363\020\045 +-\006\027\112\332\361\035\172\146\153\230\140\146\244\331\357\322 +-\056\202\361\360\357\011\352\104\311\025\152\342\003\156\063\323 +-\254\237\125\000\307\366\010\152\224\271\137\334\340\063\361\204 +-\140\371\133\047\021\264\374\026\362\273\126\152\200\045\215\002 +-\003\001\000\001\243\201\262\060\201\257\060\017\006\003\125\035 +-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\155\006\010\053 +-\006\001\005\005\007\001\014\004\141\060\137\241\135\240\133\060 +-\131\060\127\060\125\026\011\151\155\141\147\145\057\147\151\146 +-\060\041\060\037\060\007\006\005\053\016\003\002\032\004\024\217 +-\345\323\032\206\254\215\216\153\303\317\200\152\324\110\030\054 +-\173\031\056\060\045\026\043\150\164\164\160\072\057\057\154\157 +-\147\157\056\166\145\162\151\163\151\147\156\056\143\157\155\057 +-\166\163\154\157\147\157\056\147\151\146\060\035\006\003\125\035 +-\016\004\026\004\024\266\167\372\151\110\107\237\123\022\325\302 +-\352\007\062\166\007\321\227\007\031\060\015\006\011\052\206\110 +-\206\367\015\001\001\013\005\000\003\202\001\001\000\112\370\370 +-\260\003\346\054\147\173\344\224\167\143\314\156\114\371\175\016 +-\015\334\310\271\065\271\160\117\143\372\044\372\154\203\214\107 +-\235\073\143\363\232\371\166\062\225\221\261\167\274\254\232\276 +-\261\344\061\041\306\201\225\126\132\016\261\302\324\261\246\131 +-\254\361\143\313\270\114\035\131\220\112\357\220\026\050\037\132 +-\256\020\373\201\120\070\014\154\314\361\075\303\365\143\343\263 +-\343\041\311\044\071\351\375\025\146\106\364\033\021\320\115\163 +-\243\175\106\371\075\355\250\137\142\324\361\077\370\340\164\127 +-\053\030\235\201\264\304\050\332\224\227\245\160\353\254\035\276 +-\007\021\360\325\333\335\345\214\360\325\062\260\203\346\127\342 +-\217\277\276\241\252\277\075\035\265\324\070\352\327\260\134\072 +-\117\152\077\217\300\146\154\143\252\351\331\244\026\364\201\321 +-\225\024\016\175\315\225\064\331\322\217\160\163\201\173\234\176 +-\275\230\141\330\105\207\230\220\305\353\206\060\306\065\277\360 +-\377\303\125\210\203\113\357\005\222\006\161\362\270\230\223\267 +-\354\315\202\141\361\070\346\117\227\230\052\132\215 +-END +- +-# Trust for Certificate "VeriSign Universal Root Certification Authority" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "VeriSign Universal Root Certification Authority" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\066\171\312\065\146\207\162\060\115\060\245\373\207\073\017\247 +-\173\267\015\124 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\216\255\265\001\252\115\201\344\214\035\321\341\024\000\225\031 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\070\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\070\060\066\006\003\125\004\003\023 +-\057\126\145\162\151\123\151\147\156\040\125\156\151\166\145\162 +-\163\141\154\040\122\157\157\164\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\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032 +-\305\035 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" +-# +-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 "VeriSign Class 3 Public Primary Certification Authority - G4" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 +-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 +-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +-\165\164\150\157\162\151\164\171\040\055\040\107\064 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 +-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 +-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +-\165\164\150\157\162\151\164\171\040\055\040\107\064 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207 +-\254\263 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\204\060\202\003\012\240\003\002\001\002\002\020\057 +-\200\376\043\214\016\042\017\110\147\022\050\221\207\254\263\060 +-\012\006\010\052\206\110\316\075\004\003\003\060\201\312\061\013 +-\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006 +-\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040 +-\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126 +-\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145 +-\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061 +-\050\143\051\040\062\060\060\067\040\126\145\162\151\123\151\147 +-\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 +-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 +-\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151 +-\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142 +-\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162 +-\151\164\171\040\055\040\107\064\060\036\027\015\060\067\061\061 +-\060\065\060\060\060\060\060\060\132\027\015\063\070\060\061\061 +-\070\062\063\065\071\065\071\132\060\201\312\061\013\060\011\006 +-\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +-\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +-\056\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151 +-\123\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157 +-\162\153\061\072\060\070\006\003\125\004\013\023\061\050\143\051 +-\040\062\060\060\067\040\126\145\162\151\123\151\147\156\054\040 +-\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157 +-\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\105 +-\060\103\006\003\125\004\003\023\074\126\145\162\151\123\151\147 +-\156\040\103\154\141\163\163\040\063\040\120\165\142\154\151\143 +-\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151 +-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 +-\040\055\040\107\064\060\166\060\020\006\007\052\206\110\316\075 +-\002\001\006\005\053\201\004\000\042\003\142\000\004\247\126\172 +-\174\122\332\144\233\016\055\134\330\136\254\222\075\376\001\346 +-\031\112\075\024\003\113\372\140\047\040\331\203\211\151\372\124 +-\306\232\030\136\125\052\144\336\006\366\215\112\073\255\020\074 +-\145\075\220\210\004\211\340\060\141\263\256\135\001\247\173\336 +-\174\262\276\312\145\141\000\206\256\332\217\173\320\211\255\115 +-\035\131\232\101\261\274\107\200\334\236\142\303\371\243\201\262 +-\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004 +-\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001\014 +-\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026\011 +-\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007\006 +-\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215\216 +-\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026\043 +-\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162\151 +-\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157\056 +-\147\151\146\060\035\006\003\125\035\016\004\026\004\024\263\026 +-\221\375\356\246\156\344\265\056\111\217\207\170\201\200\354\345 +-\261\265\060\012\006\010\052\206\110\316\075\004\003\003\003\150 +-\000\060\145\002\060\146\041\014\030\046\140\132\070\173\126\102 +-\340\247\374\066\204\121\221\040\054\166\115\103\075\304\035\204 +-\043\320\254\326\174\065\006\316\315\151\275\220\015\333\154\110 +-\102\035\016\252\102\002\061\000\234\075\110\071\043\071\130\032 +-\025\022\131\152\236\357\325\131\262\035\122\054\231\161\315\307 +-\051\337\033\052\141\173\161\321\336\363\300\345\015\072\112\252 +-\055\247\330\206\052\335\056\020 +-END +- +-# Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\042\325\330\337\217\002\061\321\215\367\235\267\317\212\055\144 +-\311\077\154\072 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\072\122\341\347\375\157\072\343\157\363\157\231\033\371\042\101 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 +-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 +-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 +-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 +-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 +-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 +-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 +-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 +-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 +-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 +-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 +-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +-\165\164\150\157\162\151\164\171\040\055\040\107\064 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207 +-\254\263 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "NetLock Arany (Class Gold) Főtanúsítvány" +-# +-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 "NetLock Arany (Class Gold) Főtanúsítvány" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145 +-\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003 +-\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303 +-\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143 +-\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145 +-\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141 +-\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303 +-\272\163\303\255\164\166\303\241\156\171 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145 +-\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003 +-\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303 +-\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143 +-\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145 +-\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141 +-\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303 +-\272\163\303\255\164\166\303\241\156\171 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\111\101\054\344\000\020 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\025\060\202\002\375\240\003\002\001\002\002\006\111 +-\101\054\344\000\020\060\015\006\011\052\206\110\206\367\015\001 +-\001\013\005\000\060\201\247\061\013\060\011\006\003\125\004\006 +-\023\002\110\125\061\021\060\017\006\003\125\004\007\014\010\102 +-\165\144\141\160\145\163\164\061\025\060\023\006\003\125\004\012 +-\014\014\116\145\164\114\157\143\153\040\113\146\164\056\061\067 +-\060\065\006\003\125\004\013\014\056\124\141\156\303\272\163\303 +-\255\164\166\303\241\156\171\153\151\141\144\303\263\153\040\050 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\051\061\065\060\063\006\003\125\004\003 +-\014\054\116\145\164\114\157\143\153\040\101\162\141\156\171\040 +-\050\103\154\141\163\163\040\107\157\154\144\051\040\106\305\221 +-\164\141\156\303\272\163\303\255\164\166\303\241\156\171\060\036 +-\027\015\060\070\061\062\061\061\061\065\060\070\062\061\132\027 +-\015\062\070\061\062\060\066\061\065\060\070\062\061\132\060\201 +-\247\061\013\060\011\006\003\125\004\006\023\002\110\125\061\021 +-\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145\163 +-\164\061\025\060\023\006\003\125\004\012\014\014\116\145\164\114 +-\157\143\153\040\113\146\164\056\061\067\060\065\006\003\125\004 +-\013\014\056\124\141\156\303\272\163\303\255\164\166\303\241\156 +-\171\153\151\141\144\303\263\153\040\050\103\145\162\164\151\146 +-\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163 +-\051\061\065\060\063\006\003\125\004\003\014\054\116\145\164\114 +-\157\143\153\040\101\162\141\156\171\040\050\103\154\141\163\163 +-\040\107\157\154\144\051\040\106\305\221\164\141\156\303\272\163 +-\303\255\164\166\303\241\156\171\060\202\001\042\060\015\006\011 +-\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000 +-\060\202\001\012\002\202\001\001\000\304\044\136\163\276\113\155 +-\024\303\241\364\343\227\220\156\322\060\105\036\074\356\147\331 +-\144\340\032\212\177\312\060\312\203\343\040\301\343\364\072\323 +-\224\137\032\174\133\155\277\060\117\204\047\366\237\037\111\274 +-\306\231\012\220\362\017\365\177\103\204\067\143\121\213\172\245 +-\160\374\172\130\315\216\233\355\303\106\154\204\160\135\332\363 +-\001\220\043\374\116\060\251\176\341\047\143\347\355\144\074\240 +-\270\311\063\143\376\026\220\377\260\270\375\327\250\300\300\224 +-\103\013\266\325\131\246\236\126\320\044\037\160\171\257\333\071 +-\124\015\145\165\331\025\101\224\001\257\136\354\366\215\361\377 +-\255\144\376\040\232\327\134\353\376\246\037\010\144\243\213\166 +-\125\255\036\073\050\140\056\207\045\350\252\257\037\306\144\106 +-\040\267\160\177\074\336\110\333\226\123\267\071\167\344\032\342 +-\307\026\204\166\227\133\057\273\031\025\205\370\151\205\365\231 +-\247\251\362\064\247\251\266\246\003\374\157\206\075\124\174\166 +-\004\233\153\371\100\135\000\064\307\056\231\165\235\345\210\003 +-\252\115\370\003\322\102\166\300\033\002\003\000\250\213\243\105 +-\060\103\060\022\006\003\125\035\023\001\001\377\004\010\060\006 +-\001\001\377\002\001\004\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004 +-\024\314\372\147\223\360\266\270\320\245\300\036\363\123\375\214 +-\123\337\203\327\226\060\015\006\011\052\206\110\206\367\015\001 +-\001\013\005\000\003\202\001\001\000\253\177\356\034\026\251\234 +-\074\121\000\240\300\021\010\005\247\231\346\157\001\210\124\141 +-\156\361\271\030\255\112\255\376\201\100\043\224\057\373\165\174 +-\057\050\113\142\044\201\202\013\365\141\361\034\156\270\141\070 +-\353\201\372\142\241\073\132\142\323\224\145\304\341\346\155\202 +-\370\057\045\160\262\041\046\301\162\121\037\214\054\303\204\220 +-\303\132\217\272\317\364\247\145\245\353\230\321\373\005\262\106 +-\165\025\043\152\157\205\143\060\200\360\325\236\037\051\034\302 +-\154\260\120\131\135\220\133\073\250\015\060\317\277\175\177\316 +-\361\235\203\275\311\106\156\040\246\371\141\121\272\041\057\173 +-\276\245\025\143\241\324\225\207\361\236\271\363\211\363\075\205 +-\270\270\333\276\265\271\051\371\332\067\005\000\111\224\003\204 +-\104\347\277\103\061\317\165\213\045\321\364\246\144\365\222\366 +-\253\005\353\075\351\245\013\066\142\332\314\006\137\066\213\266 +-\136\061\270\052\373\136\366\161\337\104\046\236\304\346\015\221 +-\264\056\165\225\200\121\152\113\060\246\260\142\241\223\361\233 +-\330\316\304\143\165\077\131\107\261 +-END +- +-# Trust for Certificate "NetLock Arany (Class Gold) Főtanúsítvány" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "NetLock Arany (Class Gold) Főtanúsítvány" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\006\010\077\131\077\025\241\004\240\151\244\153\251\003\320\006 +-\267\227\011\221 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\305\241\267\377\163\335\326\327\064\062\030\337\374\074\255\210 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145 +-\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003 +-\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303 +-\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164 +-\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143 +-\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145 +-\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141 +-\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303 +-\272\163\303\255\164\166\303\241\156\171 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\006\111\101\054\344\000\020 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Staat der Nederlanden Root CA - G2" +-# +-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 "Staat der Nederlanden Root CA - G2" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 +-\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 +-\122\157\157\164\040\103\101\040\055\040\107\062 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 +-\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 +-\122\157\157\164\040\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\000\230\226\214 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\312\060\202\003\262\240\003\002\001\002\002\004\000 +-\230\226\214\060\015\006\011\052\206\110\206\367\015\001\001\013 +-\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116 +-\114\061\036\060\034\006\003\125\004\012\014\025\123\164\141\141 +-\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145 +-\156\061\053\060\051\006\003\125\004\003\014\042\123\164\141\141 +-\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145 +-\156\040\122\157\157\164\040\103\101\040\055\040\107\062\060\036 +-\027\015\060\070\060\063\062\066\061\061\061\070\061\067\132\027 +-\015\062\060\060\063\062\065\061\061\060\063\061\060\132\060\132 +-\061\013\060\011\006\003\125\004\006\023\002\116\114\061\036\060 +-\034\006\003\125\004\012\014\025\123\164\141\141\164\040\144\145 +-\162\040\116\145\144\145\162\154\141\156\144\145\156\061\053\060 +-\051\006\003\125\004\003\014\042\123\164\141\141\164\040\144\145 +-\162\040\116\145\144\145\162\154\141\156\144\145\156\040\122\157 +-\157\164\040\103\101\040\055\040\107\062\060\202\002\042\060\015 +-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002 +-\017\000\060\202\002\012\002\202\002\001\000\305\131\347\157\165 +-\252\076\113\234\265\270\254\236\013\344\371\331\312\253\135\217 +-\265\071\020\202\327\257\121\340\073\341\000\110\152\317\332\341 +-\006\103\021\231\252\024\045\022\255\042\350\000\155\103\304\251 +-\270\345\037\211\113\147\275\141\110\357\375\322\340\140\210\345 +-\271\030\140\050\303\167\053\255\260\067\252\067\336\144\131\052 +-\106\127\344\113\271\370\067\174\325\066\347\200\301\266\363\324 +-\147\233\226\350\316\327\306\012\123\320\153\111\226\363\243\013 +-\005\167\110\367\045\345\160\254\060\024\040\045\343\177\165\132 +-\345\110\370\116\173\003\007\004\372\202\141\207\156\360\073\304 +-\244\307\320\365\164\076\245\135\032\010\362\233\045\322\366\254 +-\004\046\076\125\072\142\050\245\173\262\060\257\370\067\302\321 +-\272\326\070\375\364\357\111\060\067\231\046\041\110\205\001\251 +-\345\026\347\334\220\125\337\017\350\070\315\231\067\041\117\135 +-\365\042\157\152\305\022\026\140\027\125\362\145\146\246\247\060 +-\221\070\301\070\035\206\004\204\272\032\045\170\136\235\257\314 +-\120\140\326\023\207\122\355\143\037\155\145\175\302\025\030\164 +-\312\341\176\144\051\214\162\330\026\023\175\013\111\112\361\050 +-\033\040\164\153\305\075\335\260\252\110\011\075\056\202\224\315 +-\032\145\331\053\210\232\231\274\030\176\237\356\175\146\174\076 +-\275\224\270\201\316\315\230\060\170\301\157\147\320\276\137\340 +-\150\355\336\342\261\311\054\131\170\222\252\337\053\140\143\362 +-\345\136\271\343\312\372\177\120\206\076\242\064\030\014\011\150 +-\050\021\034\344\341\271\134\076\107\272\062\077\030\314\133\204 +-\365\363\153\164\304\162\164\341\343\213\240\112\275\215\146\057 +-\352\255\065\332\040\323\210\202\141\360\022\042\266\274\320\325 +-\244\354\257\124\210\045\044\074\247\155\261\162\051\077\076\127 +-\246\177\125\257\156\046\306\376\347\314\100\134\121\104\201\012 +-\170\336\112\316\125\277\035\325\331\267\126\357\360\166\377\013 +-\171\265\257\275\373\251\151\221\106\227\150\200\024\066\035\263 +-\177\273\051\230\066\245\040\372\202\140\142\063\244\354\326\272 +-\007\247\156\305\317\024\246\347\326\222\064\330\201\365\374\035 +-\135\252\134\036\366\243\115\073\270\367\071\002\003\001\000\001 +-\243\201\227\060\201\224\060\017\006\003\125\035\023\001\001\377 +-\004\005\060\003\001\001\377\060\122\006\003\125\035\040\004\113 +-\060\111\060\107\006\004\125\035\040\000\060\077\060\075\006\010 +-\053\006\001\005\005\007\002\001\026\061\150\164\164\160\072\057 +-\057\167\167\167\056\160\153\151\157\166\145\162\150\145\151\144 +-\056\156\154\057\160\157\154\151\143\151\145\163\057\162\157\157 +-\164\055\160\157\154\151\143\171\055\107\062\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 +-\035\016\004\026\004\024\221\150\062\207\025\035\211\342\265\361 +-\254\066\050\064\215\013\174\142\210\353\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\003\202\002\001\000\250\101 +-\112\147\052\222\201\202\120\156\341\327\330\263\071\073\363\002 +-\025\011\120\121\357\055\275\044\173\210\206\073\371\264\274\222 +-\011\226\271\366\300\253\043\140\006\171\214\021\116\121\322\171 +-\200\063\373\235\110\276\354\101\103\201\037\176\107\100\034\345 +-\172\010\312\252\213\165\255\024\304\302\350\146\074\202\007\247 +-\346\047\202\133\030\346\017\156\331\120\076\212\102\030\051\306 +-\264\126\374\126\020\240\005\027\275\014\043\177\364\223\355\234 +-\032\121\276\335\105\101\277\221\044\264\037\214\351\137\317\173 +-\041\231\237\225\237\071\072\106\034\154\371\315\173\234\220\315 +-\050\251\307\251\125\273\254\142\064\142\065\023\113\024\072\125 +-\203\271\206\215\222\246\306\364\007\045\124\314\026\127\022\112 +-\202\170\310\024\331\027\202\046\055\135\040\037\171\256\376\324 +-\160\026\026\225\203\330\065\071\377\122\135\165\034\026\305\023 +-\125\317\107\314\165\145\122\112\336\360\260\247\344\012\226\013 +-\373\255\302\342\045\204\262\335\344\275\176\131\154\233\360\360 +-\330\347\312\362\351\227\070\176\211\276\314\373\071\027\141\077 +-\162\333\072\221\330\145\001\031\035\255\120\244\127\012\174\113 +-\274\234\161\163\052\105\121\031\205\314\216\375\107\247\164\225 +-\035\250\321\257\116\027\261\151\046\302\252\170\127\133\305\115 +-\247\345\236\005\027\224\312\262\137\240\111\030\215\064\351\046 +-\154\110\036\252\150\222\005\341\202\163\132\233\334\007\133\010 +-\155\175\235\327\215\041\331\374\024\040\252\302\105\337\077\347 +-\000\262\121\344\302\370\005\271\171\032\214\064\363\236\133\344 +-\067\133\153\112\337\054\127\212\100\132\066\272\335\165\104\010 +-\067\102\160\014\376\334\136\041\240\243\212\300\220\234\150\332 +-\120\346\105\020\107\170\266\116\322\145\311\303\067\337\341\102 +-\143\260\127\067\105\055\173\212\234\277\005\352\145\125\063\367 +-\071\020\305\050\052\041\172\033\212\304\044\371\077\025\310\232 +-\025\040\365\125\142\226\355\155\223\120\274\344\252\170\255\331 +-\313\012\145\207\246\146\301\304\201\243\167\072\130\036\013\356 +-\203\213\235\036\322\122\244\314\035\157\260\230\155\224\061\265 +-\370\161\012\334\271\374\175\062\140\346\353\257\212\001 +-END +- +-# Trust for Certificate "Staat der Nederlanden Root CA - G2" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Staat der Nederlanden Root CA - G2" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\131\257\202\171\221\206\307\264\165\007\313\317\003\127\106\353 +-\004\335\267\026 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\174\245\017\370\133\232\175\155\060\256\124\132\343\102\242\212 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 +-\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040 +-\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 +-\122\157\157\164\040\103\101\040\055\040\107\062 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\000\230\226\214 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "CA Disig" +-# +-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 "CA Disig" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061 +-\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163 +-\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104 +-\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125 +-\004\003\023\010\103\101\040\104\151\163\151\147 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061 +-\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163 +-\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104 +-\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125 +-\004\003\023\010\103\101\040\104\151\163\151\147 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\001 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061\023 +-\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163\154 +-\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104\151 +-\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125\004 +-\003\023\010\103\101\040\104\151\163\151\147\060\036\027\015\060 +-\066\060\063\062\062\060\061\063\071\063\064\132\027\015\061\066 +-\060\063\062\062\060\061\063\071\063\064\132\060\112\061\013\060 +-\011\006\003\125\004\006\023\002\123\113\061\023\060\021\006\003 +-\125\004\007\023\012\102\162\141\164\151\163\154\141\166\141\061 +-\023\060\021\006\003\125\004\012\023\012\104\151\163\151\147\040 +-\141\056\163\056\061\021\060\017\006\003\125\004\003\023\010\103 +-\101\040\104\151\163\151\147\060\202\001\042\060\015\006\011\052 +-\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060 +-\202\001\012\002\202\001\001\000\222\366\061\301\175\210\375\231 +-\001\251\330\173\362\161\165\361\061\306\363\165\146\372\121\050 +-\106\204\227\170\064\274\154\374\274\105\131\210\046\030\112\304 +-\067\037\241\112\104\275\343\161\004\365\104\027\342\077\374\110 +-\130\157\134\236\172\011\272\121\067\042\043\146\103\041\260\074 +-\144\242\370\152\025\016\077\353\121\341\124\251\335\006\231\327 +-\232\074\124\213\071\003\077\017\305\316\306\353\203\162\002\250 +-\037\161\363\055\370\165\010\333\142\114\350\372\316\371\347\152 +-\037\266\153\065\202\272\342\217\026\222\175\005\014\154\106\003 +-\135\300\355\151\277\072\301\212\240\350\216\331\271\105\050\207 +-\010\354\264\312\025\276\202\335\265\104\213\055\255\206\014\150 +-\142\155\205\126\362\254\024\143\072\306\321\231\254\064\170\126 +-\113\317\266\255\077\214\212\327\004\345\343\170\114\365\206\252 +-\365\217\372\075\154\161\243\055\312\147\353\150\173\156\063\251 +-\014\202\050\250\114\152\041\100\025\040\014\046\133\203\302\251 +-\026\025\300\044\202\135\053\026\255\312\143\366\164\000\260\337 +-\103\304\020\140\126\147\143\105\002\003\001\000\001\243\201\377 +-\060\201\374\060\017\006\003\125\035\023\001\001\377\004\005\060 +-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\215 +-\262\111\150\235\162\010\045\271\300\047\365\120\223\126\110\106 +-\161\371\217\060\016\006\003\125\035\017\001\001\377\004\004\003 +-\002\001\006\060\066\006\003\125\035\021\004\057\060\055\201\023 +-\143\141\157\160\145\162\141\164\157\162\100\144\151\163\151\147 +-\056\163\153\206\026\150\164\164\160\072\057\057\167\167\167\056 +-\144\151\163\151\147\056\163\153\057\143\141\060\146\006\003\125 +-\035\037\004\137\060\135\060\055\240\053\240\051\206\047\150\164 +-\164\160\072\057\057\167\167\167\056\144\151\163\151\147\056\163 +-\153\057\143\141\057\143\162\154\057\143\141\137\144\151\163\151 +-\147\056\143\162\154\060\054\240\052\240\050\206\046\150\164\164 +-\160\072\057\057\143\141\056\144\151\163\151\147\056\163\153\057 +-\143\141\057\143\162\154\057\143\141\137\144\151\163\151\147\056 +-\143\162\154\060\032\006\003\125\035\040\004\023\060\021\060\017 +-\006\015\053\201\036\221\223\346\012\000\000\000\001\001\001\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202 +-\001\001\000\135\064\164\141\114\257\073\330\377\237\155\130\066 +-\034\075\013\201\015\022\053\106\020\200\375\347\074\047\320\172 +-\310\251\266\176\164\060\063\243\072\212\173\164\300\171\171\102 +-\223\155\377\261\051\024\202\253\041\214\057\027\371\077\046\057 +-\365\131\306\357\200\006\267\232\111\051\354\316\176\161\074\152 +-\020\101\300\366\323\232\262\174\132\221\234\300\254\133\310\115 +-\136\367\341\123\377\103\167\374\236\113\147\154\327\363\203\321 +-\240\340\177\045\337\270\230\013\232\062\070\154\060\240\363\377 +-\010\025\063\367\120\112\173\076\243\076\040\251\334\057\126\200 +-\012\355\101\120\260\311\364\354\262\343\046\104\000\016\157\236 +-\006\274\042\226\123\160\145\304\120\012\106\153\244\057\047\201 +-\022\047\023\137\020\241\166\316\212\173\067\352\303\071\141\003 +-\225\230\072\347\154\210\045\010\374\171\150\015\207\175\142\370 +-\264\137\373\305\330\114\275\130\274\077\103\133\324\036\001\115 +-\074\143\276\043\357\214\315\132\120\270\150\124\371\012\231\063 +-\021\000\341\236\302\106\167\202\365\131\006\214\041\114\207\011 +-\315\345\250 +-END +- +-# Trust for Certificate "CA Disig" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "CA Disig" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\052\310\325\213\127\316\277\057\111\257\362\374\166\217\121\024 +-\142\220\172\101 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\077\105\226\071\342\120\207\367\273\376\230\014\074\040\230\346 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061 +-\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163 +-\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104 +-\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125 +-\004\003\023\010\103\101\040\104\151\163\151\147 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Juur-SK" +-# +-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 "Juur-SK" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011 +-\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011 +-\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125 +-\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163 +-\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060 +-\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011 +-\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011 +-\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125 +-\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163 +-\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060 +-\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\073\216\113\374 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\346\060\202\003\316\240\003\002\001\002\002\004\073 +-\216\113\374\060\015\006\011\052\206\110\206\367\015\001\001\005 +-\005\000\060\135\061\030\060\026\006\011\052\206\110\206\367\015 +-\001\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013 +-\060\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006 +-\003\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151 +-\164\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061 +-\020\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123 +-\113\060\036\027\015\060\061\060\070\063\060\061\064\062\063\060 +-\061\132\027\015\061\066\060\070\062\066\061\064\062\063\060\061 +-\132\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001 +-\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060 +-\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003 +-\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164 +-\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020 +-\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001 +-\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001 +-\000\201\161\066\076\063\007\326\343\060\215\023\176\167\062\106 +-\313\317\031\262\140\061\106\227\206\364\230\106\244\302\145\105 +-\317\323\100\174\343\132\042\250\020\170\063\314\210\261\323\201 +-\112\366\142\027\173\137\115\012\056\320\317\213\043\356\117\002 +-\116\273\353\016\312\275\030\143\350\200\034\215\341\034\215\075 +-\340\377\133\137\352\144\345\227\350\077\231\177\014\012\011\063 +-\000\032\123\247\041\341\070\113\326\203\033\255\257\144\302\371 +-\034\172\214\146\110\115\146\037\030\012\342\076\273\037\007\145 +-\223\205\271\032\260\271\304\373\015\021\366\365\326\371\033\307 +-\054\053\267\030\121\376\340\173\366\250\110\257\154\073\117\057 +-\357\370\321\107\036\046\127\360\121\035\063\226\377\357\131\075 +-\332\115\321\025\064\307\352\077\026\110\173\221\034\200\103\017 +-\075\270\005\076\321\263\225\315\330\312\017\302\103\147\333\267 +-\223\340\042\202\056\276\365\150\050\203\271\301\073\151\173\040 +-\332\116\234\155\341\272\315\217\172\154\260\011\042\327\213\013 +-\333\034\325\132\046\133\015\300\352\345\140\320\237\376\065\337 +-\077\002\003\001\000\001\243\202\001\254\060\202\001\250\060\017 +-\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +-\202\001\026\006\003\125\035\040\004\202\001\015\060\202\001\011 +-\060\202\001\005\006\012\053\006\001\004\001\316\037\001\001\001 +-\060\201\366\060\201\320\006\010\053\006\001\005\005\007\002\002 +-\060\201\303\036\201\300\000\123\000\145\000\145\000\040\000\163 +-\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141 +-\000\141\000\164\000\040\000\157\000\156\000\040\000\166\000\344 +-\000\154\000\152\000\141\000\163\000\164\000\141\000\164\000\165 +-\000\144\000\040\000\101\000\123\000\055\000\151\000\163\000\040 +-\000\123\000\145\000\162\000\164\000\151\000\146\000\151\000\164 +-\000\163\000\145\000\145\000\162\000\151\000\155\000\151\000\163 +-\000\153\000\145\000\163\000\153\000\165\000\163\000\040\000\141 +-\000\154\000\141\000\155\000\055\000\123\000\113\000\040\000\163 +-\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141 +-\000\141\000\164\000\151\000\144\000\145\000\040\000\153\000\151 +-\000\156\000\156\000\151\000\164\000\141\000\155\000\151\000\163 +-\000\145\000\153\000\163\060\041\006\010\053\006\001\005\005\007 +-\002\001\026\025\150\164\164\160\072\057\057\167\167\167\056\163 +-\153\056\145\145\057\143\160\163\057\060\053\006\003\125\035\037 +-\004\044\060\042\060\040\240\036\240\034\206\032\150\164\164\160 +-\072\057\057\167\167\167\056\163\153\056\145\145\057\152\165\165 +-\162\057\143\162\154\057\060\035\006\003\125\035\016\004\026\004 +-\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030\077 +-\157\357\351\175\276\060\037\006\003\125\035\043\004\030\060\026 +-\200\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030 +-\077\157\357\351\175\276\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\346\060\015\006\011\052\206\110\206\367\015 +-\001\001\005\005\000\003\202\001\001\000\173\301\030\224\123\242 +-\011\363\376\046\147\232\120\344\303\005\057\053\065\170\221\114 +-\174\250\021\021\171\114\111\131\254\310\367\205\145\134\106\273 +-\073\020\240\002\257\315\117\265\314\066\052\354\135\376\357\240 +-\221\311\266\223\157\174\200\124\354\307\010\160\015\216\373\202 +-\354\052\140\170\151\066\066\321\305\234\213\151\265\100\310\224 +-\145\167\362\127\041\146\073\316\205\100\266\063\143\032\277\171 +-\036\374\134\035\323\035\223\033\213\014\135\205\275\231\060\062 +-\030\011\221\122\351\174\241\272\377\144\222\232\354\376\065\356 +-\214\057\256\374\040\206\354\112\336\033\170\062\067\246\201\322 +-\235\257\132\022\026\312\231\133\374\157\155\016\305\240\036\206 +-\311\221\320\134\230\202\137\143\014\212\132\253\330\225\246\314 +-\313\212\326\277\144\113\216\312\212\262\260\351\041\062\236\252 +-\250\205\230\064\201\071\041\073\250\072\122\062\075\366\153\067 +-\206\006\132\025\230\334\360\021\146\376\064\040\267\003\364\101 +-\020\175\071\204\171\226\162\143\266\226\002\345\153\271\255\031 +-\115\273\306\104\333\066\313\052\234\216 +-END +- +-# Trust for Certificate "Juur-SK" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Juur-SK" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\100\235\113\331\027\265\134\047\266\233\144\313\230\042\104\015 +-\315\011\270\211 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\252\216\135\331\370\333\012\130\267\215\046\207\154\202\065\125 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011 +-\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011 +-\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125 +-\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163 +-\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060 +-\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\004\073\216\113\374 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Hongkong Post Root CA 1" +-# +-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 "Hongkong Post Root CA 1" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\003\350 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\060\060\202\002\030\240\003\002\001\002\002\002\003 +-\350\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061\060\036\027\015\060\063\060 +-\065\061\065\060\065\061\063\061\064\132\027\015\062\063\060\065 +-\061\065\060\064\065\062\062\071\132\060\107\061\013\060\011\006 +-\003\125\004\006\023\002\110\113\061\026\060\024\006\003\125\004 +-\012\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164 +-\061\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153 +-\157\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101 +-\040\061\060\202\001\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 +-\001\001\000\254\377\070\266\351\146\002\111\343\242\264\341\220 +-\371\100\217\171\371\342\275\171\376\002\275\356\044\222\035\042 +-\366\332\205\162\151\376\327\077\011\324\335\221\265\002\234\320 +-\215\132\341\125\303\120\206\271\051\046\302\343\331\240\361\151 +-\003\050\040\200\105\042\055\126\247\073\124\225\126\042\131\037 +-\050\337\037\040\075\155\242\066\276\043\240\261\156\265\261\047 +-\077\071\123\011\352\253\152\350\164\262\302\145\134\216\277\174 +-\303\170\204\315\236\026\374\365\056\117\040\052\010\237\167\363 +-\305\036\304\232\122\146\036\110\136\343\020\006\217\042\230\341 +-\145\216\033\135\043\146\073\270\245\062\121\310\206\252\241\251 +-\236\177\166\224\302\246\154\267\101\360\325\310\006\070\346\324 +-\014\342\363\073\114\155\120\214\304\203\047\301\023\204\131\075 +-\236\165\164\266\330\002\136\072\220\172\300\102\066\162\354\152 +-\115\334\357\304\000\337\023\030\127\137\046\170\310\326\012\171 +-\167\277\367\257\267\166\271\245\013\204\027\135\020\352\157\341 +-\253\225\021\137\155\074\243\134\115\203\133\362\263\031\212\200 +-\213\013\207\002\003\001\000\001\243\046\060\044\060\022\006\003 +-\125\035\023\001\001\377\004\010\060\006\001\001\377\002\001\003 +-\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\306 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 +-\202\001\001\000\016\106\325\074\256\342\207\331\136\201\213\002 +-\230\101\010\214\114\274\332\333\356\047\033\202\347\152\105\354 +-\026\213\117\205\240\363\262\160\275\132\226\272\312\156\155\356 +-\106\213\156\347\052\056\226\263\031\063\353\264\237\250\262\067 +-\356\230\250\227\266\056\266\147\047\324\246\111\375\034\223\145 +-\166\236\102\057\334\042\154\232\117\362\132\025\071\261\161\327 +-\053\121\350\155\034\230\300\331\052\364\241\202\173\325\311\101 +-\242\043\001\164\070\125\213\017\271\056\147\242\040\004\067\332 +-\234\013\323\027\041\340\217\227\171\064\157\204\110\002\040\063 +-\033\346\064\104\237\221\160\364\200\136\204\103\302\051\322\154 +-\022\024\344\141\215\254\020\220\236\204\120\273\360\226\157\105 +-\237\212\363\312\154\117\372\021\072\025\025\106\303\315\037\203 +-\133\055\101\022\355\120\147\101\023\075\041\253\224\212\252\116 +-\174\301\261\373\247\326\265\047\057\227\253\156\340\035\342\321 +-\034\054\037\104\342\374\276\221\241\234\373\326\051\123\163\206 +-\237\123\330\103\016\135\326\143\202\161\035\200\164\312\366\342 +-\002\153\331\132 +-END +- +-# Trust for Certificate "Hongkong Post Root CA 1" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Hongkong Post Root CA 1" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\326\332\250\040\215\011\322\025\115\044\265\057\313\064\156\262 +-\130\262\212\130 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\250\015\157\071\170\271\103\155\167\102\155\230\132\314\043\312 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +-\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157 +-\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003 +-\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040 +-\122\157\157\164\040\103\101\040\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\002\003\350 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "SecureSign RootCA11" +-# +-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 "SecureSign RootCA11" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032 +-\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147 +-\156\040\122\157\157\164\103\101\061\061 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032 +-\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147 +-\156\040\122\157\157\164\103\101\061\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\003\155\060\202\002\125\240\003\002\001\002\002\001\001 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061\053 +-\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040\103 +-\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162 +-\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032\006 +-\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147\156 +-\040\122\157\157\164\103\101\061\061\060\036\027\015\060\071\060 +-\064\060\070\060\064\065\066\064\067\132\027\015\062\071\060\064 +-\060\070\060\064\065\066\064\067\132\060\130\061\013\060\011\006 +-\003\125\004\006\023\002\112\120\061\053\060\051\006\003\125\004 +-\012\023\042\112\141\160\141\156\040\103\145\162\164\151\146\151 +-\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163\054 +-\040\111\156\143\056\061\034\060\032\006\003\125\004\003\023\023 +-\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164\103 +-\101\061\061\060\202\001\042\060\015\006\011\052\206\110\206\367 +-\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 +-\202\001\001\000\375\167\252\245\034\220\005\073\313\114\233\063 +-\213\132\024\105\244\347\220\026\321\337\127\322\041\020\244\027 +-\375\337\254\326\037\247\344\333\174\367\354\337\270\003\332\224 +-\130\375\135\162\174\214\077\137\001\147\164\025\226\343\002\074 +-\207\333\256\313\001\216\302\363\146\306\205\105\364\002\306\072 +-\265\142\262\257\372\234\277\244\346\324\200\060\230\363\015\266 +-\223\217\251\324\330\066\362\260\374\212\312\054\241\025\063\225 +-\061\332\300\033\362\356\142\231\206\143\077\277\335\223\052\203 +-\250\166\271\023\037\267\316\116\102\205\217\042\347\056\032\362 +-\225\011\262\005\265\104\116\167\241\040\275\251\362\116\012\175 +-\120\255\365\005\015\105\117\106\161\375\050\076\123\373\004\330 +-\055\327\145\035\112\033\372\317\073\260\061\232\065\156\310\213 +-\006\323\000\221\362\224\010\145\114\261\064\006\000\172\211\342 +-\360\307\003\131\317\325\326\350\247\062\263\346\230\100\206\305 +-\315\047\022\213\314\173\316\267\021\074\142\140\007\043\076\053 +-\100\156\224\200\011\155\266\263\157\167\157\065\010\120\373\002 +-\207\305\076\211\002\003\001\000\001\243\102\060\100\060\035\006 +-\003\125\035\016\004\026\004\024\133\370\115\117\262\245\206\324 +-\072\322\361\143\232\240\276\011\366\127\267\336\060\016\006\003 +-\125\035\017\001\001\377\004\004\003\002\001\006\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\005\005\000\003\202\001\001 +-\000\240\241\070\026\146\056\247\126\037\041\234\006\372\035\355 +-\271\042\305\070\046\330\116\117\354\243\177\171\336\106\041\241 +-\207\167\217\007\010\232\262\244\305\257\017\062\230\013\174\146 +-\051\266\233\175\045\122\111\103\253\114\056\053\156\172\160\257 +-\026\016\343\002\154\373\102\346\030\235\105\330\125\310\350\073 +-\335\347\341\364\056\013\034\064\134\154\130\112\373\214\210\120 +-\137\225\034\277\355\253\042\265\145\263\205\272\236\017\270\255 +-\345\172\033\212\120\072\035\275\015\274\173\124\120\013\271\102 +-\257\125\240\030\201\255\145\231\357\276\344\234\277\304\205\253 +-\101\262\124\157\334\045\315\355\170\342\216\014\215\011\111\335 +-\143\173\132\151\226\002\041\250\275\122\131\351\175\065\313\310 +-\122\312\177\201\376\331\153\323\367\021\355\045\337\370\347\371 +-\244\372\162\227\204\123\015\245\320\062\030\121\166\131\024\154 +-\017\353\354\137\200\214\165\103\203\303\205\230\377\114\236\055 +-\015\344\167\203\223\116\265\226\007\213\050\023\233\214\031\215 +-\101\047\111\100\356\336\346\043\104\071\334\241\042\326\272\003 +-\362 +-END +- +-# Trust for Certificate "SecureSign RootCA11" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "SecureSign RootCA11" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\073\304\237\110\370\363\163\240\234\036\275\370\133\261\303\145 +-\307\330\021\263 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\267\122\164\342\222\264\200\223\362\165\344\314\327\362\352\046 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +-\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040 +-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 +-\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032 +-\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147 +-\156\040\122\157\157\164\103\101\061\061 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "ACEDICOM Root" +-# +-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 "ACEDICOM Root" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105 +-\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003 +-\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004 +-\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125 +-\004\006\023\002\105\123 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105 +-\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003 +-\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004 +-\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125 +-\004\006\023\002\105\123 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\141\215\307\206\073\001\202\005 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\265\060\202\003\235\240\003\002\001\002\002\010\141 +-\215\307\206\073\001\202\005\060\015\006\011\052\206\110\206\367 +-\015\001\001\005\005\000\060\104\061\026\060\024\006\003\125\004 +-\003\014\015\101\103\105\104\111\103\117\115\040\122\157\157\164 +-\061\014\060\012\006\003\125\004\013\014\003\120\113\111\061\017 +-\060\015\006\003\125\004\012\014\006\105\104\111\103\117\115\061 +-\013\060\011\006\003\125\004\006\023\002\105\123\060\036\027\015 +-\060\070\060\064\061\070\061\066\062\064\062\062\132\027\015\062 +-\070\060\064\061\063\061\066\062\064\062\062\132\060\104\061\026 +-\060\024\006\003\125\004\003\014\015\101\103\105\104\111\103\117 +-\115\040\122\157\157\164\061\014\060\012\006\003\125\004\013\014 +-\003\120\113\111\061\017\060\015\006\003\125\004\012\014\006\105 +-\104\111\103\117\115\061\013\060\011\006\003\125\004\006\023\002 +-\105\123\060\202\002\042\060\015\006\011\052\206\110\206\367\015 +-\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 +-\002\001\000\377\222\225\341\150\006\166\264\054\310\130\110\312 +-\375\200\124\051\125\143\044\377\220\145\233\020\165\173\303\152 +-\333\142\002\001\362\030\206\265\174\132\070\261\344\130\271\373 +-\323\330\055\237\275\062\067\277\054\025\155\276\265\364\041\322 +-\023\221\331\007\255\001\005\326\363\275\167\316\137\102\201\012 +-\371\152\343\203\000\250\053\056\125\023\143\201\312\107\034\173 +-\134\026\127\172\033\203\140\004\072\076\145\303\315\001\336\336 +-\244\326\014\272\216\336\331\004\356\027\126\042\233\217\143\375 +-\115\026\013\267\173\167\214\371\045\265\321\155\231\022\056\117 +-\032\270\346\352\004\222\256\075\021\271\121\102\075\207\260\061 +-\205\257\171\132\234\376\347\116\136\222\117\103\374\253\072\255 +-\245\022\046\146\271\342\014\327\230\316\324\130\245\225\100\012 +-\267\104\235\023\164\053\302\245\353\042\025\230\020\330\213\305 +-\004\237\035\217\140\345\006\033\233\317\271\171\240\075\242\043 +-\077\102\077\153\372\034\003\173\060\215\316\154\300\277\346\033 +-\137\277\147\270\204\031\325\025\357\173\313\220\066\061\142\311 +-\274\002\253\106\137\233\376\032\150\224\064\075\220\216\255\366 +-\344\035\011\177\112\210\070\077\276\147\375\064\226\365\035\274 +-\060\164\313\070\356\325\154\253\324\374\364\000\267\000\133\205 +-\062\026\166\063\351\330\243\231\235\005\000\252\026\346\363\201 +-\175\157\175\252\206\155\255\025\164\323\304\242\161\252\364\024 +-\175\347\062\270\037\274\325\361\116\275\157\027\002\071\327\016 +-\225\102\072\307\000\076\351\046\143\021\352\013\321\112\377\030 +-\235\262\327\173\057\072\331\226\373\350\036\222\256\023\125\310 +-\331\047\366\334\110\033\260\044\301\205\343\167\235\232\244\363 +-\014\021\035\015\310\264\024\356\265\202\127\011\277\040\130\177 +-\057\042\043\330\160\313\171\154\311\113\362\251\052\310\374\207 +-\053\327\032\120\370\047\350\057\103\343\072\275\330\127\161\375 +-\316\246\122\133\371\335\115\355\345\366\157\211\355\273\223\234 +-\166\041\165\360\222\114\051\367\057\234\001\056\376\120\106\236 +-\144\014\024\263\007\133\305\302\163\154\361\007\134\105\044\024 +-\065\256\203\361\152\115\211\172\372\263\330\055\146\360\066\207 +-\365\053\123\002\003\001\000\001\243\201\252\060\201\247\060\017 +-\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +-\037\006\003\125\035\043\004\030\060\026\200\024\246\263\341\053 +-\053\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120 +-\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\206 +-\060\035\006\003\125\035\016\004\026\004\024\246\263\341\053\053 +-\111\266\327\163\241\252\224\365\001\347\163\145\114\254\120\060 +-\104\006\003\125\035\040\004\075\060\073\060\071\006\004\125\035 +-\040\000\060\061\060\057\006\010\053\006\001\005\005\007\002\001 +-\026\043\150\164\164\160\072\057\057\141\143\145\144\151\143\157 +-\155\056\145\144\151\143\157\155\147\162\157\165\160\056\143\157 +-\155\057\144\157\143\060\015\006\011\052\206\110\206\367\015\001 +-\001\005\005\000\003\202\002\001\000\316\054\013\122\121\142\046 +-\175\014\047\203\217\305\366\332\240\150\173\117\222\136\352\244 +-\163\062\021\123\104\262\104\313\235\354\017\171\102\263\020\246 +-\307\015\235\313\266\372\077\072\174\352\277\210\123\033\074\367 +-\202\372\005\065\063\341\065\250\127\300\347\375\215\117\077\223 +-\062\117\170\146\003\167\007\130\351\225\310\176\076\320\171\000 +-\214\362\033\121\063\233\274\224\351\072\173\156\122\055\062\236 +-\043\244\105\373\266\056\023\260\213\030\261\335\316\325\035\247 +-\102\177\125\276\373\133\273\107\324\374\044\315\004\256\226\005 +-\025\326\254\316\060\363\312\013\305\272\342\042\340\246\255\042 +-\344\002\356\164\021\177\114\377\170\035\065\332\346\002\064\353 +-\030\022\141\167\006\011\026\143\352\030\255\242\207\037\362\307 +-\200\011\011\165\116\020\250\217\075\206\270\165\021\300\044\142 +-\212\226\173\112\105\351\354\131\305\276\153\203\346\341\350\254 +-\265\060\036\376\005\007\200\371\341\043\015\120\217\005\230\377 +-\054\137\350\073\266\255\317\201\265\041\207\312\010\052\043\047 +-\060\040\053\317\355\224\133\254\262\172\322\307\050\241\212\013 +-\233\115\112\054\155\205\077\011\162\074\147\342\331\334\007\272 +-\353\145\173\132\001\143\326\220\133\117\027\146\075\177\013\031 +-\243\223\143\020\122\052\237\024\026\130\342\334\245\364\241\026 +-\213\016\221\213\201\312\233\131\372\330\153\221\007\145\125\137 +-\122\037\257\072\373\220\335\151\245\133\234\155\016\054\266\372 +-\316\254\245\174\062\112\147\100\334\060\064\043\335\327\004\043 +-\146\360\374\125\200\247\373\146\031\202\065\147\142\160\071\136 +-\157\307\352\220\100\104\010\036\270\262\326\333\356\131\247\015 +-\030\171\064\274\124\030\136\123\312\064\121\355\105\012\346\216 +-\307\202\066\076\247\070\143\251\060\054\027\020\140\222\237\125 +-\207\022\131\020\302\017\147\151\021\314\116\036\176\112\232\255 +-\257\100\250\165\254\126\220\164\270\240\234\245\171\157\334\351 +-\032\310\151\005\351\272\372\003\263\174\344\340\116\302\316\235 +-\350\266\106\015\156\176\127\072\147\224\302\313\037\234\167\112 +-\147\116\151\206\103\223\070\373\266\333\117\203\221\324\140\176 +-\113\076\053\070\007\125\230\136\244 +-END +- +-# Trust for Certificate "ACEDICOM Root" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "ACEDICOM Root" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\340\264\062\056\262\366\245\150\266\124\123\204\110\030\112\120 +-\066\207\103\204 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\102\201\240\342\034\343\125\020\336\125\211\102\145\226\042\346 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105 +-\104\111\103\117\115\040\122\157\157\164\061\014\060\012\006\003 +-\125\004\013\014\003\120\113\111\061\017\060\015\006\003\125\004 +-\012\014\006\105\104\111\103\117\115\061\013\060\011\006\003\125 +-\004\006\023\002\105\123 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\010\141\215\307\206\073\001\202\005 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +- +-# +-# Certificate "Verisign Class 1 Public Primary Certification Authority" +-# +-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 "Verisign Class 1 Public Primary Certification Authority" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +-\344\335 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\002\074\060\202\001\245\002\020\077\151\036\201\234\360 +-\232\112\363\163\377\271\110\242\344\335\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +-\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +-\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +-\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +-\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155\141 +-\162\171\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\066 +-\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +-\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +-\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +-\163\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155 +-\141\162\171\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\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\345\031\277\155\243\126\141\055 +-\231\110\161\366\147\336\271\215\353\267\236\206\200\012\221\016 +-\372\070\045\257\106\210\202\345\163\250\240\233\044\135\015\037 +-\314\145\156\014\260\320\126\204\030\207\232\006\233\020\241\163 +-\337\264\130\071\153\156\301\366\025\325\250\250\077\252\022\006 +-\215\061\254\177\260\064\327\217\064\147\210\011\315\024\021\342 +-\116\105\126\151\037\170\002\200\332\334\107\221\051\273\066\311 +-\143\134\305\340\327\055\207\173\241\267\062\260\173\060\272\052 +-\057\061\252\356\243\147\332\333\002\003\001\000\001\060\015\006 +-\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +-\130\025\051\071\074\167\243\332\134\045\003\174\140\372\356\011 +-\231\074\047\020\160\310\014\011\346\263\207\317\012\342\030\226 +-\065\142\314\277\233\047\171\211\137\311\304\011\364\316\265\035 +-\337\052\275\345\333\206\234\150\045\345\060\174\266\211\025\376 +-\147\321\255\341\120\254\074\174\142\113\217\272\204\327\022\025 +-\033\037\312\135\017\301\122\224\052\021\231\332\173\317\014\066 +-\023\325\065\334\020\031\131\352\224\301\000\277\165\217\331\372 +-\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133 +-END +- +-# Trust for Certificate "Verisign Class 1 Public Primary Certification Authority" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Verisign Class 1 Public Primary Certification Authority" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\316\152\144\243\011\344\057\273\331\205\034\105\076\144\011\352 +-\350\175\140\361 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\206\254\336\053\305\155\303\331\214\050\210\323\215\026\023\036 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +-\344\335 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# +-# Certificate "Verisign Class 3 Public Primary Certification Authority" +-# +-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 "Verisign Class 3 Public Primary Certification Authority" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\264\061\024\060\022\006\003\125\004\012\023\013\105\156 ++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 ++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 ++\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164 ++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 ++\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 ++\040\050\062\060\064\070\051 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +-\022\276 ++\002\004\070\143\336\370 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\002\074\060\202\001\245\002\020\074\221\061\313\037\366 +-\320\033\016\232\270\320\104\277\022\276\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +-\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +-\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +-\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +-\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155\141 +-\162\171\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\066 +-\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +-\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +-\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +-\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +-\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +-\163\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155 +-\141\162\171\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\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\311\134\131\236\362\033\212\001 +-\024\264\020\337\004\100\333\343\127\257\152\105\100\217\204\014 +-\013\321\063\331\331\021\317\356\002\130\037\045\367\052\250\104 +-\005\252\354\003\037\170\177\236\223\271\232\000\252\043\175\326 +-\254\205\242\143\105\307\162\047\314\364\114\306\165\161\322\071 +-\357\117\102\360\165\337\012\220\306\216\040\157\230\017\370\254 +-\043\137\160\051\066\244\311\206\347\261\232\040\313\123\245\205 +-\347\075\276\175\232\376\044\105\063\334\166\025\355\017\242\161 +-\144\114\145\056\201\150\105\247\002\003\001\000\001\060\015\006 +-\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +-\020\162\122\251\005\024\031\062\010\101\360\305\153\012\314\176 +-\017\041\031\315\344\147\334\137\251\033\346\312\350\163\235\042 +-\330\230\156\163\003\141\221\305\174\260\105\100\156\104\235\215 +-\260\261\226\164\141\055\015\251\105\322\244\222\052\326\232\165 +-\227\156\077\123\375\105\231\140\035\250\053\114\371\136\247\011 +-\330\165\060\327\322\145\140\075\147\326\110\125\165\151\077\221 +-\365\110\013\107\151\042\151\202\226\276\311\310\070\206\112\172 +-\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220 ++\060\202\004\052\060\202\003\022\240\003\002\001\002\002\004\070 ++\143\336\370\060\015\006\011\052\206\110\206\367\015\001\001\005 ++\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013 ++\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006 ++\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163 ++\164\056\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105 ++\156\164\162\165\163\164\056\156\145\164\040\103\145\162\164\151 ++\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 ++\164\171\040\050\062\060\064\070\051\060\036\027\015\071\071\061 ++\062\062\064\061\067\065\060\065\061\132\027\015\062\071\060\067 ++\062\064\061\064\061\065\061\062\132\060\201\264\061\024\060\022 ++\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156 ++\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167 ++\056\145\156\164\162\165\163\164\056\156\145\164\057\103\120\123 ++\137\062\060\064\070\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\063\060\061\006 ++\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145 ++\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040 ++\101\165\164\150\157\162\151\164\171\040\050\062\060\064\070\051 ++\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001 ++\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001 ++\000\255\115\113\251\022\206\262\352\243\040\007\025\026\144\052 ++\053\113\321\277\013\112\115\216\355\200\166\245\147\267\170\100 ++\300\163\102\310\150\300\333\123\053\335\136\270\166\230\065\223 ++\213\032\235\174\023\072\016\037\133\267\036\317\345\044\024\036 ++\261\201\251\215\175\270\314\153\113\003\361\002\014\334\253\245 ++\100\044\000\177\164\224\241\235\010\051\263\210\013\365\207\167 ++\235\125\315\344\303\176\327\152\144\253\205\024\206\225\133\227 ++\062\120\157\075\310\272\146\014\343\374\275\270\111\301\166\211 ++\111\031\375\300\250\275\211\243\147\057\306\237\274\161\031\140 ++\270\055\351\054\311\220\166\146\173\224\342\257\170\326\145\123 ++\135\074\326\234\262\317\051\003\371\057\244\120\262\324\110\316 ++\005\062\125\212\375\262\144\114\016\344\230\007\165\333\177\337 ++\271\010\125\140\205\060\051\371\173\110\244\151\206\343\065\077 ++\036\206\135\172\172\025\275\357\000\216\025\042\124\027\000\220 ++\046\223\274\016\111\150\221\277\370\107\323\235\225\102\301\016 ++\115\337\157\046\317\303\030\041\142\146\103\160\326\325\300\007 ++\341\002\003\001\000\001\243\102\060\100\060\016\006\003\125\035 ++\017\001\001\377\004\004\003\002\001\006\060\017\006\003\125\035 ++\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003\125 ++\035\016\004\026\004\024\125\344\201\321\021\200\276\330\211\271 ++\010\243\061\371\241\044\011\026\271\160\060\015\006\011\052\206 ++\110\206\367\015\001\001\005\005\000\003\202\001\001\000\073\233 ++\217\126\233\060\347\123\231\174\172\171\247\115\227\327\031\225 ++\220\373\006\037\312\063\174\106\143\217\226\146\044\372\100\033 ++\041\047\312\346\162\163\362\117\376\061\231\375\310\014\114\150 ++\123\306\200\202\023\230\372\266\255\332\135\075\361\316\156\366 ++\025\021\224\202\014\356\077\225\257\021\253\017\327\057\336\037 ++\003\217\127\054\036\311\273\232\032\104\225\353\030\117\246\037 ++\315\175\127\020\057\233\004\011\132\204\265\156\330\035\072\341 ++\326\236\321\154\171\136\171\034\024\305\343\320\114\223\073\145 ++\074\355\337\075\276\246\345\225\032\303\265\031\303\275\136\133 ++\273\377\043\357\150\031\313\022\223\047\134\003\055\157\060\320 ++\036\266\032\254\336\132\367\321\252\250\047\246\376\171\201\304 ++\171\231\063\127\272\022\260\251\340\102\154\223\312\126\336\376 ++\155\204\013\010\213\176\215\352\327\230\041\306\363\347\074\171 ++\057\136\234\321\114\025\215\341\354\042\067\314\232\103\013\227 ++\334\200\220\215\263\147\233\157\110\010\025\126\317\277\361\053 ++\174\136\232\166\351\131\220\305\174\203\065\021\145\121 + END + +-# Trust for Certificate "Verisign Class 3 Public Primary Certification Authority" ++# Trust for Certificate "Entrust.net 2048 2029" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Verisign Class 3 Public Primary Certification Authority" ++CKA_LABEL UTF8 "Entrust.net 2048 2029" + CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\241\333\143\223\221\157\027\344\030\125\011\100\004\025\307\002 +-\100\260\256\153 ++\120\060\006\011\035\227\324\365\256\071\367\313\347\222\175\175 ++\145\055\064\061 + END + CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\357\132\361\063\357\361\315\273\121\002\356\022\024\113\226\304 ++\356\051\061\274\062\176\232\346\350\265\367\121\264\064\161\220 + END + CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +-\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +-\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +-\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +-\143\040\120\162\151\155\141\162\171\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\264\061\024\060\022\006\003\125\004\012\023\013\105\156 ++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 ++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 ++\156\145\164\057\103\120\123\137\062\060\064\070\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\063\060\061\006\003\125\004\003\023\052\105\156\164 ++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 ++\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 ++\040\050\062\060\064\070\051 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +-\022\276 ++\002\004\070\143\336\370 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "Microsec e-Szigno Root CA 2009" ++# Certificate "Entrust.net 2048 2030" + # + 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 "Microsec e-Szigno Root CA 2009" ++CKA_LABEL UTF8 "Entrust.net 2048 2030" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +-\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +-\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +-\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +-\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +-\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +-\156\157\056\150\165 ++\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165 ++\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004 ++\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165 ++\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162 ++\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051 ++\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111 ++\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162 ++\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060 ++\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040 ++\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 ++\062 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +-\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +-\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +-\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +-\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +-\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +-\156\157\056\150\165 ++\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165 ++\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004 ++\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165 ++\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162 ++\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051 ++\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111 ++\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162 ++\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060 ++\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040 ++\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 ++\062 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\011\000\302\176\103\004\116\107\077\031 ++\002\004\112\123\214\050 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\004\012\060\202\002\362\240\003\002\001\002\002\011\000 +-\302\176\103\004\116\107\077\031\060\015\006\011\052\206\110\206 +-\367\015\001\001\013\005\000\060\201\202\061\013\060\011\006\003 +-\125\004\006\023\002\110\125\061\021\060\017\006\003\125\004\007 +-\014\010\102\165\144\141\160\145\163\164\061\026\060\024\006\003 +-\125\004\012\014\015\115\151\143\162\157\163\145\143\040\114\164 +-\144\056\061\047\060\045\006\003\125\004\003\014\036\115\151\143 +-\162\157\163\145\143\040\145\055\123\172\151\147\156\157\040\122 +-\157\157\164\040\103\101\040\062\060\060\071\061\037\060\035\006 +-\011\052\206\110\206\367\015\001\011\001\026\020\151\156\146\157 +-\100\145\055\163\172\151\147\156\157\056\150\165\060\036\027\015 +-\060\071\060\066\061\066\061\061\063\060\061\070\132\027\015\062 +-\071\061\062\063\060\061\061\063\060\061\070\132\060\201\202\061 +-\013\060\011\006\003\125\004\006\023\002\110\125\061\021\060\017 +-\006\003\125\004\007\014\010\102\165\144\141\160\145\163\164\061 +-\026\060\024\006\003\125\004\012\014\015\115\151\143\162\157\163 +-\145\143\040\114\164\144\056\061\047\060\045\006\003\125\004\003 +-\014\036\115\151\143\162\157\163\145\143\040\145\055\123\172\151 +-\147\156\157\040\122\157\157\164\040\103\101\040\062\060\060\071 +-\061\037\060\035\006\011\052\206\110\206\367\015\001\011\001\026 +-\020\151\156\146\157\100\145\055\163\172\151\147\156\157\056\150 +-\165\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001 +-\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001 +-\001\000\351\370\217\363\143\255\332\206\330\247\340\102\373\317 +-\221\336\246\046\370\231\245\143\160\255\233\256\312\063\100\175 +-\155\226\156\241\016\104\356\341\023\235\224\102\122\232\275\165 +-\205\164\054\250\016\035\223\266\030\267\214\054\250\317\373\134 +-\161\271\332\354\376\350\176\217\344\057\035\262\250\165\207\330 +-\267\241\345\073\317\231\112\106\320\203\031\175\300\241\022\034 +-\225\155\112\364\330\307\245\115\063\056\205\071\100\165\176\024 +-\174\200\022\230\120\307\101\147\270\240\200\141\124\246\154\116 +-\037\340\235\016\007\351\311\272\063\347\376\300\125\050\054\002 +-\200\247\031\365\236\334\125\123\003\227\173\007\110\377\231\373 +-\067\212\044\304\131\314\120\020\143\216\252\251\032\260\204\032 +-\206\371\137\273\261\120\156\244\321\012\314\325\161\176\037\247 +-\033\174\365\123\156\042\137\313\053\346\324\174\135\256\326\302 +-\306\114\345\005\001\331\355\127\374\301\043\171\374\372\310\044 +-\203\225\363\265\152\121\001\320\167\326\351\022\241\371\032\203 +-\373\202\033\271\260\227\364\166\006\063\103\111\240\377\013\265 +-\372\265\002\003\001\000\001\243\201\200\060\176\060\017\006\003 +-\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 +-\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 +-\003\125\035\016\004\026\004\024\313\017\306\337\102\103\314\075 +-\313\265\110\043\241\032\172\246\052\273\064\150\060\037\006\003 +-\125\035\043\004\030\060\026\200\024\313\017\306\337\102\103\314 +-\075\313\265\110\043\241\032\172\246\052\273\064\150\060\033\006 +-\003\125\035\021\004\024\060\022\201\020\151\156\146\157\100\145 +-\055\163\172\151\147\156\157\056\150\165\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\003\202\001\001\000\311\321 +-\016\136\056\325\314\263\174\076\313\374\075\377\015\050\225\223 +-\004\310\277\332\315\171\270\103\220\360\244\276\357\362\357\041 +-\230\274\324\324\135\006\366\356\102\354\060\154\240\252\251\312 +-\361\257\212\372\077\013\163\152\076\352\056\100\176\037\256\124 +-\141\171\353\056\010\067\327\043\363\214\237\276\035\261\341\244 +-\165\333\240\342\124\024\261\272\034\051\244\030\366\022\272\242 +-\024\024\343\061\065\310\100\377\267\340\005\166\127\301\034\131 +-\362\370\277\344\355\045\142\134\204\360\176\176\037\263\276\371 +-\267\041\021\314\003\001\126\160\247\020\222\036\033\064\201\036 +-\255\234\032\303\004\074\355\002\141\326\036\006\363\137\072\207 +-\362\053\361\105\207\345\075\254\321\307\127\204\275\153\256\334 +-\330\371\266\033\142\160\013\075\066\311\102\362\062\327\172\141 +-\346\322\333\075\317\310\251\311\233\334\333\130\104\327\157\070 +-\257\177\170\323\243\255\032\165\272\034\301\066\174\217\036\155 +-\034\303\165\106\256\065\005\246\366\134\075\041\356\126\360\311 +-\202\042\055\172\124\253\160\303\175\042\145\202\160\226 ++\060\202\004\076\060\202\003\046\240\003\002\001\002\002\004\112 ++\123\214\050\060\015\006\011\052\206\110\206\367\015\001\001\013 ++\005\000\060\201\276\061\013\060\011\006\003\125\004\006\023\002 ++\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156\164 ++\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006\003 ++\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156\164 ++\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055\164 ++\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060\050 ++\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164\054 ++\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164\150 ++\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061 ++\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165\163 ++\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141 ++\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055 ++\040\107\062\060\036\027\015\060\071\060\067\060\067\061\067\062 ++\065\065\064\132\027\015\063\060\061\062\060\067\061\067\065\065 ++\065\064\132\060\201\276\061\013\060\011\006\003\125\004\006\023 ++\002\125\123\061\026\060\024\006\003\125\004\012\023\015\105\156 ++\164\162\165\163\164\054\040\111\156\143\056\061\050\060\046\006 ++\003\125\004\013\023\037\123\145\145\040\167\167\167\056\145\156 ++\164\162\165\163\164\056\156\145\164\057\154\145\147\141\154\055 ++\164\145\162\155\163\061\071\060\067\006\003\125\004\013\023\060 ++\050\143\051\040\062\060\060\071\040\105\156\164\162\165\163\164 ++\054\040\111\156\143\056\040\055\040\146\157\162\040\141\165\164 ++\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171 ++\061\062\060\060\006\003\125\004\003\023\051\105\156\164\162\165 ++\163\164\040\122\157\157\164\040\103\145\162\164\151\146\151\143 ++\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040 ++\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206 ++\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012 ++\002\202\001\001\000\272\204\266\162\333\236\014\153\342\231\351 ++\060\001\247\166\352\062\270\225\101\032\311\332\141\116\130\162 ++\317\376\366\202\171\277\163\141\006\012\245\047\330\263\137\323 ++\105\116\034\162\326\116\062\362\162\212\017\367\203\031\320\152 ++\200\200\000\105\036\260\307\347\232\277\022\127\047\034\243\150 ++\057\012\207\275\152\153\016\136\145\363\034\167\325\324\205\215 ++\160\041\264\263\062\347\213\242\325\206\071\002\261\270\322\107 ++\316\344\311\111\304\073\247\336\373\124\175\127\276\360\350\156 ++\302\171\262\072\013\125\342\120\230\026\062\023\134\057\170\126 ++\301\302\224\263\362\132\344\047\232\237\044\327\306\354\320\233 ++\045\202\343\314\302\304\105\305\214\227\172\006\153\052\021\237 ++\251\012\156\110\073\157\333\324\021\031\102\367\217\007\277\365 ++\123\137\234\076\364\027\054\346\151\254\116\062\114\142\167\352 ++\267\350\345\273\064\274\031\213\256\234\121\347\267\176\265\123 ++\261\063\042\345\155\317\160\074\032\372\342\233\147\266\203\364 ++\215\245\257\142\114\115\340\130\254\144\064\022\003\370\266\215 ++\224\143\044\244\161\002\003\001\000\001\243\102\060\100\060\016 ++\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\017 ++\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 ++\035\006\003\125\035\016\004\026\004\024\152\162\046\172\320\036 ++\357\175\347\073\151\121\324\154\215\237\220\022\146\253\060\015 ++\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001 ++\001\000\171\237\035\226\306\266\171\077\042\215\207\323\207\003 ++\004\140\152\153\232\056\131\211\163\021\254\103\321\365\023\377 ++\215\071\053\300\362\275\117\160\214\251\057\352\027\304\013\124 ++\236\324\033\226\230\063\074\250\255\142\242\000\166\253\131\151 ++\156\006\035\176\304\271\104\215\230\257\022\324\141\333\012\031 ++\106\107\363\353\367\143\301\100\005\100\245\322\267\364\265\232 ++\066\277\251\210\166\210\004\125\004\053\234\207\177\032\067\074 ++\176\055\245\032\330\324\211\136\312\275\254\075\154\330\155\257 ++\325\363\166\017\315\073\210\070\042\235\154\223\232\304\075\277 ++\202\033\145\077\246\017\135\252\374\345\262\025\312\265\255\306 ++\274\075\320\204\350\352\006\162\260\115\071\062\170\277\076\021 ++\234\013\244\235\232\041\363\360\233\013\060\170\333\301\334\207 ++\103\376\274\143\232\312\305\302\034\311\307\215\377\073\022\130 ++\010\346\266\075\354\172\054\116\373\203\226\316\014\074\151\207 ++\124\163\244\163\302\223\377\121\020\254\025\124\001\330\374\005 ++\261\211\241\177\164\203\232\111\327\334\116\173\212\110\157\213 ++\105\366 + END + +-# Trust for Certificate "Microsec e-Szigno Root CA 2009" ++# Trust for Certificate "Entrust.net 2048 2030" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "Microsec e-Szigno Root CA 2009" ++CKA_LABEL UTF8 "Entrust.net 2048 2030" + CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\211\337\164\376\134\364\017\112\200\371\343\067\175\124\332\221 +-\341\001\061\216 ++\214\364\047\375\171\014\072\321\146\006\215\350\036\127\357\273 ++\223\042\162\324 + END + CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\370\111\364\003\274\104\055\203\276\110\151\175\051\144\374\261 ++\113\342\311\221\226\145\014\364\016\132\223\222\240\012\376\262 + END + CKA_ISSUER MULTILINE_OCTAL +-\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +-\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +-\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +-\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +-\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +-\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +-\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +-\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +-\156\157\056\150\165 ++\060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165 ++\163\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004 ++\013\023\037\123\145\145\040\167\167\167\056\145\156\164\162\165 ++\163\164\056\156\145\164\057\154\145\147\141\154\055\164\145\162 ++\155\163\061\071\060\067\006\003\125\004\013\023\060\050\143\051 ++\040\062\060\060\071\040\105\156\164\162\165\163\164\054\040\111 ++\156\143\056\040\055\040\146\157\162\040\141\165\164\150\157\162 ++\151\172\145\144\040\165\163\145\040\157\156\154\171\061\062\060 ++\060\006\003\125\004\003\023\051\105\156\164\162\165\163\164\040 ++\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040\107 ++\062 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\011\000\302\176\103\004\116\107\077\031 ++\002\004\112\123\214\050 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++# Certificate "Thawte Premium Server primary 1024 2021" + # + 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 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++CKA_LABEL UTF8 "Thawte Premium Server primary 1024 2021" + 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\124\122\061 +-\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +-\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +-\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +-\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +-\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +-\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +-\141\171\151\143\151\163\151 ++\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\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +-\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +-\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +-\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +-\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +-\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +-\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +-\141\171\151\143\151\163\151 ++\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\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +-\254\265 ++\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327 ++\011\124 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\003\266\060\202\002\236\240\003\002\001\002\002\020\104 +-\231\215\074\300\003\047\275\234\166\225\271\352\333\254\265\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\165 +-\061\013\060\011\006\003\125\004\006\023\002\124\122\061\050\060 +-\046\006\003\125\004\012\023\037\105\154\145\153\164\162\157\156 +-\151\153\040\102\151\154\147\151\040\107\165\166\145\156\154\151 +-\147\151\040\101\056\123\056\061\074\060\072\006\003\125\004\003 +-\023\063\145\055\107\165\166\145\156\040\113\157\153\040\105\154 +-\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146\151 +-\153\141\040\110\151\172\155\145\164\040\123\141\147\154\141\171 +-\151\143\151\163\151\060\036\027\015\060\067\060\061\060\064\061 +-\061\063\062\064\070\132\027\015\061\067\060\061\060\064\061\061 +-\063\062\064\070\132\060\165\061\013\060\011\006\003\125\004\006 +-\023\002\124\122\061\050\060\046\006\003\125\004\012\023\037\105 +-\154\145\153\164\162\157\156\151\153\040\102\151\154\147\151\040 +-\107\165\166\145\156\154\151\147\151\040\101\056\123\056\061\074 +-\060\072\006\003\125\004\003\023\063\145\055\107\165\166\145\156 +-\040\113\157\153\040\105\154\145\153\164\162\157\156\151\153\040 +-\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145\164 +-\040\123\141\147\154\141\171\151\143\151\163\151\060\202\001\042 +-\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +-\202\001\017\000\060\202\001\012\002\202\001\001\000\303\022\040 +-\236\260\136\000\145\215\116\106\273\200\134\351\054\006\227\325 +-\363\162\311\160\271\347\113\145\200\301\113\276\176\074\327\124 +-\061\224\336\325\022\272\123\026\002\352\130\143\357\133\330\363 +-\355\052\032\252\161\110\243\334\020\055\137\137\353\134\113\234 +-\226\010\102\045\050\021\314\212\132\142\001\120\325\353\011\123 +-\057\370\303\217\376\263\374\375\235\242\343\137\175\276\355\013 +-\340\140\353\151\354\063\355\330\215\373\022\111\203\000\311\213 +-\227\214\073\163\052\062\263\022\367\271\115\362\364\115\155\307 +-\346\326\046\067\010\362\331\375\153\134\243\345\110\134\130\274 +-\102\276\003\132\201\272\034\065\014\000\323\365\043\176\161\060 +-\010\046\070\334\045\021\107\055\363\272\043\020\245\277\274\002 +-\367\103\136\307\376\260\067\120\231\173\017\223\316\346\103\054 +-\303\176\015\362\034\103\146\140\313\141\061\107\207\243\117\256 +-\275\126\154\114\274\274\370\005\312\144\364\351\064\241\054\265 +-\163\341\302\076\350\310\311\064\045\010\134\363\355\246\307\224 +-\237\255\210\103\045\327\341\071\140\376\254\071\131\002\003\001 +-\000\001\243\102\060\100\060\016\006\003\125\035\017\001\001\377 +-\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377 +-\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026 +-\004\024\237\356\104\263\224\325\372\221\117\056\331\125\232\004 +-\126\333\055\304\333\245\060\015\006\011\052\206\110\206\367\015 +-\001\001\005\005\000\003\202\001\001\000\177\137\271\123\133\143 +-\075\165\062\347\372\304\164\032\313\106\337\106\151\034\122\317 +-\252\117\302\150\353\377\200\251\121\350\075\142\167\211\075\012 +-\165\071\361\156\135\027\207\157\150\005\301\224\154\331\135\337 +-\332\262\131\313\245\020\212\312\314\071\315\237\353\116\336\122 +-\377\014\360\364\222\251\362\154\123\253\233\322\107\240\037\164 +-\367\233\232\361\057\025\237\172\144\060\030\007\074\052\017\147 +-\312\374\017\211\141\235\145\245\074\345\274\023\133\010\333\343 +-\377\355\273\006\273\152\006\261\172\117\145\306\202\375\036\234 +-\213\265\015\356\110\273\270\275\252\010\264\373\243\174\313\237 +-\315\220\166\134\206\226\170\127\012\146\371\130\032\235\375\227 +-\051\140\336\021\246\220\034\031\034\356\001\226\042\064\064\056 +-\221\371\267\304\047\321\173\346\277\373\200\104\132\026\345\353 +-\340\324\012\070\274\344\221\343\325\353\134\301\254\337\033\152 +-\174\236\345\165\322\266\227\207\333\314\207\053\103\072\204\010 +-\257\253\074\333\367\074\146\061\206\260\235\123\171\355\370\043 +-\336\102\343\055\202\361\017\345\372\227 ++\060\202\003\066\060\202\002\237\240\003\002\001\002\002\020\066 ++\022\042\226\305\343\070\245\040\241\322\137\114\327\011\124\060 ++\015\006\011\052\206\110\206\367\015\001\001\005\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\061\060\061\060\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\005\005\000\003\201\201\000\145\220\254\210\017\126 ++\331\346\060\064\324\046\307\320\120\361\222\336\153\324\071\210 ++\011\042\306\246\143\203\003\367\231\167\330\262\345\030\270\135 ++\143\363\324\163\373\154\234\231\170\361\113\170\175\031\044\303 ++\053\002\204\370\274\042\331\212\042\327\240\374\161\354\221\207 ++\040\361\270\354\261\345\125\200\254\075\122\310\071\016\302\360 ++\300\005\117\326\202\165\214\275\137\322\334\166\232\005\022\311 ++\257\162\303\334\045\176\244\115\216\027\245\340\207\177\341\232 ++\132\341\140\334\144\043\074\102\056\115 + END + +-# Trust for Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++# Trust for Certificate "Thawte Premium Server primary 1024 2021" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" ++CKA_LABEL UTF8 "Thawte Premium Server primary 1024 2021" + CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\335\341\322\251\001\200\056\035\207\136\204\263\200\176\113\261 +-\375\231\101\064 ++\340\253\005\224\040\162\124\223\005\140\142\002\066\160\367\315 ++\056\374\146\146 + END + CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\075\101\051\313\036\252\021\164\315\135\260\142\257\260\103\133 ++\246\153\140\220\043\233\077\055\273\230\157\326\247\031\015\106 + END + CKA_ISSUER MULTILINE_OCTAL +-\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +-\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +-\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +-\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +-\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +-\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +-\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +-\141\171\151\143\151\163\151 ++\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\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +-\254\265 ++\002\020\066\022\042\226\305\343\070\245\040\241\322\137\114\327 ++\011\124 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "GlobalSign Root CA - R3" ++# Certificate "IPS Global CA Root 2048 2029" + # + 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 "GlobalSign Root CA - R3" ++CKA_LABEL UTF8 "IPS Global CA Root 2048 2029" + CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 + CKA_SUBJECT MULTILINE_OCTAL +-\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +-\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +-\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +-\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +-\004\003\023\012\107\154\157\142\141\154\123\151\147\156 ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155 + END + CKA_ID UTF8 "0" + CKA_ISSUER MULTILINE_OCTAL +-\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +-\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +-\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +-\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +-\004\003\023\012\107\154\157\142\141\154\123\151\147\156 ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\013\004\000\000\000\000\001\041\130\123\010\242 ++\002\001\000 + END + CKA_VALUE MULTILINE_OCTAL +-\060\202\003\137\060\202\002\107\240\003\002\001\002\002\013\004 +-\000\000\000\000\001\041\130\123\010\242\060\015\006\011\052\206 +-\110\206\367\015\001\001\013\005\000\060\114\061\040\060\036\006 +-\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147\156 +-\040\122\157\157\164\040\103\101\040\055\040\122\063\061\023\060 +-\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123\151 +-\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154\157 +-\142\141\154\123\151\147\156\060\036\027\015\060\071\060\063\061 +-\070\061\060\060\060\060\060\132\027\015\062\071\060\063\061\070 +-\061\060\060\060\060\060\132\060\114\061\040\060\036\006\003\125 +-\004\013\023\027\107\154\157\142\141\154\123\151\147\156\040\122 +-\157\157\164\040\103\101\040\055\040\122\063\061\023\060\021\006 +-\003\125\004\012\023\012\107\154\157\142\141\154\123\151\147\156 +-\061\023\060\021\006\003\125\004\003\023\012\107\154\157\142\141 +-\154\123\151\147\156\060\202\001\042\060\015\006\011\052\206\110 +-\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001 +-\012\002\202\001\001\000\314\045\166\220\171\006\170\042\026\365 +-\300\203\266\204\312\050\236\375\005\166\021\305\255\210\162\374 +-\106\002\103\307\262\212\235\004\137\044\313\056\113\341\140\202 +-\106\341\122\253\014\201\107\160\154\335\144\321\353\365\054\243 +-\017\202\075\014\053\256\227\327\266\024\206\020\171\273\073\023 +-\200\167\214\010\341\111\322\152\142\057\037\136\372\226\150\337 +-\211\047\225\070\237\006\327\076\311\313\046\131\015\163\336\260 +-\310\351\046\016\203\025\306\357\133\213\322\004\140\312\111\246 +-\050\366\151\073\366\313\310\050\221\345\235\212\141\127\067\254 +-\164\024\334\164\340\072\356\162\057\056\234\373\320\273\277\365 +-\075\000\341\006\063\350\202\053\256\123\246\072\026\163\214\335 +-\101\016\040\072\300\264\247\241\351\262\117\220\056\062\140\351 +-\127\313\271\004\222\150\150\345\070\046\140\165\262\237\167\377 +-\221\024\357\256\040\111\374\255\100\025\110\321\002\061\141\031 +-\136\270\227\357\255\167\267\144\232\172\277\137\301\023\357\233 +-\142\373\015\154\340\124\151\026\251\003\332\156\351\203\223\161 +-\166\306\151\205\202\027\002\003\001\000\001\243\102\060\100\060 +-\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +-\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +-\060\035\006\003\125\035\016\004\026\004\024\217\360\113\177\250 +-\056\105\044\256\115\120\372\143\232\213\336\342\335\033\274\060 +-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202 +-\001\001\000\113\100\333\300\120\252\376\310\014\357\367\226\124 +-\105\111\273\226\000\011\101\254\263\023\206\206\050\007\063\312 +-\153\346\164\271\272\000\055\256\244\012\323\365\361\361\017\212 +-\277\163\147\112\203\307\104\173\170\340\257\156\154\157\003\051 +-\216\063\071\105\303\216\344\271\127\154\252\374\022\226\354\123 +-\306\055\344\044\154\271\224\143\373\334\123\150\147\126\076\203 +-\270\317\065\041\303\311\150\376\316\332\302\123\252\314\220\212 +-\351\360\135\106\214\225\335\172\130\050\032\057\035\336\315\000 +-\067\101\217\355\104\155\327\123\050\227\176\363\147\004\036\025 +-\327\212\226\264\323\336\114\047\244\114\033\163\163\166\364\027 +-\231\302\037\172\016\343\055\010\255\012\034\054\377\074\253\125 +-\016\017\221\176\066\353\303\127\111\276\341\056\055\174\140\213 +-\303\101\121\023\043\235\316\367\062\153\224\001\250\231\347\054 +-\063\037\072\073\045\322\206\100\316\073\054\206\170\311\141\057 +-\024\272\356\333\125\157\337\204\356\005\011\115\275\050\330\162 +-\316\323\142\120\145\036\353\222\227\203\061\331\263\265\312\107 +-\130\077\137 +-END +- +-# Trust for Certificate "GlobalSign Root CA - R3" ++\060\202\006\007\060\202\004\357\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 ++\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123\061 ++\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151\144 ++\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162\151 ++\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123\040 ++\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165 ++\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160\163 ++\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160\163 ++\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160\163 ++\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157\157 ++\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001 ++\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143\141 ++\056\143\157\155\060\036\027\015\060\071\060\071\060\067\061\064 ++\063\070\064\064\132\027\015\062\071\061\062\062\065\061\064\063 ++\070\064\064\132\060\201\262\061\013\060\011\006\003\125\004\006 ++\023\002\105\123\061\017\060\015\006\003\125\004\010\023\006\115 ++\141\144\162\151\144\061\017\060\015\006\003\125\004\007\023\006 ++\115\141\144\162\151\144\061\057\060\055\006\003\125\004\012\023 ++\046\111\120\123\040\103\145\162\164\151\146\151\143\141\164\151 ++\157\156\040\101\165\164\150\157\162\151\164\171\040\163\056\154 ++\056\040\151\160\163\103\101\061\016\060\014\006\003\125\004\013 ++\023\005\151\160\163\103\101\061\035\060\033\006\003\125\004\003 ++\023\024\151\160\163\103\101\040\107\154\157\142\141\154\040\103 ++\101\040\122\157\157\164\061\041\060\037\006\011\052\206\110\206 ++\367\015\001\011\001\026\022\147\154\157\142\141\154\060\061\100 ++\151\160\163\143\141\056\143\157\155\060\202\001\042\060\015\006 ++\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 ++\000\060\202\001\012\002\202\001\001\000\247\357\314\200\060\260 ++\221\044\117\260\150\370\303\312\055\025\070\125\130\202\342\070 ++\143\260\367\243\222\157\203\270\260\136\260\214\254\124\261\167 ++\320\120\340\227\263\220\255\212\263\037\071\053\105\126\367\252 ++\342\337\174\262\354\157\123\057\232\313\320\346\146\313\311\023 ++\350\162\342\264\315\061\127\207\022\265\223\350\372\162\316\352 ++\107\362\214\264\260\143\327\004\000\267\144\066\071\227\350\225 ++\361\210\371\161\015\003\047\214\141\317\010\203\226\117\203\305 ++\116\350\134\370\006\160\361\002\252\034\036\251\310\252\176\347 ++\135\315\215\074\024\157\147\320\033\251\043\110\213\041\050\072 ++\212\114\346\021\061\371\041\056\262\147\146\306\051\156\224\223 ++\317\100\226\374\260\075\277\262\264\223\277\126\161\266\245\101 ++\207\260\130\265\131\043\050\111\270\230\371\120\036\055\025\050 ++\013\114\254\111\321\204\251\233\232\347\162\124\267\070\320\333 ++\311\376\251\163\325\155\020\315\216\165\353\376\227\375\200\074 ++\374\264\330\110\364\231\106\013\210\024\244\266\056\333\114\140 ++\364\041\301\154\200\225\024\325\257\325\002\003\001\000\001\243 ++\202\002\044\060\202\002\040\060\035\006\003\125\035\016\004\026 ++\004\024\025\246\226\200\261\025\113\061\303\302\234\366\347\023 ++\013\113\363\030\315\206\060\201\337\006\003\125\035\043\004\201 ++\327\060\201\324\200\024\025\246\226\200\261\025\113\061\303\302 ++\234\366\347\023\013\113\363\030\315\206\241\201\270\244\201\265 ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155\202\001\000\060\014\006\003\125\035\023\004 ++\005\060\003\001\001\377\060\013\006\003\125\035\017\004\004\003 ++\002\001\006\060\107\006\003\125\035\045\004\100\060\076\006\010 ++\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005\007 ++\003\002\006\010\053\006\001\005\005\007\003\003\006\010\053\006 ++\001\005\005\007\003\004\006\010\053\006\001\005\005\007\003\010 ++\006\012\053\006\001\004\001\202\067\012\003\004\060\035\006\003 ++\125\035\021\004\026\060\024\201\022\147\154\157\142\141\154\060 ++\061\100\151\160\163\143\141\056\143\157\155\060\035\006\003\125 ++\035\022\004\026\060\024\201\022\147\154\157\142\141\154\060\061 ++\100\151\160\163\143\141\056\143\157\155\060\101\006\003\125\035 ++\037\004\072\060\070\060\066\240\064\240\062\206\060\150\164\164 ++\160\072\057\057\143\162\154\147\154\157\142\141\154\060\061\056 ++\151\160\163\143\141\056\143\157\155\057\143\162\154\057\143\162 ++\154\147\154\157\142\141\154\060\061\056\143\162\154\060\070\006 ++\010\053\006\001\005\005\007\001\001\004\054\060\052\060\050\006 ++\010\053\006\001\005\005\007\060\001\206\034\150\164\164\160\072 ++\057\057\143\162\154\147\154\157\142\141\154\060\061\056\151\160 ++\163\143\141\056\143\157\155\060\015\006\011\052\206\110\206\367 ++\015\001\001\005\005\000\003\202\001\001\000\030\364\256\376\200 ++\017\216\301\167\157\242\132\107\110\237\043\125\241\123\153\371 ++\135\247\060\245\044\276\103\057\370\301\321\127\371\076\054\200 ++\045\314\106\251\066\363\111\133\035\366\174\327\143\263\115\076 ++\170\366\247\264\002\167\370\171\015\076\152\313\030\140\270\375 ++\000\257\014\335\124\343\124\217\042\075\363\020\157\021\015\265 ++\036\172\215\047\314\010\270\133\303\270\032\137\053\247\140\077 ++\000\034\367\017\134\102\146\144\236\207\022\200\160\211\340\372 ++\127\050\016\116\037\020\057\331\005\200\266\200\057\034\151\360 ++\366\266\145\064\005\157\312\331\076\370\324\135\067\062\307\270 ++\053\314\377\163\223\000\161\340\001\310\252\103\275\251\361\316 ++\372\200\371\361\103\022\221\246\145\345\140\007\115\107\272\053 ++\057\004\366\112\205\051\210\145\020\311\262\123\142\234\154\233 ++\140\134\032\033\323\256\305\035\162\231\006\377\005\314\206\046 ++\163\264\324\124\005\335\036\153\000\073\267\211\350\343\221\002 ++\040\022\353\357\351\376\012\051\043\201\043\243\000\332\160\314 ++\222\137\067\043\320\034\173\065\134\003\172 ++END ++ ++# Trust for Certificate "IPS Global CA Root 2048 2029" + CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST + CKA_TOKEN CK_BBOOL CK_TRUE + CKA_PRIVATE CK_BBOOL CK_FALSE + CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "GlobalSign Root CA - R3" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\326\233\126\021\110\360\034\167\305\105\170\301\011\046\337\133 +-\205\151\166\255 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\305\337\270\111\312\005\023\125\356\055\272\032\303\076\260\050 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +-\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +-\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +-\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +-\004\003\023\012\107\154\157\142\141\154\123\151\147\156 ++CKA_LABEL UTF8 "IPS Global CA Root 2048 2029" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\074\161\327\016\065\245\332\250\262\343\201\055\303\147\164\027 ++\365\231\015\363 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\045\052\306\305\211\150\071\371\125\162\002\026\136\243\236\322 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\262\061\013\060\011\006\003\125\004\006\023\002\105\123 ++\061\017\060\015\006\003\125\004\010\023\006\115\141\144\162\151 ++\144\061\017\060\015\006\003\125\004\007\023\006\115\141\144\162 ++\151\144\061\057\060\055\006\003\125\004\012\023\046\111\120\123 ++\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 ++\165\164\150\157\162\151\164\171\040\163\056\154\056\040\151\160 ++\163\103\101\061\016\060\014\006\003\125\004\013\023\005\151\160 ++\163\103\101\061\035\060\033\006\003\125\004\003\023\024\151\160 ++\163\103\101\040\107\154\157\142\141\154\040\103\101\040\122\157 ++\157\164\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\147\154\157\142\141\154\060\061\100\151\160\163\143 ++\141\056\143\157\155 + END + CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\013\004\000\000\000\000\001\041\130\123\010\242 ++\002\001\000 + END + CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-remove-fortezza.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-remove-fortezza.patch new file mode 100644 index 0000000000..440bfc2e02 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-remove-fortezza.patch @@ -0,0 +1,831 @@ +Index: mozilla/security/nss/lib/certhigh/certvfy.c +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/certhigh/certvfy.c,v +retrieving revision 1.71 +diff -p -u -r1.71 certvfy.c +--- mozilla/security/nss/lib/certhigh/certvfy.c 30 Apr 2010 07:47:48 -0000 1.71 ++++ mozilla/security/nss/lib/certhigh/certvfy.c 22 Jul 2011 20:57:00 -0000 +@@ -150,79 +150,6 @@ CERT_VerifySignedData(CERTSignedData *sd + } + + +-/* Software FORTEZZA installation hack. The software fortezza installer does +- * not have access to the krl and cert.db file. Accept FORTEZZA Certs without +- * KRL's in this case. +- */ +-static int dont_use_krl = 0; +-/* not a public exposed function... */ +-void sec_SetCheckKRLState(int value) { dont_use_krl = value; } +- +-SECStatus +-SEC_CheckKRL(CERTCertDBHandle *handle,SECKEYPublicKey *key, +- CERTCertificate *rootCert, int64 t, void * wincx) +-{ +- CERTSignedCrl *crl = NULL; +- SECStatus rv = SECFailure; +- SECStatus rv2; +- CERTCrlEntry **crlEntry; +- SECCertTimeValidity validity; +- CERTCertificate *issuerCert = NULL; +- +- if (dont_use_krl) return SECSuccess; +- +- /* first look up the KRL */ +- crl = SEC_FindCrlByName(handle,&rootCert->derSubject, SEC_KRL_TYPE); +- if (crl == NULL) { +- PORT_SetError(SEC_ERROR_NO_KRL); +- goto done; +- } +- +- /* get the issuing certificate */ +- issuerCert = CERT_FindCertByName(handle, &crl->crl.derName); +- if (issuerCert == NULL) { +- PORT_SetError(SEC_ERROR_KRL_BAD_SIGNATURE); +- goto done; +- } +- +- +- /* now verify the KRL signature */ +- rv2 = CERT_VerifySignedData(&crl->signatureWrap, issuerCert, t, wincx); +- if (rv2 != SECSuccess) { +- PORT_SetError(SEC_ERROR_KRL_BAD_SIGNATURE); +- goto done; +- } +- +- /* Verify the date validity of the KRL */ +- validity = SEC_CheckCrlTimes(&crl->crl, t); +- if (validity == secCertTimeExpired) { +- PORT_SetError(SEC_ERROR_KRL_EXPIRED); +- goto done; +- } +- +- /* now make sure the key in this cert is still valid */ +- if (key->keyType != fortezzaKey) { +- PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN); +- goto done; /* This should be an assert? */ +- } +- +- /* now make sure the key is not on the revocation list */ +- for (crlEntry = crl->crl.entries; crlEntry && *crlEntry; crlEntry++) { +- if (PORT_Memcmp((*crlEntry)->serialNumber.data, +- key->u.fortezza.KMID, +- (*crlEntry)->serialNumber.len) == 0) { +- PORT_SetError(SEC_ERROR_REVOKED_KEY); +- goto done; +- } +- } +- rv = SECSuccess; +- +-done: +- if (issuerCert) CERT_DestroyCertificate(issuerCert); +- if (crl) SEC_DestroyCrl(crl); +- return rv; +-} +- + SECStatus + SEC_CheckCRL(CERTCertDBHandle *handle,CERTCertificate *cert, + CERTCertificate *caCert, int64 t, void * wincx) +@@ -405,85 +332,6 @@ cert_AddToVerifyLog(CERTVerifyLog *log, + cert_AddToVerifyLog(log, cert, PORT_GetError(), depth, (void *)arg); \ + } + +- +-typedef enum { cbd_None, cbd_User, cbd_CA } cbd_FortezzaType; +- +-static SECStatus +-cert_VerifyFortezzaV1Cert(CERTCertDBHandle *handle, CERTCertificate *cert, +- cbd_FortezzaType *next_type, cbd_FortezzaType last_type, +- int64 t, void *wincx) +-{ +- unsigned char priv = 0; +- SECKEYPublicKey *key; +- SECStatus rv; +- +- *next_type = cbd_CA; +- +- /* read the key */ +- key = CERT_ExtractPublicKey(cert); +- +- /* Cant' get Key? fail. */ +- if (key == NULL) { +- PORT_SetError(SEC_ERROR_BAD_KEY); +- return SECFailure; +- } +- +- +- /* if the issuer is not an old fortezza cert, we bail */ +- if (key->keyType != fortezzaKey) { +- SECKEY_DestroyPublicKey(key); +- /* CA Cert not fortezza */ +- PORT_SetError(SEC_ERROR_NOT_FORTEZZA_ISSUER); +- return SECFailure; +- } +- +- /* get the privilege mask */ +- if (key->u.fortezza.DSSprivilege.len > 0) { +- priv = key->u.fortezza.DSSprivilege.data[0]; +- } +- +- /* +- * make sure the CA's keys are OK +- */ +- +- rv = SEC_CheckKRL(handle, key, NULL, t, wincx); +- SECKEY_DestroyPublicKey(key); +- if (rv != SECSuccess) { +- return rv; +- } +- +- switch (last_type) { +- case cbd_User: +- /* first check for subordination */ +- /*rv = FortezzaSubordinateCheck(cert,issuerCert);*/ +- rv = SECSuccess; +- +- /* now check for issuer privilege */ +- if ((rv != SECSuccess) || ((priv & 0x10) == 0)) { +- /* bail */ +- PORT_SetError (SEC_ERROR_CA_CERT_INVALID); +- return SECFailure; +- } +- break; +- case cbd_CA: +- if ((priv & 0x20) == 0) { +- /* bail */ +- PORT_SetError (SEC_ERROR_CA_CERT_INVALID); +- return SECFailure; +- } +- break; +- case cbd_None: +- *next_type = (priv & 0x30) ? cbd_CA : cbd_User; +- break; +- default: +- /* bail */ /* shouldn't ever happen */ +- PORT_SetError(SEC_ERROR_UNKNOWN_ISSUER); +- return SECFailure; +- } +- return SECSuccess; +-} +- +- + static SECStatus + cert_VerifyCertChainOld(CERTCertDBHandle *handle, CERTCertificate *cert, + PRBool checkSig, PRBool* sigerror, +@@ -496,7 +344,6 @@ cert_VerifyCertChainOld(CERTCertDBHandle + CERTCertificate *subjectCert = NULL; + CERTCertificate *badCert = NULL; + PRBool isca; +- PRBool isFortezzaV1 = PR_FALSE; + SECStatus rv; + SECStatus rvFinal = SECSuccess; + int count; +@@ -512,8 +359,6 @@ cert_VerifyCertChainOld(CERTCertDBHandle + int namesCount = 0; + PRBool subjectCertIsSelfIssued; + +- cbd_FortezzaType last_type = cbd_None; +- + if (revoked) { + *revoked = PR_FALSE; + } +@@ -562,21 +407,6 @@ cert_VerifyCertChainOld(CERTCertDBHandle + goto loser; + } + +- /* determine if the cert is fortezza. +- */ +- isFortezzaV1 = (PRBool) +- (CERT_GetCertKeyType(&subjectCert->subjectPublicKeyInfo) +- == fortezzaKey); +- +- if (isFortezzaV1) { +- rv = cert_VerifyFortezzaV1Cert(handle, subjectCert, &last_type, +- cbd_None, t, wincx); +- if (rv == SECFailure) { +- /**** PORT_SetError is already set by cert_VerifyFortezzaV1Cert **/ +- LOG_ERROR_OR_EXIT(log,subjectCert,0,0); +- } +- } +- + arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); + if (arena == NULL) { + goto loser; +@@ -663,19 +493,6 @@ cert_VerifyCertChainOld(CERTCertDBHandle + } + } + +- /* +- * XXX - fortezza may need error logging stuff added +- */ +- if (isFortezzaV1) { +- rv = cert_VerifyFortezzaV1Cert(handle, issuerCert, &last_type, +- last_type, t, wincx); +- if (rv == SECFailure) { +- /**** PORT_SetError is already set by * +- * cert_VerifyFortezzaV1Cert **/ +- LOG_ERROR_OR_EXIT(log,subjectCert,0,0); +- } +- } +- + /* If the basicConstraint extension is included in an immediate CA + * certificate, make sure that the isCA flag is on. If the + * pathLenConstraint component exists, it must be greater than the +@@ -683,12 +500,6 @@ cert_VerifyCertChainOld(CERTCertDBHandle + * is omitted, we will assume that this is a CA certificate with + * an unlimited pathLenConstraint (since it already passes the + * netscape-cert-type extension checking). +- * +- * In the fortezza (V1) case, we've already checked the CA bits +- * in the key, so we're presumed to be a CA; however we really don't +- * want to bypass Basic constraint or netscape extension parsing. +- * +- * In Fortezza V2, basicConstraint will be set for every CA,PCA,PAA + */ + + rv = CERT_FindBasicConstraintExten(issuerCert, &basicConstraint); +@@ -697,10 +508,8 @@ cert_VerifyCertChainOld(CERTCertDBHandle + LOG_ERROR_OR_EXIT(log,issuerCert,count+1,0); + } + pathLengthLimit = CERT_UNLIMITED_PATH_CONSTRAINT; +- /* no basic constraints found, if we're fortezza, CA bit is already +- * verified (isca = PR_TRUE). otherwise, we aren't (yet) a ca +- * isca = PR_FALSE */ +- isca = isFortezzaV1; ++ /* no basic constraints found, we aren't (yet) a CA. */ ++ isca = PR_FALSE; + } else { + if ( basicConstraint.isCA == PR_FALSE ) { + PORT_SetError (SEC_ERROR_CA_CERT_INVALID); +@@ -960,12 +769,6 @@ CERT_VerifyCACertForUsage(CERTCertDBHand + * is omitted, we will assume that this is a CA certificate with + * an unlimited pathLenConstraint (since it already passes the + * netscape-cert-type extension checking). +- * +- * In the fortezza (V1) case, we've already checked the CA bits +- * in the key, so we're presumed to be a CA; however we really don't +- * want to bypass Basic constraint or netscape extension parsing. +- * +- * In Fortezza V2, basicConstraint will be set for every CA,PCA,PAA + */ + + rv = CERT_FindBasicConstraintExten(cert, &basicConstraint); +@@ -973,9 +776,7 @@ CERT_VerifyCACertForUsage(CERTCertDBHand + if (PORT_GetError() != SEC_ERROR_EXTENSION_NOT_FOUND) { + LOG_ERROR_OR_EXIT(log,cert,0,0); + } +- /* no basic constraints found, if we're fortezza, CA bit is already +- * verified (isca = PR_TRUE). otherwise, we aren't (yet) a ca +- * isca = PR_FALSE */ ++ /* no basic constraints found, we aren't (yet) a CA. */ + isca = PR_FALSE; + } else { + if ( basicConstraint.isCA == PR_FALSE ) { +Index: mozilla/security/nss/lib/cryptohi/seckey.c +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/cryptohi/seckey.c,v +retrieving revision 1.54 +diff -p -u -r1.54 seckey.c +--- mozilla/security/nss/lib/cryptohi/seckey.c 23 Jun 2010 02:13:56 -0000 1.54 ++++ mozilla/security/nss/lib/cryptohi/seckey.c 22 Jul 2011 20:57:00 -0000 +@@ -105,47 +105,6 @@ const SEC_ASN1Template SECKEY_DHParamKey + { 0, } + }; + +-const SEC_ASN1Template SECKEY_FortezzaParameterTemplate[] = { +- { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECKEYPQGParams) }, +- { SEC_ASN1_OCTET_STRING, offsetof(SECKEYPQGParams,prime), }, +- { SEC_ASN1_OCTET_STRING, offsetof(SECKEYPQGParams,subPrime), }, +- { SEC_ASN1_OCTET_STRING, offsetof(SECKEYPQGParams,base), }, +- { 0 }, +-}; +- +-const SEC_ASN1Template SECKEY_FortezzaDiffParameterTemplate[] = { +- { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECKEYDiffPQGParams) }, +- { SEC_ASN1_INLINE, offsetof(SECKEYDiffPQGParams,DiffKEAParams), +- SECKEY_FortezzaParameterTemplate}, +- { SEC_ASN1_INLINE, offsetof(SECKEYDiffPQGParams,DiffDSAParams), +- SECKEY_FortezzaParameterTemplate}, +- { 0 }, +-}; +- +-const SEC_ASN1Template SECKEY_FortezzaPreParamTemplate[] = { +- { SEC_ASN1_EXPLICIT | SEC_ASN1_CONSTRUCTED | +- SEC_ASN1_CONTEXT_SPECIFIC | 1, offsetof(SECKEYPQGDualParams,CommParams), +- SECKEY_FortezzaParameterTemplate}, +- { 0, } +-}; +- +-const SEC_ASN1Template SECKEY_FortezzaAltPreParamTemplate[] = { +- { SEC_ASN1_EXPLICIT | SEC_ASN1_CONSTRUCTED | +- SEC_ASN1_CONTEXT_SPECIFIC | 0, offsetof(SECKEYPQGDualParams,DiffParams), +- SECKEY_FortezzaDiffParameterTemplate}, +- { 0, } +-}; +- +-const SEC_ASN1Template SECKEY_KEAPublicKeyTemplate[] = { +- { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.kea.publicValue), }, +- { 0, } +-}; +- +-const SEC_ASN1Template SECKEY_KEAParamsTemplate[] = { +- { SEC_ASN1_OCTET_STRING, offsetof(SECKEYPublicKey,u.kea.params.hash), }, +- { 0, } +-}; +- + SEC_ASN1_CHOOSER_IMPLEMENT(SECKEY_DSAPublicKeyTemplate) + SEC_ASN1_CHOOSER_IMPLEMENT(SECKEY_RSAPublicKeyTemplate) + SEC_ASN1_CHOOSER_IMPLEMENT(CERT_SubjectPublicKeyInfoTemplate) +@@ -187,12 +146,6 @@ prepare_dh_pub_key_for_asn1(SECKEYPublic + pubk->u.dh.publicValue.type = siUnsignedInteger; + } + +-static void +-prepare_kea_pub_key_for_asn1(SECKEYPublicKey *pubk) +-{ +- pubk->u.kea.publicValue.type = siUnsignedInteger; +-} +- + /* Create an RSA key pair is any slot able to do so. + ** The created keys are "session" (temporary), not "token" (permanent), + ** and they are "sensitive", which makes them costly to move to another token. +@@ -603,149 +556,6 @@ SECKEY_UpdateCertPQG(CERTCertificate * s + } + + +-/* Decode the PQG parameters. The params could be stored in two +- * possible formats, the old fortezza-only wrapped format or +- * the standard DER encoded format. Store the decoded parameters in an +- * old fortezza cert data structure */ +- +-SECStatus +-SECKEY_FortezzaDecodePQGtoOld(PRArenaPool *arena, SECKEYPublicKey *pubk, +- SECItem *params) { +- SECStatus rv; +- SECKEYPQGDualParams dual_params; +- SECItem newparams; +- +- PORT_Assert(arena); +- +- if (params == NULL) return SECFailure; +- +- if (params->data == NULL) return SECFailure; +- +- /* make a copy of the data into the arena so QuickDER output is valid */ +- rv = SECITEM_CopyItem(arena, &newparams, params); +- +- /* Check if params use the standard format. +- * The value 0xa1 will appear in the first byte of the parameter data +- * if the PQG parameters are not using the standard format. This +- * code should be changed to use a better method to detect non-standard +- * parameters. */ +- +- if ((newparams.data[0] != 0xa1) && +- (newparams.data[0] != 0xa0)) { +- +- if (SECSuccess == rv) { +- /* PQG params are in the standard format */ +- +- /* Store DSA PQG parameters */ +- prepare_pqg_params_for_asn1(&pubk->u.fortezza.params); +- rv = SEC_QuickDERDecodeItem(arena, &pubk->u.fortezza.params, +- SECKEY_PQGParamsTemplate, +- &newparams); +- } +- +- if (SECSuccess == rv) { +- +- /* Copy the DSA PQG parameters to the KEA PQG parameters. */ +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.prime, +- &pubk->u.fortezza.params.prime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.subPrime, +- &pubk->u.fortezza.params.subPrime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.base, +- &pubk->u.fortezza.params.base); +- } +- } else { +- +- dual_params.CommParams.prime.len = 0; +- dual_params.CommParams.subPrime.len = 0; +- dual_params.CommParams.base.len = 0; +- dual_params.DiffParams.DiffDSAParams.prime.len = 0; +- dual_params.DiffParams.DiffDSAParams.subPrime.len = 0; +- dual_params.DiffParams.DiffDSAParams.base.len = 0; +- +- /* else the old fortezza-only wrapped format is used. */ +- +- if (SECSuccess == rv) { +- if (newparams.data[0] == 0xa1) { +- rv = SEC_QuickDERDecodeItem(arena, &dual_params, +- SECKEY_FortezzaPreParamTemplate, &newparams); +- } else { +- rv = SEC_QuickDERDecodeItem(arena, &dual_params, +- SECKEY_FortezzaAltPreParamTemplate, &newparams); +- } +- } +- +- if ( (dual_params.CommParams.prime.len > 0) && +- (dual_params.CommParams.subPrime.len > 0) && +- (dual_params.CommParams.base.len > 0) ) { +- /* copy in common params */ +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.params.prime, +- &dual_params.CommParams.prime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.params.subPrime, +- &dual_params.CommParams.subPrime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.params.base, +- &dual_params.CommParams.base); +- } +- +- /* Copy the DSA PQG parameters to the KEA PQG parameters. */ +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.prime, +- &pubk->u.fortezza.params.prime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.subPrime, +- &pubk->u.fortezza.params.subPrime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.base, +- &pubk->u.fortezza.params.base); +- } +- } else { +- +- /* else copy in different params */ +- +- /* copy DSA PQG parameters */ +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.params.prime, +- &dual_params.DiffParams.DiffDSAParams.prime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.params.subPrime, +- &dual_params.DiffParams.DiffDSAParams.subPrime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.params.base, +- &dual_params.DiffParams.DiffDSAParams.base); +- } +- +- /* copy KEA PQG parameters */ +- +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.prime, +- &dual_params.DiffParams.DiffKEAParams.prime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.subPrime, +- &dual_params.DiffParams.DiffKEAParams.subPrime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.fortezza.keaParams.base, +- &dual_params.DiffParams.DiffKEAParams.base); +- } +- } +- } +- return rv; +-} +- +- + /* Decode the DSA PQG parameters. The params could be stored in two + * possible formats, the old fortezza-only wrapped format or + * the normal standard format. Store the decoded parameters in +@@ -754,7 +564,6 @@ SECKEY_FortezzaDecodePQGtoOld(PRArenaPoo + SECStatus + SECKEY_DSADecodePQG(PRArenaPool *arena, SECKEYPublicKey *pubk, SECItem *params) { + SECStatus rv; +- SECKEYPQGDualParams dual_params; + SECItem newparams; + + if (params == NULL) return SECFailure; +@@ -784,187 +593,16 @@ SECKEY_DSADecodePQG(PRArenaPool *arena, + } + } else { + +- dual_params.CommParams.prime.len = 0; +- dual_params.CommParams.subPrime.len = 0; +- dual_params.CommParams.base.len = 0; +- dual_params.DiffParams.DiffDSAParams.prime.len = 0; +- dual_params.DiffParams.DiffDSAParams.subPrime.len = 0; +- dual_params.DiffParams.DiffDSAParams.base.len = 0; +- + if (SECSuccess == rv) { + /* else the old fortezza-only wrapped format is used. */ +- if (newparams.data[0] == 0xa1) { +- rv = SEC_QuickDERDecodeItem(arena, &dual_params, +- SECKEY_FortezzaPreParamTemplate, &newparams); +- } else { +- rv = SEC_QuickDERDecodeItem(arena, &dual_params, +- SECKEY_FortezzaAltPreParamTemplate, &newparams); +- } +- } +- +- if ( (dual_params.CommParams.prime.len > 0) && +- (dual_params.CommParams.subPrime.len > 0) && +- (dual_params.CommParams.base.len > 0) ) { +- /* copy in common params */ +- +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.dsa.params.prime, +- &dual_params.CommParams.prime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.dsa.params.subPrime, +- &dual_params.CommParams.subPrime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.dsa.params.base, +- &dual_params.CommParams.base); +- } +- } else { +- +- /* else copy in different params */ +- +- /* copy DSA PQG parameters */ +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.dsa.params.prime, +- &dual_params.DiffParams.DiffDSAParams.prime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.dsa.params.subPrime, +- &dual_params.DiffParams.DiffDSAParams.subPrime); +- } +- if (SECSuccess == rv) { +- rv = SECITEM_CopyItem(arena, &pubk->u.dsa.params.base, +- &dual_params.DiffParams.DiffDSAParams.base); +- } ++ PORT_SetError(SEC_ERROR_BAD_DER); ++ rv = SECFailure; + } + } + return rv; + } + + +-/* Decodes the DER encoded fortezza public key and stores the results in a +- * structure of type SECKEYPublicKey. */ +- +-SECStatus +-SECKEY_FortezzaDecodeCertKey(PRArenaPool *arena, SECKEYPublicKey *pubk, +- SECItem *rawkey, SECItem *params) { +- +- unsigned char *rawptr = rawkey->data; +- unsigned char *end = rawkey->data + rawkey->len; +- unsigned char *clearptr; +- +- /* first march down and decode the raw key data */ +- +- /* version */ +- pubk->u.fortezza.KEAversion = *rawptr++; +- if (*rawptr++ != 0x01) { +- return SECFailure; +- } +- +- /* KMID */ +- PORT_Memcpy(pubk->u.fortezza.KMID,rawptr, +- sizeof(pubk->u.fortezza.KMID)); +- rawptr += sizeof(pubk->u.fortezza.KMID); +- +- /* clearance (the string up to the first byte with the hi-bit on */ +- clearptr = rawptr; +- while ((rawptr < end) && (*rawptr++ & 0x80)); +- +- if (rawptr >= end) { return SECFailure; } +- pubk->u.fortezza.clearance.len = rawptr - clearptr; +- pubk->u.fortezza.clearance.data = +- (unsigned char*)PORT_ArenaZAlloc(arena,pubk->u.fortezza.clearance.len); +- if (pubk->u.fortezza.clearance.data == NULL) { +- return SECFailure; +- } +- PORT_Memcpy(pubk->u.fortezza.clearance.data,clearptr, +- pubk->u.fortezza.clearance.len); +- +- /* KEAPrivilege (the string up to the first byte with the hi-bit on */ +- clearptr = rawptr; +- while ((rawptr < end) && (*rawptr++ & 0x80)); +- if (rawptr >= end) { return SECFailure; } +- pubk->u.fortezza.KEAprivilege.len = rawptr - clearptr; +- pubk->u.fortezza.KEAprivilege.data = +- (unsigned char*)PORT_ArenaZAlloc(arena,pubk->u.fortezza.KEAprivilege.len); +- if (pubk->u.fortezza.KEAprivilege.data == NULL) { +- return SECFailure; +- } +- PORT_Memcpy(pubk->u.fortezza.KEAprivilege.data,clearptr, +- pubk->u.fortezza.KEAprivilege.len); +- +- +- /* now copy the key. The next to bytes are the key length, and the +- * key follows */ +- pubk->u.fortezza.KEAKey.len = (*rawptr << 8) | rawptr[1]; +- +- rawptr += 2; +- if (rawptr+pubk->u.fortezza.KEAKey.len > end) { return SECFailure; } +- pubk->u.fortezza.KEAKey.data = +- (unsigned char*)PORT_ArenaZAlloc(arena,pubk->u.fortezza.KEAKey.len); +- if (pubk->u.fortezza.KEAKey.data == NULL) { +- return SECFailure; +- } +- PORT_Memcpy(pubk->u.fortezza.KEAKey.data,rawptr, +- pubk->u.fortezza.KEAKey.len); +- rawptr += pubk->u.fortezza.KEAKey.len; +- +- /* shared key */ +- if (rawptr >= end) { +- pubk->u.fortezza.DSSKey.len = pubk->u.fortezza.KEAKey.len; +- /* this depends on the fact that we are going to get freed with an +- * ArenaFree call. We cannot free DSSKey and KEAKey separately */ +- pubk->u.fortezza.DSSKey.data= +- pubk->u.fortezza.KEAKey.data; +- pubk->u.fortezza.DSSprivilege.len = +- pubk->u.fortezza.KEAprivilege.len; +- pubk->u.fortezza.DSSprivilege.data = +- pubk->u.fortezza.DSSprivilege.data; +- goto done; +- } +- +- +- /* DSS Version is next */ +- pubk->u.fortezza.DSSversion = *rawptr++; +- +- if (*rawptr++ != 2) { +- return SECFailure; +- } +- +- /* DSSPrivilege (the string up to the first byte with the hi-bit on */ +- clearptr = rawptr; +- while ((rawptr < end) && (*rawptr++ & 0x80)); +- if (rawptr >= end) { return SECFailure; } +- pubk->u.fortezza.DSSprivilege.len = rawptr - clearptr; +- pubk->u.fortezza.DSSprivilege.data = +- (unsigned char*)PORT_ArenaZAlloc(arena,pubk->u.fortezza.DSSprivilege.len); +- if (pubk->u.fortezza.DSSprivilege.data == NULL) { +- return SECFailure; +- } +- PORT_Memcpy(pubk->u.fortezza.DSSprivilege.data,clearptr, +- pubk->u.fortezza.DSSprivilege.len); +- +- /* finally copy the DSS key. The next to bytes are the key length, +- * and the key follows */ +- pubk->u.fortezza.DSSKey.len = (*rawptr << 8) | rawptr[1]; +- +- rawptr += 2; +- if (rawptr+pubk->u.fortezza.DSSKey.len > end){ return SECFailure; } +- pubk->u.fortezza.DSSKey.data = +- (unsigned char*)PORT_ArenaZAlloc(arena,pubk->u.fortezza.DSSKey.len); +- if (pubk->u.fortezza.DSSKey.data == NULL) { +- return SECFailure; +- } +- PORT_Memcpy(pubk->u.fortezza.DSSKey.data,rawptr, +- pubk->u.fortezza.DSSKey.len); +- +- /* ok, now we decode the parameters */ +-done: +- +- return SECKEY_FortezzaDecodePQGtoOld(arena, pubk, params); +-} +- +- + /* Function used to make an oid tag to a key type */ + KeyType + seckey_GetKeyType (SECOidTag tag) { +@@ -1085,59 +723,6 @@ seckey_ExtractPublicKey(CERTSubjectPubli + + if (rv == SECSuccess) return pubk; + break; +- case SEC_OID_MISSI_KEA_DSS_OLD: +- case SEC_OID_MISSI_KEA_DSS: +- case SEC_OID_MISSI_DSS_OLD: +- case SEC_OID_MISSI_DSS: +- pubk->keyType = fortezzaKey; +- rv = SECKEY_FortezzaDecodeCertKey(arena, pubk, &newOs, +- &spki->algorithm.parameters); +- if (rv == SECSuccess) +- return pubk; +- break; +- +- case SEC_OID_MISSI_KEA: +- pubk->keyType = keaKey; +- +- prepare_kea_pub_key_for_asn1(pubk); +- rv = SEC_QuickDERDecodeItem(arena, pubk, +- SECKEY_KEAPublicKeyTemplate, &newOs); +- if (rv != SECSuccess) break; +- +- /* copy the DER into the arena, since Quick DER returns data that points +- into the DER input, which may get freed by the caller */ +- rv = SECITEM_CopyItem(arena, &newParms, &spki->algorithm.parameters); +- if ( rv != SECSuccess ) +- break; +- +- rv = SEC_QuickDERDecodeItem(arena, pubk, SECKEY_KEAParamsTemplate, +- &newParms); +- +- if (rv == SECSuccess) +- return pubk; +- +- break; +- +- case SEC_OID_MISSI_ALT_KEA: +- pubk->keyType = keaKey; +- +- rv = SECITEM_CopyItem(arena,&pubk->u.kea.publicValue,&newOs); +- if (rv != SECSuccess) break; +- +- /* copy the DER into the arena, since Quick DER returns data that points +- into the DER input, which may get freed by the caller */ +- rv = SECITEM_CopyItem(arena, &newParms, &spki->algorithm.parameters); +- if ( rv != SECSuccess ) +- break; +- +- rv = SEC_QuickDERDecodeItem(arena, pubk, SECKEY_KEAParamsTemplate, +- &newParms); +- +- if (rv == SECSuccess) +- return pubk; +- +- break; +- + case SEC_OID_ANSIX962_EC_PUBLIC_KEY: + pubk->keyType = ecKey; + pubk->u.ec.size = 0; +@@ -1154,6 +739,7 @@ seckey_ExtractPublicKey(CERTSubjectPubli + break; + + default: ++ PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG); + rv = SECFailure; + break; + } +Index: mozilla/security/nss/lib/pk11wrap/pk11akey.c +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11akey.c,v +retrieving revision 1.30 +diff -p -u -r1.30 pk11akey.c +--- mozilla/security/nss/lib/pk11wrap/pk11akey.c 17 Jun 2010 20:36:37 -0000 1.30 ++++ mozilla/security/nss/lib/pk11wrap/pk11akey.c 22 Jul 2011 20:57:00 -0000 +@@ -171,20 +171,6 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, + PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dsa.publicValue.data, + pubKey->u.dsa.publicValue.len); attrs++; + break; +- case fortezzaKey: +- keyType = CKK_DSA; +- PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++; +- signedattr = attrs; +- PK11_SETATTRS(attrs, CKA_PRIME,pubKey->u.fortezza.params.prime.data, +- pubKey->u.fortezza.params.prime.len); attrs++; +- PK11_SETATTRS(attrs,CKA_SUBPRIME, +- pubKey->u.fortezza.params.subPrime.data, +- pubKey->u.fortezza.params.subPrime.len);attrs++; +- PK11_SETATTRS(attrs, CKA_BASE, pubKey->u.fortezza.params.base.data, +- pubKey->u.fortezza.params.base.len); attrs++; +- PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.fortezza.DSSKey.data, +- pubKey->u.fortezza.DSSKey.len); attrs++; +- break; + case dhKey: + keyType = CKK_DH; + PK11_SETATTRS(attrs, CKA_DERIVE, &cktrue, sizeof(CK_BBOOL));attrs++; +@@ -223,6 +209,9 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, + } + break; + default: ++ if (ckaId) { ++ SECITEM_FreeItem(ckaId,PR_TRUE); ++ } + PORT_SetError( SEC_ERROR_BAD_KEY ); + return CK_INVALID_HANDLE; + } +@@ -242,6 +231,10 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, + SECITEM_FreeItem(pubValue,PR_TRUE); + } + if ( rv != SECSuccess) { ++ /* CKR_ATTRIBUTE_VALUE_INVALID is mapped to SEC_ERROR_BAD_DATA */ ++ if (PORT_GetError() == SEC_ERROR_BAD_DATA) { ++ PORT_SetError( SEC_ERROR_BAD_KEY ); ++ } + return CK_INVALID_HANDLE; + } + } +Index: mozilla/security/nss/lib/util/quickder.c +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/util/quickder.c,v +retrieving revision 1.23 +diff -p -u -r1.23 quickder.c +--- mozilla/security/nss/lib/util/quickder.c 31 Oct 2005 18:34:42 -0000 1.23 ++++ mozilla/security/nss/lib/util/quickder.c 22 Jul 2011 20:57:00 -0000 +@@ -102,7 +102,7 @@ static unsigned char* definite_length_de + + static SECStatus GetItem(SECItem* src, SECItem* dest, PRBool includeTag) + { +- if ( (!src) || (!dest) || (!src->data) ) ++ if ( (!src) || (!dest) || (!src->data && src->len) ) + { + PORT_SetError(SEC_ERROR_INVALID_ARGS); + return SECFailure; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-shlibsign.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-shlibsign.patch new file mode 100644 index 0000000000..a94a6946cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.12.8-shlibsign.patch @@ -0,0 +1,23 @@ +--- mozilla/security/nss/cmd/shlibsign/Makefile-old 2009-10-21 01:48:57.000000000 +0000 ++++ mozilla/security/nss/cmd/shlibsign/Makefile 2009-10-21 01:55:08.000000000 +0@@ -105,6 +105,7 @@ + include ../platrules.mk + + SRCDIR = $(call core_abspath,.) ++SHLIBSIGN = + + %.chk: %.$(DLL_SUFFIX) + ifeq ($(OS_TARGET), OS2) +@@ -112,9 +113,13 @@ + $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ + $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) + else ++ifeq ($(SHLIBSIGN),) + cd $(OBJDIR) ; sh $(SRCDIR)/sign.sh $(call core_abspath,$(DIST)) \ + $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ + $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) ++else ++ cd $(OBJDIR) ; $(SHLIBSIGN) -v -i $(call core_abspath,$<) ++endif + endif + + libs install :: $(CHECKLOC) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch new file mode 100644 index 0000000000..42f26c616b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch @@ -0,0 +1,245 @@ +diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile +--- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ b/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 +@@ -0,0 +1,40 @@ ++CORE_DEPTH = ../.. ++DEPTH = ../.. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` ++PREFIX = /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@exec_prefix@,\$${prefix}," \ ++ -e "s,@libdir@,\$${prefix}/gentoo/nss," \ ++ -e "s,@includedir@,\$${prefix}/include/nss," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in +--- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 +@@ -0,0 +1,145 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++ ++major_version=@NSS_MAJOR_VERSION@ ++minor_version=@NSS_MINOR_VERSION@ ++patch_version=@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_ssl=yes ++lib_smime=yes ++lib_nss=yes ++lib_nssutil=yes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac ++ ++ case $1 in ++ --prefix=*) ++ prefix=$optarg ++ ;; ++ --prefix) ++ echo_prefix=yes ++ ;; ++ --exec-prefix=*) ++ exec_prefix=$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=yes ++ ;; ++ --includedir=*) ++ includedir=$optarg ++ ;; ++ --includedir) ++ echo_includedir=yes ++ ;; ++ --libdir=*) ++ libdir=$optarg ++ ;; ++ --libdir) ++ echo_libdir=yes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ smime) ++ lib_smime=yes ++ ;; ++ nss) ++ lib_nss=yes ++ ;; ++ nssutil) ++ lib_nssutil=yes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=`pkg-config --variable=exec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=`pkg-config --variable=includedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=`pkg-config --variable=libdir nss` ++fi ++ ++if test "$echo_prefix" = "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" = "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" = "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" = "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" = "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" = "yes"; then ++ libdirs="-Wl,-R$libdir -L$libdir" ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs="$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" ++ fi ++ echo $libdirs ++fi ++ +diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in +--- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ ++Requires: nspr >= 4.8 ++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 ++Cflags: -I${includedir} ++ +diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile +--- a/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 ++++ b/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 +@@ -78,7 +78,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_coreconf build_nspr build_dbm all ++nss_build_all: build_coreconf build_dbm all + + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + +@@ -140,12 +140,6 @@ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + +-build_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) +- +-clobber_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber +- + build_dbm: + ifndef NSS_DISABLE_DBM + cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs +diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn +--- a/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 ++++ b/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 +@@ -42,6 +42,6 @@ + + RELEASE = nss + +-DIRS = lib cmd ++DIRS = lib cmd config + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch new file mode 100644 index 0000000000..b775bac257 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch @@ -0,0 +1,33 @@ +--- nss-3.13.1/mozilla/security/coreconf/SunOS5.mk ++++ nss-3.13.1/mozilla/security/coreconf/SunOS5.mk +@@ -37,6 +37,9 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + ++NS_USE_GCC = 1 ++GCC_USE_GNU_LD = 1 ++ + # Sun's WorkShop defines v8, v8plus and v9 architectures. + # gcc on Solaris defines v8 and v9 "cpus". + # gcc's v9 is equivalent to Workshop's v8plus. +@@ -95,7 +98,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++#INCLUDES += -I/usr/dt/include -I/usr/openwin/include + + RANLIB = echo + CPU_ARCH = sparc +@@ -105,11 +108,6 @@ + NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) + + MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) +-ifdef NS_USE_GCC +-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1))) +- GCC_USE_GNU_LD = 1 +-endif +-endif + ifdef MAPFILE + ifdef NS_USE_GCC + ifdef GCC_USE_GNU_LD diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13.5-x32.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13.5-x32.patch new file mode 100644 index 0000000000..1027cf0d34 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.13.5-x32.patch @@ -0,0 +1,68 @@ +diff -8urN a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk +--- a/mozilla/security/coreconf/Linux.mk 2012-06-22 07:55:45.228234872 -0500 ++++ b/mozilla/security/coreconf/Linux.mk 2012-06-22 07:56:30.171231815 -0500 +@@ -60,21 +60,28 @@ + else + ifeq ($(OS_TEST),alpha) + OS_REL_CFLAGS = -D_ALPHA_ + CPU_ARCH = alpha + else + ifeq ($(OS_TEST),x86_64) + ifeq ($(USE_64),1) + CPU_ARCH = x86_64 ++ ARCHFLAG = -m64 ++else ++ifeq ($(USE_x32),1) ++ OS_REL_CFLAGS = -Di386 ++ CPU_ARCH = x86 ++ ARCHFLAG = -mx32 + else + OS_REL_CFLAGS = -Di386 + CPU_ARCH = x86 + ARCHFLAG = -m32 + endif ++endif + else + ifeq ($(OS_TEST),sparc64) + CPU_ARCH = sparc + else + ifeq (,$(filter-out arm% sa110,$(OS_TEST))) + CPU_ARCH = arm + else + ifeq (,$(filter-out parisc%,$(OS_TEST))) +diff -8urN a/mozilla/security/nss/lib/freebl/Makefile b/mozilla/security/nss/lib/freebl/Makefile +--- a/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:55:45.441234854 -0500 ++++ b/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:56:30.172231808 -0500 +@@ -210,22 +210,26 @@ + DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN + # DEFINES += -DMPI_AMD64_ADD + # comment the next two lines to turn off intel HW accelleration + DEFINES += -DUSE_HW_AES + ASFILES += intel-aes.s + MPI_SRCS += mpi_amd64.c mp_comba.c + endif + ifeq ($(CPU_ARCH),x86) +- ASFILES = mpi_x86.s +- DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE +- DEFINES += -DMP_ASSEMBLY_DIV_2DX1D +- DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN +- # The floating point ECC code doesn't work on Linux x86 (bug 311432). +- #ECL_USE_FP = 1 ++ ifeq ($(USE_x32),1) ++ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN ++ else ++ ASFILES = mpi_x86.s ++ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE ++ DEFINES += -DMP_ASSEMBLY_DIV_2DX1D ++ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN ++ # The floating point ECC code doesn't work on Linux x86 (bug 311432). ++ #ECL_USE_FP = 1 ++ endif + endif + ifeq ($(CPU_ARCH),arm) + DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE + DEFINES += -DMP_USE_UINT_DIGIT + DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512 + MPI_SRCS += mpi_arm.c + endif + endif # Linux diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-abort-on-failed-urandom-access.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-abort-on-failed-urandom-access.patch new file mode 100644 index 0000000000..be76bd597c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-abort-on-failed-urandom-access.patch @@ -0,0 +1,21 @@ +diff -aurN nss-3.14-urandom/mozilla/security/nss/lib/freebl/unix_rand.c nss-3.14/mozilla/security/nss/lib/freebl/unix_rand.c +--- nss-3.14-urandom/mozilla/security/nss/lib/freebl/unix_rand.c 2012-12-28 16:31:12.017070243 -0800 ++++ nss-3.14/mozilla/security/nss/lib/freebl/unix_rand.c 2012-12-28 16:31:49.107466816 -0800 +@@ -925,6 +925,17 @@ + || defined(HPUX) + if (bytes) + return; ++ ++ /* ++ * Modified to abort the process on Chromium OS if it failed ++ * to read from /dev/urandom. ++ * ++ * See crosbug.com/29623 for details. ++ */ ++ fprintf(stderr, "[ERROR:%s(%d)] NSS failed to read from /dev/urandom. " ++ "Abort process.\n", __FILE__, __LINE__); ++ fflush(stderr); ++ abort(); + #endif + + #ifdef SOLARIS diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-bugzilla-802429.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-bugzilla-802429.patch new file mode 100644 index 0000000000..d7595480b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-bugzilla-802429.patch @@ -0,0 +1,164 @@ +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11cert.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11cert.c +--- nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11cert.c 2012-12-28 16:34:08.208954371 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11cert.c 2012-12-28 16:36:17.610338570 -0800 +@@ -2663,7 +2663,7 @@ + nssCryptokiObject *instance = *ip; + PK11SlotInfo *slot = instance->token->pk11slot; + if (slot) { +- PK11_AddSlotToList(slotList, slot); ++ PK11_AddSlotToList(slotList, slot, PR_TRUE); + found = PR_TRUE; + } + } +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11priv.h nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11priv.h +--- nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11priv.h 2012-12-28 16:34:08.208954371 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11priv.h 2012-12-28 16:36:17.610338570 -0800 +@@ -28,7 +28,7 @@ + PK11SlotList * PK11_NewSlotList(void); + PK11SlotList * PK11_GetPrivateKeyTokens(CK_MECHANISM_TYPE type, + PRBool needRW,void *wincx); +-SECStatus PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot); ++SECStatus PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot, PRBool sorted); + SECStatus PK11_DeleteSlotFromList(PK11SlotList *list,PK11SlotListElement *le); + PK11SlotListElement *PK11_FindSlotElement(PK11SlotList *list, + PK11SlotInfo *slot); +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11slot.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11slot.c +--- nss-3.14-default-token/mozilla/security/nss/lib/pk11wrap/pk11slot.c 2012-12-28 16:34:08.208954371 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11slot.c 2012-12-28 16:36:17.610338570 -0800 +@@ -171,11 +171,16 @@ + + /* + * add a slot to a list ++ * "slot" is the slot to be added. Ownership is not transferred. ++ * "sorted" indicates whether or not the slot should be inserted according to ++ * cipherOrder of the associated module. PR_FALSE indicates that the slot ++ * should be inserted to the head of the list. + */ + SECStatus +-PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot) ++PK11_AddSlotToList(PK11SlotList *list,PK11SlotInfo *slot, PRBool sorted) + { + PK11SlotListElement *le; ++ PK11SlotListElement *element; + + le = (PK11SlotListElement *) PORT_Alloc(sizeof(PK11SlotListElement)); + if (le == NULL) return SECFailure; +@@ -184,9 +189,23 @@ + le->prev = NULL; + le->refCount = 1; + PZ_Lock(list->lock); +- if (list->head) list->head->prev = le; else list->tail = le; +- le->next = list->head; +- list->head = le; ++ element = list->head; ++ /* Insertion sort, with higher cipherOrders are sorted first in the list */ ++ while (element && sorted && (element->slot->module->cipherOrder > ++ le->slot->module->cipherOrder)) { ++ element = element->next; ++ } ++ if (element) { ++ le->prev = element->prev; ++ element->prev = le; ++ le->next = element; ++ } else { ++ le->prev = list->tail; ++ le->next = NULL; ++ list->tail = le; ++ } ++ if (le->prev) le->prev->next = le; ++ if (list->head == element) list->head = le; + PZ_Unlock(list->lock); + + return SECSuccess; +@@ -208,11 +227,12 @@ + } + + /* +- * Move a list to the end of the target list. NOTE: There is no locking +- * here... This assumes BOTH lists are private copy lists. ++ * Move a list to the end of the target list. ++ * NOTE: There is no locking here... This assumes BOTH lists are private copy ++ * lists. It also does not re-sort the target list. + */ + SECStatus +-PK11_MoveListToList(PK11SlotList *target,PK11SlotList *src) ++pk11_MoveListToList(PK11SlotList *target,PK11SlotList *src) + { + if (src->head == NULL) return SECSuccess; + +@@ -511,7 +531,7 @@ + ((NULL == slotName) || (0 == *slotName)) && + ((NULL == tokenName) || (0 == *tokenName)) ) { + /* default to softoken */ +- PK11_AddSlotToList(slotList, PK11_GetInternalKeySlot()); ++ PK11_AddSlotToList(slotList, PK11_GetInternalKeySlot(), PR_TRUE); + return slotList; + } + +@@ -539,7 +559,7 @@ + ( (!slotName) || (tmpSlot->slot_name && + (0==PORT_Strcmp(tmpSlot->slot_name, slotName)))) ) { + if (tmpSlot) { +- PK11_AddSlotToList(slotList, tmpSlot); ++ PK11_AddSlotToList(slotList, tmpSlot, PR_TRUE); + slotcount++; + } + } +@@ -910,7 +930,7 @@ + CK_MECHANISM_TYPE mechanism = PK11_DefaultArray[i].mechanism; + PK11SlotList *slotList = PK11_GetSlotList(mechanism); + +- if (slotList) PK11_AddSlotToList(slotList,slot); ++ if (slotList) PK11_AddSlotToList(slotList,slot,PR_FALSE); + } + } + +@@ -937,7 +957,7 @@ + + /* add this slot to the list */ + if (slotList!=NULL) +- result = PK11_AddSlotToList(slotList, slot); ++ result = PK11_AddSlotToList(slotList, slot, PR_FALSE); + + } else { /* trying to turn off */ + +@@ -1910,12 +1930,12 @@ + || PK11_DoesMechanism(slot, type)) { + if (pk11_LoginStillRequired(slot,wincx)) { + if (PK11_IsFriendly(slot)) { +- PK11_AddSlotToList(friendlyList, slot); ++ PK11_AddSlotToList(friendlyList, slot, PR_TRUE); + } else { +- PK11_AddSlotToList(loginList, slot); ++ PK11_AddSlotToList(loginList, slot, PR_TRUE); + } + } else { +- PK11_AddSlotToList(list, slot); ++ PK11_AddSlotToList(list, slot, PR_TRUE); + } + } + } +@@ -1923,9 +1943,9 @@ + } + SECMOD_ReleaseReadLock(moduleLock); + +- PK11_MoveListToList(list,friendlyList); ++ pk11_MoveListToList(list,friendlyList); + PK11_FreeSlotList(friendlyList); +- PK11_MoveListToList(list,loginList); ++ pk11_MoveListToList(list,loginList); + PK11_FreeSlotList(loginList); + + return list; +diff -aurN nss-3.14-default-token/mozilla/security/nss/lib/util/utilpars.c nss-3.14/mozilla/security/nss/lib/util/utilpars.c +--- nss-3.14-default-token/mozilla/security/nss/lib/util/utilpars.c 2012-12-28 16:34:08.218954478 -0800 ++++ nss-3.14/mozilla/security/nss/lib/util/utilpars.c 2012-12-28 16:36:08.190237792 -0800 +@@ -543,6 +543,8 @@ + NSSUTIL_ARG_ENTRY(FORTEZZA,SECMOD_FORTEZZA_FLAG), + NSSUTIL_ARG_ENTRY(RC5,SECMOD_RC5_FLAG), + NSSUTIL_ARG_ENTRY(SHA1,SECMOD_SHA1_FLAG), ++ NSSUTIL_ARG_ENTRY(SHA256,SECMOD_SHA256_FLAG), ++ NSSUTIL_ARG_ENTRY(SHA512,SECMOD_SHA512_FLAG), + NSSUTIL_ARG_ENTRY(MD5,SECMOD_MD5_FLAG), + NSSUTIL_ARG_ENTRY(MD2,SECMOD_MD2_FLAG), + NSSUTIL_ARG_ENTRY(SSL,SECMOD_SSL_FLAG), diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-chromeos-cert-nicknames.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-chromeos-cert-nicknames.patch new file mode 100644 index 0000000000..58bb16e0ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-chromeos-cert-nicknames.patch @@ -0,0 +1,95 @@ +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/nss/nss.def nss-3.14/mozilla/security/nss/lib/nss/nss.def +--- nss-3.14-prepared/mozilla/security/nss/lib/nss/nss.def 2012-12-28 16:27:38.374784755 -0800 ++++ nss-3.14/mozilla/security/nss/lib/nss/nss.def 2012-12-28 16:28:42.605473048 -0800 +@@ -613,6 +613,7 @@ + PK11_GetPQGParamsFromPrivateKey; + PK11_GetPrivateKeyNickname; + PK11_GetPublicKeyNickname; ++PK11_GetCertificateNickname; + PK11_GetSymKeyNickname; + PK11_ImportDERPrivateKeyInfoAndReturnKey; + PK11_ImportPrivateKeyInfoAndReturnKey; +@@ -624,6 +625,7 @@ + PK11_ProtectedAuthenticationPath; + PK11_SetPrivateKeyNickname; + PK11_SetPublicKeyNickname; ++PK11_SetCertificateNickname; + PK11_SetSymKeyNickname; + SECKEY_DecodeDERSubjectPublicKeyInfo; + SECKEY_DestroyPublicKeyList; +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11akey.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11akey.c +--- nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11akey.c 2012-12-28 16:27:38.354784541 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11akey.c 2012-12-28 16:28:42.605473048 -0800 +@@ -1909,6 +1909,13 @@ + return PK11_GetObjectNickname(pubKey->pkcs11Slot,pubKey->pkcs11ID); + } + ++char * ++PK11_GetCertificateNickname(CERTCertificate *certificate) ++{ ++ return PK11_GetObjectNickname(certificate->slot, ++ certificate->pkcs11ID); ++} ++ + SECStatus + PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey, const char *nickname) + { +@@ -1923,6 +1930,13 @@ + pubKey->pkcs11ID,nickname); + } + ++SECStatus ++PK11_SetCertificateNickname(CERTCertificate *certificate, const char *nickname) ++{ ++ return PK11_SetObjectNickname(certificate->slot, ++ certificate->pkcs11ID,nickname); ++} ++ + SECKEYPQGParams * + PK11_GetPQGParamsFromPrivateKey(SECKEYPrivateKey *privKey) + { +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11obj.c nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11obj.c +--- nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11obj.c 2012-12-28 16:27:38.354784541 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11obj.c 2012-12-28 16:28:42.605473048 -0800 +@@ -1410,7 +1410,10 @@ + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +- case PK11_TypeCert: /* don't handle cert case for now */ ++ case PK11_TypeCert: ++ slot = ((CERTCertificate *)objSpec)->slot; ++ handle = ((CERTCertificate *)objSpec)->pkcs11ID; ++ break; + default: + break; + } +@@ -1460,7 +1463,10 @@ + slot = ((PK11SymKey *)objSpec)->slot; + handle = ((PK11SymKey *)objSpec)->objectID; + break; +- case PK11_TypeCert: /* don't handle cert case for now */ ++ case PK11_TypeCert: ++ slot = ((CERTCertificate *)objSpec)->slot; ++ handle = ((CERTCertificate *)objSpec)->pkcs11ID; ++ break; + default: + break; + } +diff -aurN nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11pub.h nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11pub.h +--- nss-3.14-prepared/mozilla/security/nss/lib/pk11wrap/pk11pub.h 2012-12-28 16:27:38.354784541 -0800 ++++ nss-3.14/mozilla/security/nss/lib/pk11wrap/pk11pub.h 2012-12-28 16:28:42.605473048 -0800 +@@ -453,11 +453,14 @@ + char * PK11_GetSymKeyNickname(PK11SymKey *symKey); + char * PK11_GetPrivateKeyNickname(SECKEYPrivateKey *privKey); + char * PK11_GetPublicKeyNickname(SECKEYPublicKey *pubKey); ++char * PK11_GetCertificateNickname(CERTCertificate *certificate); + SECStatus PK11_SetSymKeyNickname(PK11SymKey *symKey, const char *nickname); + SECStatus PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey, + const char *nickname); + SECStatus PK11_SetPublicKeyNickname(SECKEYPublicKey *pubKey, + const char *nickname); ++SECStatus PK11_SetCertificateNickname(CERTCertificate *certificate, ++ const char *nickname); + + /* size to hold key in bytes */ + unsigned int PK11_GetKeyLength(PK11SymKey *key); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-remove-turktrust-roots.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-remove-turktrust-roots.patch new file mode 100644 index 0000000000..ef8f081555 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/files/nss-3.14-remove-turktrust-roots.patch @@ -0,0 +1,522 @@ +diff -aur nss-3.14-orig/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.14/mozilla/security/nss/lib/ckfw/builtins/certdata.c +--- nss-3.14-orig/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2013-01-25 15:59:27.409528628 -0800 ++++ nss-3.14/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2013-01-25 16:12:48.977974945 -0800 +@@ -3,7 +3,7 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #ifdef DEBUG +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.90 $ $Date: 2012/10/18 16:26:52 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.90 $ $Date: 2012/10/18 16:26:52 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.86 $ $Date: 2012/10/18 16:26:52 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.15 $ $Date: 2012/07/04 15:21:49 $"; + #endif /* DEBUG */ + + #ifndef BUILTINS_H +@@ -1097,10 +1097,10 @@ + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; + static const CK_ATTRIBUTE_TYPE nss_builtins_types_358 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; + static const CK_ATTRIBUTE_TYPE nss_builtins_types_359 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; + #ifdef DEBUG + static const NSSItem nss_builtins_items_0 [] = { +@@ -1110,7 +1110,7 @@ + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"CVS ID", (PRUint32)7 }, + { (void *)"NSS", (PRUint32)4 }, +- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.90 $ $Date: 2012/10/18 16:26:52 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.90 $ $Date: 2012/10/18 16:26:52 $", (PRUint32)160 } ++ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.86 $ $Date: 2012/10/18 16:26:52 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.15 $ $Date: 2012/07/04 15:21:49 $", (PRUint32)160 } + }; + #endif /* DEBUG */ + static const NSSItem nss_builtins_items_1 [] = { +@@ -23630,147 +23630,6 @@ + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı", (PRUint32)55 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303" +-"\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157" +-"\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151" +-"\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304" +-"\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141" +-"\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234" +-"\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260" +-"\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151" +-"\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151" +-"\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236" +-"\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060" +-"\060\067" +-, (PRUint32)194 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303" +-"\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157" +-"\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151" +-"\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304" +-"\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141" +-"\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234" +-"\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260" +-"\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151" +-"\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151" +-"\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236" +-"\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060" +-"\060\067" +-, (PRUint32)194 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)"\060\202\004\075\060\202\003\045\240\003\002\001\002\002\001\001" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303\234" +-"\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157\156" +-"\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172" +-"\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261" +-"\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124\122" +-"\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162" +-"\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234\122" +-"\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154" +-"\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305" +-"\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040" +-"\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056" +-"\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060\060" +-"\067\060\036\027\015\060\067\061\062\062\065\061\070\063\067\061" +-"\071\132\027\015\061\067\061\062\062\062\061\070\063\067\061\071" +-"\132\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124" +-"\303\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162" +-"\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110" +-"\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143" +-"\304\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002" +-"\124\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153" +-"\141\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303" +-"\234\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304" +-"\260\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154" +-"\151\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237" +-"\151\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305" +-"\236\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062" +-"\060\060\067\060\202\001\042\060\015\006\011\052\206\110\206\367" +-"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002" +-"\202\001\001\000\253\267\076\012\214\310\245\130\025\346\212\357" +-"\047\075\112\264\350\045\323\315\063\302\040\334\031\356\210\077" +-"\115\142\360\335\023\167\217\141\251\052\265\324\362\271\061\130" +-"\051\073\057\077\152\234\157\163\166\045\356\064\040\200\356\352" +-"\267\360\304\012\315\053\206\224\311\343\140\261\104\122\262\132" +-"\051\264\221\227\203\330\267\246\024\057\051\111\242\363\005\006" +-"\373\264\117\332\241\154\232\146\237\360\103\011\312\352\162\217" +-"\353\000\327\065\071\327\126\027\107\027\060\364\276\277\077\302" +-"\150\257\066\100\301\251\364\251\247\350\020\153\010\212\367\206" +-"\036\334\232\052\025\006\366\243\360\364\340\307\024\324\121\177" +-"\317\264\333\155\257\107\226\027\233\167\161\330\247\161\235\044" +-"\014\366\224\077\205\061\022\117\272\356\116\202\270\271\076\217" +-"\043\067\136\314\242\252\165\367\030\157\011\323\256\247\124\050" +-"\064\373\341\340\073\140\175\240\276\171\211\206\310\237\055\371" +-"\012\113\304\120\242\347\375\171\026\307\172\013\030\317\316\114" +-"\357\175\326\007\157\230\361\257\261\301\172\327\201\065\270\252" +-"\027\264\340\313\002\003\001\000\001\243\102\060\100\060\035\006" +-"\003\125\035\016\004\026\004\024\051\305\220\253\045\257\021\344" +-"\141\277\243\377\210\141\221\346\016\376\234\201\060\016\006\003" +-"\125\035\017\001\001\377\004\004\003\002\001\006\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\005\005\000\003\202\001\001" +-"\000\020\015\332\370\072\354\050\321\024\225\202\261\022\054\121" +-"\172\101\045\066\114\237\354\077\037\204\235\145\124\134\250\026" +-"\002\100\372\156\032\067\204\357\162\235\206\012\125\235\126\050" +-"\254\146\054\320\072\126\223\064\007\045\255\010\260\217\310\017" +-"\011\131\312\235\230\034\345\124\370\271\105\177\152\227\157\210" +-"\150\115\112\006\046\067\210\002\016\266\306\326\162\231\316\153" +-"\167\332\142\061\244\126\037\256\137\215\167\332\135\366\210\374" +-"\032\331\236\265\201\360\062\270\343\210\320\234\363\152\240\271" +-"\233\024\131\065\066\117\317\363\216\136\135\027\255\025\225\330" +-"\335\262\325\025\156\000\116\263\113\317\146\224\344\340\315\265" +-"\005\332\143\127\213\345\263\252\333\300\056\034\220\104\333\032" +-"\135\030\244\356\276\004\133\231\325\161\137\125\145\144\142\325" +-"\242\233\004\131\206\310\142\167\347\174\202\105\152\075\027\277" +-"\354\235\165\014\256\243\157\132\323\057\230\066\364\360\365\031" +-"\253\021\135\310\246\343\052\130\152\102\011\303\275\222\046\146" +-"\062\015\135\010\125\164\377\214\230\320\012\246\204\152\321\071" +-"\175" +-, (PRUint32)1089 } +-}; +-static const NSSItem nss_builtins_items_355 [] = { +- { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı", (PRUint32)55 }, +- { (void *)"\361\177\157\266\061\334\231\343\243\310\177\376\034\361\201\020" +-"\210\331\140\063" +-, (PRUint32)20 }, +- { (void *)"\053\160\040\126\206\202\240\030\310\007\123\022\050\160\041\162" +-, (PRUint32)16 }, +- { (void *)"\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303" +-"\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157" +-"\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151" +-"\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304" +-"\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124" +-"\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141" +-"\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234" +-"\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260" +-"\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151" +-"\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151" +-"\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236" +-"\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060" +-"\060\067" +-, (PRUint32)194 }, +- { (void *)"\002\001\001" +-, (PRUint32)3 }, +- { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_nss_must_verify_trust, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_356 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"T-TeleSec GlobalRoot Class 3", (PRUint32)29 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\104\105" +@@ -23859,7 +23718,7 @@ + "\116\223\303\244\124\024\133" + , (PRUint32)967 } + }; +-static const NSSItem nss_builtins_items_357 [] = { ++static const NSSItem nss_builtins_items_355 [] = { + { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -23887,7 +23746,7 @@ + { (void *)&ckt_nss_must_verify_trust, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_358 [] = { ++static const NSSItem nss_builtins_items_356 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -23983,7 +23842,7 @@ + "\307\314\165\301\226\305\235" + , (PRUint32)1031 } + }; +-static const NSSItem nss_builtins_items_359 [] = { ++static const NSSItem nss_builtins_items_357 [] = { + { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -24011,6 +23870,56 @@ + { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; ++static const NSSItem nss_builtins_items_358 [] = { ++ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"TURKTRUST Mis-issued Intermediate CA 1", (PRUint32)39 }, ++ { (void *)"\060\201\254\061\075\060\073\006\003\125\004\003\014\064\124\303" ++"\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157" ++"\156\151\153\040\123\165\156\165\143\165\040\123\145\162\164\151" ++"\146\151\153\141\163\304\261\040\110\151\172\155\145\164\154\145" ++"\162\151\061\013\060\011\006\003\125\004\006\023\002\124\122\061" ++"\136\060\134\006\003\125\004\012\014\125\124\303\234\122\113\124" ++"\122\125\123\124\040\102\151\154\147\151\040\304\260\154\145\164" ++"\151\305\237\151\155\040\166\145\040\102\151\154\151\305\237\151" ++"\155\040\107\303\274\166\145\156\154\151\304\237\151\040\110\151" ++"\172\155\145\164\154\145\162\151\040\101\056\305\236\056\040\050" ++"\143\051\040\113\141\163\304\261\155\040\040\062\060\060\065" ++, (PRUint32)175 }, ++ { (void *)"\002\002\010\047" ++, (PRUint32)4 }, ++ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_359 [] = { ++ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"TURKTRUST Mis-issued Intermediate CA 2", (PRUint32)39 }, ++ { (void *)"\060\201\254\061\075\060\073\006\003\125\004\003\014\064\124\303" ++"\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157" ++"\156\151\153\040\123\165\156\165\143\165\040\123\145\162\164\151" ++"\146\151\153\141\163\304\261\040\110\151\172\155\145\164\154\145" ++"\162\151\061\013\060\011\006\003\125\004\006\023\002\124\122\061" ++"\136\060\134\006\003\125\004\012\014\125\124\303\234\122\113\124" ++"\122\125\123\124\040\102\151\154\147\151\040\304\260\154\145\164" ++"\151\305\237\151\155\040\166\145\040\102\151\154\151\305\237\151" ++"\155\040\107\303\274\166\145\156\154\151\304\237\151\040\110\151" ++"\172\155\145\164\154\145\162\151\040\101\056\305\236\056\040\050" ++"\143\051\040\113\141\163\304\261\155\040\040\062\060\060\065" ++, (PRUint32)175 }, ++ { (void *)"\002\002\010\144" ++, (PRUint32)4 }, ++ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; + + builtinsInternalObject + nss_builtins_data[] = { +@@ -24375,7 +24284,7 @@ + { 11, nss_builtins_types_356, nss_builtins_items_356, {NULL} }, + { 13, nss_builtins_types_357, nss_builtins_items_357, {NULL} }, + { 11, nss_builtins_types_358, nss_builtins_items_358, {NULL} }, +- { 13, nss_builtins_types_359, nss_builtins_items_359, {NULL} } ++ { 11, nss_builtins_types_359, nss_builtins_items_359, {NULL} } + }; + const PRUint32 + #ifdef DEBUG +diff -aur nss-3.14-orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt nss-3.14/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +--- nss-3.14-orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2013-01-25 15:59:27.429528838 -0800 ++++ nss-3.14/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2013-01-25 16:12:47.637960812 -0800 +@@ -24424,171 +24424,6 @@ + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı" +-# +-# Issuer: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. +-# Serial Number: 1 (0x1) +-# Subject: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. +-# Not Valid Before: Tue Dec 25 18:37:19 2007 +-# Not Valid After : Fri Dec 22 18:37:19 2017 +-# Fingerprint (MD5): 2B:70:20:56:86:82:A0:18:C8:07:53:12:28:70:21:72 +-# Fingerprint (SHA1): F1:7F:6F:B6:31:DC:99:E3:A3:C8:7F:FE:1C:F1:81:10:88:D9:60:33 +-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 "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303 +-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157 +-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151 +-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304 +-\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141 +-\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234 +-\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260 +-\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151 +-\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151 +-\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236 +-\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060 +-\060\067 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303 +-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157 +-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151 +-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304 +-\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141 +-\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234 +-\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260 +-\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151 +-\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151 +-\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236 +-\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060 +-\060\067 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\001\001 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\004\075\060\202\003\045\240\003\002\001\002\002\001\001 +-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 +-\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303\234 +-\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157\156 +-\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172 +-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261 +-\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124\122 +-\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162 +-\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234\122 +-\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154 +-\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305 +-\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040 +-\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056 +-\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060\060 +-\067\060\036\027\015\060\067\061\062\062\065\061\070\063\067\061 +-\071\132\027\015\061\067\061\062\062\062\061\070\063\067\061\071 +-\132\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124 +-\303\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162 +-\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110 +-\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143 +-\304\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002 +-\124\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153 +-\141\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303 +-\234\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304 +-\260\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154 +-\151\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237 +-\151\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305 +-\236\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062 +-\060\060\067\060\202\001\042\060\015\006\011\052\206\110\206\367 +-\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 +-\202\001\001\000\253\267\076\012\214\310\245\130\025\346\212\357 +-\047\075\112\264\350\045\323\315\063\302\040\334\031\356\210\077 +-\115\142\360\335\023\167\217\141\251\052\265\324\362\271\061\130 +-\051\073\057\077\152\234\157\163\166\045\356\064\040\200\356\352 +-\267\360\304\012\315\053\206\224\311\343\140\261\104\122\262\132 +-\051\264\221\227\203\330\267\246\024\057\051\111\242\363\005\006 +-\373\264\117\332\241\154\232\146\237\360\103\011\312\352\162\217 +-\353\000\327\065\071\327\126\027\107\027\060\364\276\277\077\302 +-\150\257\066\100\301\251\364\251\247\350\020\153\010\212\367\206 +-\036\334\232\052\025\006\366\243\360\364\340\307\024\324\121\177 +-\317\264\333\155\257\107\226\027\233\167\161\330\247\161\235\044 +-\014\366\224\077\205\061\022\117\272\356\116\202\270\271\076\217 +-\043\067\136\314\242\252\165\367\030\157\011\323\256\247\124\050 +-\064\373\341\340\073\140\175\240\276\171\211\206\310\237\055\371 +-\012\113\304\120\242\347\375\171\026\307\172\013\030\317\316\114 +-\357\175\326\007\157\230\361\257\261\301\172\327\201\065\270\252 +-\027\264\340\313\002\003\001\000\001\243\102\060\100\060\035\006 +-\003\125\035\016\004\026\004\024\051\305\220\253\045\257\021\344 +-\141\277\243\377\210\141\221\346\016\376\234\201\060\016\006\003 +-\125\035\017\001\001\377\004\004\003\002\001\006\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\005\005\000\003\202\001\001 +-\000\020\015\332\370\072\354\050\321\024\225\202\261\022\054\121 +-\172\101\045\066\114\237\354\077\037\204\235\145\124\134\250\026 +-\002\100\372\156\032\067\204\357\162\235\206\012\125\235\126\050 +-\254\146\054\320\072\126\223\064\007\045\255\010\260\217\310\017 +-\011\131\312\235\230\034\345\124\370\271\105\177\152\227\157\210 +-\150\115\112\006\046\067\210\002\016\266\306\326\162\231\316\153 +-\167\332\142\061\244\126\037\256\137\215\167\332\135\366\210\374 +-\032\331\236\265\201\360\062\270\343\210\320\234\363\152\240\271 +-\233\024\131\065\066\117\317\363\216\136\135\027\255\025\225\330 +-\335\262\325\025\156\000\116\263\113\317\146\224\344\340\315\265 +-\005\332\143\127\213\345\263\252\333\300\056\034\220\104\333\032 +-\135\030\244\356\276\004\133\231\325\161\137\125\145\144\142\325 +-\242\233\004\131\206\310\142\167\347\174\202\105\152\075\027\277 +-\354\235\165\014\256\243\157\132\323\057\230\066\364\360\365\031 +-\253\021\135\310\246\343\052\130\152\102\011\303\275\222\046\146 +-\062\015\135\010\125\164\377\214\230\320\012\246\204\152\321\071 +-\175 +-END +- +-# Trust for "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı" +-# Issuer: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. +-# Serial Number: 1 (0x1) +-# Subject: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. +-# Not Valid Before: Tue Dec 25 18:37:19 2007 +-# Not Valid After : Fri Dec 22 18:37:19 2017 +-# Fingerprint (MD5): 2B:70:20:56:86:82:A0:18:C8:07:53:12:28:70:21:72 +-# Fingerprint (SHA1): F1:7F:6F:B6:31:DC:99:E3:A3:C8:7F:FE:1C:F1:81:10:88:D9:60:33 +-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 "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\361\177\157\266\061\334\231\343\243\310\177\376\034\361\201\020 +-\210\331\140\063 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\053\160\040\126\206\202\240\030\310\007\123\022\050\160\041\162 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\201\277\061\077\060\075\006\003\125\004\003\014\066\124\303 +-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157 +-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151 +-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304 +-\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124 +-\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141 +-\162\141\061\136\060\134\006\003\125\004\012\014\125\124\303\234 +-\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260 +-\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151 +-\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151 +-\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236 +-\056\040\050\143\051\040\101\162\141\154\304\261\153\040\062\060 +-\060\067 +-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 "T-TeleSec GlobalRoot Class 3" + # + # Issuer: CN=T-TeleSec GlobalRoot Class 3,OU=T-Systems Trust Center,O=T-Systems Enterprise Services GmbH,C=DE +@@ -24880,3 +24715,71 @@ + 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 ++ ++# Explicitly Distrust "TURKTRUST Mis-issued Intermediate CA 1", Bug 825022 ++# Issuer: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,C=TR,CN=T..RKTRUST Elektronik Sunucu Sertifikas.. Hizmetleri ++# Serial Number: 2087 (0x827) ++# Subject: CN=*.EGO.GOV.TR,OU=EGO BILGI ISLEM,O=EGO,L=ANKARA,ST=ANKARA,C=TR ++# Not Valid Before: Mon Aug 08 07:07:51 2011 ++# Not Valid After : Tue Jul 06 07:07:51 2021 ++# Fingerprint (MD5): F8:F5:25:FF:0C:31:CF:85:E1:0C:86:17:C1:CE:1F:8E ++# Fingerprint (SHA1): C6:9F:28:C8:25:13:9E:65:A6:46:C4:34:AC:A5:A1:D2:00:29:5D:B1 ++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 "TURKTRUST Mis-issued Intermediate CA 1" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\254\061\075\060\073\006\003\125\004\003\014\064\124\303 ++\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157 ++\156\151\153\040\123\165\156\165\143\165\040\123\145\162\164\151 ++\146\151\153\141\163\304\261\040\110\151\172\155\145\164\154\145 ++\162\151\061\013\060\011\006\003\125\004\006\023\002\124\122\061 ++\136\060\134\006\003\125\004\012\014\125\124\303\234\122\113\124 ++\122\125\123\124\040\102\151\154\147\151\040\304\260\154\145\164 ++\151\305\237\151\155\040\166\145\040\102\151\154\151\305\237\151 ++\155\040\107\303\274\166\145\156\154\151\304\237\151\040\110\151 ++\172\155\145\164\154\145\162\151\040\101\056\305\236\056\040\050 ++\143\051\040\113\141\163\304\261\155\040\040\062\060\060\065 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\002\010\047 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# Explicitly Distrust "TURKTRUST Mis-issued Intermediate CA 2", Bug 825022 ++# Issuer: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,C=TR,CN=T..RKTRUST Elektronik Sunucu Sertifikas.. Hizmetleri ++# Serial Number: 2148 (0x864) ++# Subject: E=ileti@kktcmerkezbankasi.org,CN=e-islem.kktcmerkezbankasi.org,O=KKTC Merkez Bankasi,L=Lefkosa,ST=Lefkosa,C=TR ++# Not Valid Before: Mon Aug 08 07:07:51 2011 ++# Not Valid After : Thu Aug 05 07:07:51 2021 ++# Fingerprint (MD5): BF:C3:EC:AD:0F:42:4F:B4:B5:38:DB:35:BF:AD:84:A2 ++# Fingerprint (SHA1): F9:2B:E5:26:6C:C0:5D:B2:DC:0D:C3:F2:DC:74:E0:2D:EF:D9:49:CB ++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 "TURKTRUST Mis-issued Intermediate CA 2" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\254\061\075\060\073\006\003\125\004\003\014\064\124\303 ++\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157 ++\156\151\153\040\123\165\156\165\143\165\040\123\145\162\164\151 ++\146\151\153\141\163\304\261\040\110\151\172\155\145\164\154\145 ++\162\151\061\013\060\011\006\003\125\004\006\023\002\124\122\061 ++\136\060\134\006\003\125\004\012\014\125\124\303\234\122\113\124 ++\122\125\123\124\040\102\151\154\147\151\040\304\260\154\145\164 ++\151\305\237\151\155\040\166\145\040\102\151\154\151\305\237\151 ++\155\040\107\303\274\166\145\156\154\151\304\237\151\040\110\151 ++\172\155\145\164\154\145\162\151\040\101\056\305\236\056\040\050 ++\143\051\040\113\141\163\304\261\155\040\040\062\060\060\065 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\002\010\144 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.12.8-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.12.8-r9.ebuild new file mode 120000 index 0000000000..b0a0d9a349 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.12.8-r9.ebuild @@ -0,0 +1 @@ +nss-3.12.8.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.12.8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.12.8.ebuild new file mode 100644 index 0000000000..0842d37ed8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.12.8.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.8.ebuild,v 1.1 2010/09/30 11:58:39 anarchy Exp $ + +EAPI=3 +inherit eutils flag-o-matic multilib toolchain-funcs + +NSPR_VER="4.8.6" +RTM_NAME="NSS_${PV//./_}_RTM" +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +DEPEND="dev-util/pkgconfig" +RDEPEND=">=dev-libs/nspr-${NSPR_VER} + >=dev-db/sqlite-3.5 + sys-libs/zlib" + +src_prepare() { + # Custom changes for gentoo + epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff" + epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" + epatch "${FILESDIR}"/${P}-shlibsign.patch + epatch "${FILESDIR}"/${P}-chromeos-root-certs.patch + epatch "${FILESDIR}"/${P}-remove-fortezza.patch + epatch "${FILESDIR}"/${P}-chromeos-cert-nicknames.patch + epatch "${FILESDIR}"/${P}-chromeos-mitm-root.patch + + # See https://bugzilla.mozilla.org/show_bug.cgi?id=741481 for details. + epatch "${FILESDIR}"/${P}-cert-initlocks.patch + + # See http://crosbug.com/29623 for details. + epatch "${FILESDIR}"/${P}-abort-on-failed-urandom-access.patch + + # See https://bugzilla.mozilla.org/show_bug.cgi?id=802429 for details + epatch "${FILESDIR}"/${P}-bugzilla-802429.patch + + cd "${S}"/mozilla/security/coreconf + + # Explain that linux 3.0+ is just the same as 2.6. + ln -sf Linux2.6.mk Linux$(uname -r | cut -b1-3).mk + + # hack nspr paths + echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # modify install path + sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + + # Ensure we stay multilib aware + sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + "${S}"/mozilla/security/nss/config/Makefile + + epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools + # dirty hack + cd "${S}"/mozilla/security/nss + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die +} + +src_compile() { + strip-flags + + echo > "${T}"/test.c + $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + export NSPR_INCLUDE_DIR="${ROOT}"/usr/include/nspr + export NSPR_LIB_DIR="${ROOT}"/usr/lib + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSDISTMODE=copy + export NSS_ENABLE_ECC=1 + export XCFLAGS="${CFLAGS}" + export FREEBL_NO_DEPEND=1 + + # Cross-compile Love + ( filter-flags -m* ; + cd "${S}"/mozilla/security/coreconf && + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" LDFLAGS= CC="$(tc-getBUILD_CC)" || die "coreconf make failed" ) + cd "${S}"/mozilla/security/dbm + NSINSTALL=$(readlink -f $(find "${S}"/mozilla/security/coreconf -type f -name nsinstall)) + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} || die "dbm make failed" + cd "${S}"/mozilla/security/nss + if tc-is-cross-compiler; then + SHLIBSIGN_ARG="SHLIBSIGN=/usr/bin/nssshlibsign" + fi + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} ${SHLIBSIGN_ARG} || die "nss make failed" +} + +# Altering these 3 libraries breaks the CHK verification. +# All of the following cause it to break: +# - stripping +# - prelink +# - ELF signing +# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html +# Either we have to NOT strip them, or we have to forcibly resign after +# stripping. +#local_libdir="$(get_libdir)" +#export STRIP_MASK=" +# */${local_libdir}/libfreebl3.so* +# */${local_libdir}/libnssdbm3.so* +# */${local_libdir}/libsoftokn3.so*" + +export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" + +generate_chk() { + local shlibsign="$1" + local libdir="$2" + einfo "Resigning core NSS libraries for FIPS validation" + shift 2 + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libname=lib${i}.so + local chkname=lib${i}.chk + "${shlibsign}" \ + -i "${libdir}"/${libname} \ + -o "${libdir}"/${chkname}.tmp \ + && mv -f \ + "${libdir}"/${chkname}.tmp \ + "${libdir}"/${chkname} \ + || die "Failed to sign ${libname}" + done +} + +cleanup_chk() { + local libdir="$1" + shift 1 + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libfname="${libdir}/lib${i}.so" + # If the major version has changed, then we have old chk files. + [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ + && rm -f "${libfname}.chk" + done +} + +src_install () { + MINOR_VERSION=12 + cd "${S}"/mozilla/security/dist + + dodir /usr/$(get_libdir) + cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" + # We generate these after stripping the libraries, else they don't match. + #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed" + cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" + + # Install nss-config and pkgconfig file + dodir /usr/bin + cp -L */bin/nss-config "${ED}"/usr/bin + dodir /usr/$(get_libdir)/pkgconfig + cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig + + # all the include files + insinto /usr/include/nss + doins public/nss/*.h + cd "${ED}"/usr/$(get_libdir) + local n= + for file in *$(get_libname); do + n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) + mv ${file} ${n} + ln -s ${n} ${file} + if [[ ${CHOST} == *-darwin* ]]; then + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die + fi + done + + local nssutils + if [ ! tc-is-cross-compiler ]; then + # Unless cross-compiling, enabled because we need it for chk generation. + nssutils="shlibsign" + fi + cd "${S}"/mozilla/security/dist/*/bin/ + for f in $nssutils; do + # TODO(cmasone): switch to normal nss tool names + newbin ${f} nss${f} + done + + # Prelink breaks the CHK files. We don't have any reliable way to run + # shlibsign after prelink. + declare -a libs + for l in ${NSS_CHK_SIGN_LIBS} ; do + libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so") + done + OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}" + echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" + unset libs liblist + doenvd "${T}/90nss" +} + +pkg_postinst() { + elog "We have reverted back to using upstreams soname." + elog "Please run revdep-rebuild --library libnss3.so.12 , this" + elog "will correct most issues. If you find a binary that does" + elog "not run please re-emerge package to ensure it properly" + elog " links after upgrade." + elog + local tool_root + # We must re-sign the libraries AFTER they are stripped. + if [ ! tc-is-cross-compiler ]; then + tool_root = "${EROOT}" + fi + generate_chk "${tool_root}"/usr/bin/nssshlibsign "${EROOT}"/usr/$(get_libdir) +} + +pkg_postrm() { + cleanup_chk "${EROOT}"/usr/$(get_libdir) +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.14.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.14.ebuild new file mode 100644 index 0000000000..2f975bfbe0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/nss/nss-3.14.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.ebuild,v 1.8 2012/11/29 23:41:51 blueness Exp $ + +EAPI=3 +inherit eutils flag-o-matic multilib toolchain-funcs + +NSPR_VER="4.9.2" +RTM_NAME="NSS_${PV//./_}_RTM" + +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +DEPEND="virtual/pkgconfig + >=dev-libs/nspr-${NSPR_VER}" + +RDEPEND=">=dev-libs/nspr-${NSPR_VER} + >=dev-db/sqlite-3.5 + sys-libs/zlib + !> headers.mk || die "failed to append include" + + # modify install path + sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die + + # Ensure we stay multilib aware + sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + "${S}"/mozilla/security/nss/config/Makefile || die + + epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" + + # dirty hack + cd "${S}"/mozilla/security/nss || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die +} + +src_compile() { + strip-flags + + echo > "${T}"/test.c || die + $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die + case $(file "${T}"/test.o) in + *32-bit*x86-64*) export USE_x32=1;; + *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + export NSPR_INCLUDE_DIR="${ROOT}"/usr/include/nspr + export NSPR_LIB_DIR="${ROOT}"/usr/lib + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSDISTMODE=copy + export NSS_ENABLE_ECC=1 + export XCFLAGS="${CFLAGS}" + export FREEBL_NO_DEPEND=1 + export ASFLAGS="" + + # Cross-compile Love + ( filter-flags -m* ; + cd "${S}"/mozilla/security/coreconf && + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" LDFLAGS= CC="$(tc-getBUILD_CC)" || die "coreconf make failed" ) + cd "${S}"/mozilla/security/dbm + NSINSTALL=$(readlink -f $(find "${S}"/mozilla/security/coreconf -type f -name nsinstall)) + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} || die "dbm make failed" + cd "${S}"/mozilla/security/nss + if tc-is-cross-compiler; then + SHLIBSIGN_ARG="SHLIBSIGN=/usr/bin/nssshlibsign" + fi + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" NSINSTALL="${NSINSTALL}" OS_TEST=${ARCH} ${SHLIBSIGN_ARG} || die "nss make failed" +} + +# Altering these 3 libraries breaks the CHK verification. +# All of the following cause it to break: +# - stripping +# - prelink +# - ELF signing +# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html +# Either we have to NOT strip them, or we have to forcibly resign after +# stripping. +#local_libdir="$(get_libdir)" +#export STRIP_MASK=" +# */${local_libdir}/libfreebl3.so* +# */${local_libdir}/libnssdbm3.so* +# */${local_libdir}/libsoftokn3.so*" + +export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" + +generate_chk() { + local shlibsign="$1" + local libdir="$2" + einfo "Resigning core NSS libraries for FIPS validation" + shift 2 + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libname=lib${i}.so + local chkname=lib${i}.chk + "${shlibsign}" \ + -i "${libdir}"/${libname} \ + -o "${libdir}"/${chkname}.tmp \ + && mv -f \ + "${libdir}"/${chkname}.tmp \ + "${libdir}"/${chkname} \ + || die "Failed to sign ${libname}" + done +} + +cleanup_chk() { + local libdir="$1" + shift 1 + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libfname="${libdir}/lib${i}.so" + # If the major version has changed, then we have old chk files. + [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ + && rm -f "${libfname}.chk" + done +} + +src_install () { + MINOR_VERSION=12 + cd "${S}"/mozilla/security/dist || die + + dodir /usr/$(get_libdir) || die + cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" + # We generate these after stripping the libraries, else they don't match. + #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed" + cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" + + # Install nss-config and pkgconfig file + dodir /usr/bin || die + cp -L */bin/nss-config "${ED}"/usr/bin || die + dodir /usr/$(get_libdir)/pkgconfig || die + cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die + + # all the include files + insinto /usr/include/nss + doins public/nss/*.h || die + cd "${ED}"/usr/$(get_libdir) || die + local n= + for file in *$(get_libname); do + n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) + mv ${file} ${n} || die + ln -s ${n} ${file} || die + if [[ ${CHOST} == *-darwin* ]]; then + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die + fi + done + + local nssutils + # Always enabled because we need it for chk generation. + nssutils="shlibsign" + cd "${S}"/mozilla/security/dist/*/bin/ || die + for f in $nssutils; do + # TODO(cmasone): switch to normal nss tool names + newbin ${f} nss${f} || die + done + + # Prelink breaks the CHK files. We don't have any reliable way to run + # shlibsign after prelink. + declare -a libs + for l in ${NSS_CHK_SIGN_LIBS} ; do + libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so") + done + OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}" + echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" || die + unset libs liblist + doenvd "${T}/90nss" || die +} + +pkg_postinst() { + elog "We have reverted back to using upstreams soname." + elog "Please run revdep-rebuild --library libnss3.so.12 , this" + elog "will correct most issues. If you find a binary that does" + elog "not run please re-emerge package to ensure it properly" + elog " links after upgrade." + elog + local tool_root + # We must re-sign the libraries AFTER they are stripped. + if ! tc-is-cross-compiler; then + tool_root = "${EROOT}" + fi + generate_chk "${tool_root}"/usr/bin/nssshlibsign "${EROOT}"/usr/$(get_libdir) +} + +pkg_postrm() { + cleanup_chk "${EROOT}"/usr/$(get_libdir) +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/ChangeLog new file mode 100644 index 0000000000..2c4d1b32af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/ChangeLog @@ -0,0 +1,34 @@ +# ChangeLog for dev-libs/opencryptoki +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.7 2009/06/28 10:48:58 arfrever Exp $ + +*opencryptoki-2.2.8 (28 Jun 2009) + + 28 Jun 2009; Arfrever Frehtes Taifersar Arahesis + +opencryptoki-2.2.8.ebuild: + Version bump. + + 06 Aug 2008; Ulrich Mueller metadata.xml: + Add USE flag description to metadata wrt GLEP 56. + + 10 Nov 2007; Alon Bar-Lev + -opencryptoki-2.2.4-r1.ebuild, opencryptoki-2.2.4.1.ebuild: + Cleanups + + 29 Aug 2007; Christian Heim metadata.xml: + Removing kaiowas from metadata due to his retirement (see #61930 for + reference). + +*opencryptoki-2.2.4.1 (25 Mar 2007) + + 25 Mar 2007; Petre Rodan + +files/opencryptoki-2.2.4.1-tpm_util.c.patch, + +opencryptoki-2.2.4.1.ebuild: + version bump + +*opencryptoki-2.2.4-r1 (03 Jun 2006) + + 03 Jun 2006; Petre Rodan +files/pkcsslotd.init, + +metadata.xml, +opencryptoki-2.2.4-r1.ebuild: + initial commit + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/metadata.xml new file mode 100644 index 0000000000..0c0d0f72d6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/metadata.xml @@ -0,0 +1,11 @@ + + + +crypto + + PKCS#11 provider for IBM cryptographic hardware. + + + Offer support for TPM token + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/opencryptoki-2.2.8-r17.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/opencryptoki-2.2.8-r17.ebuild new file mode 100644 index 0000000000..b1e279dbd4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/opencryptoki-2.2.8-r17.ebuild @@ -0,0 +1,40 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.8.ebuild,v 1.1 2009/06/28 10:48:58 arfrever Exp $ +EAPI="2" + +CROS_WORKON_COMMIT="a8cef4ae1b31664c9f59c509f6e79c1fc03f4bc4" +CROS_WORKON_TREE="8f71d13ce4e947d8a631fc03d8bfd4f63587d3a7" +inherit cros-workon autotools eutils multilib toolchain-funcs + +DESCRIPTION="PKCS#11 provider for IBM cryptographic hardware" +HOMEPAGE="http://sourceforge.net/projects/opencryptoki" +LICENSE="CPL-0.5" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="tpmtok" +CROS_WORKON_PROJECT="chromiumos/third_party/opencryptoki" + +RDEPEND="tpmtok? ( app-crypt/trousers ) + dev-libs/openssl" +DEPEND="${RDEPEND}" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf $(use_enable tpmtok) +} + +src_install() { + emake install DESTDIR="${D}" || die "emake install failed" + + # tpmtoken_* binaries expect to find the libraries in /usr/lib/. + dosym opencryptoki/stdll/libpkcs11_sw.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_sw.so" + dosym opencryptoki/stdll/libpkcs11_tpm.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_tpm.so" + dosym opencryptoki/libopencryptoki.so.0.0.0 "/usr/$(get_libdir)/libopencryptoki.so" + dosym opencryptoki/stdll/libpkcs11_sw.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_sw.so.0" + dosym opencryptoki/stdll/libpkcs11_tpm.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_tpm.so.0" + dosym opencryptoki/libopencryptoki.so.0.0.0 "/usr/$(get_libdir)/libopencryptoki.so.0" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/opencryptoki-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/opencryptoki-9999.ebuild new file mode 100644 index 0000000000..3be6d14c9d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/opencryptoki/opencryptoki-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.8.ebuild,v 1.1 2009/06/28 10:48:58 arfrever Exp $ +EAPI="2" + +inherit cros-workon autotools eutils multilib toolchain-funcs + +DESCRIPTION="PKCS#11 provider for IBM cryptographic hardware" +HOMEPAGE="http://sourceforge.net/projects/opencryptoki" +LICENSE="CPL-0.5" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="tpmtok" +CROS_WORKON_PROJECT="chromiumos/third_party/opencryptoki" + +RDEPEND="tpmtok? ( app-crypt/trousers ) + dev-libs/openssl" +DEPEND="${RDEPEND}" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf $(use_enable tpmtok) +} + +src_install() { + emake install DESTDIR="${D}" || die "emake install failed" + + # tpmtoken_* binaries expect to find the libraries in /usr/lib/. + dosym opencryptoki/stdll/libpkcs11_sw.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_sw.so" + dosym opencryptoki/stdll/libpkcs11_tpm.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_tpm.so" + dosym opencryptoki/libopencryptoki.so.0.0.0 "/usr/$(get_libdir)/libopencryptoki.so" + dosym opencryptoki/stdll/libpkcs11_sw.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_sw.so.0" + dosym opencryptoki/stdll/libpkcs11_tpm.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_tpm.so.0" + dosym opencryptoki/libopencryptoki.so.0.0.0 "/usr/$(get_libdir)/libopencryptoki.so.0" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/ChangeLog new file mode 100644 index 0000000000..ea3338521d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/ChangeLog @@ -0,0 +1,1308 @@ +# ChangeLog for dev-libs/openssl +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.321 2010/03/09 13:25:30 lxnay Exp $ + +*openssl-0.9.8m-r1 (09 Mar 2010) + + 09 Mar 2010; Fabio Erculiani -openssl-0.9.8m.ebuild, + +openssl-0.9.8m-r1.ebuild, +files/openssl-0.9.8m-cfb.patch: + fix critical bug #308123, thanks Joost Ruis for reporting + +*openssl-0.9.8m (05 Mar 2010) + + 05 Mar 2010; Mike Frysinger +openssl-0.9.8m.ebuild, + +files/openssl-0.9.8m-binutils.patch: + Version bump #306925 by Hanno Boeck. + + 15 Feb 2010; Mike Frysinger openssl-0.9.8l-r2.ebuild: + Fix up man page munging #304663 by William Throwe. + + 13 Feb 2010; Mike Frysinger + openssl-1.0.0_beta5.ebuild, metadata.xml: + Add support by Tony Cheneau for USE=rfc3779 #304717. + + 27 Jan 2010; Mike Frysinger openssl-0.9.8l-r2.ebuild, + openssl-1.0.0_beta5.ebuild: + Unify the sed statements and make sure we always set MANSUFFIX #302165 by + Hanno Boeck. + +*openssl-1.0.0_beta5 (21 Jan 2010) + + 21 Jan 2010; Mike Frysinger + +openssl-1.0.0_beta5.ebuild: + Version bump. + +*openssl-1.0.0_beta4 (11 Jan 2010) + + 11 Jan 2010; Mike Frysinger + +openssl-1.0.0_beta4.ebuild: + Add testing version #269482 by Daniel Black. + + 11 Jan 2010; Mike Frysinger openssl-0.9.8l-r2.ebuild: + Drop gcc-3 flag munging, add -fno-strict-aliasing for everyone, and use + SET_X when linking things to make logs more useful. + + 11 Jan 2010; Mike Frysinger openssl-0.9.8l-r2.ebuild: + Handle renamed man pages in SEE ALSO #287783 by Guido Winkelmann. + + 11 Jan 2010; Mike Frysinger + files/openssl-0.9.8h-ldflags.patch, openssl-0.9.8l-r2.ebuild: + Respect LDFLAGS on openssl again #181438. + + 11 Jan 2010; Mike Frysinger openssl-0.9.8l-r2.ebuild, + files/openssl-0.9.8e-bsd-sparc64.patch: + Update the bsd-sparc patch to apply again. + + 11 Jan 2010; Mike Frysinger openssl-0.9.8l-r2.ebuild: + Link in gmp when USE=gmp #276557 by Justin Lecher. + +*openssl-0.9.8l-r2 (27 Nov 2009) + + 27 Nov 2009; Mike Frysinger +openssl-0.9.8l-r2.ebuild, + files/openssl-0.9.8l-CVE-2009-2409.patch: + Add other half of MD2 disable so that root certs arent checked #294615 by + Alexander Danilov. + + 23 Nov 2009; Raúl Porcel openssl-0.9.8l-r1.ebuild: + ia64/m68k/s390/sh/sparc stable wrt #292022 + + 23 Nov 2009; Brent Baude openssl-0.9.8l-r1.ebuild: + Marking openssl-0.9.8l-r1 ppc64 for bug 292022 + + 23 Nov 2009; Markus Meier openssl-0.9.8l-r1.ebuild: + amd64/arm/x86 stable, bug #292022 + + 22 Nov 2009; Tobias Klausmann + openssl-0.9.8l-r1.ebuild: + Stable on alpha, bug #292022 + + 21 Nov 2009; nixnut openssl-0.9.8l-r1.ebuild: + ppc stable #292022 + + 21 Nov 2009; Jeroen Roovers openssl-0.9.8l-r1.ebuild: + Stable for HPPA (bug #292022). + + 21 Nov 2009; Mike Frysinger openssl-0.9.8l-r1.ebuild, + +files/openssl-0.9.8l-binutils.patch: + Add fix from upstream/fedora for building with newer binutils #289130 by + Martin Jansa. Also drop the alpha gcc/ccc patch as ccc is long dead. + +*openssl-0.9.8l-r1 (21 Nov 2009) + + 21 Nov 2009; Mike Frysinger +openssl-0.9.8l-r1.ebuild, + +files/openssl-0.9.8l-CVE-2009-1387.patch, + +files/openssl-0.9.8l-CVE-2009-2409.patch, + +files/openssl-0.9.8l-dtls-compat.patch: + Add fixes from upstream but not in the 0.9.8l release. + + 08 Nov 2009; nixnut openssl-0.9.8l.ebuild: + ppc stable #292022 + + 08 Nov 2009; Jeroen Roovers openssl-0.9.8l.ebuild: + Stable for HPPA (bug #292022). + + 07 Nov 2009; Tobias Klausmann openssl-0.9.8l.ebuild: + Stable on alpha, bug #292022 + + 05 Nov 2009; Mike Frysinger openssl-0.9.8l.ebuild, + +files/openssl-0.9.8l-CVE-2009-1377.patch, + +files/openssl-0.9.8l-CVE-2009-1378.patch, + +files/openssl-0.9.8l-CVE-2009-1379.patch: + Add some patches from upstream #270305. + +*openssl-0.9.8l (05 Nov 2009) + + 05 Nov 2009; Mike Frysinger +openssl-0.9.8l.ebuild: + Version bump. + + 01 Nov 2009; nixnut openssl-0.9.8k-r1.ebuild: + ppc stable #290545 + + 29 Oct 2009; Christian Faulhammer + openssl-0.9.8k-r1.ebuild: + stable x86, bug 290545 + + 26 Oct 2009; Jeroen Roovers openssl-0.9.8k-r1.ebuild: + Stable for HPPA (bug #290545). + + 21 Jun 2009; Fabian Groffen + files/gentoo.config-0.9.8: + update gentoo.config script to include support for Prefix arches + + 29 May 2009; Mike Frysinger + -files/openssl-0.9.8b-parallel-build.patch, -openssl-0.9.8h-r1.ebuild, + -files/openssl-0.9.8h-pkcs12.patch, -openssl-0.9.8i.ebuild: + Punt old packages vuln to GLSA 200902-02 #271772 by Robert Buchholz. + +*openssl-0.9.8k-r1 (29 May 2009) + + 29 May 2009; Diego E. Pettenò + +openssl-0.9.8k-r1.ebuild: + Revision bump with zlib linked in at build-time rather than dlopened. See + bug #271415. + + 09 Apr 2009; Mike Frysinger openssl-0.9.8k.ebuild: + Make sure we dont accidently create /etc/sandbox.d with 0700 perms #265376 + by Friedrich Oslage. + + 02 Apr 2009; Raúl Porcel openssl-0.9.8k.ebuild: + alpha/arm/ia64/m68k/s390/sh stable wrt #263751 + + 29 Mar 2009; Markus Meier openssl-0.9.8k.ebuild: + x86 stable, bug #263751 + + 26 Mar 2009; Jeroen Roovers openssl-0.9.8k.ebuild: + Stable for HPPA (bug #263751). + + 26 Mar 2009; Brent Baude openssl-0.9.8k.ebuild: + Marking openssl-0.9.8k ppc64 and ppc for bug 263751 + + 26 Mar 2009; Ferris McCormick openssl-0.9.8k.ebuild: + Sparc stable --- security Bug #263751 --- All tests run as they should. + + 26 Mar 2009; Richard Freeman openssl-0.9.8k.ebuild: + amd64 stable - 263751 + +*openssl-0.9.8k (25 Mar 2009) + + 25 Mar 2009; Mike Frysinger + +files/openssl-0.9.8k-toolchain.patch, +openssl-0.9.8k.ebuild: + Version bump #263751. + + 19 Feb 2009; Raúl Porcel + +files/openssl-0.9.8j-ia64.patch, openssl-0.9.8j.ebuild: + Add patch to fix ia64 build failure from the openssl mailing list, thanks + to Ryan Bebeau for letting me know, ia64 stable + + 10 Jan 2009; Markus Meier openssl-0.9.8j.ebuild: + amd64 stable, bug #251346 + + 09 Jan 2009; Raúl Porcel openssl-0.9.8j.ebuild: + alpha/sparc/x86 stable wrt #251346 + + 08 Jan 2009; Brent Baude openssl-0.9.8j.ebuild: + Marking openssl-0.9.8j ppc64 and ppc for bug 251346 + + 08 Jan 2009; Jeroen Roovers openssl-0.9.8j.ebuild: + Stable for HPPA (bug #25134). + +*openssl-0.9.8j (08 Jan 2009) + + 08 Jan 2009; Peter Alfredsen + +files/openssl-0.9.8j-parallel-build.patch, +openssl-0.9.8j.ebuild: + Bump, bug 254183 and CVE-2008-5077, bug 251346. Parallel build fails + horribly, forcing -j1. Since we don't install fips, sedded that part out + of the root makefile to get around a build failure. + + 03 Oct 2008; Raúl Porcel openssl-0.9.8h-r1.ebuild: + alpha/ia64/x86 stable wrt #239301 + + 02 Oct 2008; Jeroen Roovers openssl-0.9.8h-r1.ebuild: + Stable for HPPA (bug #239301). + + 02 Oct 2008; Brent Baude openssl-0.9.8h-r1.ebuild: + stable ppc, bug 239301 + + 02 Oct 2008; Brent Baude openssl-0.9.8h-r1.ebuild: + stable ppc64, bug 239301 + + 02 Oct 2008; Ferris McCormick + openssl-0.9.8h-r1.ebuild: + Sparc stable --- Bug #239301 --- looks good and all tests successful. + + 02 Oct 2008; Thomas Anderson + openssl-0.9.8h-r1.ebuild: + stable amd64, bug 239301 + +*openssl-0.9.8i (02 Oct 2008) + + 02 Oct 2008; Mike Frysinger +openssl-0.9.8i.ebuild: + Version bump #239030 by Lars (Polynomial-C). + +*openssl-0.9.8h-r1 (21 Jun 2008) + + 21 Jun 2008; Mike Frysinger + +files/openssl-0.9.8h-ldflags.patch, +files/openssl-0.9.8h-pkcs12.patch, + +openssl-0.9.8h-r1.ebuild: + Respect LDFLAGS #181438 by Arfrever Frehtes Taifersar Arahesis and add fix + from upstream for PKCS12 troubles #224843 by Per Pomsel. + + 05 Jun 2008; Tobias Scherbaum + openssl-0.9.8g-r2.ebuild: + ppc stable, bug #223429 + + 03 Jun 2008; Steve Dibb openssl-0.9.8g-r2.ebuild: + amd64 stable, security bug 223429 + + 02 Jun 2008; Raúl Porcel openssl-0.9.8g-r2.ebuild: + alpha/ia64/sparc stable wrt security #223429 + + 31 May 2008; Markus Rothe openssl-0.9.8g-r2.ebuild: + Stable on ppc64; bug #223429 + + 31 May 2008; Jeroen Roovers openssl-0.9.8g-r2.ebuild: + Stable for HPPA (bug #223429). + + 31 May 2008; Christian Faulhammer + openssl-0.9.8g-r2.ebuild: + stable x86, security bug 223429 + +*openssl-0.9.8g-r2 (30 May 2008) + + 30 May 2008; Doug Goldstein + +files/openssl-0.9.8g-CVE-2008-0891.patch, + +files/openssl-0.9.8g-CVE-2008-1672.patch, +openssl-0.9.8g-r2.ebuild: + Security fix for CVE-2008-0891 & CVE-2008-1672. bug #223429 + +*openssl-0.9.8h (28 May 2008) + + 28 May 2008; Mike Frysinger +openssl-0.9.8h.ebuild: + Version bump. + + 16 May 2008; Ulrich Mueller openssl-0.9.8g-r1.ebuild: + Don't install bogus Emacs support file, bug 222337. + +*openssl-0.9.8g-r1 (25 Mar 2008) + + 25 Mar 2008; Doug Goldstein + +files/openssl-0.9.8g-sslv3-no-tlsext.patch, +openssl-0.9.8g-r1.ebuild: + Patch from OpenSSL's bug tracker not to send TLS Extensions on SSLv3 only + connections, while not explicitly against the SSL spec, several SSL + implementations can not handle it. Patch by Kaspar Brand + from http://rt.openssl.org/Ticket/Display.html?id=1629. + Resolves bug #198914 + + 24 Dec 2007; Mike Frysinger openssl-0.9.8g.ebuild: + Dont force src_test any longer as things seem to be sane. + + 24 Nov 2007; Brent Baude openssl-0.9.8g.ebuild: + Keywording openssl-0.9.8g ppc for bug 198370 + + 19 Nov 2007; Joshua Kinard openssl-0.9.8g.ebuild: + Stable on mips, per #198370. + + 16 Nov 2007; Doug Goldstein openssl-0.9.8g.ebuild: + change depend to mit-krb5 since openssl's Configure script specifically + states they don't support building against heimdal and it will break. Which + results in a die during the ebuild + + 12 Nov 2007; Mike Frysinger openssl-0.9.8g.ebuild: + Filter out $APPS from the environment #197996. + + 09 Nov 2007; Daniel Gryniewicz openssl-0.9.8g.ebuild: + Marked stable on amd64 for bug #198370 + + 08 Nov 2007; Jeroen Roovers openssl-0.9.8g.ebuild: + Stable for HPPA (bug #198370). + + 07 Nov 2007; Markus Rothe openssl-0.9.8g.ebuild: + Stable on ppc64; bug #198370 + + 07 Nov 2007; Raúl Porcel openssl-0.9.8g.ebuild: + alpha/ia64 stable wrt #198370 + + 07 Nov 2007; Jurek Bartuszek openssl-0.9.8g.ebuild: + x86 stable (bug #198370) + + 07 Nov 2007; Ferris McCormick openssl-0.9.8g.ebuild: + Sparc stable, Bug #198370; early, but all tests check out and can't + duplicate reported problems. + +*openssl-0.9.8g (20 Oct 2007) + + 20 Oct 2007; +openssl-0.9.8g.ebuild: + Version bump. Enable tlsext #196191 by Hanno Boeck. Fix double test running + #196149 by Dustin Surawicz. + + 16 Oct 2007; Tobias Scherbaum + openssl-0.9.8f.ebuild: + ppc stable, bug #195634 + + 16 Oct 2007; Christoph Mende openssl-0.9.8f.ebuild: + Stable on amd64 wrt bug #195634 + + 14 Oct 2007; Jeroen Roovers openssl-0.9.8f.ebuild: + Stable for HPPA (bug #195634). + + 14 Oct 2007; Markus Rothe openssl-0.9.8f.ebuild: + Stable on ppc64; bug #195634 + + 14 Oct 2007; Raúl Porcel openssl-0.9.8f.ebuild: + alpha/ia64/sparc stable wrt security #195634 + + 13 Oct 2007; Dawid Węgliński openssl-0.9.8f.ebuild: + Stable on x86 wrt bug #195634 + +*openssl-0.9.8f (13 Oct 2007) + + 13 Oct 2007; Mike Frysinger + +files/openssl-0.9.8f-fix-version.patch, +openssl-0.9.8f.ebuild: + Version bump. + + 11 Oct 2007; Mike Frysinger + +files/openssl-0.9.8e-padlock-O0.patch, openssl-0.9.8e-r4.ebuild: + Fix from upstream for building with -O0 #185104. + +*openssl-0.9.8e-r4 (07 Oct 2007) + + 07 Oct 2007; Mike Frysinger +openssl-0.9.8e-r4.ebuild: + Enable camellia and mdc2 regardless of USE=bindist #194946 by Justin Foote. + Flesh out support for USE="gmp kerberos zlib". + + 03 Oct 2007; Chris Gianelloni + openssl-0.9.8e-r3.ebuild: + Stable on amd64 wrt bug #194039. + + 01 Oct 2007; Jeroen Roovers openssl-0.9.8e-r3.ebuild: + Stable for HPPA (bug #194039). + + 01 Oct 2007; Roy Marples + +files/openssl-0.9.8e-bsd-sparc64.patch, openssl-0.9.8e-r3.ebuild: + Love the ~sparc-fbsd keyword. + + 01 Oct 2007; Raúl Porcel openssl-0.9.8e-r3.ebuild: + alpha/ia64/sparc stable wrt security #194039 + + 01 Oct 2007; Joe Peterson openssl-0.9.8e-r3.ebuild: + Add ~x86-fbsd keyword + + 01 Oct 2007; Mike Frysinger openssl-0.9.8e-r3.ebuild: + Tweak how we do the manpage renaming so that it is POSIX friendly #194335 by + Joe Peterson. + + 01 Oct 2007; Joshua Kinard openssl-0.9.8e-r3.ebuild: + Stable on mips, per #194039. + + 30 Sep 2007; Tobias Scherbaum + openssl-0.9.8e-r3.ebuild: + ppc stable, bug #194039 + + 30 Sep 2007; Markus Meier openssl-0.9.8e-r3.ebuild: + x86 stable, security bug #194039 + + 30 Sep 2007; Mike Frysinger openssl-0.9.8e-r3.ebuild: + We dont actually need the hppa patch anymore as exit() in awk at first match + makes the head useless. + + 30 Sep 2007; Mike Frysinger + +files/openssl-0.9.8e-make.patch, openssl-0.9.8e-r3.ebuild: + Fix building on Gentoo/BSD setups where `make` != `$MAKE` #146316. + + 30 Sep 2007; Markus Rothe openssl-0.9.8e-r3.ebuild: + Stable on ppc64; bug #194039 + +*openssl-0.9.8e-r3 (30 Sep 2007) + + 30 Sep 2007; Mike Frysinger + +files/openssl-0.9.8e-CVE-2007-5135.patch, +openssl-0.9.8e-r3.ebuild: + Add fix from upstream for CVE-2007-5135 #194039. + + 29 Aug 2007; Markus Rothe openssl-0.9.8e-r2.ebuild: + Stable on ppc64; bug #188799 + + 28 Aug 2007; Christoph Mende + openssl-0.9.8e-r2.ebuild: + Stable on amd64 wrt security bug #188799 + + 28 Aug 2007; Tobias Scherbaum + openssl-0.9.8e-r2.ebuild: + ppc stable, bug #188799 + + 27 Aug 2007; Jeroen Roovers openssl-0.9.8e-r2.ebuild: + Stable for HPPA (bug #188799). + + 27 Aug 2007; Gustavo Zacarias + openssl-0.9.8e-r2.ebuild: + Stable on sparc wrt security #188799 + + 25 Aug 2007; Raúl Porcel openssl-0.9.8e-r2.ebuild: + alpha/ia64/x86 stable wrt security #188799 + +*openssl-0.9.8e-r2 (25 Aug 2007) + + 25 Aug 2007; Mike Frysinger + +files/openssl-0.9.8e-CVE-2007-3108.patch, +openssl-0.9.8e-r2.ebuild: + Add fix from upstream for CVE-2007-3108 #188799. + +*openssl-0.9.8e-r1 (22 Jun 2007) + + 22 Jun 2007; Mike Frysinger + +files/openssl-0.9.8-evp-key-len.patch, +files/openssl-0.9.8-gcc42.patch, + +openssl-0.9.8e-r1.ebuild: + Fix from upstream for encfs/ssh troubles #168750 and fix from PLD Linux for + gcc-4.2 troubles #158324. + + 22 Apr 2007; Bryan Østergaard openssl-0.9.8d.ebuild: + Stable on Mips. + +*openssl-0.9.8e (27 Feb 2007) +*openssl-0.9.7m (27 Feb 2007) + + 27 Feb 2007; Mike Frysinger +openssl-0.9.7m.ebuild, + +openssl-0.9.8e.ebuild: + Version bump #168357 by Michael Huber. + + 04 Nov 2006; Ilya A. Volynets-Evenbakh + openssl-0.9.8d.ebuild: + 0.9.8 builds on mips now, so add mips back to keywords + + 03 Nov 2006; Ilya A. Volynets-Evenbakh + openssl-0.9.7l.ebuild: + Stabilize on mips + + 23 Oct 2006; Joslwah openssl-0.9.8d.ebuild: + Mark ppc64 stable. + + 18 Oct 2006; Roy Marples openssl-0.9.7l.ebuild: + Added ~sparc-fbsd keyword. + + 14 Oct 2006; Aron Griffis openssl-0.9.7l.ebuild, + openssl-0.9.8d.ebuild: + Mark 0.9.8d 0.9.7l stable on ia64. #145510 + + 14 Oct 2006; Jason Wever openssl-0.9.8d.ebuild: + Added fix from bug #149958 for ppc64. + + 01 Oct 2006; Mike Frysinger + +files/openssl-0.9.8-makedepend.patch, openssl-0.9.7l.ebuild, + openssl-0.9.8d.ebuild: + Fix up depend system to use gcc to generate deps #149583. + + 01 Oct 2006; Mike Frysinger openssl-0.9.8d.ebuild: + Respect LDFLAGS #149676 by Donnie Berkholz. + + 30 Sep 2006; Fernando J. Pereda openssl-0.9.7l.ebuild, + openssl-0.9.8d.ebuild: + Stable on alpha as per security bug #145510 + + 28 Sep 2006; Tobias Scherbaum + openssl-0.9.7l.ebuild, openssl-0.9.8d.ebuild: + ppc stable, bug #145510 + + 28 Sep 2006; Gustavo Zacarias openssl-0.9.7l.ebuild, + openssl-0.9.8d.ebuild: + Stable on hppa wrt security #145510 + + 28 Sep 2006; Jason Wever openssl-0.9.7l.ebuild, + openssl-0.9.8d.ebuild: + Stable on SPARC wrt security bug #145510. + + 28 Sep 2006; Chris Gianelloni openssl-0.9.7l.ebuild, + openssl-0.9.8d.ebuild: + Stable on amd64/x86 wrt bug #145510. + + 28 Sep 2006; Brent Baude openssl-0.9.7l.ebuild: + Marking openssl-0.9.7l ppc64 stable for sec bug #145510 + +*openssl-0.9.8d (28 Sep 2006) +*openssl-0.9.7l (28 Sep 2006) + + 28 Sep 2006; Mike Frysinger +openssl-0.9.7l.ebuild, + +openssl-0.9.8d.ebuild: + Version bump for security #145510 and #148654. + + 24 Sep 2006; Michael Hanselmann + openssl-0.9.8c-r2.ebuild: + Stable on ppc. + +*openssl-0.9.8c-r2 (18 Sep 2006) + + 18 Sep 2006; Mike Frysinger files/gentoo.config-0.9.8, + -openssl-0.9.8c-r1.ebuild, +openssl-0.9.8c-r2.ebuild: + Force people to re-emerge openssl on i686 so that they get the optimized + version. You will probably have to re-emerge openssh/etc... if you + experience troubles. Openssl sucks sometimes. + +*openssl-0.9.8c-r1 (16 Sep 2006) + + 16 Sep 2006; Mike Frysinger -openssl-0.9.8c.ebuild, + +openssl-0.9.8c-r1.ebuild: + Remove USE=sse2 for now as it breaks ABI #147758 by Andrew Stimpson and + revert asm targets for i686. + + 15 Sep 2006; Mike Frysinger files/gentoo.config-0.9.8, + openssl-0.9.8c.ebuild: + Add support for USE=sse2 and reclassify i686/sparc7 targets #147551. + + 07 Sep 2006; Gustavo Zacarias openssl-0.9.7k.ebuild: + Stable on hppa wrt security #146375 + + 07 Sep 2006; Joshua Kinard openssl-0.9.8b.ebuild, + openssl-0.9.8c.ebuild: + Remask openssl-0.9.8 on mips due to changes upstream which need resolving. + + 06 Sep 2006; Ilya A. Volynets-Evenbakh + openssl-0.9.8c.ebuild: + Don't run src_test when test is not in FEATURES. + + 06 Sep 2006; Markus Rothe openssl-0.9.7k.ebuild, + openssl-0.9.8c.ebuild: + 0.9.8c ~ppc64 again. fails test with gcc-3.4. marked 0.9.7k stable on ppc64 + + 06 Sep 2006; Joshua Jackson openssl-0.9.7k.ebuild, + openssl-0.9.8c.ebuild: + stable x86; security bug #146375 + + 05 Sep 2006; Thomas Cort openssl-0.9.8c.ebuild: + Stable on alpha wrt security Bug #146375. + + 05 Sep 2006; Markus Rothe openssl-0.9.8c.ebuild: + Stable on ppc64; bug #146375 + + 05 Sep 2006; Jason Wever openssl-0.9.7k.ebuild: + Stable on SPARC wrt security bug #146375. + + 05 Sep 2006; Mike Doty openssl-0.9.8c.ebuild: + amd64 stable, bug 146375 + + 05 Sep 2006; Joseph Jezak openssl-0.9.7k.ebuild: + Marked ppc stable for bug #146375. + +*openssl-0.9.8c (05 Sep 2006) +*openssl-0.9.7k (05 Sep 2006) + + 05 Sep 2006; Mike Frysinger +openssl-0.9.7k.ebuild, + +openssl-0.9.8c.ebuild: + Version bump #146375 by Sune Kloppenborg Jeppesen. + + 05 Sep 2006; Joshua Kinard openssl-0.9.8b.ebuild: + Added ~mips to KEYWORDS. + + 03 Sep 2006; Joshua Jackson openssl-0.9.8b.ebuild: + Added ~x86 as per bug 145605 + + 02 Sep 2006; Michael Sterrett + openssl-0.9.7j.ebuild: + keepdir instead of dodir for empty directory + + 02 Sep 2006; openssl-0.9.8b.ebuild: + ~ppc added. bug 145605 + + 01 Sep 2006; Jason Wever openssl-0.9.8b.ebuild: + Added ~sparc keyword wrt bug #145605. + + 31 Aug 2006; openssl-0.9.8b.ebuild: + marked ~amd64 + + 30 Aug 2006; Markus Rothe openssl-0.9.8b.ebuild: + Added ~ppc64; bug #145605 + + 09 Jul 2006; Joshua Kinard openssl-0.9.7j.ebuild: + Marked stable on mips. + + 06 Jul 2006; openssl-0.9.7i.ebuild, + openssl-0.9.7j.ebuild: + - openssl needs tc- functions exported for the install phase so we dont try + to install for x86 when compiling for ppc + + 01 Jul 2006; Jason Wever openssl-0.9.7j.ebuild: + Fixed typo when I added filtering for -mv8 CFLAG, solves bug #138583. + + 30 Jun 2006; Jason Wever openssl-0.9.7j.ebuild: + Filtered out the assumed -mv8 use flag as it was removed in >=gcc-4.0.0 + + 28 Jun 2006; Joshua Jackson openssl-0.9.7j.ebuild: + Stable x86; bug #137143 + + 27 Jun 2006; Thomas Cort openssl-0.9.7j.ebuild: + Stable on alpha wrt Bug #137143. + + 25 Jun 2006; Guy Martin openssl-0.9.7j.ebuild: + Stable on hppa. + + 25 Jun 2006; Guy Martin ChangeLog: + Stable on hppa. + + 21 Jun 2006; Gustavo Zacarias openssl-0.9.7j.ebuild: + Stable on sparc wrt #137143 + + 21 Jun 2006; openssl-0.9.7j.ebuild: + Stable on ppc; bug #137143 + + 20 Jun 2006; Simon Stelling openssl-0.9.7j.ebuild: + stable on amd64 + + 18 Jun 2006; Markus Rothe openssl-0.9.7j.ebuild: + Stable on ppc64; bug #137143 + + 14 May 2006; Mike Frysinger + +files/openssl-0.9.7j-doc-updates.patch, + +files/openssl-0.9.8b-doc-updates.patch, openssl-0.9.7i.ebuild, + openssl-0.9.7j.ebuild, openssl-0.9.8a.ebuild, openssl-0.9.8b.ebuild: + Dont run src_test twice and namespace common manpages to prevent conflicts + with other packages #132830 by Diego Pettenò. + +*openssl-0.9.8b (05 May 2006) + + 05 May 2006; Mike Frysinger + +files/openssl-0.9.8b-parallel-build.patch, +openssl-0.9.8b.ebuild: + Version bump. + +*openssl-0.9.7j (05 May 2006) + + 05 May 2006; Mike Frysinger +openssl-0.9.7j.ebuild: + Version bump. + + 27 Apr 2006; Marien Zwart Manifest: + Fixing SHA256 digest, pass four + + 19 Apr 2006; Seemant Kulleen ChangeLog: + fix the Manifest -- got hit by this on a few different build boxes + + 19 Apr 2006; Mike Frysinger + +files/openssl-0.9.7i-m68k.patch, openssl-0.9.7i.ebuild: + Add support for m68k shared libs #113807 by Kolbjørn Barmen. + + 30 Mar 2006; Diego Pettenò openssl-0.9.7i.ebuild: + Add ~x86-fbsd keyword. + + 09 Mar 2006; Mike Frysinger openssl-0.9.7e-r2.ebuild, + openssl-0.9.7g-r1.ebuild, openssl-0.9.7h.ebuild, openssl-0.9.7i.ebuild, + openssl-0.9.8a.ebuild: + Use revdep-rebuild --library instead of revdep-rebuild --soname #125506 by + Carsten Lohrke. + + 15 Feb 2006; Markus Rothe openssl-0.9.7i.ebuild: + Stable on ppc64; bug #122071 + + 13 Feb 2006; Mark Loeser openssl-0.9.7e-r2.ebuild: + Fix leading spaces + + 12 Feb 2006; Mike Frysinger openssl-0.9.7i.ebuild, + openssl-0.9.8a.ebuild: + Run sed in LC_ALL=C in order to fix [a-z] in funky locales #122554 by Erkki + Eilonen. + + 09 Feb 2006; Simon Stelling openssl-0.9.7e-r2.ebuild, + openssl-0.9.7i.ebuild: + stable on amd64 + + 09 Feb 2006; Joshua Kinard openssl-0.9.7i.ebuild: + Marked stable on mips. + + 09 Feb 2006; Aron Griffis openssl-0.9.7i.ebuild: + Mark 0.9.7i stable on alpha + + 08 Feb 2006; Gustavo Zacarias openssl-0.9.7i.ebuild: + Stable on sparc wrt #122071 + + 08 Feb 2006; openssl-0.9.7i.ebuild: + Stable on ppc. bug 122071 + + 08 Feb 2006; Saleem Abdulrasool + openssl-0.9.7i.ebuild: + stable on x86 as per bug #122071 + + 06 Jan 2006; Mike Frysinger openssl-0.9.6m.ebuild, + openssl-0.9.7e-r2.ebuild, openssl-0.9.7g-r1.ebuild, openssl-0.9.7h.ebuild, + openssl-0.9.7i.ebuild, openssl-0.9.8a.ebuild: + Add ca-certificates for most systems. + + 13 Dec 2005; Markus Rothe openssl-0.9.7i.ebuild: + Added ~ppc64 keyword; bug #114592 + + 09 Nov 2005; openssl-0.9.7i.ebuild: + Add back in ~amd64. It is ABI compat as far as I can tell + + 26 Oct 2005; Mike Frysinger + +files/gentoo.config-0.9.8, +files/openssl-0.9.8-toolchain.patch, + openssl-0.9.8a.ebuild: + Clean up ebuild and fix building on x86 #110457 by Justin Guyett. + +*openssl-0.9.7i (16 Oct 2005) + + 16 Oct 2005; Mike Frysinger +openssl-0.9.7i.ebuild: + Version bump. + +*openssl-0.9.8a (12 Oct 2005) +*openssl-0.9.7h (12 Oct 2005) + + 12 Oct 2005; Mike Frysinger + +files/openssl-0.9.7h-ABI-compat.patch, +openssl-0.9.7h.ebuild, + +files/openssl-0.9.8-hppa-fix-detection.patch, +openssl-0.9.8a.ebuild: + Version bumpage. + +*openssl-0.9.8-r1 (12 Oct 2005) +*openssl-0.9.7g-r1 (12 Oct 2005) +*openssl-0.9.7e-r2 (12 Oct 2005) + + 12 Oct 2005; Mike Frysinger + +files/openssl-0.9.7-CAN-2005-2969.patch, + +files/openssl-0.9.8-CAN-2005-2969.patch, -openssl-0.9.7d-r2.ebuild, + +openssl-0.9.7e-r2.ebuild, +openssl-0.9.7g-r1.ebuild, + +openssl-0.9.8-r1.ebuild: + Add fixes for CAN-2005-2969 #108852. + + 02 Sep 2005; MATSUU Takuto + +files/openssl-0.9.7e-superh.patch, openssl-0.9.7e-r1.ebuild: + Added patch to support sh. + + 18 Aug 2005; Mike Frysinger openssl-0.9.7e-r1.ebuild, + openssl-0.9.7g.ebuild, openssl-0.9.8.ebuild: + Add support for USE=zlib #79179 by Stefan Riemer. + + 13 Aug 2005; Diego Pettenò + files/gentoo.config-0.9.7g, +files/openssl-0.9.7g-amd64-fbsd.patch, + openssl-0.9.7g.ebuild: + Added patch to support amd64-fbsd target. Updated config script. + + 12 Aug 2005; +files/openssl-0.9.7c-tempfile.patch: + Readding missing patch. + + 12 Aug 2005; Caleb Tennis -openssl-0.9.7e.ebuild: + remove stale version + + 12 Aug 2005; Caleb Tennis + -files/openssl-0.9.7c-gentoo.diff, -files/openssl-0.9.7c-tempfile.patch, + -openssl-0.9.7c-r1.ebuild: + remove old version that was package.masked for security reasons + + 07 Aug 2005; MATSUU Takuto files/gentoo.config-0.9.7g, + files/openssl-0.9.7g-superh.patch: + Fixed compile issue on sh. Bug 98418. + + 08 Jul 2005; Hardave Riar openssl-0.9.7g.ebuild: + Marked ~mips, bug #92076. + + 06 Jul 2005; Martin Schlemmer openssl-0.9.8.ebuild: + Remove custom config stuff as asked in gentoo.config-0.9.7g - bug #98072 + responsible. + + 05 Jul 2005; Martin Schlemmer + openssl-0.9.7c-r1.ebuild, openssl-0.9.7d-r2.ebuild, openssl-0.9.7e.ebuild, + openssl-0.9.7e-r1.ebuild, openssl-0.9.7g.ebuild: + Fix creating certificates cannot find libcrypt/libssl on new install. + +*openssl-0.9.8 (05 Jul 2005) + + 05 Jul 2005; Martin Schlemmer + +files/openssl-0.9.8-make-engines-dir.patch, + +files/openssl-0.9.8-parallel-build.patch, + +files/openssl-0.9.8-ppc64.patch, +openssl-0.9.8.ebuild: + Update version. Fix parallel build. Fix new engines not creating install + dir. Fix creating certificates cannot find libcrypt/libssl on new install. + + 04 Jul 2005; Hardave Riar openssl-0.9.7e-r1.ebuild: + Stable on mips. + + 02 Jul 2005; Bryan Østergaard + openssl-0.9.7e-r1.ebuild: + Stable on alpha. + + 17 Jun 2005; Michael Hanselmann + openssl-0.9.7e-r1.ebuild: + Stable on ppc. + + 13 Jun 2005; Diego Pettenò + files/gentoo.config-0.9.7g: + Unbreak uclibc cross-compilation and beautify the script using a case + instead of a series of ifs. + + 13 Jun 2005; Diego Pettenò + files/gentoo.config-0.9.7g, openssl-0.9.7g.ebuild: + Fixed the gentoo.config script to be aware of different OS (in this case, + FreeBSD), and added an output to tell which target is selected. + + 29 May 2005; openssl-0.9.7d-r2.ebuild, + openssl-0.9.7e.ebuild: + echangelog - update package to use libc expanded variable elibc_uclibc vs + uclibc so USE=-* works + + 26 May 2005; Markus Rothe openssl-0.9.7e-r1.ebuild: + Stable on ppc64 + + 11 May 2005; Gustavo Zacarias openssl-0.9.7g.ebuild: + Back to ~sparc wrt #92075 + + 10 May 2005; Mike Frysinger + +files/openssl-0.9.7g-ABI-compat.patch, openssl-0.9.7g.ebuild: + Add patch to fix amd64 ABI breakage #86358. Thanks to Daniel Gryniewicz for + tracking this down. + + 10 May 2005; Mike Frysinger + +files/openssl-0.9.7e-ptr-casting.patch, + +files/openssl-0.9.7e-x86_64-bn-asm.patch, + +files/openssl-0.9.7g-mem-clr-ptr-cast.patch, + +files/openssl-0.9.7g-ptr-casting.patch, openssl-0.9.7e-r1.ebuild, + openssl-0.9.7g.ebuild: + Some misc pointer/asm fixes from upstream. + + 09 May 2005; Mike Frysinger + +files/gentoo.config-0.9.7g, openssl-0.9.7g.ebuild: + Add cross-compiling support #85344. + + 02 May 2005; Gustavo Zacarias + openssl-0.9.7e-r1.ebuild: + Stable on sparc + +*openssl-0.9.7g (01 May 2005) + + 01 May 2005; Mike Frysinger + +files/openssl-0.9.7g-no-fips.patch, +openssl-0.9.7g.ebuild: + Version bump #86358. + + 20 Apr 2005; openssl-0.9.7e-r1.ebuild: + - clean out patent or otherwise encumbered code when USE=bindist is set + + 08 Apr 2005; Markus Rothe openssl-0.9.7e.ebuild: + Stable on ppc64 + + 29 Mar 2005; Mamoru KOMACHI openssl-0.9.7d.ebuild, + openssl-0.9.7d-r1.ebuild, openssl-0.9.7d-r2.ebuild, openssl-0.9.7e.ebuild, + openssl-0.9.7e-r1.ebuild: + Install elisp file only if emacs USE flag is set; bug #85944. + + 22 Mar 2005; Jeremy Huddleston + openssl-0.9.7e-r1.ebuild: + Use correct toolchain CC. + + 13 Mar 2005; Mike Frysinger + +files/openssl-0.9.7e-no-fips.patch, openssl-0.9.7e-r1.ebuild: + Dont install the fips stuff #80878 by Kaiting Chen. + + 02 Mar 2005; Daniel Goller openssl-0.9.7e.ebuild: + Stable on ppc + + 14 Feb 2005; Gustavo Zacarias openssl-0.9.7e.ebuild: + Stable on sparc + +*openssl-0.9.7e-r1 (14 Feb 2005) + + 14 Feb 2005; Robin H. Johnson + +openssl-0.9.7e-r1.ebuild: + Bug #69550, make sure openssl is built correctly to work with unstripped + /lib/ld.so. + + 07 Feb 2005; Bryan Østergaard openssl-0.9.7e.ebuild: + Stable on alpha. + + 13 Dec 2004; Jeremy Huddleston + openssl-0.9.7d-r2.ebuild, openssl-0.9.7e.ebuild: + Added support for sparc64-multilib. + +*openssl-0.9.7e (12 Dec 2004) + + 12 Dec 2004; Mike Frysinger + +files/openssl-0.9.7-alpha-default-gcc.patch, + +files/openssl-0.9.7-arm-big-endian.patch, + +files/openssl-0.9.7-hppa-fix-detection.patch, + +files/openssl-0.9.7e-gentoo.patch, +openssl-0.9.7e.ebuild: + Version bump #68983 by Lars. Also cleanup the sed-scripts to be patches and + add an arm big endian fix #74054. + + 07 Nov 2004; Joshua Kinard openssl-0.9.7d-r2.ebuild: + Marked stable on mips. + + 05 Nov 2004; Jason Wever openssl-0.9.7d-r2.ebuild: + Stable on sparc wrt security bug #68407. + + 06 Nov 2004; Bryan Østergaard + openssl-0.9.7d-r2.ebuild: + Stable on alpha, bug 68407. + + 05 Nov 2004; Karol Wojtaszek + openssl-0.9.7d-r2.ebuild: + Stable on amd64 + + 05 Nov 2004; Markus Rothe openssl-0.9.7d-r2.ebuild: + Stable on ppc64; bug #68407 + +*openssl-0.9.7d-r2 (06 Nov 2004) + + 06 Nov 2004; Daniel Black + +files/openssl-0.9.7c-tempfile.patch, +openssl-0.9.7d-r2.ebuild: + Fixed insecure temp file creation as per bug #68407. stable on x86 and ppc + + 21 Sep 2004; Michael Sterrett + openssl-0.9.7d-r1.ebuild: + error check sed + + 01 Sep 2004; Travis Tilley openssl-0.9.7d-r1.ebuild: + made openssl use $(get_libdir) to optionally install to lib64/lib32 + + 19 Jul 2004; Mike Frysinger openssl-0.9.7d-r1.ebuild: + Move `make test` out of src_compile() and into src_test() where it should be. + + 13 Jul 2004; Daniel Ahlberg openssl-0.9.7d-r1.ebuild: + Change back to single make. + Added diffutils to DEPEND, closing #55560. + + 01 Jul 2004; Jeremy Huddleston + openssl-0.9.6m.ebuild, openssl-0.9.7c-r1.ebuild, openssl-0.9.7c.ebuild, + openssl-0.9.7d-r1.ebuild, openssl-0.9.7d.ebuild: + virtual/glibc -> virtual/libc + + 28 Jun 2004; openssl-0.9.7d-r1.ebuild: + added missing uclibc to IUSE + + 25 Jun 2004; openssl-0.9.7d-r1.ebuild: + uclibc update + + 15 Jun 2004; Daniel Ahlberg openssl-0.9.7d-r1.ebuild, + openssl-0.9.7d.ebuild: + Fall back to single thread make if parallell fails. Hopefully closing #48475. + + 15 Jun 2004; openssl-0.9.7d.ebuild: + remove dep of bc when uclibc is used + +*openssl-0.9.7d-r1 (14 Jun 2004) + + 14 Jun 2004; Daniel Ahlberg openssl-0.9.7d-r1.ebuild, + Add smime patch from CVS, closing #50440. + + 06 Jun 2004; Aron Griffis openssl-0.9.7c-r1.ebuild, + openssl-0.9.7d.ebuild: + Fix use invocation + + 16 May 2004; Luca Barbato openssl-0.9.7d.ebuild: + Minor workaround for ppc and ppc64 gcc-3.3.3 and gcc-3.4 + + 10 May 2004; Tom Gall openssl-0.9.7d.ebuild: + fix for ppc64, bug #50637 + + 28 Apr 2004; Tom Gall openssl-0.9.7d.ebuild: + patch fix ppc64, bug #49102 + + 25 Apr 2004; Daniel Ahlberg openssl-0.9.7d.ebuild: + Install emacs files, from #47854. + + 20 Apr 2004; Tom Gall openssl-0.9.7d.ebuild: + fix for ppc64 support see #45463 + + 30 Mar 2004; Daniel Ahlberg openssl-0.9.7d.ebuild: + + use gcc eclass instead of gcc-dumpversion. + + filter -funroll-loops, closing #45600. + + use emake of 0.9.7, closing #45002. + +*openssl-0.9.6m (17 Mar 2004) +*openssl-0.9.7d (17 Mar 2004) + + 17 Mar 2004; Daniel Ahlberg openssl-0.9.7d.ebuild, + openssl-0.9.6m.ebuild: + Security update, also removed some old ebuilds. + + 01 Mar 2004; Tom Gall openssl-0.9.7c-r1.ebuild: + remove call to make test for ppc64 for now. This is problematic, as + we have some bug running around for ppc64 but we also need to move + forward. + + 16 Feb 2004; Gustavo Zacarias + openssl-0.9.7c-r1.ebuild: + Fixed compilation of sparc32 target on sparc64 + + 10 Feb 2004; Bartosch Pixa + openssl-0.9.7c-r1.ebuild: + set ppc in keywords + + 28 Jan 2004; Aron Griffis openssl-0.9.7c-r1.ebuild: + stable on alpha and ia64 + + 18 Jan 2004; Jason Wever openssl-0.9.7c-r1.ebuild: + Marked stable on sparc. + + 18 Jan 2004; Martin Guy openssl-0.9.7c-r1.ebuild: + Marked stable on hppa. + +*openssl-0.9.7b-r3 (17 Jan 2004) + + 17 Jan 2004; Joshua Kinard openssl-0.9.6k-r1.ebuild, + openssl-0.9.6k.ebuild, openssl-0.9.6l.ebuild, openssl-0.9.7b-r3.ebuild, + openssl-0.9.7b.ebuild, openssl-0.9.7c-r1.ebuild, openssl-0.9.7c.ebuild: + Bumped mips to stable, fixed copyright headers, & Removed inherit on gcc.eclass + and replaced $(gcc-version) calls with a ${gcc_version} variable defined by + calling gcc -dumpversion directly. The reason for this was to resolve + dependency issues reported by repoman. + + 17 Jan 2004; Guy Martin openssl-0.9.7c-r1.ebuild: + Fixed detection of the target on hppa smp box. + + 13 Jan 2004; Daniel Ahlberg openssl-0.9.7c-r1.ebuild: + More CFLAGS filtering, Closing #34261. + + 09 Jan 2004; Daniel Ahlberg openssl-0.9.7c-r1.ebuild: + Update the way CFLAGS are changed. + + 08 Jan 2004; Robin H. Johnson openssl-0.9.7c-r1.ebuild: + fix bug #37600 + + 03 Jan 2004; Daniel Ahlberg openssl-0.9.7c-r1.ebuild: + Better filtering of existing cflags to be replaced by our own. Closing #35283. + + 16 Dec 2003; Joshua Kinard openssl-0.9.7c-r1.ebuild: + Made a change to the mips detection so we can differentiate betweem mips and + mipsel machines, and pass the apropriate configure target, otherwise the + testsuite fails + +*openssl-0.9.6l (04 Nov 2003) +*openssl-0.9.7c-r1 (04 Nov 2003) + + 8 Dec 2003; Guy Martin openssl-0.9.6k.ebuild, + openssl-0.9.6k-r1.ebuild, openssl-0.9.6l.ebuild : + Forcing target linux-parisc even on 32bit kernel because detection fail + on multicpu box. + + 25 Nov 2003; Guy Martin openssl-0.9.7c-r1.ebuild : + Fix detection of parisc64 boxes. + + 17 Nov 2003; Joshua Kinard openssl-0.9.7c-r1.ebuild: + Made a tweak to allow openssl to build on mips64 platforms (64-bit kernel, + 32-bit userland) + + 12 Nov 2003; Daniel Ahlberg openssl-0.9.7c.ebuild, openssl-0.9.7c-r1.ebuild : + Make test removes the built libraries to be rebuilt later with make install, this was not the case with + 0.9.6 libraries as they where only inserted into ${D}. Now we run make again before installing those + libraries to make sure they exist. Closing #32858. + + 06 Nov 2003; Paul de Vrieze openssl-0.9.7c-r1.ebuild: + Add checks so that missing 0.9.6 libs when they should be there will cause the + ebuild to fail, so saving from mishap + + 04 Nov 2003; Daniel AHlberg openssl-0.9.7c-r1.ebuild openssl-0.9.6l.ebuild : + Security update. + + 28 Oct 2003; Daniel Ahlberg openssl-0.9.7c.ebuild : + Add make test to compile process. Closes #30066. + +*openssl-0.9.6k-r1 (10 Oct 2003) + + 10 Oct 2003; Daniel Ahlberg openssl-0.9.6k-r1.ebuild: + Adding the fix for bn.h to the 0.9.6k series + + 01 Oct 2003; Jon Portnoy openssl-0.9.7c.ebuild : + Stable for ia64 + + 30 Sep 2003; openssl-0.9.7c.ebuild: + Keyword amd64 + + 30 Sep 2003; Christian Birchinger openssl-0.9.6k.ebuild: + Added sparc stable keyword + +*openssl-0.9.7c (30 Sep 2003) +*openssl-0.9.6k (30 Sep 2003) + + 30 Sep 2003; Daniel Ahlberg openssl-0.9.7c.ebuild, openssl-0.9.6k.ebuild : + Security update. + +*openssl-0.9.7b-r2 (16 Sep 2003) + + 24 Sep 2003; Martin Schlemmer openssl-0.9.7b-r1.ebuild, + openssl-0.9.7b-r2.ebuild, openssl-0.9.7b.ebuild: + Breaks things one some boxen, bug #13795. The problem is that if we have + a 'gcc fixed' version in $(gcc-config -L) from 0.9.6, then breaks as it was + defined as 'int BN_mod(...)' and in 0.9.7 it is a #define with BN_div(...). + + 19 Sep 2003; Daniel Ahlberg openssl-0.9.7b-r2.ebuild : + Filter "-fprefetch-loop-arrays" for all GCC 3.3 versions. + Closing #28997. + + 17 Sep 2003; Daniel Ahlberg openssl-0.9.7b-r2.ebuild : + Closing #12971 and #25461. Removing from packages.mask + + 16 Sep 2003; Daniel Ahlberg openssl-0.9.7b-r2.ebuild : + This version optionally installs openssl-0.9.6 if upgrading, and leaves it out + if installing from scratch. Libraries from openssl-0.9.6 are needed becuse every + program linking to openssl links directly to the version named library instead of + the symlink. + +*openssl-0.9.7b-r1 (02 Sep 2003) + + 02 Sep 2003; Mike Frysinger : + Add a version so ppl running ~ can unmask/emerge it. + + 29 Jul 2003; Will Woods openssl-0.9.6j.ebuild: + Use SSH_TARGET on alpha to force it to honor CHOST, marked stable. + +*openssl-0.9.6j (23 May 2003) + + 29 Sep 2003; Joshua Kinard openssl-0.9.6j.ebuild: + Changes ~mips to mips in KEYWORDS + + 23 Sep 2003; Bartosch Pixa openssl-0.9.6j.ebuild: + set ppc in keywords + + 23 Jul 2003; Guy Martin openssl-0.9.6j.ebuild : + Marked stable on hppa. + + 01 Jul 2003; Todd Sunderlin openssl-0.9.6j.ebuild : + set stable on sparc + + 14 Jun 2003; Guy Martin openssl-0.9.6j.ebuild : + Added a build fix for people running a 64bit kernel. + + 23 May 2003; Brandon Low openssl-0.9.6j.ebuild: + Bump, lots of nice security fixes, several patches from 0.9.6i-r2 are merged + in here + + 20 May 2003; Tavis Ormandy openssl-0.9.6i-r2.ebuild, + openssl-0.9.7b.ebuild: + ccc/openssl co-existance fixes. + + 18 May 2003; Tavis Ormandy openssl-0.9.6i-r2.ebuild: + making ccc usable. + +*openssl-0.9.7b (10 Apr 2003) + + 17 Apr 2003; Tavis Ormandy openssl-0.9.6i-r2.ebuild, + openssl-0.9.7b.ebuild: + Setting openssl-0.9.6i-r2 to completely ignore ccc, even if found - if used, result wont be + backward compatible. + + Produce libssl.so on linux-alpha*-ccc in openssl-0.9.7b. + + 10 Apr 2003; Brandon Low Manifest, + openssl-0.9.7b.ebuild: + Bump + +*openssl-0.9.6i-r2 (24 Mar 2003) + + 14 Jun 2003; Guy Martin openssl-0.9.6i-r2.ebuild : + Added a build fix for people running a 64bit kernel. + + 19 Mar 2003; Daniel Ahlberg : + Security update. Added patch against Klima-Pokorny-Rosa attack. + +*openssl-0.9.7a-r2 (24 Mar 2003) + + 19 Mar 2003; Daniel Ahlberg : + Security update. Added patch against Klima-Pokorny-Rosa attack. + +*openssl-0.9.6i-r1 (19 Mar 2003) + + 19 Mar 2003; Daniel Ahlberg : + Security update. + +*openssl-0.9.7a-r1 (19 Mar 2003) + + 19 Mar 2003; Daniel Ahlberg : + Security update. + + 13 Mar 2003; Guy Martin openssl-0.9.6i.ebuild : + Now produce also libssl.so on hppa. + + 28 Feb 2003; Maarten Thibaut openssl-0.9.6i.ebuild : + Add code to detect sparc32 build on sparc64. Add code to compile for + sparc32 on sparc64 depending on PROFILE_ARCH environment variable. + + 23 Feb 2003; Zach Welch openssl-0.9.6i.ebuild : + Add arm patch to ebuild to fix problems linking aginst libcrypto.so + Cleanup several lintool violations + + 21 Feb 2003; Zach Welch openssl-0.9.6i.ebuild : + Added arm to keywords. + + 21 Feb 2003; Jan Seidel openssl-0.9.6g-r1.ebuild openssl-0.9.6i.ebuild : + added a patch for mips + + 12 Feb 2003; Guy Martin : + Added -fPIC to CFLAGS for hppa needed by many apps linking to openssl. + + 09 Feb 2003; Guy Martin : + Added hppa to keywords. + + 07 Jan 2003; Daniel Ahlberg openssl-0.9.7.ebuild : + Added warning message and some info on how to successfully emerge new version. + +*openssl-0.9.7 (05 Jan 2003) + + 05 Jan 2003; Daniel Ahlberg files/digest-openssl-0.9.7 : + Version bump. Found by jochem prins in #12973. Masked. + + 05 Jan 2003; Daniel Ahlberg files/digest-openssl-0.9.6h : + Removed masking in packages.mask and marked it unstable. + + 19 Dec 2002; Daniel Ahlberg files/digest-openssl-0.9.6h : + Re-made digest. The new md5 sum is the same as the md5sum in the announcement + mail. I must have made the old digest against a bad archive. + +*openssl-0.9.6h (16 Dec 2002) + + 16 Dec 2002; Daniel Ahlberg : + Version bump. Masked in packages.mask. NOT binary compatible with g so it will break things + unless you re-emerge does packages failing. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*openssl-0.9.6g-r1 (04 Nov 2002) + + 21 Feb 2003; Jan Seidel : + Added a patch for mips + + 25 Nov 2002; Nick Hadaway openssl-0.9.6g-r1.ebuild : + Updated ebuild so the certs directory is created. + + 04 Nov 2002; Daniel Ahlberg : + Changed openssldir to /etc as suggested by Corporate Gadfly in #9315. + +*opessl-0.9.6g (29 Aug 2002) + + 09 Feb 2003; Jan Seidel : + Added a patch for mips (apache2 with openssl) + + 19 Jan 2003; Jan Seidel : + Added mips to keywords + + 06 Oct 2002; Jack Morgan : + Added sparc/sparc64 keywords + + 27 Sep 2002; Daniel Ahlberg : + Cleaned out files/. + + Made OpenSSL use native crypt() instead of built-in. Thanks to Jason Jeremias + in #8438. + + 17 Sep 2002; Mark Guertin openssl-0.9.6g.ebuild : + Added ppc to keywords + + 29 Aug 2002; Daniel Ahlberg openssl-0.9.6g.ebuild : + Version bump, closes #6290. Ebuild contributed by hannes@mehnert.org. + +*openssl-0.9.6e (30 Jul 2002) + + 2 Aug 2002; Calum Selkirk openssl-0.9.6e.ebuild : + + Added ppc to KEYWORDS. + + 30 Jul 2002; Daniel Ahlberg openssl-0.9.6e.ebuild : + + New version to fix security, http://www.openssl.org/news/secadv_20020730.txt + +*openssl-0.9.6d-r1 (10 Jul 2002) + + 10 Jul 2002; Josh Tegart : + + Fixed problem that prevented openssl-0.9.6d from building on sparc. The + Configure script incorrectly set the SHARED_LDFLAGS in the Makefile. The new + ebuild simply removes the incorrect value if ARCH="sparc". + +*openssl-0.9.6d (13 May 2002) + + 13 May 2002; Donny Davies : + + Update to latest. Added LICENSE, SLOT. Use make vs. emake. + +*openssl-0.9.6c-r1 (3 Apr 2002) + + patch from src_unpack; it was redundant. Remove the manpage sed stuff + and pass MANDIR to make install instead. Fix a longstanding annoyance + with the support scripts getting installed into /usr/ssl and install + them in the proper place: /usr/lib/ssl. Add a patch for compiling with + gcc-3. Fix a glitch with the html docs getting installed into a redundant + 'doc' subdirectory. Remove all old patches, digests and ebuilds. + + 21 Mar 2002; Daniel Robbins : Fixed 0.9.6c ebuild so + that it doesn't do 'sed -e "foo" | cat > Makefile', which breaks often. Now + it is a standard 2-liner. + + 21 Mar 2002; Seemant Kulleen openssl-0.9.6c.ebuild : + Fixed so that html documentation is no longer gzipped. Small enough to not + warrant a revision bump on the ebuild. + +*openssl-0.9.6c (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/blacklist b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/blacklist new file mode 100644 index 0000000000..add4f5f1b4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/blacklist @@ -0,0 +1,42 @@ +# Certs listed by serial at https://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html +serial 047ecbe9fca55f7bd09eae36e10cae1e +serial 00f5c86af36162f13a64f54f6dc9587c06 +serial 00d7558fdaf5f1105bb213282b707729a3 +serial 392a434f0e07df1f8aa305de34e0c229 +serial 3e75ced46b693021218830ae86a82a71 +serial 00e9028b9578e415dc1a710a2b88154447 +serial 009239d5348f40d1695a745470e1f23f43 +serial 00b0b7133ed096f9b56fae91c874bd3ac0 +serial 00d8f35f4eb7872b2dab0692e315382fb0 +# Certs listed by hash in the Chrome source - DigiNotar's cross-signed roots +# Subject: CN=DigiNotar Root CA +# Issuer: CN=Entrust.net x2 and self-signed +sha1 410f36363258f30b347d12ce4863e433437806a8 +# Subject: CN=DigiNotar Cyber CA +# Issuer: CN=GTE CyberTrust Global Root +sha1 c4f9663716cd5e71d6950b5f33ce041c95b435d1 +# Subject: CN=DigiNotar Services 1024 CA +# Issuer: CN=Entrust.net +sha1 e23b8d105f87710a68d9248050ebefc627be4ca6 +# Subject: CN=DigiNotar PKIoverheid CA Organisatie - G2 +# Issuer: CN=Staat der Nederlanden Organisatie CA - G2 +sha1 7b2e16bc39bcd72b456e9f055d1de615b74945db +# Subject: CN=DigiNotar PKIoverheid CA Overheid en Bedrijven +# Issuer: CN=Staat der Nederlanden Overheid CA +sha1 e8f91200c65cee16e039b9f883841661635f81c5 +# Subject: O=Digicert Sdn. Bhd. +# Issuer: CN=GTE CyberTrust Global Root +# Expires: Jul 17 15:16:54 2012 GMT +sha1 0129bcd5b448ae8d2496d1c3e19723919088e152 +# Subject: O=Digicert Sdn. Bhd. +# Issuer: CN=Entrust.net Certification Authority (2048) +# Expires: Jul 16 17:53:37 2015 GMT +sha1 d33c5b41e45cc4b3be9ad6952c4ecc2528032981 +# Issuer: CN=Trustwave Organization Issuing CA, Level 2 +# Covers two certificates, the latter of which expires Apr 15 21:09:30 +# 2021 GMT. +sha1 e12d89f56d2276f830e6ceafa66c725c0b41a932 +# Cyberoam CA certificate. Private key leaked, but this certificate would +# only have been installed by Cyberoam customers. The certificate expires +# in 2036, but we can probably remove in a couple of years (2014). +sha1 d9f5c6ce57ffaa39cc7ed172bd53e0d307834bd1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/c_rehash.sh b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/c_rehash.sh new file mode 100644 index 0000000000..75a774945c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/c_rehash.sh @@ -0,0 +1,210 @@ +#!/bin/sh +# +# Ben Secrest +# +# sh c_rehash script, scan all files in a directory +# and add symbolic links to their hash values. +# +# based on the c_rehash perl script distributed with openssl +# +# LICENSE: See OpenSSL license +# ^^acceptable?^^ +# + +# default certificate location +DIR=/etc/openssl + +# for filetype bitfield +IS_CERT=$(( 1 << 0 )) +IS_CRL=$(( 1 << 1 )) + + +# check to see if a file is a certificate file or a CRL file +# arguments: +# 1. the filename to be scanned +# returns: +# bitfield of file type; uses ${IS_CERT} and ${IS_CRL} +# +check_file() +{ + local IS_TYPE=0 + + # make IFS a newline so we can process grep output line by line + local OLDIFS=${IFS} + IFS=$( printf "\n" ) + + # XXX: could be more efficient to have two 'grep -m' but is -m portable? + for LINE in $( grep '^-----BEGIN .*-----' ${1} ) + do + if echo ${LINE} \ + | grep -q -E '^-----BEGIN (X509 |TRUSTED )?CERTIFICATE-----' + then + IS_TYPE=$(( ${IS_TYPE} | ${IS_CERT} )) + + if [ $(( ${IS_TYPE} & ${IS_CRL} )) -ne 0 ] + then + break + fi + elif echo ${LINE} | grep -q '^-----BEGIN X509 CRL-----' + then + IS_TYPE=$(( ${IS_TYPE} | ${IS_CRL} )) + + if [ $(( ${IS_TYPE} & ${IS_CERT} )) -ne 0 ] + then + break + fi + fi + done + + # restore IFS + IFS=${OLDIFS} + + return ${IS_TYPE} +} + + +# +# use openssl to fingerprint a file +# arguments: +# 1. the filename to fingerprint +# 2. the method to use (x509, crl) +# returns: +# none +# assumptions: +# user will capture output from last stage of pipeline +# +fingerprint() +{ + ${SSL_CMD} ${2} -fingerprint -noout -in ${1} | sed 's/^.*=//' | tr -d ':' +} + + +# +# link_hash - create links to certificate files +# arguments: +# 1. the filename to create a link for +# 2. the type of certificate being linked (x509, crl) +# returns: +# 0 on success, 1 otherwise +# +link_hash() +{ + local FINGERPRINT=$( fingerprint ${1} ${2} ) + local HASH=$( ${SSL_CMD} ${2} -hash -noout -in ${1} ) + local SUFFIX=0 + local LINKFILE='' + local TAG='' + + if [ ${2} = "crl" ] + then + TAG='r' + fi + + LINKFILE=${HASH}.${TAG}${SUFFIX} + + while [ -f ${LINKFILE} ] + do + if [ ${FINGERPRINT} = $( fingerprint ${LINKFILE} ${2} ) ] + then + echo "WARNING: Skipping duplicate file ${1}" >&2 + return 1 + fi + + SUFFIX=$(( ${SUFFIX} + 1 )) + LINKFILE=${HASH}.${TAG}${SUFFIX} + done + + echo "${1} => ${LINKFILE}" + + # assume any system with a POSIX shell will either support symlinks or + # do something to handle this gracefully + ln -s ${1} ${LINKFILE} + + return 0 +} + + +# hash_dir create hash links in a given directory +hash_dir() +{ + echo "Doing ${1}" + + cd ${1} + + ls -1 * 2>/dev/null | while read FILE + do + if echo ${FILE} | grep -q -E '^[[:xdigit:]]{8}\.r?[[:digit:]]+$' \ + && [ -h "${FILE}" ] + then + rm ${FILE} + fi + done + + ls -1 *.pem 2>/dev/null | while read FILE + do + check_file ${FILE} + local FILE_TYPE=${?} + local TYPE_STR='' + + if [ $(( ${FILE_TYPE} & ${IS_CERT} )) -ne 0 ] + then + TYPE_STR='x509' + elif [ $(( ${FILE_TYPE} & ${IS_CRL} )) -ne 0 ] + then + TYPE_STR='crl' + else + echo "WARNING: ${FILE} does not contain a certificate or CRL: skipping" >&2 + continue + fi + + link_hash ${FILE} ${TYPE_STR} + done +} + + +# choose the name of an ssl application +if [ -n "${OPENSSL}" ] +then + SSL_CMD=$(which ${OPENSSL} 2>/dev/null) +else + SSL_CMD=/usr/bin/openssl + OPENSSL=${SSL_CMD} + export OPENSSL +fi + +# fix paths +PATH=${PATH}:${DIR}/bin +export PATH + +# confirm existance/executability of ssl command +if ! [ -x ${SSL_CMD} ] +then + echo "${0}: rehashing skipped ('openssl' program not available)" >&2 + exit 0 +fi + +# determine which directories to process +old_IFS=$IFS +if [ ${#} -gt 0 ] +then + IFS=':' + DIRLIST=${*} +elif [ -n "${SSL_CERT_DIR}" ] +then + DIRLIST=$SSL_CERT_DIR +else + DIRLIST=${DIR}/certs +fi + +IFS=':' + +# process directories +for CERT_DIR in ${DIRLIST} +do + if [ -d ${CERT_DIR} -a -w ${CERT_DIR} ] + then + IFS=$old_IFS + hash_dir ${CERT_DIR} + IFS=':' + fi +done diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/chromeos-version.sh new file mode 100755 index 0000000000..082ab5e0eb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/chromeos-version.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec sed -n '/^VERSION=/s:.*=::p' "$1"/Makefile diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-0.9.8 b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-0.9.8 new file mode 100755 index 0000000000..b096d34bfc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-0.9.8 @@ -0,0 +1,145 @@ +#!/usr/bin/env bash +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.8,v 1.17 2009/06/21 11:40:34 grobian Exp $ +# +# Openssl doesn't play along nicely with cross-compiling +# like autotools based projects, so let's teach it new tricks. +# +# Review the bundled 'config' script to see why kind of targets +# we can pass to the 'Configure' script. + + +# Testing routines +if [[ $1 == "test" ]] ; then + for c in \ + "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \ + "armv5b-linux-gnu |linux-generic32 -DB_ENDIAN" \ + "x86_64-pc-linux-gnu |linux-x86_64" \ + "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \ + "i686-pc-linux-gnu |linux-elf" \ + "whatever-gentoo-freebsdX.Y |BSD-generic32" \ + "i686-gentoo-freebsdX.Y |BSD-x86-elf" \ + "sparc64-alpha-freebsdX.Y |BSD-sparc64" \ + "ia64-gentoo-freebsd5.99234 |BSD-ia64" \ + "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \ + "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \ + "powerpc-gentOO-linux-uclibc |linux-ppc" \ + "powerpc64-unk-linux-gnu |linux-ppc64" \ + "x86_64-apple-darwinX |darwin64-x86_64-cc" \ + "powerpc64-apple-darwinX |darwin64-ppc-cc" \ + "i686-apple-darwinX |darwin-i386-cc" \ + "i386-apple-darwinX |darwin-i386-cc" \ + "powerpc-apple-darwinX |darwin-ppc-cc" \ + "i586-pc-winnt |winnt-parity" \ + ;do + CHOST=${c/|*} + ret_want=${c/*|} + ret_got=$(CHOST=${CHOST} "$0") + + if [[ ${ret_want} == "${ret_got}" ]] ; then + echo "PASS: ${CHOST}" + else + echo "FAIL: ${CHOST}" + echo -e "\twanted: ${ret_want}" + echo -e "\twe got: ${ret_got}" + fi + done + exit 0 +fi +[[ -z ${CHOST} && -n $1 ]] && CHOST=$1 + + +# Detect the operating system +case ${CHOST} in + *-aix*) system="aix";; + *-darwin*) system="darwin";; + *-freebsd*) system="BSD";; + *-hpux*) system="hpux";; + *-linux*) system="linux";; + *-solaris*) system="solaris";; + *-winnt*) system="winnt";; + *) exit 0;; +esac + + +# Compiler munging +compiler="gcc" +if [[ ${CC} == "ccc" ]] ; then + compiler=${CC} +fi + + +# Detect target arch +machine="" +chost_machine=${CHOST%%-*} +case ${system} in +linux) + case ${chost_machine} in + alphaev56*) machine=alpha+bwx-${compiler};; + alphaev[678]*)machine=alpha+bwx-${compiler};; + alpha*) machine=alpha-${compiler};; + arm*b*) machine="generic32 -DB_ENDIAN";; + arm*) machine="generic32 -DL_ENDIAN";; + # hppa64*) machine=parisc64;; + hppa*) machine="generic32 -DB_ENDIAN";; + i[0-9]86*) machine=elf;; + ia64*) machine=ia64;; + m68*) machine="generic32 -DB_ENDIAN";; + mips*el*) machine="generic32 -DL_ENDIAN";; + mips*) machine="generic32 -DB_ENDIAN";; + powerpc64*) machine=ppc64;; + powerpc*) machine=ppc;; + # sh64*) machine=elf;; + sh*b*) machine="generic32 -DB_ENDIAN";; + sh*) machine="generic32 -DL_ENDIAN";; + sparc*v7*) machine="generic32 -DB_ENDIAN";; + sparc64*) machine=sparcv9;; + sparc*) machine=sparcv8;; + s390x*) machine="generic64 -DB_ENDIAN";; + s390*) machine="generic32 -DB_ENDIAN";; + x86_64*) machine=x86_64;; + esac + ;; +BSD) + case ${chost_machine} in + alpha*) machine=generic64;; + i[6-9]86*) machine=x86-elf;; + ia64*) machine=ia64;; + sparc64*) machine=sparc64;; + x86_64*) machine=x86_64;; + *) machine=generic32;; + esac + ;; +aix) + machine=${compiler} + ;; +darwin) + case ${chost_machine} in + powerpc64) machine=ppc-cc; system=${system}64;; + powerpc) machine=ppc-cc;; + i?86*) machine=i386-cc;; + x86_64) machine=x86_64-cc; system=${system}64;; + esac + ;; +hpux) + case ${chost_machine} in + ia64) machine=ia64-${compiler} ;; + esac + ;; +solaris) + case ${chost_machine} in + i386) machine=x86-${compiler} ;; + x86_64*) machine=x86_64-${compiler}; system=${system}64;; + sparcv9*) machine=sparcv9-${compiler}; system=${system}64;; + sparc*) machine=sparcv8-${compiler};; + esac + ;; +winnt) + machine=parity + ;; +esac + + +# If we have something, show it +[[ -n ${machine} ]] && echo ${system}-${machine} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.0 b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.0 new file mode 100644 index 0000000000..73f3a8839e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.0 @@ -0,0 +1,159 @@ +#!/usr/bin/env bash +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.0,v 1.4 2011/12/07 16:03:05 vapier Exp $ +# +# Openssl doesn't play along nicely with cross-compiling +# like autotools based projects, so let's teach it new tricks. +# +# Review the bundled 'config' script to see why kind of targets +# we can pass to the 'Configure' script. + + +# Testing routines +if [[ $1 == "test" ]] ; then + for c in \ + "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \ + "armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \ + "x86_64-pc-linux-gnu |linux-x86_64" \ + "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \ + "i686-pc-linux-gnu |linux-elf" \ + "whatever-gentoo-freebsdX.Y |BSD-generic32" \ + "i686-gentoo-freebsdX.Y |BSD-x86-elf" \ + "sparc64-alpha-freebsdX.Y |BSD-sparc64" \ + "ia64-gentoo-freebsd5.99234 |BSD-ia64" \ + "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \ + "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \ + "powerpc-gentOO-linux-uclibc |linux-ppc" \ + "powerpc64-unk-linux-gnu |linux-ppc64" \ + "x86_64-apple-darwinX |darwin64-x86_64-cc" \ + "powerpc64-apple-darwinX |darwin64-ppc-cc" \ + "i686-apple-darwinX |darwin-i386-cc" \ + "i386-apple-darwinX |darwin-i386-cc" \ + "powerpc-apple-darwinX |darwin-ppc-cc" \ + "i586-pc-winnt |winnt-parity" \ + "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ + "s390x-linux-gnu |linux-s390x" \ + ;do + CHOST=${c/|*} + ret_want=${c/*|} + ret_got=$(CHOST=${CHOST} "$0") + + if [[ ${ret_want} == "${ret_got}" ]] ; then + echo "PASS: ${CHOST}" + else + echo "FAIL: ${CHOST}" + echo -e "\twanted: ${ret_want}" + echo -e "\twe got: ${ret_got}" + fi + done + exit 0 +fi +[[ -z ${CHOST} && -n $1 ]] && CHOST=$1 + + +# Detect the operating system +case ${CHOST} in + *-aix*) system="aix";; + *-darwin*) system="darwin";; + *-freebsd*) system="BSD";; + *-hpux*) system="hpux";; + *-linux*) system="linux";; + *-solaris*) system="solaris";; + *-winnt*) system="winnt";; + x86_64-*-mingw*) system="mingw64";; + *mingw*) system="mingw";; + *) exit 0;; +esac + + +# Compiler munging +compiler="gcc" +if [[ ${CC} == "ccc" ]] ; then + compiler=${CC} +fi + + +# Detect target arch +machine="" +chost_machine=${CHOST%%-*} +case ${system} in +linux) + case ${chost_machine}:${ABI} in + alphaev56*) machine=alpha+bwx-${compiler};; + alphaev[678]*)machine=alpha+bwx-${compiler};; + alpha*) machine=alpha-${compiler};; + armv[4-9]*b*) machine="armv4 -DB_ENDIAN";; + armv[4-9]*) machine="armv4 -DL_ENDIAN";; + arm*b*) machine="generic32 -DB_ENDIAN";; + arm*) machine="generic32 -DL_ENDIAN";; + avr*) machine="generic32 -DL_ENDIAN";; + bfin*) machine="generic32 -DL_ENDIAN";; + # hppa64*) machine=parisc64;; + hppa*) machine="generic32 -DB_ENDIAN";; + i[0-9]86*|\ + x86_64*:x86) machine=elf;; + ia64*) machine=ia64;; + m68*) machine="generic32 -DB_ENDIAN";; + mips*el*) machine="generic32 -DL_ENDIAN";; + mips*) machine="generic32 -DB_ENDIAN";; + powerpc64*) machine=ppc64;; + powerpc*) machine=ppc;; + # sh64*) machine=elf;; + sh*b*) machine="generic32 -DB_ENDIAN";; + sh*) machine="generic32 -DL_ENDIAN";; + sparc*v7*) machine="generic32 -DB_ENDIAN";; + sparc64*) machine=sparcv9;; + sparc*) machine=sparcv8;; + s390x*) machine=s390x;; + s390*) machine="generic32 -DB_ENDIAN";; + x86_64*:x32) machine=x32;; + x86_64*) machine=x86_64;; + esac + ;; +BSD) + case ${chost_machine} in + alpha*) machine=generic64;; + i[6-9]86*) machine=x86-elf;; + ia64*) machine=ia64;; + sparc64*) machine=sparc64;; + x86_64*) machine=x86_64;; + *) machine=generic32;; + esac + ;; +aix) + machine=${compiler} + ;; +darwin) + case ${chost_machine} in + powerpc64) machine=ppc-cc; system=${system}64;; + powerpc) machine=ppc-cc;; + i?86*) machine=i386-cc;; + x86_64) machine=x86_64-cc; system=${system}64;; + esac + ;; +hpux) + case ${chost_machine} in + ia64) machine=ia64-${compiler} ;; + esac + ;; +solaris) + case ${chost_machine} in + i386) machine=x86-${compiler} ;; + x86_64*) machine=x86_64-${compiler}; system=${system}64;; + sparcv9*) machine=sparcv9-${compiler}; system=${system}64;; + sparc*) machine=sparcv8-${compiler};; + esac + ;; +winnt) + machine=parity + ;; +mingw*) + # special case ... no xxx-yyy style name + echo ${system} + ;; +esac + + +# If we have something, show it +[[ -n ${machine} ]] && echo ${system}-${machine} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8-make-engines-dir.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8-make-engines-dir.patch new file mode 100644 index 0000000000..5cba456c7e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8-make-engines-dir.patch @@ -0,0 +1,12 @@ +http://rt.openssl.org/Ticket/Display.html?id=2082 + +--- openssl-0.9.8/engines/Makefile ++++ openssl-0.9.8.az/engines/Makefile +@@ -88,6 +88,7 @@ + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @if [ -n "$(SHARED_LIBS)" ]; then \ + set -e; \ ++ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines; \ + for l in $(LIBNAMES); do \ + ( echo installing $$l; \ + if [ "$(PLATFORM)" != "Cygwin" ]; then \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8-makedepend.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8-makedepend.patch new file mode 100644 index 0000000000..9abbe8ef37 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8-makedepend.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/149583 + +http://rt.openssl.org/Ticket/Display.html?id=2085 + +--- util/domd ++++ util/domd +@@ -14,7 +14,7 @@ + cp Makefile Makefile.save + # fake the presence of Kerberos + touch $TOP/krb5.h +-if [ "$MAKEDEPEND" = "gcc" ]; then ++if [ "$MAKEDEPEND" != "makedepend" ]; then + args="" + while [ $# -gt 0 ]; do + if [ "$1" != "--" ]; then args="$args $1"; fi diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8b-doc-updates.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8b-doc-updates.patch new file mode 100644 index 0000000000..37cc34cb4c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8b-doc-updates.patch @@ -0,0 +1,270 @@ +http://rt.openssl.org/Ticket/Display.html?id=2083 + +--- doc/crypto/ASN1_generate_nconf.pod ++++ doc/crypto/ASN1_generate_nconf.pod +@@ -6,6 +6,8 @@ ASN1_generate_nconf, ASN1_generate_v3 - + + =head1 SYNOPSIS + ++ #include ++ + ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf); + ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf); + +--- doc/crypto/ASN1_OBJECT_new.pod ++++ doc/crypto/ASN1_OBJECT_new.pod +@@ -6,6 +6,8 @@ ASN1_OBJECT_new, ASN1_OBJECT_free, - obj + + =head1 SYNOPSIS + ++ #include ++ + ASN1_OBJECT *ASN1_OBJECT_new(void); + void ASN1_OBJECT_free(ASN1_OBJECT *a); + +--- doc/crypto/ASN1_STRING_length.pod ++++ doc/crypto/ASN1_STRING_length.pod +@@ -8,6 +8,8 @@ ASN1_STRING utility functions + + =head1 SYNOPSIS + ++ #include ++ + int ASN1_STRING_length(ASN1_STRING *x); + unsigned char * ASN1_STRING_data(ASN1_STRING *x); + +--- doc/crypto/ASN1_STRING_new.pod ++++ doc/crypto/ASN1_STRING_new.pod +@@ -7,6 +7,8 @@ ASN1_STRING allocation functions + + =head1 SYNOPSIS + ++ #include ++ + ASN1_STRING * ASN1_STRING_new(void); + ASN1_STRING * ASN1_STRING_type_new(int type); + void ASN1_STRING_free(ASN1_STRING *a); +--- doc/crypto/bn_internal.pod ++++ doc/crypto/bn_internal.pod +@@ -13,6 +13,8 @@ library internal functions + + =head1 SYNOPSIS + ++ #include ++ + BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w); + BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, + BN_ULONG w); +--- doc/crypto/CRYPTO_set_ex_data.pod ++++ doc/crypto/CRYPTO_set_ex_data.pod +@@ -6,6 +6,8 @@ CRYPTO_set_ex_data, CRYPTO_get_ex_data - + + =head1 SYNOPSIS + ++ #include ++ + int CRYPTO_set_ex_data(CRYPTO_EX_DATA *r, int idx, void *arg); + + void *CRYPTO_get_ex_data(CRYPTO_EX_DATA *r, int idx); +--- doc/crypto/OBJ_nid2obj.pod ++++ doc/crypto/OBJ_nid2obj.pod +@@ -8,6 +8,8 @@ functions + + =head1 SYNOPSIS + ++ #include ++ + ASN1_OBJECT * OBJ_nid2obj(int n); + const char * OBJ_nid2ln(int n); + const char * OBJ_nid2sn(int n); +--- doc/crypto/PKCS7_decrypt.pod ++++ doc/crypto/PKCS7_decrypt.pod +@@ -6,7 +6,9 @@ PKCS7_decrypt - decrypt content from a P + + =head1 SYNOPSIS + +-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags); ++ #include ++ ++ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags); + + =head1 DESCRIPTION + +--- doc/crypto/PKCS7_encrypt.pod ++++ doc/crypto/PKCS7_encrypt.pod +@@ -6,7 +6,9 @@ PKCS7_encrypt - create a PKCS#7 envelope + + =head1 SYNOPSIS + +-PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags); ++ #include ++ ++ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags); + + =head1 DESCRIPTION + +--- doc/crypto/PKCS7_sign.pod ++++ doc/crypto/PKCS7_sign.pod +@@ -6,7 +6,9 @@ PKCS7_sign - create a PKCS#7 signedData + + =head1 SYNOPSIS + +-PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags); ++ #include ++ ++ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags); + + =head1 DESCRIPTION + +--- doc/crypto/PKCS7_verify.pod ++++ doc/crypto/PKCS7_verify.pod +@@ -6,9 +6,11 @@ PKCS7_verify - verify a PKCS#7 signedDat + + =head1 SYNOPSIS + +-int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags); ++ #include + +-STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags); ++ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags); ++ ++ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags); + + =head1 DESCRIPTION + +--- doc/crypto/SMIME_read_PKCS7.pod ++++ doc/crypto/SMIME_read_PKCS7.pod +@@ -6,7 +6,9 @@ SMIME_read_PKCS7 - parse S/MIME message. + + =head1 SYNOPSIS + +-PKCS7 *SMIME_read_PKCS7(BIO *in, BIO **bcont); ++ #include ++ ++ PKCS7 *SMIME_read_PKCS7(BIO *in, BIO **bcont); + + =head1 DESCRIPTION + +--- doc/crypto/SMIME_write_PKCS7.pod ++++ doc/crypto/SMIME_write_PKCS7.pod +@@ -6,7 +6,9 @@ SMIME_write_PKCS7 - convert PKCS#7 struc + + =head1 SYNOPSIS + +-int SMIME_write_PKCS7(BIO *out, PKCS7 *p7, BIO *data, int flags); ++ #include ++ ++ int SMIME_write_PKCS7(BIO *out, PKCS7 *p7, BIO *data, int flags); + + =head1 DESCRIPTION + +--- doc/crypto/ui_compat.pod ++++ doc/crypto/ui_compat.pod +@@ -7,6 +7,8 @@ Compatibility user interface functions + + =head1 SYNOPSIS + ++ #include ++ + int des_read_password(DES_cblock *key,const char *prompt,int verify); + int des_read_2passwords(DES_cblock *key1,DES_cblock *key2, + const char *prompt,int verify); +--- doc/crypto/X509_NAME_add_entry_by_txt.pod ++++ doc/crypto/X509_NAME_add_entry_by_txt.pod +@@ -7,15 +7,17 @@ X509_NAME_add_entry, X509_NAME_delete_en + + =head1 SYNOPSIS + +-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, const unsigned char *bytes, int len, int loc, int set); ++ #include + +-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set); ++ int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, const unsigned char *bytes, int len, int loc, int set); + +-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, unsigned char *bytes, int len, int loc, int set); ++ int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set); + +-int X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne, int loc, int set); ++ int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, unsigned char *bytes, int len, int loc, int set); + +-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc); ++ int X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne, int loc, int set); ++ ++ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc); + + =head1 DESCRIPTION + +--- doc/crypto/X509_NAME_ENTRY_get_object.pod ++++ doc/crypto/X509_NAME_ENTRY_get_object.pod +@@ -9,15 +9,17 @@ X509_NAME_ENTRY_create_by_OBJ - X509_NAM + + =head1 SYNOPSIS + +-ASN1_OBJECT * X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne); +-ASN1_STRING * X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne); ++ #include + +-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj); +-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, const unsigned char *bytes, int len); ++ ASN1_OBJECT * X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne); ++ ASN1_STRING * X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne); + +-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const char *field, int type, const unsigned char *bytes, int len); +-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,unsigned char *bytes, int len); +-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len); ++ int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj); ++ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, const unsigned char *bytes, int len); ++ ++ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const char *field, int type, const unsigned char *bytes, int len); ++ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,unsigned char *bytes, int len); ++ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len); + + =head1 DESCRIPTION + +--- doc/crypto/X509_NAME_get_index_by_NID.pod ++++ doc/crypto/X509_NAME_get_index_by_NID.pod +@@ -8,14 +8,16 @@ X509_NAME lookup and enumeration functio + + =head1 SYNOPSIS + +-int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos); +-int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, int lastpos); ++ #include + +-int X509_NAME_entry_count(X509_NAME *name); +-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc); ++ int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos); ++ int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, int lastpos); + +-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf,int len); +-int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,int len); ++ int X509_NAME_entry_count(X509_NAME *name); ++ X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc); ++ ++ int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf,int len); ++ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,int len); + + =head1 DESCRIPTION + +--- doc/crypto/X509_new.pod ++++ doc/crypto/X509_new.pod +@@ -6,6 +6,8 @@ X509_new, X509_free - X509 certificate A + + =head1 SYNOPSIS + ++ #include ++ + X509 *X509_new(void); + void X509_free(X509 *a); + +--- Makefile.org ++++ Makefile.org +@@ -218,7 +218,7 @@ + MANDIR=$(OPENSSLDIR)/man + MAN1=1 + MAN3=3 +-MANSUFFIX= ++MANSUFFIX=ssl + SHELL=/bin/sh + + TOP= . diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch new file mode 100644 index 0000000000..a798164a90 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch @@ -0,0 +1,25 @@ +--- a/Configure ++++ b/Configure +@@ -365,7 +365,7 @@ + # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it + # simply *happens* to work around a compiler bug in gcc 3.3.3, + # triggered by RIPEMD160 code. +-"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:ULTRASPARC::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + +the -B flag is a no-op nowadays + +--- a/crypto/des/Makefile ++++ b/crypto/des/Makefile +@@ -62,7 +62,7 @@ + $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB) + + des_enc-sparc.S: asm/des_enc.m4 +- m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S ++ m4 asm/des_enc.m4 > des_enc-sparc.S + + # ELF + dx86-elf.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8e-make.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8e-make.patch new file mode 100644 index 0000000000..54f4302cbe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8e-make.patch @@ -0,0 +1,26 @@ +respect $MAKE if it is set in the environment so we don't get a mix +of the host `make` and whatever $MAKE is set to when recursing + +http://bugs.gentoo.org/146316 + +http://rt.openssl.org/Ticket/Display.html?id=2080 + +--- openssl-0.9.8e/Configure ++++ openssl-0.9.8e/Configure +@@ -931,6 +931,7 @@ + $default_ranlib= &which("ranlib") or $default_ranlib="true"; + $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl") + or $perl="perl"; ++my $make = $ENV{'MAKE'} || "make"; + + chop $openssldir if $openssldir =~ /\/$/; + chop $prefix if $prefix =~ /\/$/; +@@ -1554,7 +1557,7 @@ + EOF + close(OUT); + } else { +- my $make_command = "make PERL=\'$perl\'"; ++ my $make_command = "$make PERL=\'$perl\'"; + my $make_targets = ""; + $make_targets .= " links" if $symlink; + $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8g-sslv3-no-tlsext.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8g-sslv3-no-tlsext.patch new file mode 100644 index 0000000000..ef6134b02c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8g-sslv3-no-tlsext.patch @@ -0,0 +1,31 @@ +Fix from upstream cvs + +Index: ssl/t1_lib.c +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/ssl/t1_lib.c,v +retrieving revision 1.64 +retrieving revision 1.65 +diff -u -p -r1.64 -r1.65 +--- ssl/t1_lib.c 29 Dec 2008 16:15:27 -0000 1.64 ++++ ssl/t1_lib.c 28 Apr 2009 22:10:54 -0000 1.65 +@@ -267,6 +267,10 @@ unsigned char *ssl_add_clienthello_tlsex + int extdatalen=0; + unsigned char *ret = p; + ++ /* don't add extensions for SSLv3 */ ++ if (s->client_version == SSL3_VERSION) ++ return p; ++ + ret+=2; + + if (ret>=limit) return NULL; /* this really never occurs, but ... */ +@@ -448,6 +452,10 @@ unsigned char *ssl_add_serverhello_tlsex + int extdatalen=0; + unsigned char *ret = p; + ++ /* don't add extensions for SSLv3 */ ++ if (s->version == SSL3_VERSION) ++ return p; ++ + ret+=2; + if (ret>=limit) return NULL; /* this really never occurs, but ... */ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch new file mode 100644 index 0000000000..254d20594b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch @@ -0,0 +1,27 @@ +http://bugs.gentoo.org/181438 + +make sure we respect LDFLAGS + +also make sure we don't add useless -rpath flags to the system libdir + +--- openssl-0.9.8h/Makefile.org ++++ openssl-0.9.8h/Makefile.org +@@ -180,6 +181,7 @@ + MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ + DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}' \ + MAKEDEPPROG='${MAKEDEPPROG}' \ ++ LDFLAGS='${LDFLAGS}' \ + SHARED_LDFLAGS='${SHARED_LDFLAGS}' \ + KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' \ + EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' \ +--- openssl-0.9.8h/Makefile.shared ++++ openssl-0.9.8h/Makefile.shared +@@ -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="$(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/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8j-parallel-build.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8j-parallel-build.patch new file mode 100644 index 0000000000..b9bb7a6a46 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8j-parallel-build.patch @@ -0,0 +1,25 @@ +http://rt.openssl.org/Ticket/Display.html?id=2084 + +--- openssl-0.9.8j/Makefile.org ++++ openssl-0.9.8j/Makefile.org +@@ -333,15 +333,15 @@ + dir=crypto; target=all; $(BUILD_ONE_CMD) + build_fips: + @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD) +-build_ssl: ++build_ssl: build_crypto + @dir=ssl; target=all; $(BUILD_ONE_CMD) +-build_engines: ++build_engines: build_crypto + @dir=engines; target=all; $(BUILD_ONE_CMD) +-build_apps: ++build_apps: build_libs + @dir=apps; target=all; $(BUILD_ONE_CMD) +-build_tests: ++build_tests: build_libs + @dir=test; target=all; $(BUILD_ONE_CMD) +-build_tools: ++build_tools: build_libs + @dir=tools; target=all; $(BUILD_ONE_CMD) + + all_testapps: build_libs build_testapps diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8k-toolchain.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8k-toolchain.patch new file mode 100644 index 0000000000..78d77d0a74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8k-toolchain.patch @@ -0,0 +1,22 @@ +http://rt.openssl.org/Ticket/Display.html?id=2081 + +--- Configure ++++ Configure +@@ -979,7 +979,8 @@ + my $shared_cflag = $fields[$idx_shared_cflag]; + my $shared_ldflag = $fields[$idx_shared_ldflag]; + my $shared_extension = $fields[$idx_shared_extension]; +-my $ranlib = $fields[$idx_ranlib]; ++my $ar = $ENV{'AR'} || "ar"; ++my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib]; + my $arflags = $fields[$idx_arflags]; + + if ($fips) +@@ -1487,6 +1488,7 @@ + s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/; + s/^PROCESSOR=.*/PROCESSOR= $processor/; + s/^RANLIB=.*/RANLIB= $ranlib/; ++ s/^AR=ar /AR= $ar /; + s/^ARFLAGS=.*/ARFLAGS= $arflags/; + s/^PERL=.*/PERL= $perl/; + s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1377.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1377.patch new file mode 100644 index 0000000000..761698e0f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1377.patch @@ -0,0 +1,53 @@ +http://rt.openssl.org/Ticket/Display.html?id=1931&user=guest&pass=guest + +Index: openssl/crypto/pqueue/pqueue.c +RCS File: /v/openssl/cvs/openssl/crypto/pqueue/pqueue.c,v +rcsdiff -q -kk '-r1.2.2.4' '-r1.2.2.5' -u '/v/openssl/cvs/openssl/crypto/pqueue/pqueue.c,v' 2>/dev/null +--- crypto/pqueue/pqueue.c 2005/06/28 12:53:33 1.2.2.4 ++++ crypto/pqueue/pqueue.c 2009/05/16 16:18:44 1.2.2.5 +@@ -234,3 +234,17 @@ + + return ret; + } ++ ++int ++pqueue_size(pqueue_s *pq) ++{ ++ pitem *item = pq->items; ++ int count = 0; ++ ++ while(item != NULL) ++ { ++ count++; ++ item = item->next; ++ } ++ return count; ++} +Index: openssl/crypto/pqueue/pqueue.h +RCS File: /v/openssl/cvs/openssl/crypto/pqueue/pqueue.h,v +rcsdiff -q -kk '-r1.2.2.1' '-r1.2.2.2' -u '/v/openssl/cvs/openssl/crypto/pqueue/pqueue.h,v' 2>/dev/null +--- crypto/pqueue/pqueue.h 2005/05/30 22:34:27 1.2.2.1 ++++ crypto/pqueue/pqueue.h 2009/05/16 16:18:44 1.2.2.2 +@@ -91,5 +91,6 @@ + pitem *pqueue_next(piterator *iter); + + void pqueue_print(pqueue pq); ++int pqueue_size(pqueue pq); + + #endif /* ! HEADER_PQUEUE_H */ +Index: openssl/ssl/d1_pkt.c +RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v +rcsdiff -q -kk '-r1.4.2.17' '-r1.4.2.18' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null +--- ssl/d1_pkt.c 2009/05/16 15:51:59 1.4.2.17 ++++ ssl/d1_pkt.c 2009/05/16 16:18:45 1.4.2.18 +@@ -167,6 +167,10 @@ + DTLS1_RECORD_DATA *rdata; + pitem *item; + ++ /* Limit the size of the queue to prevent DOS attacks */ ++ if (pqueue_size(queue->q) >= 100) ++ return 0; ++ + rdata = OPENSSL_malloc(sizeof(DTLS1_RECORD_DATA)); + item = pitem_new(priority, rdata); + if (rdata == NULL || item == NULL) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1378.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1378.patch new file mode 100644 index 0000000000..f111a4c086 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1378.patch @@ -0,0 +1,24 @@ +http://rt.openssl.org/Ticket/Display.html?id=1931&user=guest&pass=guest + +Index: ssl/d1_both.c +=================================================================== +--- ssl/d1_both.c.orig ++++ ssl/d1_both.c +@@ -561,7 +561,16 @@ dtls1_process_out_of_seq_message(SSL *s, + if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len) + goto err; + +- if (msg_hdr->seq <= s->d1->handshake_read_seq) ++ /* Try to find item in queue, to prevent duplicate entries */ ++ pq_64bit_init(&seq64); ++ pq_64bit_assign_word(&seq64, msg_hdr->seq); ++ item = pqueue_find(s->d1->buffered_messages, seq64); ++ pq_64bit_free(&seq64); ++ ++ /* Discard the message if sequence number was already there, is ++ * too far in the future or the fragment is already in the queue */ ++ if (msg_hdr->seq <= s->d1->handshake_read_seq || ++ msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL) + { + unsigned char devnull [256]; + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1379.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1379.patch new file mode 100644 index 0000000000..7067324350 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1379.patch @@ -0,0 +1,22 @@ +Index: openssl/ssl/d1_both.c +RCS File: /v/openssl/cvs/openssl/ssl/d1_both.c,v +rcsdiff -q -kk '-r1.14.2.6' '-r1.14.2.7' -u '/v/openssl/cvs/openssl/ssl/d1_both.c,v' 2>/dev/null +--- d1_both.c 2009/04/22 12:17:02 1.14.2.6 ++++ d1_both.c 2009/05/13 11:51:30 1.14.2.7 +@@ -519,6 +519,7 @@ + + if ( s->d1->handshake_read_seq == frag->msg_header.seq) + { ++ unsigned long frag_len = frag->msg_header.frag_len; + pqueue_pop(s->d1->buffered_messages); + + al=dtls1_preprocess_fragment(s,&frag->msg_header,max); +@@ -536,7 +537,7 @@ + if (al==0) + { + *ok = 1; +- return frag->msg_header.frag_len; ++ return frag_len; + } + + ssl3_send_alert(s,SSL3_AL_FATAL,al); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1387.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1387.patch new file mode 100644 index 0000000000..a9e5ea054f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-1387.patch @@ -0,0 +1,59 @@ +http://bugs.gentoo.org/270305 + +fix from upstream + +Index: ssl/d1_both.c +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/ssl/d1_both.c,v +retrieving revision 1.4.2.7 +retrieving revision 1.4.2.8 +diff -u -p -r1.4.2.7 -r1.4.2.8 +--- ssl/d1_both.c 17 Oct 2007 21:17:49 -0000 1.4.2.7 ++++ ssl/d1_both.c 2 Apr 2009 22:12:13 -0000 1.4.2.8 +@@ -575,30 +575,31 @@ dtls1_process_out_of_seq_message(SSL *s, + } + } + +- frag = dtls1_hm_fragment_new(frag_len); +- if ( frag == NULL) +- goto err; ++ if (frag_len) ++ { ++ frag = dtls1_hm_fragment_new(frag_len); ++ if ( frag == NULL) ++ goto err; + +- memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); ++ memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); + +- if (frag_len) +- { +- /* read the body of the fragment (header has already been read */ ++ /* read the body of the fragment (header has already been read) */ + i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE, + frag->fragment,frag_len,0); + if (i<=0 || (unsigned long)i!=frag_len) + goto err; +- } + +- pq_64bit_init(&seq64); +- pq_64bit_assign_word(&seq64, msg_hdr->seq); ++ pq_64bit_init(&seq64); ++ pq_64bit_assign_word(&seq64, msg_hdr->seq); + +- item = pitem_new(seq64, frag); +- pq_64bit_free(&seq64); +- if ( item == NULL) +- goto err; ++ item = pitem_new(seq64, frag); ++ pq_64bit_free(&seq64); ++ if ( item == NULL) ++ goto err; ++ ++ pqueue_insert(s->d1->buffered_messages, item); ++ } + +- pqueue_insert(s->d1->buffered_messages, item); + return DTLS1_HM_FRAGMENT_RETRY; + + err: diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch new file mode 100644 index 0000000000..b097869f3b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/280591 + +fix from upstream + +http://cvs.openssl.org/chngview?cn=18260 + +Index: openssl/crypto/x509/x509_vfy.c +RCS File: /v/openssl/cvs/openssl/crypto/x509/x509_vfy.c,v +rcsdiff -q -kk '-r1.77.2.8' '-r1.77.2.9' -u '/v/openssl/cvs/openssl/crypto/x509/x509_vfy.c,v' 2>/dev/null +--- crypto/x509/x509_vfy.c 2008/07/13 14:33:15 1.77.2.8 ++++ crypto/x509/x509_vfy.c 2009/06/15 14:52:38 1.77.2.9 +@@ -986,7 +986,11 @@ + while (n >= 0) + { + ctx->error_depth=n; +- if (!xs->valid) ++ ++ /* Skip signature check for self signed certificates. It ++ * doesn't add any security and just wastes time. ++ */ ++ if (!xs->valid && xs != xi) + { + if ((pkey=X509_get_pubkey(xi)) == NULL) + { +@@ -996,13 +1000,6 @@ + if (!ok) goto end; + } + else if (X509_verify(xs,pkey) <= 0) +- /* XXX For the final trusted self-signed cert, +- * this is a waste of time. That check should +- * optional so that e.g. 'openssl x509' can be +- * used to detect invalid self-signatures, but +- * we don't verify again and again in SSL +- * handshakes and the like once the cert has +- * been declared trusted. */ + { + ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE; + ctx->current_cert=xs; + +http://cvs.openssl.org/chngview?cn=18317 + +Index: openssl/crypto/evp/c_alld.c +RCS File: /v/openssl/cvs/openssl/crypto/evp/c_alld.c,v +rcsdiff -q -kk '-r1.7' '-r1.7.2.1' -u '/v/openssl/cvs/openssl/crypto/evp/c_alld.c,v' 2>/dev/null +--- crypto/evp/c_alld.c 2005/04/30 21:51:40 1.7 ++++ crypto/evp/c_alld.c 2009/07/08 08:33:26 1.7.2.1 +@@ -64,9 +64,6 @@ + + void OpenSSL_add_all_digests(void) + { +-#ifndef OPENSSL_NO_MD2 +- EVP_add_digest(EVP_md2()); +-#endif + #ifndef OPENSSL_NO_MD4 + EVP_add_digest(EVP_md4()); + #endif +Index: openssl/ssl/ssl_algs.c +RCS File: /v/openssl/cvs/openssl/ssl/ssl_algs.c,v +rcsdiff -q -kk '-r1.12.2.3' '-r1.12.2.4' -u '/v/openssl/cvs/openssl/ssl/ssl_algs.c,v' 2>/dev/null +--- ssl/ssl_algs.c 2007/04/23 23:50:21 1.12.2.3 ++++ ssl/ssl_algs.c 2009/07/08 08:33:27 1.12.2.4 +@@ -92,9 +92,6 @@ + EVP_add_cipher(EVP_seed_cbc()); + #endif + +-#ifndef OPENSSL_NO_MD2 +- EVP_add_digest(EVP_md2()); +-#endif + #ifndef OPENSSL_NO_MD5 + EVP_add_digest(EVP_md5()); + EVP_add_digest_alias(SN_md5,"ssl2-md5"); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch new file mode 100644 index 0000000000..d1bb7754f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch @@ -0,0 +1,67 @@ +fix from upstream for building with newer binutils + +http://bugs.gentoo.org/289130 + +Index: crypto/md5/asm/md5-x86_64.pl +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/md5/asm/md5-x86_64.pl,v +retrieving revision 1.2.2.1 +retrieving revision 1.2.2.2 +diff -u -p -r1.2.2.1 -r1.2.2.2 +--- openssl/crypto/md5/asm/md5-x86_64.pl 11 Nov 2007 13:34:06 -0000 1.2.2.1 ++++ openssl/crypto/md5/asm/md5-x86_64.pl 13 Nov 2009 14:14:46 -0000 1.2.2.2 +@@ -19,6 +19,7 @@ my $code; + sub round1_step + { + my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_; ++ $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal + $code .= " mov 0*4(%rsi), %r10d /* (NEXT STEP) X[0] */\n" if ($pos == -1); + $code .= " mov %edx, %r11d /* (NEXT STEP) z' = %edx */\n" if ($pos == -1); + $code .= </dev/null +--- d1_clnt.c 2009/04/14 15:20:47 1.3.2.15 ++++ d1_clnt.c 2009/04/19 18:08:11 1.3.2.16 +@@ -130,7 +130,7 @@ + + static SSL_METHOD *dtls1_get_client_method(int ver) + { +- if (ver == DTLS1_VERSION) ++ if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER) + return(DTLSv1_client_method()); + else + return(NULL); +@@ -181,7 +181,8 @@ + s->server=0; + if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1); + +- if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00)) ++ if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) && ++ (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00)) + { + SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR); + ret = -1; +Index: openssl/ssl/d1_lib.c +RCS File: /v/openssl/cvs/openssl/ssl/d1_lib.c,v +rcsdiff -q -kk '-r1.1.2.7' '-r1.1.2.8' -u '/v/openssl/cvs/openssl/ssl/d1_lib.c,v' 2>/dev/null +--- d1_lib.c 2009/04/02 22:34:59 1.1.2.7 ++++ d1_lib.c 2009/04/19 18:08:11 1.1.2.8 +@@ -198,7 +198,10 @@ + void dtls1_clear(SSL *s) + { + ssl3_clear(s); +- s->version=DTLS1_VERSION; ++ if (s->options & SSL_OP_CISCO_ANYCONNECT) ++ s->version=DTLS1_BAD_VER; ++ else ++ s->version=DTLS1_VERSION; + } + + /* +Index: openssl/ssl/d1_pkt.c +RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v +rcsdiff -q -kk '-r1.4.2.15' '-r1.4.2.16' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null +--- d1_pkt.c 2009/04/02 22:34:59 1.4.2.15 ++++ d1_pkt.c 2009/04/19 18:08:12 1.4.2.16 +@@ -1024,15 +1024,17 @@ + if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC) + { + struct ccs_header_st ccs_hdr; ++ int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH; + + dtls1_get_ccs_header(rr->data, &ccs_hdr); + + /* 'Change Cipher Spec' is just a single byte, so we know + * exactly what the record payload has to look like */ + /* XDTLS: check that epoch is consistent */ +- if ( (s->client_version == DTLS1_BAD_VER && rr->length != 3) || +- (s->client_version != DTLS1_BAD_VER && rr->length != DTLS1_CCS_HEADER_LENGTH) || +- (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS)) ++ if (s->client_version == DTLS1_BAD_VER || s->version == DTLS1_BAD_VER) ++ ccs_hdr_len = 3; ++ ++ if ((rr->length != ccs_hdr_len) || (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS)) + { + i=SSL_AD_ILLEGAL_PARAMETER; + SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC); +@@ -1358,7 +1360,7 @@ + #if 0 + /* 'create_empty_fragment' is true only when this function calls itself */ + if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done +- && SSL_version(s) != DTLS1_VERSION) ++ && SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER) + { + /* countermeasure against known-IV weakness in CBC ciphersuites + * (see http://www.openssl.org/~bodo/tls-cbc.txt) +Index: openssl/ssl/s3_clnt.c +RCS File: /v/openssl/cvs/openssl/ssl/s3_clnt.c,v +rcsdiff -q -kk '-r1.88.2.21' '-r1.88.2.22' -u '/v/openssl/cvs/openssl/ssl/s3_clnt.c,v' 2>/dev/null +--- s3_clnt.c 2009/02/14 21:50:14 1.88.2.21 ++++ s3_clnt.c 2009/04/19 18:08:12 1.88.2.22 +@@ -708,7 +708,7 @@ + + if (!ok) return((int)n); + +- if ( SSL_version(s) == DTLS1_VERSION) ++ if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) + { + if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST) + { +Index: openssl/ssl/ssl.h +RCS File: /v/openssl/cvs/openssl/ssl/ssl.h,v +rcsdiff -q -kk '-r1.161.2.21' '-r1.161.2.22' -u '/v/openssl/cvs/openssl/ssl/ssl.h,v' 2>/dev/null +--- ssl.h 2008/08/13 19:44:44 1.161.2.21 ++++ ssl.h 2009/04/19 18:08:12 1.161.2.22 +@@ -510,6 +510,8 @@ + #define SSL_OP_COOKIE_EXCHANGE 0x00002000L + /* Don't use RFC4507 ticket extension */ + #define SSL_OP_NO_TICKET 0x00004000L ++/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client) */ ++#define SSL_OP_CISCO_ANYCONNECT 0x00008000L + + /* As server, disallow session resumption on renegotiation */ + #define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000L +Index: openssl/ssl/ssl_lib.c +RCS File: /v/openssl/cvs/openssl/ssl/ssl_lib.c,v +rcsdiff -q -kk '-r1.133.2.16' '-r1.133.2.17' -u '/v/openssl/cvs/openssl/ssl/ssl_lib.c,v' 2>/dev/null +--- ssl_lib.c 2009/02/23 16:02:47 1.133.2.16 ++++ ssl_lib.c 2009/04/19 18:08:12 1.133.2.17 +@@ -995,7 +995,8 @@ + s->max_cert_list=larg; + return(l); + case SSL_CTRL_SET_MTU: +- if (SSL_version(s) == DTLS1_VERSION) ++ if (SSL_version(s) == DTLS1_VERSION || ++ SSL_version(s) == DTLS1_BAD_VER) + { + s->d1->mtu = larg; + return larg; +Index: openssl/ssl/ssl_sess.c +RCS File: /v/openssl/cvs/openssl/ssl/ssl_sess.c,v +rcsdiff -q -kk '-r1.51.2.9' '-r1.51.2.10' -u '/v/openssl/cvs/openssl/ssl/ssl_sess.c,v' 2>/dev/null +--- ssl_sess.c 2008/06/04 18:35:27 1.51.2.9 ++++ ssl_sess.c 2009/04/19 18:08:12 1.51.2.10 +@@ -211,6 +211,11 @@ + ss->ssl_version=TLS1_VERSION; + ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH; + } ++ else if (s->version == DTLS1_BAD_VER) ++ { ++ ss->ssl_version=DTLS1_BAD_VER; ++ ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH; ++ } + else if (s->version == DTLS1_VERSION) + { + ss->ssl_version=DTLS1_VERSION; +Index: openssl/ssl/t1_enc.c +RCS File: /v/openssl/cvs/openssl/ssl/t1_enc.c,v +rcsdiff -q -kk '-r1.35.2.8' '-r1.35.2.9' -u '/v/openssl/cvs/openssl/ssl/t1_enc.c,v' 2>/dev/null +--- t1_enc.c 2009/01/05 14:43:07 1.35.2.8 ++++ t1_enc.c 2009/04/19 18:08:12 1.35.2.9 +@@ -765,10 +765,10 @@ + HMAC_CTX_init(&hmac); + HMAC_Init_ex(&hmac,mac_sec,EVP_MD_size(hash),hash,NULL); + +- if (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER) ++ if (ssl->version == DTLS1_BAD_VER || ++ (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER)) + { + unsigned char dtlsseq[8],*p=dtlsseq; +- + s2n(send?ssl->d1->w_epoch:ssl->d1->r_epoch, p); + memcpy (p,&seq[2],6); + +@@ -793,7 +793,7 @@ + {unsigned int z; for (z=0; zlength; z++) printf("%02X ",buf[z]); printf("\n"); } + #endif + +- if ( SSL_version(ssl) != DTLS1_VERSION) ++ if ( SSL_version(ssl) != DTLS1_VERSION && SSL_version(ssl) != DTLS1_BAD_VER) + { + for (i=7; i>=0; i--) + { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch new file mode 100644 index 0000000000..9fa79b9a65 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/289130 + +Ripped from Fedora + +--- openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl.binutils 2009-11-12 15:17:29.000000000 +0100 ++++ openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl 2009-11-12 17:24:18.000000000 +0100 +@@ -150,7 +150,7 @@ ___ + sub BODY_20_39 { + my ($i,$a,$b,$c,$d,$e,$f)=@_; + my $j=$i+1; +-my $K=($i<40)?0x6ed9eba1:0xca62c1d6; ++my $K=($i<40)?0x6ed9eba1:-0x359d3e2a; + $code.=<<___ if ($i<79); + lea $K($xi,$e),$f + mov `4*($j%16)`(%rsp),$xi +@@ -187,7 +187,7 @@ sub BODY_40_59 { + my ($i,$a,$b,$c,$d,$e,$f)=@_; + my $j=$i+1; + $code.=<<___; +- lea 0x8f1bbcdc($xi,$e),$f ++ lea -0x70e44324($xi,$e),$f + mov `4*($j%16)`(%rsp),$xi + mov $b,$t0 + mov $b,$t1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8m-cfb.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8m-cfb.patch new file mode 100644 index 0000000000..9835b93c31 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8m-cfb.patch @@ -0,0 +1,15 @@ +--- crypto/evp/evp_locl.h 2010/02/15 19:40:45 1.10.2.7 ++++ crypto/evp/evp_locl.h 2010/02/26 14:41:38 1.10.2.8 +@@ -127,9 +127,9 @@ + #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \ + iv_len, cbits, flags, init_key, cleanup, \ + set_asn1, get_asn1, ctrl) \ +-BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \ +- (cbits + 7)/8, key_len, iv_len, \ +- flags, init_key, cleanup, set_asn1, get_asn1, ctrl) ++BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \ ++ key_len, iv_len, flags, init_key, cleanup, set_asn1, \ ++ get_asn1, ctrl) + + #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \ + iv_len, cbits, flags, init_key, cleanup, \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8r-verify-retcode.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8r-verify-retcode.patch new file mode 100644 index 0000000000..b5b345b51e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-0.9.8r-verify-retcode.patch @@ -0,0 +1,39 @@ +diff --git a/apps/verify.c b/apps/verify.c +index 20cc9e3..19dfb85 100644 +--- a/apps/verify.c ++++ b/apps/verify.c +@@ -90,6 +90,7 @@ int MAIN(int argc, char **argv) + #ifndef OPENSSL_NO_ENGINE + char *engine=NULL; + #endif ++ int anyfailed = 0; + + cert_ctx=X509_STORE_new(); + if (cert_ctx == NULL) goto end; +@@ -208,11 +209,12 @@ int MAIN(int argc, char **argv) + } + } + +- if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, purpose, e); ++ if (argc < 1) ++ anyfailed = check(cert_ctx, NULL, untrusted, trusted, purpose, e); + else + for (i=0; i) + s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/; + s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/; + s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/; ++ s/^WINDRES=\s*/WINDRES= \$\(CROSS_COMPILE\)/; + s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc"; + } + else { + s/^CC=.*$/CC= $cc/; + s/^AR=\s*ar/AR= $ar/; + s/^RANLIB=.*/RANLIB= $ranlib/; ++ s/^WINDRES=.*/WINDRES= $windres/; + s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc"; + } + s/^CFLAG=.*$/CFLAG= $cflags/; +Index: Makefile.org +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.org,v +retrieving revision 1.295.2.10 +diff -u -p -r1.295.2.10 Makefile.org +--- Makefile.org 27 Jan 2010 16:06:58 -0000 1.295.2.10 ++++ Makefile.org 4 Jul 2011 23:13:08 -0000 +@@ -66,6 +66,7 @@ EXE_EXT= + ARFLAGS= + AR=ar $(ARFLAGS) r + RANLIB= ranlib ++WINDRES= windres + NM= nm + PERL= perl + TAR= tar +@@ -180,6 +181,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESS + CC='$(CC)' CFLAG='$(CFLAG)' \ + AS='$(CC)' ASFLAG='$(CFLAG) -c' \ + AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ ++ WINDRES='$(WINDRES)' \ + CROSS_COMPILE='$(CROSS_COMPILE)' \ + PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \ + SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ +Index: Makefile.shared +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.shared,v +retrieving revision 1.72.2.4 +diff -u -p -r1.72.2.4 Makefile.shared +--- Makefile.shared 21 Aug 2010 11:36:49 -0000 1.72.2.4 ++++ Makefile.shared 4 Jul 2011 23:13:52 -0000 +@@ -293,7 +293,7 @@ link_a.cygwin: + fi; \ + dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ + $(PERL) util/mkrc.pl $$dll_name | \ +- $(CROSS_COMPILE)windres -o rc.o; \ ++ $(WINDRES) -o rc.o; \ + extras="$$extras rc.o"; \ + ALLSYMSFLAGS='-Wl,--whole-archive'; \ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch new file mode 100644 index 0000000000..6c0218256d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch @@ -0,0 +1,32 @@ +depend on other pc files rather than encoding library info directly in +every pkg-config file + +--- a/Makefile.org ++++ b/Makefile.org +@@ -335,11 +335,11 @@ libssl.pc: Makefile + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ + echo 'includedir=$${prefix}/include'; \ + echo ''; \ +- echo 'Name: OpenSSL'; \ ++ echo 'Name: OpenSSL-libssl'; \ + echo 'Description: Secure Sockets Layer and cryptography libraries'; \ + echo 'Version: '$(VERSION); \ +- echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ ++ echo 'Requires.private: libcrypto'; \ ++ echo 'Libs: -L$${libdir} -lssl'; \ + echo 'Libs.private: $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc + +@@ -352,10 +353,7 @@ openssl.pc: Makefile + echo 'Name: OpenSSL'; \ + echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ + echo 'Version: '$(VERSION); \ +- echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ +- echo 'Libs.private: $(EX_LIBS)'; \ +- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc ++ echo 'Requires: libssl libcrypto' ) > openssl.pc + + Makefile: Makefile.org Configure config + @echo "Makefile is older than Makefile.org, Configure or config." diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-ipv6.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-ipv6.patch new file mode 100644 index 0000000000..4955c65d31 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-ipv6.patch @@ -0,0 +1,678 @@ +http://rt.openssl.org/Ticket/Display.html?id=2051 +user/pass: guest/guest + +Index: apps/s_apps.h +=================================================================== +RCS file: /v/openssl/cvs/openssl/apps/s_apps.h,v +retrieving revision 1.21.2.1 +diff -u -r1.21.2.1 s_apps.h +--- apps/s_apps.h 4 Sep 2009 17:42:04 -0000 1.21.2.1 ++++ apps/s_apps.h 28 Dec 2011 00:28:14 -0000 +@@ -148,7 +148,7 @@ + #define PORT_STR "4433" + #define PROTOCOL "tcp" + +-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context); ++int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6); + #ifdef HEADER_X509_H + int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); + #endif +@@ -156,7 +156,7 @@ + int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file); + int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key); + #endif +-int init_client(int *sock, char *server, int port, int type); ++int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6); + int should_retry(int i); + int extract_port(char *str, short *port_ptr); + int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); +Index: apps/s_cb.c +=================================================================== +RCS file: /v/openssl/cvs/openssl/apps/s_cb.c,v +retrieving revision 1.27.2.8.2.2 +diff -u -r1.27.2.8.2.2 s_cb.c +--- apps/s_cb.c 13 Nov 2011 13:13:13 -0000 1.27.2.8.2.2 ++++ apps/s_cb.c 28 Dec 2011 00:28:14 -0000 +Index: apps/s_client.c +=================================================================== +RCS file: /v/openssl/cvs/openssl/apps/s_client.c,v +retrieving revision 1.123.2.6.2.10 +diff -u -r1.123.2.6.2.10 s_client.c +--- apps/s_client.c 14 Dec 2011 22:18:02 -0000 1.123.2.6.2.10 ++++ apps/s_client.c 28 Dec 2011 00:28:14 -0000 +@@ -285,6 +285,9 @@ + { + BIO_printf(bio_err,"usage: s_client args\n"); + BIO_printf(bio_err,"\n"); ++#if OPENSSL_USE_IPV6 ++ BIO_printf(bio_err," -6 - use IPv6\n"); ++#endif + BIO_printf(bio_err," -host host - use -connect instead\n"); + BIO_printf(bio_err," -port port - use -connect instead\n"); + BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR); +@@ -564,6 +567,7 @@ + int sbuf_len,sbuf_off; + fd_set readfds,writefds; + short port=PORT; ++ int use_ipv4, use_ipv6; + int full_log=1; + char *host=SSL_HOST_NAME; + char *cert_file=NULL,*key_file=NULL; +@@ -609,7 +613,11 @@ + #endif + char *sess_in = NULL; + char *sess_out = NULL; +- struct sockaddr peer; ++#if OPENSSL_USE_IPV6 ++ struct sockaddr_storage peer; ++#else ++ struct sockaddr_in peer; ++#endif + int peerlen = sizeof(peer); + int enable_timeouts = 0 ; + long socket_mtu = 0; +@@ -630,6 +638,8 @@ + meth=SSLv2_client_method(); + #endif + ++ use_ipv4 = 1; ++ use_ipv6 = 0; + apps_startup(); + c_Pause=0; + c_quiet=0; +@@ -951,6 +961,13 @@ + jpake_secret = *++argv; + } + #endif ++#if OPENSSL_USE_IPV6 ++ else if (strcmp(*argv,"-6") == 0) ++ { ++ use_ipv4 = 0; ++ use_ipv6 = 1; ++ } ++#endif + else if (strcmp(*argv,"-use_srtp") == 0) + { + if (--argc < 1) goto bad; +@@ -967,7 +984,7 @@ + keymatexportlen=atoi(*(++argv)); + if (keymatexportlen == 0) goto bad; + } +- else ++ else + { + BIO_printf(bio_err,"unknown option %s\n",*argv); + badop=1; +@@ -1259,7 +1276,7 @@ + + re_start: + +- if (init_client(&s,host,port,socket_type) == 0) ++ if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0) + { + BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error()); + SHUTDOWN(s); +@@ -1285,7 +1302,7 @@ + { + + sbio=BIO_new_dgram(s,BIO_NOCLOSE); +- if (getsockname(s, &peer, (void *)&peerlen) < 0) ++ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0) + { + BIO_printf(bio_err, "getsockname:errno=%d\n", + get_last_socket_error()); +@@ -2036,7 +2061,7 @@ + BIO_printf(bio,"Expansion: %s\n", + expansion ? SSL_COMP_get_name(expansion) : "NONE"); + #endif +- ++ + #ifdef SSL_DEBUG + { + /* Print out local port of connection: useful for debugging */ +=================================================================== +RCS file: /v/openssl/cvs/openssl/apps/s_server.c,v +retrieving revision 1.136.2.15.2.13 +diff -u -r1.136.2.15.2.13 s_server.c +--- apps/s_server.c 27 Dec 2011 14:23:22 -0000 1.136.2.15.2.13 ++++ apps/s_server.c 28 Dec 2011 00:28:14 -0000 +@@ -558,6 +558,10 @@ + # endif + BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list"); + #endif ++ BIO_printf(bio_err," -4 - use IPv4 only\n"); ++#if OPENSSL_USE_IPV6 ++ BIO_printf(bio_err," -6 - use IPv6 only\n"); ++#endif + BIO_printf(bio_err," -keymatexport label - Export keying material using label\n"); + BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n"); + } +@@ -943,6 +947,7 @@ + int state=0; + const SSL_METHOD *meth=NULL; + int socket_type=SOCK_STREAM; ++ int use_ipv4, use_ipv6; + ENGINE *e=NULL; + char *inrand=NULL; + int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM; +@@ -981,6 +986,12 @@ + /* #error no SSL version enabled */ + #endif + ++ use_ipv4 = 1; ++#if OPENSSL_USE_IPV6 ++ use_ipv6 = 1; ++#else ++ use_ipv6 = 0; ++#endif + local_argc=argc; + local_argv=argv; + +@@ -1329,6 +1340,18 @@ + jpake_secret = *(++argv); + } + #endif ++ else if (strcmp(*argv,"-4") == 0) ++ { ++ use_ipv4 = 1; ++ use_ipv6 = 0; ++ } ++#if OPENSSL_USE_IPV6 ++ else if (strcmp(*argv,"-6") == 0) ++ { ++ use_ipv4 = 0; ++ use_ipv6 = 1; ++ } ++#endif + else if (strcmp(*argv,"-use_srtp") == 0) + { + if (--argc < 1) goto bad; +@@ -1884,9 +1907,9 @@ + BIO_printf(bio_s_out,"ACCEPT\n"); + (void)BIO_flush(bio_s_out); + if (www) +- do_server(port,socket_type,&accept_socket,www_body, context); ++ do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6); + else +- do_server(port,socket_type,&accept_socket,sv_body, context); ++ do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6); + print_stats(bio_s_out,ctx); + ret=0; + end: +Index: apps/s_socket.c +=================================================================== +RCS file: /v/openssl/cvs/openssl/apps/s_socket.c,v +retrieving revision 1.43.2.3.2.2 +diff -u -r1.43.2.3.2.2 s_socket.c +--- apps/s_socket.c 2 Dec 2011 14:39:40 -0000 1.43.2.3.2.2 ++++ apps/s_socket.c 28 Dec 2011 00:28:14 -0000 +@@ -97,16 +97,16 @@ + #include "netdb.h" + #endif + +-static struct hostent *GetHostByName(char *name); ++static struct hostent *GetHostByName(char *name, int domain); + #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) + static void ssl_sock_cleanup(void); + #endif + static int ssl_sock_init(void); +-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type); +-static int init_server(int *sock, int port, int type); +-static int init_server_long(int *sock, int port,char *ip, int type); ++static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain); ++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6); ++static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6); + static int do_accept(int acc_sock, int *sock, char **host); +-static int host_ip(char *str, unsigned char ip[4]); ++static int host_ip(char *str, unsigned char *ip, int domain); + + #ifdef OPENSSL_SYS_WIN16 + #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ +@@ -234,38 +234,76 @@ + return(1); + } + +-int init_client(int *sock, char *host, int port, int type) ++int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6) + { ++#if OPENSSL_USE_IPV6 ++ unsigned char ip[16]; ++#else + unsigned char ip[4]; ++#endif + +- memset(ip, '\0', sizeof ip); +- if (!host_ip(host,&(ip[0]))) ++ if (!use_ipv4 && !use_ipv6) + return 0; +- return init_client_ip(sock,ip,port,type); +- } +- +-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type) +- { +- unsigned long addr; ++#if OPENSSL_USE_IPV6 ++ /* we are fine here */ ++#else ++ if (use_ipv6) ++ return 0; ++#endif ++ if (use_ipv4) ++ if (host_ip(host,ip,AF_INET)) ++ return(init_client_ip(sock,ip,port,type,AF_INET)); ++#if OPENSSL_USE_IPV6 ++ if (use_ipv6) ++ if (host_ip(host,ip,AF_INET6)) ++ return(init_client_ip(sock,ip,port,type,AF_INET6)); ++#endif ++ return 0; ++ } ++ ++static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain) ++ { ++#if OPENSSL_USE_IPV6 ++ struct sockaddr_storage them; ++ struct sockaddr_in *them_in = (struct sockaddr_in *)&them; ++ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them; ++#else + struct sockaddr_in them; ++ struct sockaddr_in *them_in = &them; ++#endif ++ socklen_t addr_len; + int s,i; + + if (!ssl_sock_init()) return(0); + + memset((char *)&them,0,sizeof(them)); +- them.sin_family=AF_INET; +- them.sin_port=htons((unsigned short)port); +- addr=(unsigned long) +- ((unsigned long)ip[0]<<24L)| +- ((unsigned long)ip[1]<<16L)| +- ((unsigned long)ip[2]<< 8L)| +- ((unsigned long)ip[3]); +- them.sin_addr.s_addr=htonl(addr); ++ if (domain == AF_INET) ++ { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in); ++ them_in->sin_family=AF_INET; ++ them_in->sin_port=htons((unsigned short)port); ++#ifndef BIT_FIELD_LIMITS ++ memcpy(&them_in->sin_addr.s_addr, ip, 4); ++#else ++ memcpy(&them_in->sin_addr, ip, 4); ++#endif ++ } ++ else ++#if OPENSSL_USE_IPV6 ++ { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in6); ++ them_in6->sin6_family=AF_INET6; ++ them_in6->sin6_port=htons((unsigned short)port); ++ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr)); ++ } ++#else ++ return(0); ++#endif + + if (type == SOCK_STREAM) +- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL); ++ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL); + else /* ( type == SOCK_DGRAM) */ +- s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP); ++ s=socket(domain,SOCK_DGRAM,IPPROTO_UDP); + + if (s == INVALID_SOCKET) { perror("socket"); return(0); } + +@@ -277,29 +315,27 @@ + if (i < 0) { perror("keepalive"); return(0); } + } + #endif +- +- if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1) ++ if (connect(s,(struct sockaddr *)&them,addr_len) == -1) + { closesocket(s); perror("connect"); return(0); } + *sock=s; + return(1); + } + +-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context) ++int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6) + { + int sock; + char *name = NULL; + int accept_socket = 0; + int i; + +- if (!init_server(&accept_socket,port,type)) return(0); +- ++ if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0); + if (ret != NULL) + { + *ret=accept_socket; + /* return(1);*/ + } +- for (;;) +- { ++ for (;;) ++ { + if (type==SOCK_STREAM) + { + if (do_accept(accept_socket,&sock,&name) == 0) +@@ -322,41 +358,88 @@ + } + } + +-static int init_server_long(int *sock, int port, char *ip, int type) ++static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6) + { + int ret=0; ++ int domain; ++#if OPENSSL_USE_IPV6 ++ struct sockaddr_storage server; ++ struct sockaddr_in *server_in = (struct sockaddr_in *)&server; ++ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server; ++#else + struct sockaddr_in server; ++ struct sockaddr_in *server_in = &server; ++#endif ++ socklen_t addr_len; + int s= -1; + ++ if (!use_ipv4 && !use_ipv6) ++ goto err; ++#if OPENSSL_USE_IPV6 ++ /* we are fine here */ ++#else ++ if (use_ipv6) ++ goto err; ++#endif + if (!ssl_sock_init()) return(0); + +- memset((char *)&server,0,sizeof(server)); +- server.sin_family=AF_INET; +- server.sin_port=htons((unsigned short)port); +- if (ip == NULL) +- server.sin_addr.s_addr=INADDR_ANY; +- else +-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ +-#ifndef BIT_FIELD_LIMITS +- memcpy(&server.sin_addr.s_addr,ip,4); ++#if OPENSSL_USE_IPV6 ++ domain = use_ipv6 ? AF_INET6 : AF_INET; + #else +- memcpy(&server.sin_addr,ip,4); ++ domain = AF_INET; + #endif +- +- if (type == SOCK_STREAM) +- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL); +- else /* type == SOCK_DGRAM */ +- s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP); ++ if (type == SOCK_STREAM) ++ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL); ++ else /* type == SOCK_DGRAM */ ++ s=socket(domain, SOCK_DGRAM,IPPROTO_UDP); + + if (s == INVALID_SOCKET) goto err; + #if defined SOL_SOCKET && defined SO_REUSEADDR ++ { ++ int j = 1; ++ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, ++ (void *) &j, sizeof j); ++ } ++#endif ++#if OPENSSL_USE_IPV6 ++ if ((use_ipv4 == 0) && (use_ipv6 == 1)) + { +- int j = 1; +- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, +- (void *) &j, sizeof j); ++ const int on = 1; ++ ++ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, ++ (const void *) &on, sizeof(int)); + } + #endif +- if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1) ++ if (domain == AF_INET) ++ { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in); ++ memset(server_in, 0, sizeof(struct sockaddr_in)); ++ server_in->sin_family=AF_INET; ++ server_in->sin_port = htons((unsigned short)port); ++ if (ip == NULL) ++ server_in->sin_addr.s_addr = htonl(INADDR_ANY); ++ else ++/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ ++#ifndef BIT_FIELD_LIMITS ++ memcpy(&server_in->sin_addr.s_addr, ip, 4); ++#else ++ memcpy(&server_in->sin_addr, ip, 4); ++#endif ++ } ++#if OPENSSL_USE_IPV6 ++ else ++ { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in6); ++ memset(server_in6, 0, sizeof(struct sockaddr_in6)); ++ server_in6->sin6_family = AF_INET6; ++ server_in6->sin6_port = htons((unsigned short)port); ++ if (ip == NULL) ++ server_in6->sin6_addr = in6addr_any; ++ else ++ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr)); ++ } ++#endif ++ if (bind(s, (struct sockaddr *)&server, addr_len) == -1) + { + #ifndef OPENSSL_SYS_WINDOWS + perror("bind"); +@@ -375,16 +458,23 @@ + return(ret); + } + +-static int init_server(int *sock, int port, int type) ++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6) + { +- return(init_server_long(sock, port, NULL, type)); ++ return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6)); + } + + static int do_accept(int acc_sock, int *sock, char **host) + { + int ret; + struct hostent *h1,*h2; +- static struct sockaddr_in from; ++#if OPENSSL_USE_IPV6 ++ struct sockaddr_storage from; ++ struct sockaddr_in *from_in = (struct sockaddr_in *)&from; ++ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from; ++#else ++ struct sockaddr_in from; ++ struct sockaddr_in *from_in = &from; ++#endif + int len; + /* struct linger ling; */ + +@@ -431,13 +521,23 @@ + */ + + if (host == NULL) goto end; ++#if OPENSSL_USE_IPV6 ++ if (from.ss_family == AF_INET) ++#else ++ if (from.sin_family == AF_INET) ++#endif + #ifndef BIT_FIELD_LIMITS +- /* I should use WSAAsyncGetHostByName() under windows */ +- h1=gethostbyaddr((char *)&from.sin_addr.s_addr, +- sizeof(from.sin_addr.s_addr),AF_INET); ++ /* I should use WSAAsyncGetHostByName() under windows */ ++ h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr, ++ sizeof(from_in->sin_addr.s_addr), AF_INET); + #else +- h1=gethostbyaddr((char *)&from.sin_addr, +- sizeof(struct in_addr),AF_INET); ++ h1=gethostbyaddr((char *)&from_in->sin_addr, ++ sizeof(struct in_addr), AF_INET); ++#endif ++#if OPENSSL_USE_IPV6 ++ else ++ h1=gethostbyaddr((char *)&from_in6->sin6_addr, ++ sizeof(struct in6_addr), AF_INET6); + #endif + if (h1 == NULL) + { +@@ -454,15 +554,23 @@ + } + BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1); + +- h2=GetHostByName(*host); ++#if OPENSSL_USE_IPV6 ++ h2=GetHostByName(*host, from.ss_family); ++#else ++ h2=GetHostByName(*host, from.sin_family); ++#endif + if (h2 == NULL) + { + BIO_printf(bio_err,"gethostbyname failure\n"); + return(0); + } +- if (h2->h_addrtype != AF_INET) ++#if OPENSSL_USE_IPV6 ++ if (h2->h_addrtype != from.ss_family) ++#else ++ if (h2->h_addrtype != from.sin_family) ++#endif + { +- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n"); ++ BIO_printf(bio_err,"gethostbyname addr address is not correct\n"); + return(0); + } + } +@@ -477,7 +585,7 @@ + char *h,*p; + + h=str; +- p=strchr(str,':'); ++ p=strrchr(str,':'); + if (p == NULL) + { + BIO_printf(bio_err,"no port defined\n"); +@@ -485,7 +593,7 @@ + } + *(p++)='\0'; + +- if ((ip != NULL) && !host_ip(str,ip)) ++ if ((ip != NULL) && !host_ip(str,ip,AF_INET)) + goto err; + if (host_ptr != NULL) *host_ptr=h; + +@@ -496,48 +604,58 @@ + return(0); + } + +-static int host_ip(char *str, unsigned char ip[4]) ++static int host_ip(char *str, unsigned char *ip, int domain) + { +- unsigned int in[4]; ++ unsigned int in[4]; ++ unsigned long l; + int i; + +- if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4) ++ if ((domain == AF_INET) && ++ (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)) + { ++ + for (i=0; i<4; i++) + if (in[i] > 255) + { + BIO_printf(bio_err,"invalid IP address\n"); + goto err; + } +- ip[0]=in[0]; +- ip[1]=in[1]; +- ip[2]=in[2]; +- ip[3]=in[3]; +- } ++ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]); ++ memcpy(ip, &l, 4); ++ return 1; ++ } ++#if OPENSSL_USE_IPV6 ++ else if ((domain == AF_INET6) && ++ (inet_pton(AF_INET6, str, ip) == 1)) ++ return 1; ++#endif + else + { /* do a gethostbyname */ + struct hostent *he; + + if (!ssl_sock_init()) return(0); + +- he=GetHostByName(str); ++ he=GetHostByName(str,domain); + if (he == NULL) + { + BIO_printf(bio_err,"gethostbyname failure\n"); + goto err; + } + /* cast to short because of win16 winsock definition */ +- if ((short)he->h_addrtype != AF_INET) ++ if ((short)he->h_addrtype != domain) + { +- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n"); ++ BIO_printf(bio_err,"gethostbyname addr family is not correct\n"); + return(0); + } +- ip[0]=he->h_addr_list[0][0]; +- ip[1]=he->h_addr_list[0][1]; +- ip[2]=he->h_addr_list[0][2]; +- ip[3]=he->h_addr_list[0][3]; ++ if (domain == AF_INET) ++ memset(ip, 0, 4); ++#if OPENSSL_USE_IPV6 ++ else ++ memset(ip, 0, 16); ++#endif ++ memcpy(ip, he->h_addr_list[0], he->h_length); ++ return 1; + } +- return(1); + err: + return(0); + } +@@ -574,7 +692,7 @@ + static unsigned long ghbn_hits=0L; + static unsigned long ghbn_miss=0L; + +-static struct hostent *GetHostByName(char *name) ++static struct hostent *GetHostByName(char *name, int domain) + { + struct hostent *ret; + int i,lowi=0; +@@ -589,14 +707,20 @@ + } + if (ghbn_cache[i].order > 0) + { +- if (strncmp(name,ghbn_cache[i].name,128) == 0) ++ if ((strncmp(name,ghbn_cache[i].name,128) == 0) && ++ (ghbn_cache[i].ent.h_addrtype == domain)) + break; + } + } + if (i == GHBN_NUM) /* no hit*/ + { + ghbn_miss++; +- ret=gethostbyname(name); ++ if (domain == AF_INET) ++ ret=gethostbyname(name); ++#if OPENSSL_USE_IPV6 ++ else ++ ret=gethostbyname2(name, AF_INET6); ++#endif + if (ret == NULL) return(NULL); + /* else add to cache */ + if(strlen(name) < sizeof ghbn_cache[0].name) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch new file mode 100644 index 0000000000..7c804b5432 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch @@ -0,0 +1,337 @@ +http://rt.openssl.org/Ticket/Display.html?id=2084 + +--- a/Makefile.org ++++ b/Makefile.org +@@ -247,17 +247,17 @@ + build_libs: build_crypto build_ssl build_engines + + build_crypto: +- @dir=crypto; target=all; $(BUILD_ONE_CMD) ++ +@dir=crypto; target=all; $(BUILD_ONE_CMD) +-build_ssl: ++build_ssl: build_crypto +- @dir=ssl; target=all; $(BUILD_ONE_CMD) ++ +@dir=ssl; target=all; $(BUILD_ONE_CMD) +-build_engines: ++build_engines: build_crypto +- @dir=engines; target=all; $(BUILD_ONE_CMD) ++ +@dir=engines; target=all; $(BUILD_ONE_CMD) +-build_apps: ++build_apps: build_libs +- @dir=apps; target=all; $(BUILD_ONE_CMD) ++ +@dir=apps; target=all; $(BUILD_ONE_CMD) +-build_tests: ++build_tests: build_libs +- @dir=test; target=all; $(BUILD_ONE_CMD) ++ +@dir=test; target=all; $(BUILD_ONE_CMD) +-build_tools: ++build_tools: build_libs +- @dir=tools; target=all; $(BUILD_ONE_CMD) ++ +@dir=tools; target=all; $(BUILD_ONE_CMD) + + all_testapps: build_libs build_testapps + build_testapps: +@@ -497,9 +497,9 @@ + dist_pem_h: + (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) + +-install: all install_docs install_sw ++install: install_docs install_sw + +-install_sw: ++install_dirs: + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ +@@ -508,6 +508,13 @@ + $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/private ++ @$(PERL) $(TOP)/util/mkdir-p.pl \ ++ $(INSTALL_PREFIX)$(MANDIR)/man1 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man3 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man5 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man7 ++ ++install_sw: install_dirs + @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ +@@ -511,7 +511,7 @@ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; +- @set -e; target=install; $(RECURSIVE_BUILD_CMD) ++ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) + @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ + do \ + if [ -f "$$i" ]; then \ +@@ -593,12 +600,7 @@ + done; \ + done + +-install_docs: +- @$(PERL) $(TOP)/util/mkdir-p.pl \ +- $(INSTALL_PREFIX)$(MANDIR)/man1 \ +- $(INSTALL_PREFIX)$(MANDIR)/man3 \ +- $(INSTALL_PREFIX)$(MANDIR)/man5 \ +- $(INSTALL_PREFIX)$(MANDIR)/man7 ++install_docs: install_dirs + @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ + here="`pwd`"; \ + filecase=; \ +--- a/Makefile.shared ++++ b/Makefile.shared +@@ -105,6 +105,7 @@ LINK_SO= \ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ ++ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ + LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ +@@ -122,6 +124,7 @@ SYMLINK_SO= \ + done; \ + fi; \ + if [ -n "$$SHLIB_SOVER" ]; then \ ++ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ + ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ + ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ + fi; \ +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -85,11 +85,11 @@ + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi + + subdirs: +- @target=all; $(RECURSIVE_MAKE) ++ +@target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO +- @target=files; $(RECURSIVE_MAKE) ++ +@target=files; $(RECURSIVE_MAKE) + + links: + @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) +@@ -100,7 +100,7 @@ + # lib: $(LIB): are splitted to avoid end-less loop + lib: $(LIB) + @touch lib +-$(LIB): $(LIBOBJ) ++$(LIB): $(LIBOBJ) | subdirs + $(AR) $(LIB) $(LIBOBJ) + $(RANLIB) $(LIB) || echo Never mind. + +@@ -110,7 +110,7 @@ + fi + + libs: +- @target=lib; $(RECURSIVE_MAKE) ++ +@target=lib; $(RECURSIVE_MAKE) + + install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... +@@ -119,7 +119,7 @@ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; +- @target=install; $(RECURSIVE_MAKE) ++ +@target=install; $(RECURSIVE_MAKE) + + lint: + @target=lint; $(RECURSIVE_MAKE) +--- a/engines/Makefile ++++ b/engines/Makefile +@@ -72,7 +72,7 @@ + + all: lib subdirs + +-lib: $(LIBOBJ) ++lib: $(LIBOBJ) | subdirs + @if [ -n "$(SHARED_LIBS)" ]; then \ + set -e; \ + for l in $(LIBNAMES); do \ +@@ -89,7 +89,7 @@ + + subdirs: + echo $(EDIRS) +- @target=all; $(RECURSIVE_MAKE) ++ +@target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO +@@ -128,7 +128,7 @@ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ + done; \ + fi +- @target=install; $(RECURSIVE_MAKE) ++ +@target=install; $(RECURSIVE_MAKE) + + tags: + ctags $(SRC) +--- a/test/Makefile ++++ b/test/Makefile +@@ -123,7 +123,7 @@ + tags: + ctags $(SRC) + +-tests: exe apps $(TESTS) ++tests: exe $(TESTS) + + apps: + @(cd ..; $(MAKE) DIRS=apps all) +@@ -365,109 +365,109 @@ + link_app.$${shlib_target} + + $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) +- @target=$(RSATEST); $(BUILD_CMD) ++ +@target=$(RSATEST); $(BUILD_CMD) + + $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) +- @target=$(BNTEST); $(BUILD_CMD) ++ +@target=$(BNTEST); $(BUILD_CMD) + + $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) +- @target=$(ECTEST); $(BUILD_CMD) ++ +@target=$(ECTEST); $(BUILD_CMD) + + $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) +- @target=$(EXPTEST); $(BUILD_CMD) ++ +@target=$(EXPTEST); $(BUILD_CMD) + + $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) +- @target=$(IDEATEST); $(BUILD_CMD) ++ +@target=$(IDEATEST); $(BUILD_CMD) + + $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) +- @target=$(MD2TEST); $(BUILD_CMD) ++ +@target=$(MD2TEST); $(BUILD_CMD) + + $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) +- @target=$(SHATEST); $(BUILD_CMD) ++ +@target=$(SHATEST); $(BUILD_CMD) + + $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) +- @target=$(SHA1TEST); $(BUILD_CMD) ++ +@target=$(SHA1TEST); $(BUILD_CMD) + + $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) +- @target=$(SHA256TEST); $(BUILD_CMD) ++ +@target=$(SHA256TEST); $(BUILD_CMD) + + $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) +- @target=$(SHA512TEST); $(BUILD_CMD) ++ +@target=$(SHA512TEST); $(BUILD_CMD) + + $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) +- @target=$(RMDTEST); $(BUILD_CMD) ++ +@target=$(RMDTEST); $(BUILD_CMD) + + $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) +- @target=$(MDC2TEST); $(BUILD_CMD) ++ +@target=$(MDC2TEST); $(BUILD_CMD) + + $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) +- @target=$(MD4TEST); $(BUILD_CMD) ++ +@target=$(MD4TEST); $(BUILD_CMD) + + $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) +- @target=$(MD5TEST); $(BUILD_CMD) ++ +@target=$(MD5TEST); $(BUILD_CMD) + + $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) +- @target=$(HMACTEST); $(BUILD_CMD) ++ +@target=$(HMACTEST); $(BUILD_CMD) + + $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) +- @target=$(WPTEST); $(BUILD_CMD) ++ +@target=$(WPTEST); $(BUILD_CMD) + + $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) +- @target=$(RC2TEST); $(BUILD_CMD) ++ +@target=$(RC2TEST); $(BUILD_CMD) + + $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) +- @target=$(BFTEST); $(BUILD_CMD) ++ +@target=$(BFTEST); $(BUILD_CMD) + + $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) +- @target=$(CASTTEST); $(BUILD_CMD) ++ +@target=$(CASTTEST); $(BUILD_CMD) + + $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) +- @target=$(RC4TEST); $(BUILD_CMD) ++ +@target=$(RC4TEST); $(BUILD_CMD) + + $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) +- @target=$(RC5TEST); $(BUILD_CMD) ++ +@target=$(RC5TEST); $(BUILD_CMD) + + $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) +- @target=$(DESTEST); $(BUILD_CMD) ++ +@target=$(DESTEST); $(BUILD_CMD) + + $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) +- @target=$(RANDTEST); $(BUILD_CMD) ++ +@target=$(RANDTEST); $(BUILD_CMD) + + $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) +- @target=$(DHTEST); $(BUILD_CMD) ++ +@target=$(DHTEST); $(BUILD_CMD) + + $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) +- @target=$(DSATEST); $(BUILD_CMD) ++ +@target=$(DSATEST); $(BUILD_CMD) + + $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) +- @target=$(METHTEST); $(BUILD_CMD) ++ +@target=$(METHTEST); $(BUILD_CMD) + + $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) +- @target=$(SSLTEST); $(FIPS_BUILD_CMD) ++ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) + + $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) +- @target=$(ENGINETEST); $(BUILD_CMD) ++ +@target=$(ENGINETEST); $(BUILD_CMD) + + $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) +- @target=$(EVPTEST); $(BUILD_CMD) ++ +@target=$(EVPTEST); $(BUILD_CMD) + + $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) +- @target=$(ECDSATEST); $(BUILD_CMD) ++ +@target=$(ECDSATEST); $(BUILD_CMD) + + $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) +- @target=$(ECDHTEST); $(BUILD_CMD) ++ +@target=$(ECDHTEST); $(BUILD_CMD) + + $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) +- @target=$(IGETEST); $(BUILD_CMD) ++ +@target=$(IGETEST); $(BUILD_CMD) + + $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) +- @target=$(JPAKETEST); $(BUILD_CMD) ++ +@target=$(JPAKETEST); $(BUILD_CMD) + + $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) +- @target=$(ASN1TEST); $(BUILD_CMD) ++ +@target=$(ASN1TEST); $(BUILD_CMD) + + $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) +- @target=$(SRPTEST); $(BUILD_CMD) ++ +@target=$(SRPTEST); $(BUILD_CMD) + + #$(AESTEST).o: $(AESTEST).c + # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c +@@ -480,7 +480,7 @@ + # fi + + dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) +- @target=dummytest; $(BUILD_CMD) ++ +@target=dummytest; $(BUILD_CMD) + + # DO NOT DELETE THIS LINE -- make depend depends on it. + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-x32.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-x32.patch new file mode 100644 index 0000000000..5106cb6e82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.1-x32.patch @@ -0,0 +1,79 @@ +http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=51bfed2e26fc13a66e8b5710aa2ce1d7a04af721 + +UpstreamStatus: Pending + +Received from H J Liu @ Intel +Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors. +Signed-Off-By: Nitin A Kamble 2011/07/13 + +ported the patch to the 1.0.0e version +Signed-Off-By: Nitin A Kamble 2011/12/01 +Index: openssl-1.0.0e/Configure +=================================================================== +--- openssl-1.0.0e.orig/Configure ++++ openssl-1.0.0e/Configure +@@ -393,6 +393,7 @@ my %table=( + "debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++"linux-x32", "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "dist", "cc:-O::(unknown)::::::", + + # Basic configs that should work on any (32 and less bit) box +Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c +=================================================================== +--- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c ++++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c +@@ -55,7 +55,7 @@ + * machine. + */ + +-#ifdef _WIN64 ++#if defined _WIN64 || !defined __LP64__ + #define BN_ULONG unsigned long long + #else + #define BN_ULONG unsigned long +@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con + asm ( + " subq %2,%2 \n" + ".p2align 4 \n" +- "1: movq (%4,%2,8),%0 \n" +- " adcq (%5,%2,8),%0 \n" +- " movq %0,(%3,%2,8) \n" ++ "1: movq (%q4,%2,8),%0 \n" ++ " adcq (%q5,%2,8),%0 \n" ++ " movq %0,(%q3,%2,8) \n" + " leaq 1(%2),%2 \n" + " loop 1b \n" + " sbbq %0,%0 \n" +@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con + asm ( + " subq %2,%2 \n" + ".p2align 4 \n" +- "1: movq (%4,%2,8),%0 \n" +- " sbbq (%5,%2,8),%0 \n" +- " movq %0,(%3,%2,8) \n" ++ "1: movq (%q4,%2,8),%0 \n" ++ " sbbq (%q5,%2,8),%0 \n" ++ " movq %0,(%q3,%2,8) \n" + " leaq 1(%2),%2 \n" + " loop 1b \n" + " sbbq %0,%0 \n" +Index: openssl-1.0.0e/crypto/bn/bn.h +=================================================================== +--- openssl-1.0.0e.orig/crypto/bn/bn.h ++++ openssl-1.0.0e/crypto/bn/bn.h +@@ -172,6 +172,13 @@ extern "C" { + # endif + #endif + ++/* Address type. */ ++#ifdef _WIN64 ++#define BN_ADDR unsigned long long ++#else ++#define BN_ADDR unsigned long ++#endif ++ + /* assuming long is 64bit - this is the DEC Alpha + * unsigned long long is only 64 bits :-(, don't define + * BN_LLONG for the DEC Alpha */ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-pkcs11-engine-r1.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-pkcs11-engine-r1.patch new file mode 100644 index 0000000000..89302edc1f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-pkcs11-engine-r1.patch @@ -0,0 +1,24 @@ +--- apps/openssl.cnf ++++ apps/openssl.cnf +@@ -12,6 +12,21 @@ + #oid_file = $ENV::HOME/.oid + oid_section = new_oids + ++openssl_conf = openssl_def ++ ++[openssl_def] ++engines = engine_section ++ ++[engine_section] ++pkcs11 = pkcs11_section ++ ++[pkcs11_section] ++engine_id = pkcs11 ++dynamic_path = @GENTOO_LIBDIR@/engines/engine_pkcs11.so ++MODULE_PATH = @GENTOO_LIBDIR@/libchaps.so ++PIN = 111111 ++init = 0 ++ + # To use this configuration file with the "-extfile" option of the + # "openssl x509" utility, name here the section containing the + # X.509v3 extensions to use: diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/metadata.xml new file mode 100644 index 0000000000..9ab019d9ea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/metadata.xml @@ -0,0 +1,8 @@ + + + +base-system + + Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers) + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-1.0.1c-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-1.0.1c-r8.ebuild new file mode 100644 index 0000000000..825d44920b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-1.0.1c-r8.ebuild @@ -0,0 +1,226 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1c.ebuild,v 1.2 2012/05/20 14:01:08 vapier Exp $ + +EAPI="4" + +CROS_WORKON_COMMIT="1c7606ce1b8c853047f1718b8201ac4af488c279" +CROS_WORKON_TREE="3c54d51cd31fbd357c6a08a37e4281836018d2a9" +inherit eutils flag-o-matic toolchain-funcs cros-workon + +CROS_WORKON_PROJECT="chromiumos/third_party/openssl" + +REV="1.7" +DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)" +HOMEPAGE="http://www.openssl.org/" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 amd64-fbsd sparc-fbsd x86-fbsd" +IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib heartbeat" + +# Have the sub-libs in RDEPEND with [static-libs] since, logically, +# our libssl.a depends on libz.a/etc... at runtime. +LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] ) + zlib? ( sys-libs/zlib[static-libs(+)] ) + kerberos? ( app-crypt/mit-krb5 )" +# The blocks are temporary just to make sure people upgrade to a +# version that lack runtime version checking. We'll drop them in +# the future. +RDEPEND="static-libs? ( ${LIB_DEPEND} ) + !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + sys-apps/diffutils + >=dev-lang/perl-5 + test? ( sys-devel/bc )" +PDEPEND="app-misc/ca-certificates" + +src_unpack() { + cros-workon_src_unpack + SSL_CNF_DIR="/etc/ssl" + sed \ + -e "/^DIR=/s:=.*:=${SSL_CNF_DIR}:" \ + "${FILESDIR}"/c_rehash.sh \ + > "${WORKDIR}"/c_rehash || die #416717 +} + +src_prepare() { + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile + + if ! use vanilla ; then + epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 + epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089 + epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 + epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch + epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch + epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch + epatch "${FILESDIR}"/${PN}-1.0.1-ipv6.patch + epatch_user #332661 + fi + + # disable fips in the build + # make sure the man pages are suffixed #302165 + # don't bother building man pages if they're disabled + sed -i \ + -e '/DIRS/s: fips : :g' \ + -e '/^MANSUFFIX/s:=.*:=ssl:' \ + -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ + -e $(has noman FEATURES \ + && echo '/^install:/s:install_docs::' \ + || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \ + Makefile.org \ + || die + # show the actual commands in the log + sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared + + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die + chmod a+rx gentoo.config + + append-flags -fno-strict-aliasing + append-flags $(test-flags-CC -Wa,--noexecstack) + + sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906 + ./config --test-sanity || die "I AM NOT SANE" +} + +src_configure() { + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB # RC + + # Clean out patent-or-otherwise-encumbered code + # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) + # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm + # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography + # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 + # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 + + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + echoit() { echo "$@" ; "$@" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + echoit \ + ./${config} \ + ${sslout} \ + $(use sse2 || echo "no-sse2") \ + enable-camellia \ + $(use_ssl !bindist ec) \ + enable-idea \ + enable-mdc2 \ + $(use_ssl !bindist rc5) \ + enable-tlsext \ + $(use_ssl gmp gmp -lgmp) \ + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ + $(use_ssl rfc3779) \ + $(use_ssl zlib) \ + $(use_ssl heartbeats) \ + --prefix=/usr \ + --openssldir=${SSL_CNF_DIR} \ + --libdir=$(get_libdir) \ + shared threads \ + || die + + # Clean out hardcoded flags that openssl uses + local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ + -e 's:^CFLAG=::' \ + -e 's:-fomit-frame-pointer ::g' \ + -e 's:-O[0-9] ::g' \ + -e 's:-march=[-a-z0-9]* ::g' \ + -e 's:-mcpu=[-a-z0-9]* ::g' \ + -e 's:-m[a-z0-9]* ::g' \ + ) + sed -i \ + -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ + -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ + Makefile || die +} + +src_compile() { + # depend is needed to use $confopts; it also doesn't matter + # that it's -j1 as the code itself serializes subdirs + emake -j1 depend + emake all + # rehash is needed to prep the certs/ dir; do this + # separately to avoid parallel build issues. + emake rehash +} + +# TODO(ellyjones): these are broken even in upstream +# src_test() { +# emake -j1 test +# } + +src_install() { + emake INSTALL_PREFIX="${D}" install + dobin "${S}"/tools/c_rehash #333117 + dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el + dohtml -r doc/* + use rfc3779 && dodoc engines/ccgost/README.gost + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + use static-libs || rm -f "${D}"/usr/lib*/lib*.a + + # create the certs directory + dodir ${SSL_CNF_DIR}/certs + cp -RP certs/* "${D}"${SSL_CNF_DIR}/certs/ || die + rm -r "${D}"${SSL_CNF_DIR}/certs/{demo,expired} + + # Namespace openssl programs to prevent conflicts with other man pages + cd "${D}"/usr/share/man + local m d s + for m in $(find . -type f | xargs grep -L '#include') ; do + d=${m%/*} ; d=${d#./} ; m=${m##*/} + [[ ${m} == openssl.1* ]] && continue + [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" + mv ${d}/{,ssl-}${m} + # fix up references to renamed man pages + sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} + ln -s ssl-${m} ${d}/openssl-${m} + # locate any symlinks that point to this man page ... we assume + # that any broken links are due to the above renaming + for s in $(find -L ${d} -type l) ; do + s=${s##*/} + rm -f ${d}/${s} + ln -s ssl-${m} ${d}/ssl-${s} + ln -s ssl-${s} ${d}/openssl-${s} + done + done + [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" + + dodir /etc/sandbox.d #254521 + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private + + insinto ${SSL_CNF_DIR} + doins "${FILESDIR}"/blacklist +} + +pkg_preinst() { + has_version ${CATEGORY}/${PN}:0.9.8 && return 0 + preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 +} + +pkg_postinst() { + ebegin "Running 'c_rehash ${ROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" + c_rehash "${ROOT%/}${SSL_CNF_DIR}/certs" >/dev/null + eend $? + + has_version ${CATEGORY}/${PN}:0.9.8 && return 0 + preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-9999.ebuild new file mode 100644 index 0000000000..d554af4319 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-9999.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1c.ebuild,v 1.2 2012/05/20 14:01:08 vapier Exp $ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs cros-workon + +CROS_WORKON_PROJECT="chromiumos/third_party/openssl" + +REV="1.7" +DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)" +HOMEPAGE="http://www.openssl.org/" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib heartbeat" + +# Have the sub-libs in RDEPEND with [static-libs] since, logically, +# our libssl.a depends on libz.a/etc... at runtime. +LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] ) + zlib? ( sys-libs/zlib[static-libs(+)] ) + kerberos? ( app-crypt/mit-krb5 )" +# The blocks are temporary just to make sure people upgrade to a +# version that lack runtime version checking. We'll drop them in +# the future. +RDEPEND="static-libs? ( ${LIB_DEPEND} ) + !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + sys-apps/diffutils + >=dev-lang/perl-5 + test? ( sys-devel/bc )" +PDEPEND="app-misc/ca-certificates" + +src_unpack() { + cros-workon_src_unpack + SSL_CNF_DIR="/etc/ssl" + sed \ + -e "/^DIR=/s:=.*:=${SSL_CNF_DIR}:" \ + "${FILESDIR}"/c_rehash.sh \ + > "${WORKDIR}"/c_rehash || die #416717 +} + +src_prepare() { + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile + + if ! use vanilla ; then + epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 + epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089 + epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 + epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch + epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch + epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch + epatch "${FILESDIR}"/${PN}-1.0.1-ipv6.patch + epatch_user #332661 + fi + + # disable fips in the build + # make sure the man pages are suffixed #302165 + # don't bother building man pages if they're disabled + sed -i \ + -e '/DIRS/s: fips : :g' \ + -e '/^MANSUFFIX/s:=.*:=ssl:' \ + -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ + -e $(has noman FEATURES \ + && echo '/^install:/s:install_docs::' \ + || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \ + Makefile.org \ + || die + # show the actual commands in the log + sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared + + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die + chmod a+rx gentoo.config + + append-flags -fno-strict-aliasing + append-flags $(test-flags-CC -Wa,--noexecstack) + + sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906 + ./config --test-sanity || die "I AM NOT SANE" +} + +src_configure() { + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB # RC + + # Clean out patent-or-otherwise-encumbered code + # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) + # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm + # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography + # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 + # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 + + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + echoit() { echo "$@" ; "$@" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + echoit \ + ./${config} \ + ${sslout} \ + $(use sse2 || echo "no-sse2") \ + enable-camellia \ + $(use_ssl !bindist ec) \ + enable-idea \ + enable-mdc2 \ + $(use_ssl !bindist rc5) \ + enable-tlsext \ + $(use_ssl gmp gmp -lgmp) \ + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ + $(use_ssl rfc3779) \ + $(use_ssl zlib) \ + $(use_ssl heartbeats) \ + --prefix=/usr \ + --openssldir=${SSL_CNF_DIR} \ + --libdir=$(get_libdir) \ + shared threads \ + || die + + # Clean out hardcoded flags that openssl uses + local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ + -e 's:^CFLAG=::' \ + -e 's:-fomit-frame-pointer ::g' \ + -e 's:-O[0-9] ::g' \ + -e 's:-march=[-a-z0-9]* ::g' \ + -e 's:-mcpu=[-a-z0-9]* ::g' \ + -e 's:-m[a-z0-9]* ::g' \ + ) + sed -i \ + -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ + -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ + Makefile || die +} + +src_compile() { + # depend is needed to use $confopts; it also doesn't matter + # that it's -j1 as the code itself serializes subdirs + emake -j1 depend + emake all + # rehash is needed to prep the certs/ dir; do this + # separately to avoid parallel build issues. + emake rehash +} + +# TODO(ellyjones): these are broken even in upstream +# src_test() { +# emake -j1 test +# } + +src_install() { + emake INSTALL_PREFIX="${D}" install + dobin "${S}"/tools/c_rehash #333117 + dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el + dohtml -r doc/* + use rfc3779 && dodoc engines/ccgost/README.gost + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + use static-libs || rm -f "${D}"/usr/lib*/lib*.a + + # create the certs directory + dodir ${SSL_CNF_DIR}/certs + cp -RP certs/* "${D}"${SSL_CNF_DIR}/certs/ || die + rm -r "${D}"${SSL_CNF_DIR}/certs/{demo,expired} + + # Namespace openssl programs to prevent conflicts with other man pages + cd "${D}"/usr/share/man + local m d s + for m in $(find . -type f | xargs grep -L '#include') ; do + d=${m%/*} ; d=${d#./} ; m=${m##*/} + [[ ${m} == openssl.1* ]] && continue + [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" + mv ${d}/{,ssl-}${m} + # fix up references to renamed man pages + sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} + ln -s ssl-${m} ${d}/openssl-${m} + # locate any symlinks that point to this man page ... we assume + # that any broken links are due to the above renaming + for s in $(find -L ${d} -type l) ; do + s=${s##*/} + rm -f ${d}/${s} + ln -s ssl-${m} ${d}/ssl-${s} + ln -s ssl-${s} ${d}/openssl-${s} + done + done + [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" + + dodir /etc/sandbox.d #254521 + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private + + insinto ${SSL_CNF_DIR} + doins "${FILESDIR}"/blacklist +} + +pkg_preinst() { + has_version ${CATEGORY}/${PN}:0.9.8 && return 0 + preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 +} + +pkg_postinst() { + ebegin "Running 'c_rehash ${ROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" + c_rehash "${ROOT%/}${SSL_CNF_DIR}/certs" >/dev/null + eend $? + + has_version ${CATEGORY}/${PN}:0.9.8 && return 0 + preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/Manifest new file mode 100644 index 0000000000..067be103d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/Manifest @@ -0,0 +1 @@ +DIST protobuf-2.3.0.tar.bz2 1424966 RMD160 92b9c374ce3ccbb0b0d22d08e9f9d3a5a68d1ac8 SHA1 db0fbdc58be22a676335a37787178a4dfddf93c6 SHA256 760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/70protobuf-gentoo.el b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/70protobuf-gentoo.el new file mode 100644 index 0000000000..51370527f6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/70protobuf-gentoo.el @@ -0,0 +1,3 @@ +(add-to-list 'load-path "@SITELISP@") +(add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode)) +(autoload 'protobuf-mode "protobuf-mode" "Google protobuf mode." t) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/proto.vim b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/proto.vim new file mode 100644 index 0000000000..5b76a4f6a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/proto.vim @@ -0,0 +1,3 @@ +augroup filetype + au! BufRead,BufNewFile *.proto setfiletype proto +augroup end diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.2.0-decoder_test_64bit_fix.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.2.0-decoder_test_64bit_fix.patch new file mode 100644 index 0000000000..5a88a119e5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.2.0-decoder_test_64bit_fix.patch @@ -0,0 +1,17 @@ +diff -Naurp protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py +--- protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py 2008-12-05 19:07:15.000000000 +0100 ++++ protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py 2008-12-06 22:11:48.000000000 +0100 +@@ -106,6 +106,13 @@ class DecoderTest(unittest.TestCase): + self.mox.ReplayAll() + result = decoder_method(d) + self.assertEqual(expected_result, result) ++ # HACK: Convert all ints to longs so that different behavior ++ # between 32-bit and 64-bit systems does not impact the result ++ # of the test. ++ if isinstance(result, int): ++ result = long(result) ++ if isinstance(expected_result, int): ++ expected_result = long(expected_result) + self.assert_(isinstance(result, type(expected_result))) + self.mox.VerifyAll() + self.mox.ResetAll() diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.2.0-fix-emacs-byte-compile.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.2.0-fix-emacs-byte-compile.patch new file mode 100644 index 0000000000..8a2381a470 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.2.0-fix-emacs-byte-compile.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/271007 +Fix error with byte-compilation in Emacs. + +--- protobuf-2.1.0-orig/editors/protobuf-mode.el 2009-05-13 22:36:40.000000000 +0200 ++++ protobuf-2.1.0/editors/protobuf-mode.el 2009-05-24 13:37:04.000000000 +0200 +@@ -71,7 +71,8 @@ + + ;; This mode does not inherit properties from other modes. So, we do not use + ;; the usual `c-add-language' function. +-(put 'protobuf-mode 'c-mode-prefix "protobuf-") ++(eval-and-compile ++ (put 'protobuf-mode 'c-mode-prefix "protobuf-")) + + ;; The following code uses of the `c-lang-defconst' macro define syntactic + ;; features of protocol buffer language. Refer to the documentation in the diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch new file mode 100644 index 0000000000..418622e547 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch @@ -0,0 +1,28 @@ +Fixing as-needed issue + +http://bugs.gentoo.org/show_bug.cgi?id=271509 + +--- m4/acx_pthread.m4 ++++ m4/acx_pthread.m4 +@@ -278,7 +278,8 @@ + fi + fi + +- if test x"$done" = xno; then ++ if test x"$done" = xyes; then ++ done="no" + AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); +--- gtest/m4/acx_pthread.m4 ++++ gtest/m4/acx_pthread.m4 +@@ -278,7 +278,8 @@ + fi + fi + +- if test x"$done" = xno; then ++ if test x"$done" = xyes; then ++ done="no" + AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch new file mode 100644 index 0000000000..86c4b59763 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch @@ -0,0 +1,26 @@ +Fixing as-needed issues + +http://bugs.gentoo.org/show_bug.cgi?id=271509 + +--- m4/acx_pthread.m4 ++++ m4/acx_pthread.m4 +@@ -99,7 +99,7 @@ + # which indicates that we try without any flags at all, and "pthread-config" + # which is a program returning the flags for the Pth emulation library. + +-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" ++acx_pthread_flags="pthreads none pthread -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config" + + # The ordering *is* (sometimes) important. Some notes on the + # individual items follow: +--- gtest/m4/acx_pthread.m4 ++++ gtest/m4/acx_pthread.m4 +@@ -99,7 +99,7 @@ + # which indicates that we try without any flags at all, and "pthread-config" + # which is a program returning the flags for the Pth emulation library. + +-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" ++acx_pthread_flags="pthreads none pthread -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config" + + # The ordering *is* (sometimes) important. Some notes on the + # individual items follow: diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-crosscompile.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-crosscompile.patch new file mode 100644 index 0000000000..decd82e8df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/files/protobuf-2.3.0-crosscompile.patch @@ -0,0 +1,14 @@ +diff -Naur protobuf-2.3.0-orig/python/setup.py protobuf-2.3.0/python/setup.py +--- protobuf-2.3.0-orig/python/setup.py 2011-03-22 16:33:33.000000000 -0700 ++++ protobuf-2.3.0/python/setup.py 2011-03-22 17:01:14.000000000 -0700 +@@ -16,7 +16,9 @@ + maintainer_email = "protobuf@googlegroups.com" + + # Find the Protocol Compiler. +-if os.path.exists("../src/protoc"): ++if 'PROTOC' in os.environ and os.path.exists(os.environ['PROTOC']): ++ protoc = os.environ['PROTOC'] ++elif os.path.exists("../src/protoc"): + protoc = "../src/protoc" + elif os.path.exists("../src/protoc.exe"): + protoc = "../src/protoc.exe" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/protobuf-2.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/protobuf-2.2.0.ebuild new file mode 100644 index 0000000000..a4aa4015ba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/protobuf-2.2.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.2.0.ebuild,v 1.1 2009/08/21 17:41:18 nelchael Exp $ + +EAPI="2" + +JAVA_PKG_IUSE="source" + +inherit eutils python java-pkg-opt-2 elisp-common + +DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" +HOMEPAGE="http://code.google.com/p/protobuf/" +SRC_URI="http://protobuf.googlecode.com/files/${PF}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="emacs examples java python vim-syntax" + +DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 ) + python? ( dev-python/setuptools ) + emacs? ( virtual/emacs )" +RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 ) + emacs? ( virtual/emacs )" + +src_prepare() { + epatch "${FILESDIR}/${P}-decoder_test_64bit_fix.patch" + epatch "${FILESDIR}/${P}-fix-emacs-byte-compile.patch" +} + +src_configure() { + local protoc="" + if tc-is-cross-compiler; then + protoc="--with-protoc=$(which protoc)" || + die "need native protoc tool to cross compile" + fi + econf ${protoc} || die "died running econf" +} + +src_compile() { + emake || die + + if use python; then + cd python; distutils_src_compile; cd .. + fi + + if use java; then + src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto + mkdir java/build + pushd java/src/main/java + ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" + popd + jar cf "${PN}.jar" -C java/build . || die "jar failed" + fi + + if use emacs; then + elisp-compile "${S}/editors/protobuf-mode.el" || die "elisp-compile failed!" + fi +} + +src_install() { + emake DESTDIR="${D}" install + dodoc CHANGES.txt CONTRIBUTORS.txt README.txt + + if use python; then + cd python; distutils_src_install; cd .. + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + fi + + if use emacs; then + elisp-install ${PN} editors/protobuf-mode.el* || die "elisp-install failed!" + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r examples/* || die "doins examples failed" + fi + + if use java; then + java-pkg_dojar ${PN}.jar + use source && java-pkg_dosrc java/src/main/java/* + fi +} + +src_test() { + emake check + + if use python; then + cd python; ${python} setup.py test || die "python test failed" + cd .. + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/protobuf-2.3.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/protobuf-2.3.0-r4.ebuild new file mode 100644 index 0000000000..0fd954aee4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/protobuf/protobuf-2.3.0-r4.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0-r1.ebuild,v 1.5 2011/03/16 18:00:10 xarthisius Exp $ + +EAPI="3" + +PYTHON_DEPEND="python-runtime? 2" +JAVA_PKG_IUSE="source" + +inherit autotools eutils distutils python-old-eapi3 java-pkg-opt-2 elisp-common toolchain-funcs + +DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" +HOMEPAGE="http://code.google.com/p/protobuf/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 x86 ~x64-macos" + +IUSE="emacs examples java python python-runtime static-libs vim-syntax" + +DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 ) + python? ( dev-lang/python dev-python/setuptools ) + emacs? ( virtual/emacs )" +RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 ) + emacs? ( virtual/emacs )" + +PYTHON_MODNAME="google/protobuf" +DISTUTILS_SRC_TEST="setup.py" + +src_prepare() { + epatch "${FILESDIR}"/${P}-asneeded-2.patch + epatch "${FILESDIR}"/${P}-crosscompile.patch + eautoreconf + + if use python; then + python_set_active_version 2 + python_convert_shebangs -r 2 . + distutils_src_prepare + fi +} + +src_configure() { + PROTOC_ARG= + if tc-is-cross-compiler ; then + host_protoc=$(which protoc) + [[ -n ${host_protoc} ]] || die "Please install ${P} in your host environment." + PROTOC_ARG="--with-protoc=${host_protoc}" + export PROTOC=${host_protoc} + fi + + export LDFLAGS="-L./.libs ${LDFLAGS}" + econf $PROTOC_ARG \ + $(use_enable static-libs static) +} + +src_compile() { + emake || die "emake failed" + + if use python; then + einfo "Compiling Python library ..." + pushd python + distutils_src_compile + popd + fi + + if use java; then + einfo "Compiling Java library ..." + src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto + mkdir java/build + pushd java/src/main/java + ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" + popd + jar cf "${PN}.jar" -C java/build . || die "jar failed" + fi + + if use emacs; then + elisp-compile "${S}/editors/protobuf-mode.el" || die "elisp-compile failed!" + fi +} + +src_test() { + emake check || die "emake check failed" + + if use python; then + pushd python + distutils_src_test + popd + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc CHANGES.txt CONTRIBUTORS.txt README.txt + + use static-libs || rm -rf "${D}"/usr/lib*/*.la + + if use python; then + pushd python + # distutils.eclass doesn't allow us to install into /usr/local, so we + # have to do this manually. + "${EPYTHON}" setup.py install --root="${D}" --prefix=/usr/local + popd + # HACK ALERT: upstream setup.py forgets to install google/__init__.py, + # hack now, fix properly later. + pushd "${D}" + local whereto="$(find . -name 'site-packages')" + popd + insinto "${whereto/./}"/google/ + doins "${S}"/python/google/__init__.py + fi + + if use java; then + java-pkg_dojar ${PN}.jar + use source && java-pkg_dosrc java/src/main/java/* + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + fi + + if use emacs; then + elisp-install ${PN} editors/protobuf-mode.el* || die "elisp-install failed!" + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r examples/* || die "doins examples failed" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/files/pyzy-dont-download-dictionary-file.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/files/pyzy-dont-download-dictionary-file.patch new file mode 100644 index 0000000000..6283cd2156 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/files/pyzy-dont-download-dictionary-file.patch @@ -0,0 +1,28 @@ +Don't download database file on make phrase. +The database file will be downloaded by ebuild script instead. +diff -urN pyzy-0.1.0.orig/data/db/open-phrase/Makefile.am pyzy-0.1.0/data/db/open-phrase/Makefile.am +--- pyzy-0.1.0.orig/data/db/open-phrase/Makefile.am 2012-09-05 13:23:24.151736716 +0900 ++++ pyzy-0.1.0/data/db/open-phrase/Makefile.am 2012-09-05 14:18:57.144553548 +0900 +@@ -30,9 +30,6 @@ + DBTAR = pyzy-database-$(DBVER).tar.bz2 + + $(DBTAR): +- $(AM_V_GEN) \ +- wget http://pyzy.googlecode.com/files/$(DBTAR) || \ +- ( $(RM) $@; exit 1) + + stamp-db: $(DBTAR) + $(AM_V_GEN) \ +diff -urN pyzy-0.1.0.orig/data/db/open-phrase/Makefile.in pyzy-0.1.0/data/db/open-phrase/Makefile.in +--- pyzy-0.1.0.orig/data/db/open-phrase/Makefile.in 2012-09-05 13:27:28.991201762 +0900 ++++ pyzy-0.1.0/data/db/open-phrase/Makefile.in 2012-09-05 14:19:09.814528103 +0900 +@@ -491,9 +491,6 @@ + + + @PYZY_BUILD_DB_OPEN_PHRASE_TRUE@$(DBTAR): +-@PYZY_BUILD_DB_OPEN_PHRASE_TRUE@ $(AM_V_GEN) \ +-@PYZY_BUILD_DB_OPEN_PHRASE_TRUE@ wget http://pyzy.googlecode.com/files/$(DBTAR) || \ +-@PYZY_BUILD_DB_OPEN_PHRASE_TRUE@ ( $(RM) $@; exit 1) + + @PYZY_BUILD_DB_OPEN_PHRASE_TRUE@stamp-db: $(DBTAR) + @PYZY_BUILD_DB_OPEN_PHRASE_TRUE@ $(AM_V_GEN) \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/pyzy-0.1.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/pyzy-0.1.0-r1.ebuild new file mode 120000 index 0000000000..9b2add12ee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/pyzy-0.1.0-r1.ebuild @@ -0,0 +1 @@ +pyzy-0.1.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/pyzy-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/pyzy-0.1.0.ebuild new file mode 100644 index 0000000000..090a2632c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/pyzy/pyzy-0.1.0.ebuild @@ -0,0 +1,34 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +inherit eutils + +DESCRIPTION="the Chinese PinYin and Bopomofo conversion library" +HOMEPAGE="http://code.google.com/p/pyzy/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz + http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-database-1.0.0.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="" + +RDEPEND=">=dev-db/sqlite-3.6.18 + >=dev-libs/glib-2.24 + sys-apps/util-linux" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/gettext-0.16.1" + +src_prepare() { + # Using open-phrase database downloaded by this ebuild script. + epatch "${FILESDIR}"/pyzy-dont-download-dictionary-file.patch + mv ../db ./data/db/open-phrase/ || die +} + +src_configure() { + econf \ + --enable-db-open-phrase \ + --disable-db-android +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/vectormath/vectormath-166.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/vectormath/vectormath-166.ebuild new file mode 100644 index 0000000000..fbf23b33ef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/vectormath/vectormath-166.ebuild @@ -0,0 +1,20 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Sony vector math library." +HOMEPAGE="http://www.bulletphysics.com/Bullet/phpBB2/viewforum.php?f=18" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-svn-${PV}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="" + +src_install() { + insinto /usr/include/vectormath/scalar/cpp + doins "${S}/include/vectormath/scalar/cpp/mat_aos.h" + doins "${S}/include/vectormath/scalar/cpp/quat_aos.h" + doins "${S}/include/vectormath/scalar/cpp/vec_aos.h" + doins "${S}/include/vectormath/scalar/cpp/vectormath_aos.h" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/Manifest new file mode 100644 index 0000000000..9e970f7014 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/Manifest @@ -0,0 +1 @@ +DIST gdata-2.0.14.tar.gz 1872888 RMD160 9a0f2b7ba5bfc0cd813ac7ef54068acfae0992b6 SHA1 5eed0e01ab931e3f706ec544fc8f06ecac384e91 SHA256 ba291d2b9d36a0f1b1b31a5a3ac3ba11f1bcce21c915a6ec78d109a43dafb1b0 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/files/gdata-2.0.14-tracker-add-issue.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/files/gdata-2.0.14-tracker-add-issue.patch new file mode 100644 index 0000000000..fc0032cfee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/files/gdata-2.0.14-tracker-add-issue.patch @@ -0,0 +1,13 @@ +--- gdata-2.0.14.orig/src/gdata/projecthosting/client.py 2011-11-17 09:22:17.350490120 -0800 ++++ gdata-2.0.14/src/gdata/projecthosting/client.py 2011-11-17 09:22:44.380842001 -0800 +@@ -67,8 +67,8 @@ class ProjectHostingClient(gdata.client. + new_entry.status = gdata.projecthosting.data.Status(text=status) + + if owner: +- owner = [gdata.projecthosting.data.Owner( +- username=gdata.projecthosting.data.Username(text=owner))] ++ new_entry.owner = gdata.projecthosting.data.Owner( ++ username=gdata.projecthosting.data.Username(text=owner)) + + if labels: + new_entry.label = [gdata.projecthosting.data.Label(text=label) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/gdata-2.0.14-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/gdata-2.0.14-r1.ebuild new file mode 100644 index 0000000000..4ba7e0d334 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/gdata-2.0.14-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/gdata/gdata-2.0.14.ebuild,v 1.9 2011/06/04 18:52:06 armin76 Exp $ + +EAPI="3" +PYTHON_DEPEND="2" +PYTHON_USE_WITH="ssl" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils eutils + +MY_P="gdata-${PV}" + +DESCRIPTION="Python client library for Google data APIs" +HOMEPAGE="http://code.google.com/p/gdata-python-client/ http://pypi.python.org/pypi/gdata" +SRC_URI="http://gdata-python-client.googlecode.com/files/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="examples" + +DEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/elementtree )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +PYTHON_MODNAME="atom gdata" + +src_prepare() { + epatch "${FILESDIR}/${P}-tracker-add-issue.patch" || die +} + +src_test() { + testing() { + PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" tests/run_data_tests.py -v || return 1 + + # run_service_tests.py requires interaction (and a valid Google account), so skip it. + # PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" tests/run_service_tests.py -v || return 1 + } + python_execute_function testing +} + +src_install() { + distutils_src_install + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r samples/* || die "Installation of examples failed" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/Manifest new file mode 100644 index 0000000000..8aeb6e3aac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/Manifest @@ -0,0 +1 @@ +DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch new file mode 100644 index 0000000000..8882cd0790 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch @@ -0,0 +1,50 @@ +--- + Fix FHS compliance of codegen + + codegen/Makefile.am | 2 +- + codegen/pygtk-codegen-2.0.in | 3 ++- + pygtk-2.0.pc.in | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +--- a/codegen/Makefile.am 2007-11-01 12:20:22.000000000 -0400 ++++ b/codegen/Makefile.am 2008-05-28 22:21:04.000000000 -0400 +@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0 + + bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION) + +-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen ++codegendir = $(pyexecdir)/gtk-2.0/codegen + + codegen_PYTHON = \ + __init__.py \ +--- a/codegen/pygobject-codegen-2.0.in 2007-11-01 12:20:22.000000000 -0400 ++++ b/codegen/pygobject-codegen-2.0.in 2008-05-28 22:24:38.000000000 -0400 +@@ -1,9 +1,10 @@ + #!/bin/sh + + prefix=@prefix@ ++exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ + datadir=@datadir@ +-codegendir=${datadir}/pygobject/2.0/codegen ++codegendir=@pyexecdir@/gtk-2.0/codegen + + PYTHONPATH=$codegendir + export PYTHONPATH +--- a/pygobject-2.0.pc.in 2007-11-01 12:20:22.000000000 -0400 ++++ b/pygobject-2.0.pc.in 2008-05-28 22:21:04.000000000 -0400 +@@ -4,6 +4,7 @@ + datarootdir=@datarootdir@ + datadir=@datadir@ + libdir=@libdir@ ++pyexecdir=@pyexecdir@ + + # you can use the --variable=pygtkincludedir argument to + # pkg-config to get this value. You might want to use this to +@@ -12,5 +12,5 @@ + defsdir=${datadir}/pygobject/2.0/defs +-codegendir=${datadir}/pygobject/2.0/codegen ++codegendir=${pyexecdir}/gtk-2.0/codegen + + Name: PyGObject + Description: Python bindings for GObject diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch new file mode 100644 index 0000000000..9e57bb7f56 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch @@ -0,0 +1,13 @@ +# Fix build failure due to automake 1.11. +# defsgen.py was installed twice +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=279813 +--- a/codegen/Makefile.am ++++ b/codegen/Makefile.am +@@ -18,7 +18,6 @@ + docextract_to_xml.py \ + docgen.py \ + h2def.py \ +- defsgen.py \ + createdefs.py \ + mergedefs.py \ + missingdefs.py \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch new file mode 100644 index 0000000000..a84dd9581e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch @@ -0,0 +1,36 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -214,6 +214,20 @@ + + fi + ++dnl Get the host compiler if cross-compiling ++dnl ++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) ++AC_MSG_CHECKING([for CC_FOR_BUILD]) ++if test "x${CC_FOR_BUILD+set}" != "xset" ; then ++ if test "x$cross_compiling" = "xyes" ; then ++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc} ++ else ++ CC_FOR_BUILD=${CC} ++ fi ++fi ++AC_MSG_RESULT([$CC_FOR_BUILD]) ++AC_SUBST(CC_FOR_BUILD) ++ + AC_CONFIG_FILES( + Makefile + pygobject-2.0.pc +--- a/gobject/Makefile.am ++++ b/gobject/Makefile.am +@@ -71,6 +71,13 @@ + if PLATFORM_WIN32 + _gobject_la_CFLAGS += -DPLATFORM_WIN32 + endif ++ ++# Strip all the noise (system includes/etc...) before the main func ++generate-constants$(EXEEXT): generate-constants.c ++ printf '#include \nint main()' > generate-constants.pre.c ++ $(CC) $(generate_constants_CFLAGS) -E generate-constants.c | sed -e '1,/^int main/d' >> generate-constants.pre.c ++ $(CC_FOR_BUILD) -o $@ generate-constants.pre.c ++ rm -f generate-constants.pre.c diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch new file mode 100644 index 0000000000..f351092b2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch @@ -0,0 +1,57 @@ +--- tests/Makefile.am ++++ tests/Makefile.am +@@ -11,7 +11,7 @@ + test-thread.h \ + test-unknown.h + +-noinst_LTLIBRARIES = testhelper.la ++check_LTLIBRARIES = testhelper.la + linked_LIBS = testhelper.la + + testhelper_la_LDFLAGS = -module -avoid-version +@@ -47,6 +47,7 @@ + cp $(top_srcdir)/gobject/*.py $(top_builddir)/gobject; \ + cp $(top_srcdir)/gio/*.py $(top_builddir)/gio; \ + fi ++ $(LN_S) .libs/testhelper.so testhelper.so + @$(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(top_srcdir) + @if test "$(top_builddir)" != "$(top_srcdir)"; then \ + rm -f $(top_builddir)/glib/*.py; \ +@@ -58,8 +59,5 @@ + @rm -fr $(top_builddir)/gio/*.pyc + + +-all: $(LTLIBRARIES:.la=.so) + clean-local: +- rm -f $(LTLIBRARIES:.la=.so) +-.la.so: +- $(LN_S) .libs/$@ $@ || true ++ rm -f .libs/testhelper.so +--- tests/runtests.py ++++ tests/runtests.py +@@ -6,6 +6,9 @@ + + import common + ++# Some tests fail with translated messages. ++os.environ["LC_ALL"] = "C" ++ + program = None + if len(sys.argv) == 3: + buildDir = sys.argv[1] +--- tests/test_gio.py ++++ tests/test_gio.py +@@ -386,9 +386,10 @@ + + def testQueryWritableNamespaces(self): + infolist = self.file.query_writable_namespaces() +- for info in infolist: +- if info.name == "xattr": +- self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING) ++ if infolist: ++ for info in infolist: ++ if info.name == "xattr": ++ self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING) + + def testSetAttribute(self): + self._f.write("testing attributes") diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r1.ebuild new file mode 100644 index 0000000000..4c753ea0cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.10 2009/08/19 16:30:10 jer Exp $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +SUPPORT_PYTHON_ABIS="1" +# pygobject is partially incompatible with Python 3. +# PYTHON_DEPEND="2:2.6 3:3.1" +# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython" +PYTHON_DEPEND="2:2.6" +RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython" + +# XXX: Is the alternatives stuff needed anymore? +inherit alternatives autotools gnome2 python virtualx + +DESCRIPTION="GLib's GObject library bindings for Python" +HOMEPAGE="http://www.pygtk.org/" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="doc examples libffi test" + +COMMON_DEPEND=">=dev-libs/glib-2.24.0:2 + libffi? ( virtual/libffi )" +DEPEND="${COMMON_DEPEND} + doc? ( + dev-libs/libxslt + >=app-text/docbook-xsl-stylesheets-1.70.1 ) + test? ( + media-fonts/font-cursor-misc + media-fonts/font-misc-misc ) + >=dev-util/pkgconfig-0.12" +RDEPEND="${COMMON_DEPEND} + ! +Date: Sat, 02 May 2009 13:11:06 +0000 +Subject: Remove 'ltihooks.py' as using deprecated Python module. + +Remove the script and all related imports. All relevant Makefile's +now create symbolic links for '.so' files from '.libs' to the level +up, so that C helper modules are still importable in built, but not +installed source tree. Same as in PyGObject. (Bug #565593.) +--- +diff --git a/Makefile.am b/Makefile.am +index 1ed5196..2472727 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -44,10 +44,6 @@ pkgconfig_DATA += pygtk-$(PLATFORM_VERSION).pc + defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs + defs_DATA = + +-# python +-pyexec_LTLIBRARIES = +-noinst_PYTHON = ltihooks.py +- + # pygtk scripts + pkgpythondir = $(pyexecdir)/gtk-2.0 + +@@ -141,3 +137,10 @@ doc-dist: + cp -r docs/cursors/* pygtk/cursors + tar cfz $(PACKAGE)-docs.tar.gz pygtk + rm -fr pygtk ++ ++ ++all: $(pkgpyexec_LTLIBRARIES:.la=.so) ++clean-local: ++ rm -f $(pkgpyexec_LTLIBRARIES:.la=.so) ++.la.so: ++ $(LN_S) .libs/$@ $@ || true +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 2021220..b9ec8f3 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -195,7 +195,7 @@ CLEANFILES += \ + gtkunixprint.c \ + gtkunixprint.defs \ + gtkunixprint-types.defs +- ++ + + EXTRA_DIST += \ + $(GTKUNIXPRINT_DEFS) \ +@@ -248,3 +248,9 @@ endif + gtk-types.c: + @: + ++ ++all: $(pygtkexec_LTLIBRARIES:.la=.so) $(pkgpyexec_LTLIBRARIES:.la=.so) ++clean-local: ++ rm -f $(pygtkexec_LTLIBRARIES:.la=.so) $(pkgpyexec_LTLIBRARIES:.la=.so) ++.la.so: ++ $(LN_S) .libs/$@ $@ || true +diff --git a/gtk/__init__.py b/gtk/__init__.py +index e2733dc..92af869 100644 +--- a/gtk/__init__.py ++++ b/gtk/__init__.py +@@ -22,14 +22,6 @@ + + import sys + +-# this can go when things are a little further along +-try: +- import ltihooks +- # pyflakes +- ltihooks +-except ImportError: +- ltihooks = None +- + # For broken embedded programs which forgot to call Sys_SetArgv + if not hasattr(sys, 'argv'): + sys.argv = [] +@@ -49,13 +41,6 @@ else: + + import gdk + +-if ltihooks: +- try: +- ltihooks.uninstall() +- del ltihooks +- except: +- pass +- + from gtk._lazyutils import LazyNamespace, LazyModule + from gtk.deprecation import _Deprecated, _DeprecatedConstant + +diff --git a/tests/common.py b/tests/common.py +index dfc3401..33216e1 100644 +--- a/tests/common.py ++++ b/tests/common.py +@@ -7,29 +7,19 @@ def importModules(buildDir, srcDir): + # Be very careful when you change this code, it's + # fragile and the order is really significant + +- # ltihooks +- sys.path.insert(0, srcDir) + # atk, pango + sys.path.insert(0, buildDir) + # _gtk, keysyms, glade + sys.path.insert(0, os.path.join(buildDir, 'gtk')) + sys.argv.append('--g-fatal-warnings') +- import ltihooks + + atk = importModule('atk', buildDir) + pango = importModule('pango', buildDir) + gtk = importModule('gtk', buildDir, 'gtk') + gdk = importModule('gtk.gdk', buildDir, '_gdk.la') + +- # gtk/__init__.py removes the ltihooks, readd them +- import gtk +- +- ltihooks.install() + glade = importModule('gtk.glade', buildDir) + +- ltihooks.uninstall() +- del ltihooks +- + globals().update(locals()) + + os.environ['PYGTK_USE_GIL_STATE_API'] = '' +-- +cgit v0.8.2 +--- a/ltihooks.py 2009-03-05 23:06:53.000000000 +0100 ++++ b/dev/null 2009-05-02 19:22:42.444026449 +0200 +@@ -1,60 +0,0 @@ +-# -*- Mode: Python; py-indent-offset: 4 -*- +-# ltihooks.py: python import hooks that understand libtool libraries. +-# Copyright (C) 2000 James Henstridge. +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- +-import os, ihooks +- +-class LibtoolHooks(ihooks.Hooks): +- def get_suffixes(self): +- """Like normal get_suffixes, but adds .la suffixes to list""" +- ret = ihooks.Hooks.get_suffixes(self) +- ret.insert(0, ('module.la', 'rb', 3)) +- ret.insert(0, ('.la', 'rb', 3)) +- return ret +- +- def load_dynamic(self, name, filename, file=None): +- """Like normal load_dynamic, but treat .la files specially""" +- if len(filename) > 3 and filename[-3:] == '.la': +- fp = open(filename, 'r') +- dlname = '' +- installed = 1 +- line = fp.readline() +- while line: +- if len(line) > 7 and line[:7] == 'dlname=': +- dlname = line[8:-2] +- elif len(line) > 10 and line[:10] == 'installed=': +- installed = line[10:-1] == 'yes' +- line = fp.readline() +- fp.close() +- if dlname: +- if installed: +- filename = os.path.join(os.path.dirname(filename), +- dlname) +- else: +- filename = os.path.join(os.path.dirname(filename), +- '.libs', dlname) +- return ihooks.Hooks.load_dynamic(self, name, filename, file) +- +-importer = ihooks.ModuleImporter() +-importer.set_hooks(LibtoolHooks()) +- +-def install(): +- importer.install() +-def uninstall(): +- importer.uninstall() +- +-install() diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/files/pygtk-2.14.1-numpy.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/files/pygtk-2.14.1-numpy.patch new file mode 100644 index 0000000000..12e6c185c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/files/pygtk-2.14.1-numpy.patch @@ -0,0 +1,113 @@ +Index: gtk/gdk.override +=================================================================== +--- gtk/gdk.override (révision 3082) ++++ gtk/gdk.override (copie de travail) +@@ -44,7 +44,7 @@ + #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object)) + + #ifdef HAVE_NUMPY +-# include ++# include + static int have_numpy(void); + #endif + +Index: configure.ac +=================================================================== +--- configure.ac (révision 3082) ++++ configure.ac (copie de travail) +@@ -350,18 +350,27 @@ + esac + + +-dnl checks to see if Numeric Python is installed. ++dnl checks to see if numpy is installed. + AC_ARG_ENABLE(numpy, + AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),, + enable_numpy=yes) + + if test "x$enable_numpy" != xno; then + save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +- AC_CHECK_HEADER([Numeric/arrayobject.h], +- [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],, +- [#include ]) +- CPPFLAGS="$save_CPPFLAGS" ++ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()" 2> /dev/null` ++ if test "x$numpy_INCLUDES" = "x"; then ++ AC_MSG_WARN([Could not find a valid numpy installation, disabling.]) ++ enable_numpy=no ++ else ++ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES" ++ AC_CHECK_HEADER([numpy/arrayobject.h], ++ [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])], ++ [enable_numpy=no], ++ [#include ]) ++ if test "x$enable_numpy" != "xno"; then ++ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES" ++ fi ++ fi + fi + + +@@ -402,11 +411,11 @@ + $have_gtk && echo gtk with $gtk_version API + $have_libglade && echo gtk.glade + $have_gtkunixprint && echo gtk.unixprint +-echo + + if test ! $have_atk || ! $have_pango || \ + ! $have_gtk || ! $have_libglade || \ + ! $have_pangocairo || ! $have_gtkunixprint; then ++ echo + echo "The following modules will NOT be built:" + echo + $have_atk || echo atk +@@ -416,3 +425,7 @@ + $have_libglade || echo gtk.glade + $have_gtkunixprint || echo gtk.unixprint + fi ++ ++echo ++echo "Numpy support: $enable_numpy" ++echo +Index: setup.py +=================================================================== +--- setup.py (révision 3082) ++++ setup.py (copie de travail) +@@ -228,16 +228,16 @@ + data_files.append((DEFS_DIR, ('pangocairo.defs',))) + GLOBAL_MACROS.append(('HAVE_PYCAIRO',1)) + if gtk.can_build(): +- if '--disable-numeric' in sys.argv: +- sys.argv.remove('--disable-numeric') ++ if '--disable-numpy' in sys.argv: ++ sys.argv.remove('--disable-numpy') + else: + try: +- import Numeric +- Numeric # pyflakes ++ import numpy ++ numpy # pyflakes + GLOBAL_MACROS.append(('HAVE_NUMPY', 1)) + except ImportError: +- print ('* Numeric module could not be found, ' +- 'will build without Numeric support.') ++ print ('* numpy module could not be found, ' ++ 'will build without numpy support.') + ext_modules.append(gtk) + data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',))) + data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs', +Index: README +=================================================================== +--- README (révision 3082) ++++ README (copie de travail) +@@ -54,7 +54,7 @@ + GTK+ 2.14.0 or higher for 2.14 API + * libglade 2.5.0 or higher (optional) + * pycairo 1.0.2 or higher (optional) +- * Numeric (optional) ++ * numpy (optional) + + This release is supporting the following GTK+ releases: + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/pygtk-2.14.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/pygtk-2.14.1-r2.ebuild new file mode 100644 index 0000000000..b7fda8bf0c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/pygtk-2.14.1-r2.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.14.1-r1.ebuild,v 1.8 2009/09/06 20:57:05 ranger Exp $ + +EAPI="3" +GCONF_DEBUG="no" +PYTHON_DEPEND="2:2.6" +SUPPORT_PYTHON_ABIS="1" +# dev-python/pycairo does not support Python 2.4 / 2.5. +RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" + +inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx + +DESCRIPTION="GTK+2 bindings for Python" +HOMEPAGE="http://www.pygtk.org/" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" +IUSE="doc examples" + +RDEPEND=">=dev-libs/glib-2.8:2 + >=x11-libs/pango-1.16 + >=dev-libs/atk-1.12 + >=x11-libs/gtk+-2.13.6 + >=dev-python/pycairo-1.0.2 + >=dev-python/pygobject-2.15.3 + dev-python/numpy + >=gnome-base/libglade-2.5:2.0 +" +DEPEND="${RDEPEND} + doc? ( + dev-libs/libxslt + >=app-text/docbook-xsl-stylesheets-1.70.1 ) + >=dev-util/pkgconfig-0.9" + +src_prepare() { + # Fix declaration of codegen in .pc + epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch" + + # Fix test failurs due to ltihooks + # gentoo bug #268315, upstream bug #565593 + epatch "${FILESDIR}/${P}-ltihooks.patch" + + # Switch to numpy, bug #185692 + epatch "${FILESDIR}/${P}-numpy.patch" + epatch "${FILESDIR}/${P}-fix-numpy-warning.patch" + + # Fix bug with GtkToggleButton and gtk+-2.16, bug #275449 + epatch "${FILESDIR}/${P}-gtktoggle.patch" + + epatch "${FILESDIR}"/${PN}-2.14.1-libdir-pc.patch + + # Disable pyc compiling + mv "${S}"/py-compile "${S}"/py-compile.orig + ln -s $(type -P true) "${S}"/py-compile + + AT_M4DIR="m4" eautoreconf + + python_copy_sources +} + +src_configure() { + use hppa && append-flags -ffunction-sections + python_src_configure \ + $(use_enable doc docs) \ + --enable-thread +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + + testing() { + cd tests + export XDG_CONFIG_HOME="${T}/$(PYTHON --ABI)" + Xemake check-local + } + python_execute_function -s testing +} + +src_install() { + python_src_install + python_clean_installation_image + dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO || die + + if use examples; then + rm examples/Makefile* + insinto /usr/share/doc/${PF} + doins -r examples || die + fi +} + +pkg_postinst() { + python_mod_optimize gtk-2.0 + + create_symlinks() { + alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9] + alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9] + } + python_execute_function create_symlinks +} + +pkg_postrm() { + python_mod_cleanup gtk-2.0 + + create_symlinks() { + alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9] + alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9] + } + python_execute_function create_symlinks +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/pygtk-2.14.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/pygtk-2.14.1-r3.ebuild new file mode 120000 index 0000000000..eb5456cbea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-python/pygtk/pygtk-2.14.1-r3.ebuild @@ -0,0 +1 @@ +pygtk-2.14.1-r2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/apitrace-3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/apitrace-3.0-r1.ebuild new file mode 100644 index 0000000000..f3f9850add --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/apitrace-3.0-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.1 2012/03/18 21:35:32 radhermit Exp $ + +EAPI="2" +PYTHON_DEPEND="2:2.6" + +inherit cmake-utils eutils python multilib + +DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs" +HOMEPAGE="https://github.com/apitrace/apitrace" +SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="egl multilib qt4" + +RDEPEND="app-arch/snappy + media-libs/libpng + sys-libs/zlib + media-libs/mesa[egl?] + egl? ( || ( + >=media-libs/mesa-8.0[gles1,gles2] + =x11-libs/qt-core-4.7:4 + >=x11-libs/qt-gui-4.7:4 + >=x11-libs/qt-webkit-4.7:4 + >=dev-libs/qjson-0.5 + )" +DEPEND="${RDEPEND}" + +EMULTILIB_PKG="true" + +PATCHES=( + "${FILESDIR}"/${P}-system-libs.patch + "${FILESDIR}"/${P}-glxtrace-only.patch +) + +pkg_setup() { + python_set_active_version 2 +} + +src_unpack() { + unpack ${A} + mv *-${PN}-* "${S}" +} + +src_prepare() { + base_src_prepare + # Workaround NULL DT_RPATH issues + sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die +} + +src_configure() { + for ABI in $(get_install_abis) ; do + mycmakeargs=( + $(cmake-utils_use_enable qt4 GUI) + $(cmake-utils_use_enable egl EGL) + ) + + if use multilib ; then + if [[ "${ABI}" != "${DEFAULT_ABI}" ]] ; then + mycmakeargs=( + -DBUILD_LIB_ONLY=ON + -DENABLE_GUI=OFF + $(cmake-utils_use_enable egl EGL) + ) + fi + multilib_toolchain_setup ${ABI} + fi + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH=${ROOT}" ) + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER" ) + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY" ) + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY" ) + + CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + cmake-utils_src_configure + done +} + +src_compile() { + for ABI in $(get_install_abis) ; do + use multilib && multilib_toolchain_setup ${ABI} + CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + cmake-utils_src_compile + done +} + +src_install() { + dobin "${CMAKE_BUILD_DIR}"/{glretrace,apitrace} + use qt4 && dobin "${CMAKE_BUILD_DIR}"/qapitrace + + for ABI in $(get_install_abis) ; do + CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + exeinto /usr/$(get_libdir)/${PN}/wrappers + doexe "${CMAKE_BUILD_DIR}"/wrappers/*.so + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 + done + + dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown + + exeinto /usr/$(get_libdir)/${PN}/scripts + doexe $(find scripts -type f -executable) +} + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch new file mode 100644 index 0000000000..a6704d1713 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch @@ -0,0 +1,63 @@ +--- apitrace-apitrace-de9f3e5/CMakeLists.txt ++++ apitrace-apitrace-de9f3e5/CMakeLists.txt +@@ -19,6 +19,8 @@ + + set (ENABLE_EGL "AUTO" CACHE STRING "Enable EGL support.") + ++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF) ++ + + ############################################################################## + # Find dependencies +@@ -159,7 +161,13 @@ + include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) + link_libraries (${ZLIB_LIBRARIES}) + +-find_package (SNAPPY REQUIRED) ++if (BUILD_LIB_ONLY) ++ set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) ++ set (SNAPPY_LIBRARIES snappy_bundled) ++ add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL) ++else (BUILD_LIB_ONLY) ++ find_package (SNAPPY REQUIRED) ++endif (BUILD_LIB_ONLY) + include_directories (${SNAPPY_INCLUDE_DIRS}) + link_libraries (${SNAPPY_LIBRARIES}) + +@@ -182,6 +190,8 @@ + # By bundling the QJSON source, we make it much more easier to build the GUI on + # Windows and MacOSX. But we only use the bundled sources when ENABLE_GUI is + # AUTO. ++if (NOT BUILD_LIB_ONLY) ++ + if (QT4_FOUND AND NOT QJSON_FOUND AND (ENABLE_GUI STREQUAL "AUTO")) + add_subdirectory (thirdparty/qjson EXCLUDE_FROM_ALL) + set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) +@@ -190,6 +200,8 @@ + set (QJSON_FOUND TRUE) + endif () + ++endif (NOT BUILD_LIB_ONLY) ++ + # For glext headers. Needs to be before system includes as often system's GL + # headers bundle and include glext.h and glxext.h + include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glext) +@@ -497,6 +513,8 @@ + ############################################################################## + # API retracers + ++if (NOT BUILD_LIB_ONLY) ++ + add_custom_command ( + OUTPUT glretrace_gl.cpp + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp +@@ -624,6 +642,8 @@ + add_subdirectory(gui) + endif () + ++endif (NOT BUILD_LIB_ONLY) ++ + + ############################################################################## + # Packaging + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/files/apitrace-3.0-system-libs.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/files/apitrace-3.0-system-libs.patch new file mode 100644 index 0000000000..3951354092 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/apitrace/files/apitrace-3.0-system-libs.patch @@ -0,0 +1,69 @@ +--- apitrace-apitrace-de9f3e5/cmake/FindSNAPPY.cmake ++++ apitrace-apitrace-de9f3e5/cmake/FindSNAPPY.cmake +@@ -0,0 +1,31 @@ ++# Find SNAPPY - A fast compressor/decompressor ++# ++# This module defines ++# SNAPPY_FOUND - whether the qsjon library was found ++# SNAPPY_LIBRARIES - the snappy library ++# SNAPPY_INCLUDE_DIR - the include path of the snappy library ++# ++ ++if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES) ++ ++ # Already in cache ++ set (SNAPPY_FOUND TRUE) ++ ++else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES) ++ ++ find_library (SNAPPY_LIBRARIES ++ NAMES ++ snappy ++ PATHS ++ ) ++ ++ find_path (SNAPPY_INCLUDE_DIR ++ NAMES ++ snappy.h ++ PATHS ++ ) ++ ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR) ++ ++endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES) +--- apitrace-apitrace-de9f3e5/CMakeLists.txt ++++ apitrace-apitrace-de9f3e5/CMakeLists.txt +@@ -155,27 +155,16 @@ + # - on unices to prevent symbol collisions when tracing applications that link + # against other versions of these libraries + +-set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) +-set (ZLIB_LIBRARIES z_bundled) +-add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL) +- +-include_directories (${ZLIB_INCLUDE_DIRS}) ++find_package (ZLIB REQUIRED) ++include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) + link_libraries (${ZLIB_LIBRARIES}) + +-set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) +-set (SNAPPY_LIBRARIES snappy_bundled) +-add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL) +- ++find_package (SNAPPY REQUIRED) + include_directories (${SNAPPY_INCLUDE_DIRS}) + link_libraries (${SNAPPY_LIBRARIES}) + +-set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng) +-set (PNG_DEFINITIONS "") +-set (PNG_LIBRARIES png_bundled) +- +-add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL) ++find_package (PNG REQUIRED) ++include_directories (${PNG_INCLUDE_DIRS}) +-include_directories (${PNG_INCLUDE_DIR}) +-add_definitions (${PNG_DEFINITIONS}) + link_libraries (${PNG_LIBRARIES}) + + if (MSVC) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/Manifest new file mode 100644 index 0000000000..dbf071aaff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/Manifest @@ -0,0 +1 @@ +DIST bsdiff-4.3.tar.gz 5740 RMD160 27bb255b5dd5aa56d3a076dac9ca76d238a79a04 SHA1 0c0a89d604fc55ef2b5e69cd18372b2972edd8b8 SHA256 18821588b2dc5bf159aa37d3bcb7b885d85ffd1e19f23a0c57a58723fea85f48 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/bsdiff-4.3-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/bsdiff-4.3-r5.ebuild new file mode 100644 index 0000000000..a5302f49da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/bsdiff-4.3-r5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/bsdiff-4.3-r2.ebuild,v 1.1 2010/12/13 00:35:03 flameeyes Exp $ + +EAPI=2 + +inherit eutils toolchain-funcs flag-o-matic + +IUSE="" + +DESCRIPTION="bsdiff: Binary Differencer using a suffix alg" +HOMEPAGE="http://www.daemonology.net/bsdiff/" +SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD-2" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND="app-arch/bzip2 + dev-libs/libdivsufsort" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch ${FILESDIR}/4.3_bspatch-support-input-output-positioning.patch || die + epatch ${FILESDIR}/4.3_bsdiff-divsufsort.patch || die +} + +doecho() { + echo "$@" + "$@" +} + +src_compile() { + append-lfs-flags + doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 -ldivsufsort64 || die "failed compiling bsdiff" + doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch" +} + +src_install() { + dobin bs{diff,patch} || die + doman bs{diff,patch}.1 || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/files/4.3_bsdiff-divsufsort.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/files/4.3_bsdiff-divsufsort.patch new file mode 100644 index 0000000000..48bc8c30f2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/files/4.3_bsdiff-divsufsort.patch @@ -0,0 +1,187 @@ +diff -urN bsdiff-4.3/bsdiff.c bsdiff-4.3-new/bsdiff.c +--- bsdiff-4.3/bsdiff.c 2005-08-16 15:13:52.000000000 -0700 ++++ bsdiff-4.3-new/bsdiff.c 2012-03-28 17:17:04.000000000 -0700 +@@ -38,106 +38,15 @@ + #include + #include + +-#define MIN(x,y) (((x)<(y)) ? (x) : (y)) +- +-static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h) +-{ +- off_t i,j,k,x,tmp,jj,kk; +- +- if(len<16) { +- for(k=start;kstart) split(I,V,start,jj-start,h); +- +- for(i=0;ikk) split(I,V,kk,start+len-kk,h); +-} +- +-static void qsufsort(off_t *I,off_t *V,u_char *old,off_t oldsize) +-{ +- off_t buckets[256]; +- off_t i,h,len; ++#if _FILE_OFFSET_BITS == 64 ++#include "divsufsort64.h" ++#define saidx_t saidx64_t ++#define divsufsort divsufsort64 ++#else ++#include "divsufsort.h" ++#endif + +- for(i=0;i<256;i++) buckets[i]=0; +- for(i=0;i0;i--) buckets[i]=buckets[i-1]; +- buckets[0]=0; +- +- for(i=0;i 100) break; + }; + + if((len!=oldscore) || (scan==newsize)) { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/files/4.3_bspatch-support-input-output-positioning.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/files/4.3_bspatch-support-input-output-positioning.patch new file mode 100644 index 0000000000..928fa00706 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/files/4.3_bspatch-support-input-output-positioning.patch @@ -0,0 +1,343 @@ +--- bsdiff-4.3/bspatch.c 2005-08-16 15:14:00.000000000 -0700 ++++ bsdiff-4.3-new/bspatch.c 2010-10-12 13:57:08.000000000 -0700 +@@ -3,7 +3,7 @@ + * All rights reserved + * + * Redistribution and use in source and binary forms, with or without +- * modification, are permitted providing that the following conditions ++ * modification, are permitted providing that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. +@@ -29,6 +29,9 @@ + #endif + + #include ++#include ++#include ++#include + #include + #include + #include +@@ -36,6 +39,264 @@ + #include + #include + ++#define JOIN(a, b) __JOIN(a, b) ++#define __JOIN(a, b) a ## b ++#define COMPILE_ASSERT(expr, message) \ ++ typedef char JOIN(message, JOIN(_, __LINE__)) [(expr) ? 1 : -1] ++ ++COMPILE_ASSERT(sizeof(int64_t) == 8, int64_t_64_bit); ++COMPILE_ASSERT(sizeof(off_t) == 8, off_t_64_bit); ++ ++#define MIN(a, b) \ ++ ((a) < (b) ? (a) : (b)) ++ ++static const char kFdFilePrefix[] = "/dev/fd/"; ++ ++// Reads next int from *ints. The int should be terminated with a comma ++// or NULL char. *ints will be updated to the space right after the comma ++// or set to NULL if this was the last number. This assumes the input is ++// a valid string, as validated with PositionsStringIsValid(). ++// Returns 1 on success. ++int NextInt64(const char** ints, int64_t *out) { ++ if (!ints[0]) ++ return 0; ++ int r = sscanf(*ints, "%" PRIi64, out); ++ if (r == 1) { ++ const char* next_comma = strchr(*ints, ','); ++ const char* next_colon = strchr(*ints, ':'); ++ if (!next_comma && !next_colon) ++ *ints = NULL; ++ else if (!next_comma) ++ *ints = next_colon + 1; ++ else if (!next_colon) ++ *ints = next_comma + 1; ++ else ++ *ints = MIN(next_comma, next_colon) + 1; ++ return 1; ++ } ++ return 0; ++} ++ ++COMPILE_ASSERT(sizeof(intmax_t) == 8, intmax_t_not_64_bit); ++ ++// Returns 1 if str can be converted to int64_t without over/underflowing. ++// str is assumed to point to an optional negative sign followed by numbers, ++// optionally followed by non-numeric characters, followed by '\0'. ++int IsValidInt64(const char* str) { ++ char* end_ptr = 0; ++ errno = 0; ++ intmax_t result = strtoimax(str, &end_ptr, /* base: */ 10); ++ return errno == 0; ++} ++ ++// Input validator. Make sure the positions string is well formatted. ++// All numerical values are checked to make sure they don't over/underflow ++// int64_t. Returns 1 if valid. ++int PositionsStringIsValid(const char* positions) { ++ if (positions == NULL) ++ errx(1, "bad string"); ++ ++ // Special case: empty string is valid ++ if (!positions[0]) ++ return 1; ++ ++ // Use a state machine to determine if the string is valid. ++ // Key: (s): state, ((s)) valid end state. ++ // n (negative_valid) is a boolean that starts out as true. ++ // If n is true, ':' is the delimiter, otherwise ','. ++ // ++ // .--------------------------. ++ // | | n ? ':' : ',' ; n = !n ++ // V '-'&&n 0-9 | ++ // start->(0)------------->(1)----->((2))---. ++ // `---------------------> <--' 0-9 ++ // 0-9 ++ int state = 0; ++ int negative_valid = 1; ++ const char* number_start = positions; ++ for (;; positions++) { ++ char c = *positions; ++ switch (state) { ++ case 0: ++ if (c == '-' && negative_valid) { ++ state = 1; ++ continue; ++ } ++ if (isdigit(c)) { ++ state = 2; ++ continue; ++ } ++ return 0; ++ case 1: ++ if (isdigit(c)) { ++ state = 2; ++ continue; ++ } ++ return 0; ++ case 2: ++ if (isdigit(c)) ++ continue; ++ // number_start must point to a valid number ++ if (!IsValidInt64(number_start)) { ++ return 0; ++ } ++ if ((negative_valid && c == ':') || ++ (!negative_valid && c == ',')) { ++ state = 0; ++ number_start = positions + 1; ++ negative_valid = !negative_valid; ++ continue; ++ } ++ return (c == '\0'); ++ } ++ } ++} ++ ++static const int64_t kMaxLength = sizeof(size_t) > 4 ? INT64_MAX : SIZE_MAX; ++ ++// Reads into a buffer a series of byte ranges from filename. ++// Each range is a pair of comma-separated ints from positions. ++// -1 as an offset means a sparse-hole. ++// E.g. If positions were "1,5:23,4:-1,8:3,7", then we would return a buffer ++// consisting of 5 bytes from offset 1 of the file, followed by ++// 4 bytes from offset 23, then 8 bytes of all zeros, then 7 bytes from ++// offset 3 in the file. ++// Returns NULL on error. ++static char* PositionedRead(const char* filename, ++ const char* positions, ++ ssize_t* old_size) { ++ if (!PositionsStringIsValid(positions)) { ++ errx(1, "invalid positions string for read\n"); ++ } ++ ++ // Get length ++ const char* p = positions; ++ int64_t length = 0; ++ for (;;) { ++ int64_t value; ++ if (0 == NextInt64(&p, &value)) { ++ break; ++ } ++ int r = NextInt64(&p, &value); ++ if (r == 0) { ++ errx(1, "bad length parse\n"); ++ } ++ if (value < 0) { ++ errx(1, "length can't be negative\n"); ++ } ++ length += value; ++ } ++ ++ // Malloc ++ if (length > 0x40000000) { // 1 GiB; sanity check ++ errx(1, "Read length too long (exceeds 1 GiB)"); ++ } ++ // Following bsdiff convention, allocate length + 1 to avoid malloc(0) ++ char* buf = malloc(length + 1); ++ if (buf == NULL) { ++ errx(1, "malloc failed\n"); ++ } ++ char* buf_tail = buf; ++ ++ int fd = -1; ++ int should_close = 1; ++ if (strlen(filename) > strlen(kFdFilePrefix) && ++ !strncmp(filename, kFdFilePrefix, strlen(kFdFilePrefix))) { ++ sscanf(filename + strlen(kFdFilePrefix), "%d", &fd); ++ should_close = 0; ++ } else { ++ fd = open(filename, O_RDONLY); ++ } ++ if (fd < 0) { ++ errx(1, "open failed for read\n"); ++ } ++ ++ // Read bytes ++ p = positions; ++ for (;;) { ++ int64_t offset, read_length; ++ if (NextInt64(&p, &offset) == 0) { ++ break; ++ } ++ if (offset < 0) { ++ errx(1, "no support for sparse positions " ++ "yet during read\n"); ++ } ++ if (NextInt64(&p, &read_length) == 0) { ++ errx(1, "bad length parse (should never happen)\n"); ++ } ++ if (read_length < 0) { ++ errx(1, "length can't be negative " ++ "(should never happen)\n"); ++ } ++ if (read_length > kMaxLength) { ++ errx(1, "read length too large\n"); ++ } ++ ssize_t rc = pread(fd, buf_tail, (size_t)read_length, (off_t)offset); ++ if (rc != read_length) { ++ errx(1, "read failed\n"); ++ } ++ buf_tail += rc; ++ } ++ if (should_close) ++ close(fd); ++ *old_size = length; ++ return buf; ++} ++ ++static void PositionedWrite(const char* filename, ++ const char* positions, ++ const char* buf, ++ ssize_t new_size) { ++ if (!PositionsStringIsValid(positions)) { ++ errx(1, "invalid positions string for write\n"); ++ } ++ int fd = -1; ++ int should_close = 1; ++ if (strlen(filename) > strlen(kFdFilePrefix) && ++ !strncmp(filename, kFdFilePrefix, strlen(kFdFilePrefix))) { ++ sscanf(filename + strlen(kFdFilePrefix), "%d", &fd); ++ should_close = 0; ++ } else { ++ fd = open(filename, O_WRONLY | O_CREAT, 0666); ++ } ++ if (fd < 0) { ++ errx(1, "open failed for write\n"); ++ } ++ ++ for (;;) { ++ int64_t offset, length; ++ if (NextInt64(&positions, &offset) == 0) { ++ break; ++ } ++ if (NextInt64(&positions, &length) == 0) { ++ errx(1, "bad length parse for write\n"); ++ } ++ if (length < 0) { ++ errx(1, "length can't be negative for write\n"); ++ } ++ if (length > kMaxLength) { ++ errx(1, "write length too large\n"); ++ } ++ ++ if (offset < 0) { ++ // Sparse hole. Skip. ++ } else { ++ ssize_t rc = pwrite(fd, buf, (size_t)length, (off_t)offset); ++ if (rc != length) { ++ errx(1, "write failed\n"); ++ } ++ } ++ buf += length; ++ new_size -= length; ++ } ++ if (new_size != 0) { ++ errx(1, "output position length doesn't match new size\n"); ++ } ++ if (should_close) ++ close(fd); ++} ++ + static off_t offtin(u_char *buf) + { + off_t y; +@@ -69,7 +330,13 @@ + off_t lenread; + off_t i; + +- if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]); ++ if ((argc != 6) && (argc != 4)) { ++ errx(1,"usage: %s oldfile newfile patchfile \\\n" ++ " [in_offset,in_length,in_offset,in_length,... \\\n" ++ " out_offset,out_length," ++ "out_offset,out_length,...]\n",argv[0]); ++ } ++ int using_positioning = (argc == 6); + + /* Open patch file */ + if ((f = fopen(argv[3], "r")) == NULL) +@@ -132,12 +399,18 @@ + if ((epfbz2 = BZ2_bzReadOpen(&ebz2err, epf, 0, 0, NULL, 0)) == NULL) + errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err); + +- if(((fd=open(argv[1],O_RDONLY,0))<0) || +- ((oldsize=lseek(fd,0,SEEK_END))==-1) || +- ((old=malloc(oldsize+1))==NULL) || +- (lseek(fd,0,SEEK_SET)!=0) || +- (read(fd,old,oldsize)!=oldsize) || +- (close(fd)==-1)) err(1,"%s",argv[1]); ++ // Read ++ ++ if (!using_positioning) { ++ if(((fd=open(argv[1],O_RDONLY,0))<0) || ++ ((oldsize=lseek(fd,0,SEEK_END))==-1) || ++ ((old=malloc(oldsize+1))==NULL) || ++ (lseek(fd,0,SEEK_SET)!=0) || ++ (read(fd,old,oldsize)!=oldsize) || ++ (close(fd)==-1)) err(1,"%s",argv[1]); ++ } else { ++ old = PositionedRead(argv[1], argv[4], &oldsize); ++ } + if((new=malloc(newsize+1))==NULL) err(1,NULL); + + oldpos=0;newpos=0; +@@ -193,9 +466,13 @@ + err(1, "fclose(%s)", argv[3]); + + /* Write the new file */ +- if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) || +- (write(fd,new,newsize)!=newsize) || (close(fd)==-1)) +- err(1,"%s",argv[2]); ++ if (!using_positioning) { ++ if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) || ++ (write(fd,new,newsize)!=newsize) || (close(fd)==-1)) ++ err(1,"%s",argv[2]); ++ } else { ++ PositionedWrite(argv[2], argv[5], new, newsize); ++ } + + free(new); + free(old); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/git/git-1.7.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/git/git-1.7.0.ebuild new file mode 100644 index 0000000000..4e45c376d5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/git/git-1.7.0.ebuild @@ -0,0 +1,5 @@ +# Dummy package that will be thrown away once the +# dev-util/git -> dev-vcs/git migration finishes. + +SLOT="0" +KEYWORDS="amd64 arm x86" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/gob/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/gob/Manifest new file mode 100644 index 0000000000..f5b7d80dba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/gob/Manifest @@ -0,0 +1 @@ +DIST gob2-2.0.17.tar.bz2 216848 RMD160 eabc5d26e48d47b9183c288342e8bcf01ae9659d SHA1 25497258882d627e991da4599a507eea4e30a3dd SHA256 e9f52fff7ada88a36da1d412f8b2b57b44cc0527e545cf2f5d873c002c0da7f4 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/gob/gob-2.0.17.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/gob/gob-2.0.17.ebuild new file mode 100644 index 0000000000..a5b48e2407 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/gob/gob-2.0.17.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/gob/gob-2.0.16.ebuild,v 1.2 2010/01/15 21:40:42 fauli Exp $ + +GCONF_DEBUG="no" + +inherit gnome2 + +MY_PN=gob2 +MY_P=${MY_PN}-${PV} +S=${WORKDIR}/${MY_P} +PVP=(${PV//[-\._]/ }) + +DESCRIPTION="Preprocessor for making GTK+ objects with inline C code" +HOMEPAGE="http://www.5z.com/jirka/gob.html" +SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="" + +RDEPEND=">=dev-libs/glib-2" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/flex" + +DOCS="AUTHORS ChangeLog NEWS README TODO" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/hdctools/hdctools-0.0.1-r184.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/hdctools/hdctools-0.0.1-r184.ebuild new file mode 100644 index 0000000000..f80e5a7938 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/hdctools/hdctools-0.0.1-r184.ebuild @@ -0,0 +1,39 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="bb954d3423be9a55ddbc17bced4d902d2ff68ada" +CROS_WORKON_TREE="2cd6599248d6a4c113086df61d6767dc9c3bc8f7" +CROS_WORKON_PROJECT="chromiumos/third_party/hdctools" + +SUPPORT_PYTHON_ABIS="1" + +inherit cros-workon distutils toolchain-funcs multilib + +DESCRIPTION="Software to communicate with servo/miniservo debug boards" +HOMEPAGE="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND=">=dev-embedded/libftdi-0.18 + dev-libs/libusb + dev-python/numpy + dev-python/pexpect + dev-python/pyserial + dev-python/pyusb" +DEPEND="${RDEPEND} + app-text/htmltidy" + +src_compile() { + tc-export CC PKG_CONFIG + emake || die + distutils_src_compile +} + +src_install() { + emake DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install || die + distutils_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/hdctools/hdctools-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/hdctools/hdctools-9999.ebuild new file mode 100644 index 0000000000..0355ef0419 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/hdctools/hdctools-9999.ebuild @@ -0,0 +1,37 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/hdctools" + +SUPPORT_PYTHON_ABIS="1" + +inherit cros-workon distutils toolchain-funcs multilib + +DESCRIPTION="Software to communicate with servo/miniservo debug boards" +HOMEPAGE="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=">=dev-embedded/libftdi-0.18 + dev-libs/libusb + dev-python/numpy + dev-python/pexpect + dev-python/pyserial + dev-python/pyusb" +DEPEND="${RDEPEND} + app-text/htmltidy" + +src_compile() { + tc-export CC PKG_CONFIG + emake || die + distutils_src_compile +} + +src_install() { + emake DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install || die + distutils_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/Manifest new file mode 100644 index 0000000000..9f89d75c73 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/Manifest @@ -0,0 +1 @@ +DIST lcov-1.9.tar.gz 140035 RMD160 8065012a49cc7e10c295093c9b0c6dee9efcac22 SHA1 5aff4b998b1288896734326a0b74ab536339ec21 SHA256 c37e125d4f0773339de3600d45ad325fe710ea2f0051d7ee2b8a168f450f1aca diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/files/geninfo-gcov_4.6_compat.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/files/geninfo-gcov_4.6_compat.patch new file mode 100644 index 0000000000..d6c13e9970 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/files/geninfo-gcov_4.6_compat.patch @@ -0,0 +1,32 @@ +This patch is needed because this commit: +http://gcc.gnu.org/viewcvs?view=revision&revision=173147 +changes the way the gcno files store function information. + +It should be removed once we upgrade to gcc-4.7 and grab the +new lcov from upstream gentoo. +--- lcov-1.9/bin/geninfo 2010-08-06 04:05:17.000000000 -0700 ++++ lcov-1.9/bin/geninfo 2012-06-26 17:03:18.925545659 -0700 +@@ -63,6 +63,7 @@ + our $gcov_tool = "gcov"; + our $tool_name = basename($0); + ++our $GCOV_VERSION_4_6_0 = 0x40600; + our $GCOV_VERSION_3_4_0 = 0x30400; + our $GCOV_VERSION_3_3_0 = 0x30300; + our $GCNO_FUNCTION_TAG = 0x01000000; +@@ -2897,12 +2898,14 @@ + my ($handle, $bb, $fileorder, $base, $big_endian) = @_; + my $filename; + my $function; ++ my $checksum_length = ($gcov_version < $GCOV_VERSION_4_6_0) ? 4 : 8; + my $lineno; + my $lines; + + graph_expect("function record"); + # Skip ident and checksum +- graph_skip($handle, 8, "function ident and checksum") or return undef; ++ graph_skip($handle, 4 + $checksum_length, ++ "function ident and checksum") or return undef; + # Read function name + graph_expect("function name"); + $function = read_gcno_string($handle, $big_endian); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/lcov-1.9.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/lcov-1.9.ebuild new file mode 100644 index 0000000000..ea21d32635 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/lcov/lcov-1.9.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/lcov-1.9.ebuild,v 1.3 2012/05/21 12:29:34 johu Exp $ + +inherit eutils + +EAPI="2" + +DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov" +HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php" +SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="" + +DEPEND="" +RDEPEND=">=dev-lang/perl-5 + dev-perl/GD[png]" + +src_prepare() { + epatch ${FILESDIR}/geninfo-gcov_4.6_compat.patch +} + +src_install() { + emake PREFIX="${D}" install || die "install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/libc-bench/libc-bench-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/libc-bench/libc-bench-0.0.1-r3.ebuild new file mode 100644 index 0000000000..389e19db70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/libc-bench/libc-bench-0.0.1-r3.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="f753ff1b9271342abd3f58dbac13174b936406f3" +CROS_WORKON_TREE="fb0ecd51a4636d40f23ccfc7492087b17e28b1dd" +CROS_WORKON_PROJECT="chromiumos/third_party/libc-bench" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="libc benchmark originally from +http://www.etalabs.net/src/libc-bench/" +HOMEPAGE="http://www.etalabs.net/src/libc-bench/" +SRC_URI="" +LICENSE="" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_compile() { + tc-export CC CXX PKG_CONFIG + emake || die "end compile failed." +} + +src_install() { + INSTALL_DIR=/usr/local/libc-bench/ + dodir $INSTALL_DIR + exeinto $INSTALL_DIR + doexe libc-bench +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/libc-bench/libc-bench-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/libc-bench/libc-bench-9999.ebuild new file mode 100644 index 0000000000..deba4bdd6e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/libc-bench/libc-bench-9999.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/libc-bench" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="libc benchmark originally from +http://www.etalabs.net/src/libc-bench/" +HOMEPAGE="http://www.etalabs.net/src/libc-bench/" +SRC_URI="" +LICENSE="" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_compile() { + tc-export CC CXX PKG_CONFIG + emake || die "end compile failed." +} + +src_install() { + INSTALL_DIR=/usr/local/libc-bench/ + dodir $INSTALL_DIR + exeinto $INSTALL_DIR + doexe libc-bench +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/files/chromeos-version.sh new file mode 100755 index 0000000000..5de8bc36cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/files/chromeos-version.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +# Matching regexp for all known kernel release tags to date. +PATTERN="v[23].*" + +if [ ! -d "$1" ] ; then + exit +fi + +cd "$1" || exit + +git describe --match "${PATTERN}" --abbrev=0 HEAD 2>&1 | egrep "${PATTERN}" | + sed s/v\\.*//g | sed s/-/_/g diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/perf-next-3.4_rc7-r254.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/perf-next-3.4_rc7-r254.ebuild new file mode 100644 index 0000000000..bdafbd0f35 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/perf-next-3.4_rc7-r254.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.32.ebuild,v 1.1 2009/12/04 16:33:24 flameeyes Exp $ + +EAPI=4 +CROS_WORKON_COMMIT="f6a45ba0aa715500f21d6d95a0558dd50e4bbf6b" +CROS_WORKON_TREE="b80c11182613432cf1192946a2c95ea1cd742d9d" +CROS_WORKON_PROJECT="chromiumos/third_party/kernel-next" + +inherit cros-workon eutils toolchain-funcs linux-info + +DESCRIPTION="Userland tools for Linux Performance Counters" +HOMEPAGE="http://perf.wiki.kernel.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="+demangle +doc perl python ncurses" + +RDEPEND="demangle? ( sys-devel/binutils ) + dev-libs/elfutils + ncurses? ( dev-libs/newt ) + perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) + !dev-util/perf" +DEPEND="${RDEPEND} + doc? ( app-text/asciidoc app-text/xmlto )" + +CROS_WORKON_LOCALNAME="kernel-next" + +src_compile() { + local makeargs= + + pushd tools/perf + + use demangle || makeargs="${makeargs} NO_DEMANGLE=1 " + use perl || makeargs="${makeargs} NO_LIBPERL=1 " + use python || makeargs="${makeargs} NO_LIBPYTHON=1 " + use ncurses || makeargs="${makeargs} NO_NEWT=1 " + + if use arm; then + export ARM_SHA=1 + fi + + emake ${makeargs} \ + CC="$(tc-getCC)" AR="$(tc-getAR)" \ + prefix="/usr" bindir_relative="sbin" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" + + if use doc; then + pushd Documentation + emake ${makeargs} + popd + fi + + popd +} + +src_install() { + pushd tools/perf + + dosbin perf + dosbin perf-archive + + dodoc CREDITS + + if use doc; then + dodoc Documentation/*.txt + dohtml Documentation/*.html + doman Documentation/*.1 + fi + + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/perf-next-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/perf-next-9999.ebuild new file mode 100644 index 0000000000..d8b5a58a25 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/perf-next/perf-next-9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.32.ebuild,v 1.1 2009/12/04 16:33:24 flameeyes Exp $ + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/kernel-next" + +inherit cros-workon eutils toolchain-funcs linux-info + +DESCRIPTION="Userland tools for Linux Performance Counters" +HOMEPAGE="http://perf.wiki.kernel.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+demangle +doc perl python ncurses" + +RDEPEND="demangle? ( sys-devel/binutils ) + dev-libs/elfutils + ncurses? ( dev-libs/newt ) + perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) + !dev-util/perf" +DEPEND="${RDEPEND} + doc? ( app-text/asciidoc app-text/xmlto )" + +CROS_WORKON_LOCALNAME="kernel-next" + +src_compile() { + local makeargs= + + pushd tools/perf + + use demangle || makeargs="${makeargs} NO_DEMANGLE=1 " + use perl || makeargs="${makeargs} NO_LIBPERL=1 " + use python || makeargs="${makeargs} NO_LIBPYTHON=1 " + use ncurses || makeargs="${makeargs} NO_NEWT=1 " + + if use arm; then + export ARM_SHA=1 + fi + + emake ${makeargs} \ + CC="$(tc-getCC)" AR="$(tc-getAR)" \ + prefix="/usr" bindir_relative="sbin" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" + + if use doc; then + pushd Documentation + emake ${makeargs} + popd + fi + + popd +} + +src_install() { + pushd tools/perf + + dosbin perf + dosbin perf-archive + + dodoc CREDITS + + if use doc; then + dodoc Documentation/*.txt + dohtml Documentation/*.html + doman Documentation/*.1 + fi + + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/perf/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/files/chromeos-version.sh new file mode 100755 index 0000000000..5de8bc36cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/files/chromeos-version.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +# Matching regexp for all known kernel release tags to date. +PATTERN="v[23].*" + +if [ ! -d "$1" ] ; then + exit +fi + +cd "$1" || exit + +git describe --match "${PATTERN}" --abbrev=0 HEAD 2>&1 | egrep "${PATTERN}" | + sed s/v\\.*//g | sed s/-/_/g diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/perf/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/metadata.xml new file mode 100644 index 0000000000..8c848aed84 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/metadata.xml @@ -0,0 +1,26 @@ + + + + no-herd + + flameeyes@gentoo.org + + + + Enable C++ symbol name demangling, using libbfd from + sys-devel/binutils. When this flag is enabled, the + package will have to be rebuilt after every version bump of + binutils. + + + Build documentation and man pages. With thise USE flag disabled, + the --help parameter for perf and its sub-tools will not be + available. This is optional because it depends on a few + documentation handling tools that are not always welcome on user + systems. + + + Add support for Perl as a scripting language for perf tools. + + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/perf/perf-3.4-r2115.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/perf-3.4-r2115.ebuild new file mode 100644 index 0000000000..6e74bc0779 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/perf-3.4-r2115.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.32.ebuild,v 1.1 2009/12/04 16:33:24 flameeyes Exp $ + +EAPI=4 +CROS_WORKON_COMMIT="808f8d525c0eeaba7d71f2c9f993c02b1c76e210" +CROS_WORKON_TREE="cf09dbf486aa2e7f53a7236d4d77165325586be8" +CROS_WORKON_PROJECT="chromiumos/third_party/kernel" + +inherit cros-workon eutils toolchain-funcs linux-info + +DESCRIPTION="Userland tools for Linux Performance Counters" +HOMEPAGE="http://perf.wiki.kernel.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="+demangle +doc perl python ncurses" + +RDEPEND="demangle? ( sys-devel/binutils ) + dev-libs/elfutils + ncurses? ( dev-libs/newt ) + perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) + !dev-util/perf-next" +DEPEND="${RDEPEND} + doc? ( app-text/asciidoc app-text/xmlto )" + +CROS_WORKON_LOCALNAME="kernel/files" + +src_compile() { + local makeargs= + + pushd tools/perf + + use demangle || makeargs="${makeargs} NO_DEMANGLE=1 " + use perl || makeargs="${makeargs} NO_LIBPERL=1 " + use python || makeargs="${makeargs} NO_LIBPYTHON=1 " + use ncurses || makeargs="${makeargs} NO_NEWT=1 " + + if use arm; then + export ARM_SHA=1 + fi + + emake ${makeargs} \ + CC="$(tc-getCC)" AR="$(tc-getAR)" \ + prefix="/usr" bindir_relative="sbin" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" + + if use doc; then + pushd Documentation + emake ${makeargs} + popd + fi + + popd +} + +src_install() { + pushd tools/perf + + dosbin perf + dosbin perf-archive + + dodoc CREDITS + + if use doc; then + dodoc Documentation/*.txt + dohtml Documentation/*.html + doman Documentation/*.1 + fi + + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/perf/perf-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/perf-9999.ebuild new file mode 100644 index 0000000000..eb69cb5bbf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/perf/perf-9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.32.ebuild,v 1.1 2009/12/04 16:33:24 flameeyes Exp $ + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/kernel" + +inherit cros-workon eutils toolchain-funcs linux-info + +DESCRIPTION="Userland tools for Linux Performance Counters" +HOMEPAGE="http://perf.wiki.kernel.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+demangle +doc perl python ncurses" + +RDEPEND="demangle? ( sys-devel/binutils ) + dev-libs/elfutils + ncurses? ( dev-libs/newt ) + perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) + !dev-util/perf-next" +DEPEND="${RDEPEND} + doc? ( app-text/asciidoc app-text/xmlto )" + +CROS_WORKON_LOCALNAME="kernel/files" + +src_compile() { + local makeargs= + + pushd tools/perf + + use demangle || makeargs="${makeargs} NO_DEMANGLE=1 " + use perl || makeargs="${makeargs} NO_LIBPERL=1 " + use python || makeargs="${makeargs} NO_LIBPYTHON=1 " + use ncurses || makeargs="${makeargs} NO_NEWT=1 " + + if use arm; then + export ARM_SHA=1 + fi + + emake ${makeargs} \ + CC="$(tc-getCC)" AR="$(tc-getAR)" \ + prefix="/usr" bindir_relative="sbin" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" + + if use doc; then + pushd Documentation + emake ${makeargs} + popd + fi + + popd +} + +src_install() { + pushd tools/perf + + dosbin perf + dosbin perf-archive + + dodoc CREDITS + + if use doc; then + dodoc Documentation/*.txt + dohtml Documentation/*.html + doman Documentation/*.1 + fi + + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/subversion/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/subversion/Manifest new file mode 100644 index 0000000000..08bc624476 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/subversion/Manifest @@ -0,0 +1 @@ +DIST subversion-1.6.9.tar.bz2 5478554 RMD160 5f085c053657dc8d0048944265dbe436892a94fb SHA1 477aa89e60de7974ac0aa921cc369b4c2907693c SHA256 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/subversion/subversion-1.6.9.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/subversion/subversion-1.6.9.ebuild new file mode 100644 index 0000000000..3d798e30ca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/subversion/subversion-1.6.9.ebuild @@ -0,0 +1,5 @@ +# Dummy package that will be thrown away once the +# dev-util/subversion -> dev-vcs/subversion migration finishes. + +SLOT="0" +KEYWORDS="amd64 arm x86" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/files/systemtap-1.5-aux_syscalls.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/files/systemtap-1.5-aux_syscalls.patch new file mode 100644 index 0000000000..149ed35924 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/files/systemtap-1.5-aux_syscalls.patch @@ -0,0 +1,32 @@ +systemtap v1.5 doesn't provide complete support for ARM. +This patch implements the arm version of aux_syscalls. + +--- /dev/null ++++ tapset/arm/aux_syscalls.stp +@@ -0,0 +1,26 @@ ++# arch-specific requests of ptrace ___________________________ ++# ++function _arch_ptrace_argstr(request, pid, addr, data) ++{ ++ if (request == %{ PTRACE_GETREGS %}) ++ // TODO: Retrieve *data in .return ++ return sprintf ("PTRACE_GETREGS, %d, data=%p", pid, data) ++ if (request == %{ PTRACE_SETREGS %}) ++ // TODO: Retrieve *data here ++ return sprintf ("PTRACE_SETREGS, %d, data=%p", pid, data) ++ if (request == %{ PTRACE_GETFPREGS %}) ++ // TODO: Retrieve *data in .return ++ return sprintf ("PTRACE_GETFPREGS, %d, data=%p", pid, data) ++ if (request == %{ PTRACE_SETFPREGS %}) ++ // TODO: Retrieve *data here ++ return sprintf ("PTRACE_SETFPREGS, %d, data=%p", pid, data) ++ if (request == %{ PTRACE_SINGLESTEP %}) ++ // TODO: Retrieve *data here ++ return sprintf ("PTRACE_SINGLESTEP, %d, data=%p", pid, data) ++ return sprintf("unknown ptrace request: %d, %d, data=%p", request, pid, data); ++} ++ ++function _ptrace_return_arch_prctl_addr(request, addr, data) ++{ ++ return 0 ++} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/files/systemtap-1.5-comp0.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/files/systemtap-1.5-comp0.patch new file mode 100644 index 0000000000..f933c85595 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/files/systemtap-1.5-comp0.patch @@ -0,0 +1,30 @@ +From c02332052959e4213a59ce0ff40354f51506103a Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Wed, 6 Jul 2011 23:07:51 +0200 +Subject: [PATCH] Silence sys/sdt.h comparison of unsigned expression < 0 is always false. + +Some arm g++ setups would complain about the wchar_t "signedness detection": +sys/sdt.h:102: error: comparison of unsigned expression < 0 is always false + +jistone said: "((T)(-1) < 1)" would still get the right boolean value, +and shouldn't trigger range errors like "unsigned is never < 0". +--- + includes/sys/sdt.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h +index f7e1360..0a9fd40 100644 +--- a/includes/sys/sdt.h ++++ b/includes/sys/sdt.h +@@ -77,7 +77,7 @@ struct __sdt_type + #define __SDT_ALWAYS_SIGNED(T) \ + template<> struct __sdt_type { static const bool __sdt_signed = true; }; + #define __SDT_COND_SIGNED(T) \ +-template<> struct __sdt_type { static const bool __sdt_signed = ((T)(-1) < 0); }; ++template<> struct __sdt_type { static const bool __sdt_signed = ((T)(-1) < 1); }; + __SDT_ALWAYS_SIGNED(signed char) + __SDT_ALWAYS_SIGNED(short) + __SDT_ALWAYS_SIGNED(int) +-- +1.7.3.4 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/systemtap-1.5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/systemtap-1.5.ebuild new file mode 100644 index 0000000000..afa03f678d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/systemtap/systemtap-1.5.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-1.5.ebuild,v 1.1 2011/05/28 20:46:48 swegener Exp $ + +EAPI="2" + +inherit linux-info eutils + +DESCRIPTION="A linux trace/probe tool" +HOMEPAGE="http://sourceware.org/systemtap/" +if [[ ${PV} = *_pre* ]] # is this a snaphot? +then + # see configure.ac to get the version of the snapshot + SRC_URI="http://sources.redhat.com/${PN}/ftp/snapshots/${PN}-${PV/*_pre/}.tar.bz2 + mirror://gentoo/${PN}-${PV/*_pre/}.tar.bz2" # upstream only keeps four snapshot distfiles around + S="${WORKDIR}"/src +else + SRC_URI="http://sources.redhat.com/${PN}/ftp/releases/${P}.tar.gz" + # use default S for releases +fi + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 arm ~x86" +IUSE="sqlite" + +DEPEND=">=dev-libs/elfutils-0.131 + sys-libs/libcap + sqlite? ( =dev-db/sqlite-3* )" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS" +ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'." +ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'." +ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'." + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.5-comp0.patch + epatch "${FILESDIR}"/${PN}-1.5-aux_syscalls.patch +} + +src_configure() { + eval export ac_cv_file__usr_include_{nss3,nss,nspr4,nspr}= + eval export ac_cv_file__usr_include_{avahi_client,avahi_common}= + econf \ + --docdir=/usr/share/doc/${PF} \ + --without-rpm \ + --disable-server \ + --disable-docs \ + --disable-refdocs \ + --disable-grapher \ + $(use_enable sqlite) \ + || die "econf failed" +} + +src_install() { + emake install DESTDIR="${D}" || die "make install failed" + dodoc AUTHORS HACKING NEWS README +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/xnu_quick_test/xnu_quick_test-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/xnu_quick_test/xnu_quick_test-0.0.1-r3.ebuild new file mode 100644 index 0000000000..1271f07db8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/xnu_quick_test/xnu_quick_test-0.0.1-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="52004833d705bf13d177d2dc4781fc89edb90622" +CROS_WORKON_TREE="275bcb3a81b419a073305e0ab91feca9c18ff48e" +CROS_WORKON_PROJECT="chromiumos/platform/xnu_quick_test" +CROS_WORKON_LOCALNAME="../platform/xnu_quick_test" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon + +DESCRIPTION="Simple kernel regression test suite" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_install() { + echo "Not convinced where this should be installed yet." +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/xnu_quick_test/xnu_quick_test-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/xnu_quick_test/xnu_quick_test-9999.ebuild new file mode 100644 index 0000000000..11a2ce6b4c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/xnu_quick_test/xnu_quick_test-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/xnu_quick_test" +CROS_WORKON_LOCALNAME="../platform/xnu_quick_test" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon + +DESCRIPTION="Simple kernel regression test suite" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_install() { + echo "Not convinced where this should be installed yet." +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/xxd/xxd-1.10-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/xxd/xxd-1.10-r2.ebuild new file mode 120000 index 0000000000..5f3d951bac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/xxd/xxd-1.10-r2.ebuild @@ -0,0 +1 @@ +xxd-1.10.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/xxd/xxd-1.10.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/xxd/xxd-1.10.ebuild new file mode 100644 index 0000000000..2a1687da04 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/xxd/xxd-1.10.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +inherit toolchain-funcs + +DESCRIPTION="make a hexdump or do the reverse" +HOMEPAGE="http://ftp.uni-erlangen.de/pub/utilities/etc/?order=s" +SRC_URI="http://ftp.uni-erlangen.de/pub/utilities/etc/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +src_prepare() { + # use implicit make rules as they're better than the makefile + echo 'all: xxd' > Makefile + tc-export CC +} + +src_install() { + # Has to be /bin rather than /usr/bin due to conflict with vim + into / + dobin xxd +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.6.6.1-interix6.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.6.6.1-interix6.patch new file mode 100644 index 0000000000..0a8db37474 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.6.6.1-interix6.patch @@ -0,0 +1,17 @@ +diff -ru git-1.6.6.1.orig/compat/inet_ntop.c git-1.6.6.1/compat/inet_ntop.c +--- git-1.6.6.1.orig/compat/inet_ntop.c 2010-03-09 04:39:03 -0800 ++++ git-1.6.6.1/compat/inet_ntop.c 2010-03-09 04:40:50 -0800 +@@ -169,6 +169,8 @@ + } + #endif + ++/* conflicts with interix' headers... */ ++#ifndef __INTERIX + /* char * + * inet_ntop(af, src, dst, size) + * convert a network format address to presentation format. +@@ -197,3 +199,4 @@ + } + /* NOTREACHED */ + } ++#endif diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.7.1-interix.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.7.1-interix.patch new file mode 100644 index 0000000000..130d808791 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.7.1-interix.patch @@ -0,0 +1,100 @@ +patch reported upstream at the mailing list. +mail reference is: http://marc.info/?l=git&m=126813299716136&w=2 + +--- builtin/upload-archive.c ++++ builtin/upload-archive.c +@@ -132,8 +132,9 @@ + packet_flush(1); + + while (1) { +- struct pollfd pfd[2]; + int status; ++#ifndef __INTERIX ++ struct pollfd pfd[2]; + + pfd[0].fd = fd1[0]; + pfd[0].events = POLLIN; +@@ -156,6 +157,8 @@ + if (process_input(pfd[0].fd, 1)) + continue; + ++#endif ++ + if (waitpid(writer, &status, 0) < 0) + error_clnt("%s", lostchild); + else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) +--- daemon.c ++++ daemon.c +@@ -14,6 +14,8 @@ + #define NI_MAXSERV 32 + #endif + ++#ifndef __INTERIX /* not available on interix! */ ++ + static int log_syslog; + static int verbose; + static int reuseaddr; +@@ -922,8 +924,13 @@ + return service_loop(socknum, socklist); + } + ++#endif /* __INTERIX */ ++ + int main(int argc, char **argv) + { ++#ifdef __INTERIX ++ die("not implemented on interix!"); ++#else /* !__INTERIX */ + int listen_port = 0; + char *listen_addr = NULL; + int inetd_mode = 0; +@@ -1121,4 +1128,5 @@ + store_pid(pid_file); + + return serve(listen_addr, listen_port, pass, gid); ++#endif /* __INTERIX */ + } +--- git-compat-util.h ++++ git-compat-util.h +@@ -93,7 +93,9 @@ + #include + #ifndef __MINGW32__ + #include ++#ifndef __INTERIX + #include ++#endif + #include + #include + #ifndef NO_SYS_SELECT_H +@@ -104,7 +106,11 @@ + #include + #include + #include ++#ifndef __INTERIX + #include ++#else ++#include ++#endif + #if defined(__CYGWIN__) + #undef _XOPEN_SOURCE + #include +--- upload-pack.c ++++ upload-pack.c +@@ -150,6 +150,7 @@ + + static void create_pack_file(void) + { ++#ifndef __INTERIX + struct async rev_list; + struct child_process pack_objects; + int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr); +@@ -328,6 +329,9 @@ + fail: + send_client_data(3, abort_msg, sizeof(abort_msg)); + die("git upload-pack: %s", abort_msg); ++#else /* __INTERIX */ ++ die("git upload-pack: not implemented on interix!"); ++#endif /* __INTERIX */ + } + + static int got_sha1(char *hex, unsigned char *sha1) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.7.2-always-install-js.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.7.2-always-install-js.patch new file mode 100644 index 0000000000..fea661b904 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/files/git-1.7.2-always-install-js.patch @@ -0,0 +1,31 @@ +diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.2.orig/Makefile git-1.7.2/Makefile +--- git-1.7.2.orig/Makefile 2010-07-21 21:35:25.000000000 +0000 ++++ git-1.7.2/Makefile 2010-07-22 16:52:22.994872806 +0000 +@@ -1650,17 +1650,16 @@ + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all + + ifdef JSMIN +-GITWEB_PROGRAMS += gitweb/static/gitweb.min.js + GITWEB_JS = gitweb/static/gitweb.min.js + else + GITWEB_JS = gitweb/static/gitweb.js + endif + ifdef CSSMIN +-GITWEB_PROGRAMS += gitweb/static/gitweb.min.css + GITWEB_CSS = gitweb/static/gitweb.min.css + else + GITWEB_CSS = gitweb/static/gitweb.css + endif ++GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS) + OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS) + gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS) + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) +@@ -1675,7 +1674,7 @@ + endif # CSSMIN + + +-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js ++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS) + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/git-1.7.2.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/git-1.7.2.3-r1.ebuild new file mode 100644 index 0000000000..e5ec7d02b3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/git/git-1.7.2.3-r1.ebuild @@ -0,0 +1,464 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.3.ebuild,v 1.1 2010/09/13 18:34:05 robbat2 Exp $ + +EAPI=3 + +GENTOO_DEPEND_ON_PERL=no +inherit toolchain-funcs eutils elisp-common perl-module bash-completion +[ "$PV" == "9999" ] && inherit git + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [ "$PV" != "9999" ]; then + SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 + mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 + doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" + KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + SRC_URI="" + EGIT_BRANCH="master" + EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" + KEYWORDS="~ppc ~ppc64" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + dev-util/git + !blksha1? ( dev-libs/openssl ) + sys-libs/zlib + perl? ( dev-lang/perl[-build] ) + tk? ( dev-lang/tk ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs )" + +RDEPEND="${CDEPEND} + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI ) + cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + gtk? + ( + >=dev-python/pygtk-2.8 + || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) + )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + app-arch/cpio + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + )" + +# Live ebuild builds HTML docs, additionally +if [ "$PV" == "9999" ]; then + DEPEND="${DEPEND} + doc? ( + app-text/xmlto + )" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if ! use perl ; then + use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" + use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" + use subversion && ewarn "git-svn needs USE=perl, it won't work" + fi + if use webdav && ! use curl ; then + ewarn "USE=webdav needs USE=curl. Ignoring" + fi + if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts="${myopts} BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts="${myopts} PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts="${myopts} NO_EXPAT=YesPlease" + else + myopts="${myopts} NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts="${myopts} INSTALL=install TAR=tar" + myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" + myopts="${myopts} SANE_TOOL_PATH=" + myopts="${myopts} OLD_ICONV=" + myopts="${myopts} NO_EXTERNAL_GREP=" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." + # || myopts="${myopts} NO_ICONV=YesPlease" + # because, above, we need to do this unconditionally (no "&& use iconv") + use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + + use tk \ + || myopts="${myopts} NO_TCLTK=YesPlease" + use perl \ + && myopts="${myopts} INSTALLDIRS=vendor" \ + || myopts="${myopts} NO_PERL=YesPlease" + use threads \ + && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use subversion \ + || myopts="${myopts} NO_SVN_TESTS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts="${myopts} NO_MMAP=YesPlease" +# myopts="${myopts} NO_IPV6=YesPlease" +# myopts="${myopts} NO_STRLCPY=YesPlease" +# myopts="${myopts} NO_MEMMEM=YesPlease" +# myopts="${myopts} NO_MKDTEMP=YesPlease" +# myopts="${myopts} NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == *-interix* ]] ; then + myopts="${myopts} NO_IPV6=YesPlease" + myopts="${myopts} NO_MEMMEM=YesPlease" + myopts="${myopts} NO_MKDTEMP=YesPlease" + myopts="${myopts} NO_STRTOUMAX=YesPlease" + myopts="${myopts} NO_STRTOULL=YesPlease" + myopts="${myopts} NO_INET_NTOP=YesPlease" + myopts="${myopts} NO_INET_PTON=YesPlease" + myopts="${myopts} NO_NSEC=YesPlease" + myopts="${myopts} NO_MKSTEMPS=YesPlease" + fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts="${myopts} NO_NSEC=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts="${myopts} ASCIIDOC8=YesPlease" + myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts="${myopts} NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [ "${PV}" != "9999" ]; then + unpack ${MY_P}.tar.bz2 + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.bz2 + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 + cd "${S}" + else + git_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # Noperl is being merged to upstream as of 2009/04/05 + #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch + + # GetOpt-Long v2.38 is strict + # Merged in 1.6.3 final 2009/05/07 + #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch + + # JS install fixup + epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch + + # USE=-iconv causes segfaults, fixed post 1.7.1 + # Gentoo bug #321895 + #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC = \).*$:\1$(OPTCC):' \ + -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # bug #318289 + epatch "${FILESDIR}"/git-1.7.1-interix.patch + epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch +} + +git_emake() { + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + "$@" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el \ + || die "emacs modules failed" + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + cd "${S}"/Documentation + if [[ "$PV" == "9999" ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + doman man?/*.[157] Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + dobashcompletion contrib/completion/git-completion.bash ${PN} + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} || die + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die + fi + + if use gtk ; then + dobin "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + dobin contrib/fast-import/git-p4 + dodoc contrib/fast-import/git-p4.txt + newbin contrib/fast-import/import-tars.perl import-tars + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # svnimport - use git-svn + # p4import - excluded because fast-import has a better one + # examples - these are stuff that is not used in Git anymore actually + # patches - stuff the Git guys made to go upstream to other places + for i in continuous fast-import hg-to-git \ + hooks remotes2config.sh stats \ + workdir convert-objects blameview ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + exeinto /usr/share/${PN}/gitweb + doexe "${S}"/gitweb/gitweb.cgi + insinto /usr/share/${PN}/gitweb/static + doins "${S}"/gitweb/static/gitweb.css + js=gitweb.js + [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js + doins "${S}"/gitweb/static/${js} + doins "${S}"/gitweb/static/git-{favicon,logo}.png + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + fi + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + newinitd "${FILESDIR}"/git-daemon.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + + fixlocalpod +} + +src_test() { + local disabled="" + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh" + local tests_perl="t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + built_with_use dev-vcs/cvs server && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + cd "${S}" + # Now run the tests + einfo "Start test run" + git_emake \ + test || die "tests failed" +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then + ewarn "You must build dev-vcs/subversion with USE=perl" + ewarn "to get the full functionality of git-svn!" + fi + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/files/patman b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/files/patman new file mode 100755 index 0000000000..99547a098f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/files/patman @@ -0,0 +1,8 @@ +#!/bin/sh + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Load patman using python module syntax +exec python -m patman.patman "$@" \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/files/setup.py b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/files/setup.py new file mode 100644 index 0000000000..e08d9e26bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/files/setup.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +from distutils.core import setup + +setup(name='patman', + version='121220', + url='http://www.denx.de/wiki/U-Boot', + packages=['patman'], + package_dir={'patman' : '.'}) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/patman-0.0.1-r21.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/patman-0.0.1-r21.ebuild new file mode 100644 index 0000000000..8ac1a9474d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/patman-0.0.1-r21.ebuild @@ -0,0 +1,38 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +EAPI=4 +CROS_WORKON_COMMIT="f561cd93f05c290bd0280f467c4a10ff224f7bf9" +CROS_WORKON_TREE="8595e217edc9baad42dd848f58b4cbd0c85c0200" +PYTHON_DEPEND="2" +CROS_WORKON_PROJECT="chromiumos/third_party/u-boot" +CROS_WORKON_LOCALNAME="u-boot" +CROS_WORKON_SUBDIR="files/tools/patman" + +inherit cros-workon distutils + +DESCRIPTION="Patman tool (from U-Boot) for sending patches upstream" +HOMEPAGE="http://www.denx.de/wiki/U-Boot" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="dev-python/setuptools" +RDEPEND="" + +src_prepare() { + rm patman + cp "${FILESDIR}/setup.py" . + touch __init__.py + + distutils_src_prepare +} + +src_install() { + dobin "${FILESDIR}/patman" + + distutils_src_install +} \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/patman-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/patman-9999.ebuild new file mode 100644 index 0000000000..9b2bec0161 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/patman/patman-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +EAPI=4 +PYTHON_DEPEND="2" +CROS_WORKON_PROJECT="chromiumos/third_party/u-boot" +CROS_WORKON_LOCALNAME="u-boot" +CROS_WORKON_SUBDIR="files/tools/patman" + +inherit cros-workon distutils + +DESCRIPTION="Patman tool (from U-Boot) for sending patches upstream" +HOMEPAGE="http://www.denx.de/wiki/U-Boot" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-python/setuptools" +RDEPEND="" + +src_prepare() { + rm patman + cp "${FILESDIR}/setup.py" . + touch __init__.py + + distutils_src_prepare +} + +src_install() { + dobin "${FILESDIR}/patman" + + distutils_src_install +} \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/70svn-gentoo.el b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/70svn-gentoo.el new file mode 100644 index 0000000000..e5721e2480 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/70svn-gentoo.el @@ -0,0 +1,13 @@ + +;;; subversion site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(and (< emacs-major-version 22) + (add-to-list 'load-path "@SITELISP@/compat")) +(add-to-list 'vc-handled-backends 'SVN) + +(defalias 'svn-examine 'svn-status) +(autoload 'svn-status "dsvn" "Run `svn status'." t) +(autoload 'svn-update "dsvn" "Run `svn update'." t) +(autoload 'svn-status "psvn" + "Examine the status of Subversion working copy in directory DIR." t) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch new file mode 100644 index 0000000000..689b29cd7f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch @@ -0,0 +1,56 @@ +--- Makefile.in ++++ Makefile.in +@@ -47,6 +47,7 @@ + SVN_SASL_LIBS = @SVN_SASL_LIBS@ + SVN_SERF_LIBS = @SVN_SERF_LIBS@ + SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@ ++SVN_XML_LIBS = -lexpat + SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ + + LIBS = @LIBS@ +--- build/ac-macros/aprutil.m4 ++++ build/ac-macros/aprutil.m4 +@@ -77,16 +77,14 @@ + AC_MSG_ERROR([apu-config --prefix failed]) + fi + +- dnl When APR stores the dependent libs in the .la file, we don't need +- dnl --libs. +- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" ++ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apu-config --link-libtool failed]) + fi + +- SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" ++ SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`" + if test $? -ne 0; then +- AC_MSG_ERROR([apu-config --link-ld --libs failed]) ++ AC_MSG_ERROR([apu-config --link-ld failed]) + fi + + AC_SUBST(SVN_APRUTIL_INCLUDES) +--- build/ac-macros/apr.m4 ++++ build/ac-macros/apr.m4 +@@ -74,16 +74,14 @@ + AC_MSG_ERROR([apr-config --prefix failed]) + fi + +- dnl When APR stores the dependent libs in the .la file, we don't need +- dnl --libs. +- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" ++ SVN_APR_LIBS="`$apr_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apr-config --link-libtool failed]) + fi + +- SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" ++ SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`" + if test $? -ne 0; then +- AC_MSG_ERROR([apr-config --link-ld --libs failed]) ++ AC_MSG_ERROR([apr-config --link-ld failed]) + fi + + SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch new file mode 100644 index 0000000000..5f0c870d4c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch @@ -0,0 +1,144 @@ +--- configure.ac ++++ configure.ac +@@ -198,6 +198,24 @@ + + AC_SUBST(LT_LDFLAGS) + ++AC_ARG_ENABLE(local-library-preloading, ++ AS_HELP_STRING([--disable-local-library-preloading], ++ [Disable preloading of locally built libraries in locally built executables]), ++ [ ++ if test "$enableval" != "no"; then ++ TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts" ++ else ++ TRANSFORM_LIBTOOL_SCRIPTS="" ++ fi ++ ], [ ++ if test "`uname`" != "Darwin"; then ++ TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts" ++ else ++ TRANSFORM_LIBTOOL_SCRIPTS="" ++ fi ++]) ++AC_SUBST(TRANSFORM_LIBTOOL_SCRIPTS) ++ + dnl Check if -no-undefined is needed for the platform. + dnl It should always work but with libtool 1.4.3 on OS X it breaks the build. + dnl So we only turn it on for platforms where we know we really need it. +--- Makefile.in ++++ Makefile.in +@@ -309,7 +309,10 @@ + + @INCLUDE_OUTPUTS@ + +-local-all: @BUILD_RULES@ ++local-all: @BUILD_RULES@ @TRANSFORM_LIBTOOL_SCRIPTS@ ++ ++transform-libtool-scripts: @BUILD_RULES@ ++ @$(top_srcdir)/build/transform_libtool_scripts.sh + + locale-gnu-pot: + cd $(abs_srcdir) && XGETTEXT="$(XGETTEXT)" MSGMERGE="$(MSGMERGE)" \ +--- build/transform_libtool_scripts.sh ++++ build/transform_libtool_scripts.sh +@@ -0,0 +1,100 @@ ++#!/bin/sh ++ ++# Dependencies of libraries ++subr="subr" ++auth_gnome_keyring="auth_gnome_keyring $subr" ++auth_kwallet="auth_kwallet $subr" ++delta="delta $subr" ++diff="diff $subr" ++fs_util="fs_util $subr" ++fs_base="fs_base $delta $fs_util $subr" ++fs_fs="fs_fs $delta $fs_util $subr" ++fs="fs $fs_base $fs_fs $fs_util $subr" ++repos="repos $delta $fs $fs_util $subr" ++ra_local="ra_local $delta $fs $fs_util $repos $subr" ++ra_neon="ra_neon $delta $subr" ++ra_serf="ra_serf $delta $subr" ++ra_svn="ra_svn $delta $subr" ++ra="ra $delta $ra_local $ra_neon $ra_serf $ra_svn $subr" ++wc="wc $delta $diff $subr" ++client="client $delta $diff $ra $subr $wc" ++ ++# Variable 'libraries' containing names of variables corresponding to libraries ++libraries="auth_gnome_keyring auth_kwallet client delta diff fs fs_base fs_fs fs_util ra ra_local ra_neon ra_serf ra_svn repos subr wc" ++ ++for library in $libraries; do ++ # Delete duplicates in dependencies of libraries ++ library_dependencies="$(echo -n $(for x in $(eval echo "\$$library"); do echo $x; done | sort -u))" ++ eval "$library=\$library_dependencies" ++done ++ ++# Dependencies of executables ++svn="$auth_gnome_keyring $auth_kwallet $client $delta $diff $ra $subr $wc" ++svnadmin="$delta $fs $repos $subr" ++svndumpfilter="$delta $fs $repos $subr" ++svnlook="$delta $diff $fs $repos $subr" ++svnserve="$delta $fs $ra_svn $repos $subr" ++svnsync="$auth_gnome_keyring $auth_kwallet $delta $ra $subr" ++svnversion="$subr $wc" ++entries_dump="$subr $wc" ++ ++# Variable 'executables' containing names of variables corresponding to executables ++executables="svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion entries_dump" ++ ++for executable in $executables; do ++ # Set variables containing paths of executables ++ if [ "$executable" != entries_dump ]; then ++ eval "${executable}_path=subversion/$executable/$executable" ++ else ++ eval "${executable}_path=subversion/tests/cmdline/entries-dump" ++ fi ++ # Delete duplicates in dependencies of executables ++ executable_dependencies="$(echo -n $(for x in $(eval echo "\$$executable"); do echo $x; done | sort -u))" ++ eval "$executable=\$executable_dependencies" ++done ++ ++test_paths="$(find subversion/tests -mindepth 2 -maxdepth 2 -name '*-test' ! -path '*/.libs/*' | sort)" ++for test in $test_paths; do ++ test_path="$test" ++ # Dependencies of tests are based on names of directories containing tests ++ test_library="$(echo $test | sed -e 's:^subversion/tests/libsvn_\([^/]*\)/.*:\1:')" ++ test_dependencies="$(eval echo "\$$test_library")" ++ # Set variables corresponding to tests and containing dependencies of tests ++ test="$(echo $test | sed -e 's:^subversion/tests/libsvn_[^/]*/\(.*\):\1:' -e 's/-/_/g')" ++ eval "$test=\$test_dependencies" ++ # Set variables containing paths of tests ++ eval "${test}_path=\$test_path" ++ # Set variable 'tests' containing names of variables corresponding to tests ++ tests="$tests $test" ++done ++ ++# auth-test dynamically loads libsvn_auth_gnome_keyring and libsvn_auth_kwallet libraries ++auth_test="auth_gnome_keyring auth_kwallet $auth_test" ++ ++# Usage: sed_append LINE_NUMBER TEXT FILE ++sed_append() ++{ ++ sed -e "$1a\\ ++$2" "$3" > "$3.new" ++ mv -f "$3.new" "$3" ++} ++ ++current_directory="$(pwd)" ++for libtool_script in $executables $tests; do ++ eval "libtool_script_path=\$${libtool_script}_path" ++ if [ -f "$libtool_script_path" ]; then ++ if { grep LD_LIBRARY_PATH "$libtool_script_path" && ! grep LD_PRELOAD "$libtool_script_path"; } > /dev/null; then ++ echo "Transforming $libtool_script_path" ++ libtool_script_dependencies="$(eval echo "\$$libtool_script")" ++ for libtool_script_dependency in $libtool_script_dependencies; do ++ libtool_script_library="$current_directory/subversion/libsvn_$libtool_script_dependency/.libs/libsvn_$libtool_script_dependency-1.so" ++ [ -f "$libtool_script_library" ] && libtool_script_libraries="$libtool_script_libraries $libtool_script_library" ++ done ++ libtool_script_libraries="${libtool_script_libraries# *}" ++ # Append definitions of LD_PRELOAD to libtool scripts ++ sed_append 4 "LD_PRELOAD=\"$libtool_script_libraries\"" "$libtool_script_path" ++ sed_append 5 "export LD_PRELOAD" "$libtool_script_path" ++ chmod +x "$libtool_script_path" ++ fi ++ fi ++done diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch new file mode 100644 index 0000000000..4bb9c09f0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch @@ -0,0 +1,298 @@ +https://svn.collab.net/viewvc/svn?view=revision&revision=38004 +https://svn.collab.net/viewvc/svn?view=revision&revision=38014 +https://svn.collab.net/viewvc/svn?view=revision&revision=38028 +https://svn.collab.net/viewvc/svn?view=revision&revision=38122 + +--- subversion/libsvn_auth_kwallet/kwallet.cpp ++++ subversion/libsvn_auth_kwallet/kwallet.cpp +@@ -22,6 +22,7 @@ + + /*** Includes. ***/ + ++#include + #include + #include + +@@ -30,6 +31,9 @@ + #include "svn_auth.h" + #include "svn_config.h" + #include "svn_error.h" ++#include "svn_io.h" ++#include "svn_pools.h" ++#include "svn_string.h" + #include "svn_version.h" + + #include "private/svn_auth_private.h" +@@ -38,13 +42,20 @@ + + #include + #include ++#include ++#include + #include ++#include ++#include + + #include + #include + #include + #include + #include ++#include ++#include ++#include + + + /*-----------------------------------------------------------------------*/ +@@ -52,6 +63,28 @@ + /*-----------------------------------------------------------------------*/ + + ++#define INITIALIZE_APPLICATION \ ++ if (apr_hash_get(parameters, \ ++ "svn:auth:qapplication-safe", \ ++ APR_HASH_KEY_STRING)) \ ++ { \ ++ QApplication *app; \ ++ if (! qApp) \ ++ { \ ++ int argc = 1; \ ++ app = new QApplication(argc, (char *[1]) {(char *) "svn"}); \ ++ } \ ++ } \ ++ else \ ++ { \ ++ QCoreApplication *app; \ ++ if (! qApp) \ ++ { \ ++ int argc = 1; \ ++ app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); \ ++ } \ ++ } ++ + static const char * + get_application_name(apr_hash_t *parameters, + apr_pool_t *pool) +@@ -69,8 +102,7 @@ + const char *svn_application_name; + if (svn_application_name_with_pid) + { +- long pid = getpid(); +- svn_application_name = apr_psprintf(pool, "Subversion [%ld]", pid); ++ svn_application_name = apr_psprintf(pool, "Subversion [%ld]", long(getpid())); + } + else + { +@@ -102,9 +134,108 @@ + } + } + ++static pid_t ++get_parent_pid(pid_t pid, ++ apr_pool_t *pool) ++{ ++ pid_t parent_pid = 0; ++ ++#ifdef __linux__ ++ svn_stream_t *stat_file_stream; ++ svn_string_t *stat_file_string; ++ const char *preceeding_space, *following_space, *parent_pid_string; ++ ++ const char *path = apr_psprintf(pool, "/proc/%ld/stat", long(pid)); ++ svn_error_t *err = svn_stream_open_readonly(&stat_file_stream, path, pool, pool); ++ if (err == SVN_NO_ERROR) ++ { ++ err = svn_string_from_stream(&stat_file_string, stat_file_stream, pool, pool); ++ if (err == SVN_NO_ERROR) ++ { ++ if ((preceeding_space = strchr(stat_file_string->data, ' '))) ++ { ++ if ((preceeding_space = strchr(preceeding_space + 1, ' '))) ++ { ++ if ((preceeding_space = strchr(preceeding_space + 1, ' '))) ++ { ++ if ((following_space = strchr(preceeding_space + 1, ' '))) ++ { ++ parent_pid_string = apr_pstrndup(pool, ++ preceeding_space + 1, ++ following_space - preceeding_space); ++ parent_pid = atol(parent_pid_string); ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ if (err) ++ { ++ svn_error_clear(err); ++ } ++#endif ++ ++ return parent_pid; ++} ++ ++static WId ++get_wid(apr_hash_t *parameters, ++ apr_pool_t *pool) ++{ ++ WId wid = 1; ++ ++ if (apr_hash_get(parameters, ++ "svn:auth:qapplication-safe", ++ APR_HASH_KEY_STRING)) ++ { ++ QMap process_info_list; ++ QList windows(KWindowSystem::windows()); ++ QList::const_iterator i; ++ for (i = windows.begin(); i != windows.end(); i++) ++ { ++ process_info_list[NETWinInfo(QX11Info::display(), ++ *i, ++ QX11Info::appRootWindow(), ++ NET::WMPid).pid()] = *i; ++ } ++ ++ apr_pool_t *iterpool = svn_pool_create(pool); ++ pid_t pid = getpid(); ++ while (pid != 0) ++ { ++ svn_pool_clear(iterpool); ++ if (process_info_list.contains(pid)) ++ { ++ wid = process_info_list[pid]; ++ break; ++ } ++ pid = get_parent_pid(pid, iterpool); ++ } ++ svn_pool_destroy(iterpool); ++ } ++ ++ if (wid == 1) ++ { ++ const char *wid_env_string = getenv("WINDOWID"); ++ if (wid_env_string) ++ { ++ long wid_env = atol(wid_env_string); ++ if (wid_env != 0) ++ { ++ wid = wid_env; ++ } ++ } ++ } ++ ++ return wid; ++} ++ + static KWallet::Wallet * + get_wallet(QString wallet_name, +- apr_hash_t *parameters) ++ apr_hash_t *parameters, ++ apr_pool_t *pool) + { + KWallet::Wallet *wallet = + static_cast (apr_hash_get(parameters, +@@ -115,7 +246,7 @@ + APR_HASH_KEY_STRING)) + { + wallet = KWallet::Wallet::openWallet(wallet_name, +- -1, ++ pool ? get_wid(parameters, pool) : 1, + KWallet::Wallet::Synchronous); + } + if (wallet) +@@ -141,7 +272,7 @@ + apr_hash_t *parameters = static_cast (data); + if (apr_hash_get(parameters, "kwallet-initialized", APR_HASH_KEY_STRING)) + { +- KWallet::Wallet *wallet = get_wallet(NULL, parameters); ++ KWallet::Wallet *wallet = get_wallet(NULL, parameters, NULL); + delete wallet; + apr_hash_set(parameters, + "kwallet-initialized", +@@ -172,12 +303,7 @@ + return FALSE; + } + +- QCoreApplication *app; +- if (! qApp) +- { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); +- } ++ INITIALIZE_APPLICATION + + KCmdLineArgs::init(1, + (char *[1]) {(char *) "svn"}, +@@ -195,7 +321,7 @@ + QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring); + if (! KWallet::Wallet::keyDoesNotExist(wallet_name, folder, key)) + { +- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); ++ KWallet::Wallet *wallet = get_wallet(wallet_name, parameters, pool); + if (wallet) + { + apr_hash_set(parameters, +@@ -242,12 +368,7 @@ + return FALSE; + } + +- QCoreApplication *app; +- if (! qApp) +- { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); +- } ++ INITIALIZE_APPLICATION + + KCmdLineArgs::init(1, + (char *[1]) {(char *) "svn"}, +@@ -262,7 +383,7 @@ + QString q_password = QString::fromUtf8(password); + QString wallet_name = get_wallet_name(parameters); + QString folder = QString::fromUtf8("Subversion"); +- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); ++ KWallet::Wallet *wallet = get_wallet(wallet_name, parameters, pool); + if (wallet) + { + apr_hash_set(parameters, +--- subversion/svn/main.c ++++ subversion/svn/main.c +@@ -2067,6 +2067,9 @@ + pool))) + svn_handle_error2(err, stderr, TRUE, "svn: "); + ++ /* svn can safely create instance of QApplication class. */ ++ svn_auth_set_parameter(ab, "svn:auth:qapplication-safe", "1"); ++ + ctx->auth_baton = ab; + + /* Set up conflict resolution callback. */ +--- subversion/svnsync/main.c ++++ subversion/svnsync/main.c +@@ -1,6 +1,6 @@ + /* + * ==================================================================== +- * Copyright (c) 2005-2008 CollabNet. All rights reserved. ++ * Copyright (c) 2005-2009 CollabNet. All rights reserved. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms +@@ -2362,7 +2362,15 @@ + check_cancel, NULL, + pool); + if (! err) +- err = (*subcommand->cmd_func)(os, &opt_baton, pool); ++ { ++ /* svnsync can safely create instance of QApplication class. */ ++ svn_auth_set_parameter(opt_baton.source_auth_baton, ++ "svn:auth:qapplication-safe", "1"); ++ svn_auth_set_parameter(opt_baton.sync_auth_baton, ++ "svn:auth:qapplication-safe", "1"); ++ ++ err = (*subcommand->cmd_func)(os, &opt_baton, pool); ++ } + if (err) + { + /* For argument-related problems, suggest using the 'help' diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd new file mode 100644 index 0000000000..832d375aa2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd @@ -0,0 +1,10 @@ +# The commented variables in this file are the defaults that are used +# in the init-script. You don't need to uncomment them except to +# customize them to different values. + +# Options for svnserve +#SVNSERVE_OPTS="--root=/var/svn" + +# User and group as which to run svnserve +#SVNSERVE_USER="apache" +#SVNSERVE_GROUP="apache" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd2 b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd2 new file mode 100644 index 0000000000..b487a40975 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd2 @@ -0,0 +1,10 @@ +# The commented variables in this file are the defaults that are used +# in the init-script. You don't need to uncomment them except to +# customize them to different values. + +# Options for svnserve +#SVNSERVE_OPTS="--root=/var/svn" + +# User and group as which to run svnserve +SVNSERVE_USER="svn" +SVNSERVE_GROUP="svnusers" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd new file mode 100644 index 0000000000..7b7c4c8441 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/files/svnserve.initd,v 1.2 2005/08/25 13:59:48 pauldv Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting svnserve" + # Ensure that we run from a readable working dir, and that we do not + # lock filesystems when being run from such a location. + cd / + start-stop-daemon --start --quiet --background --make-pidfile \ + --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \ + --chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \ + --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn} + eend $? +} + +stop() { + ebegin "Stopping svnserve" + start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.xinetd b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.xinetd new file mode 100644 index 0000000000..e29f906b50 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.xinetd @@ -0,0 +1,14 @@ +service svn +{ + socket_type = stream + wait = no + user = apache + group = apache + umask = 002 + protocol = tcp + log_on_failure += USERID HOST + port = 3690 + server = /usr/bin/svnserve + server_args = -i + disable = yes +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/vc-svn.el b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/vc-svn.el new file mode 100644 index 0000000000..e591820f3a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/vc-svn.el @@ -0,0 +1,414 @@ +;;;; vc-svn.el --- a VC backend for Subversion +;;;; Jim Blandy --- July 2002 + +;;; Writing this back end has shown up some problems in VC: bugs, +;;; shortcomings in the back end interface, and so on. But I want to +;;; first produce code that Subversion users can use with an already +;;; released Emacs distribution. +;;; +;;; So for now we're working within the limitations of the released +;;; VC; once we've got something functional, then we can start writing +;;; VC patches. + + +;;; To make this file load on demand, put this file into a directory +;;; in `load-path', and add this line to a startup file: +;;; +;;; (add-to-list 'vc-handled-backends 'SVN) + + +;;; To do here: +;;; Provide more of the optional VC backend functions: +;;; - dir-state +;;; - merge across arbitrary revisions +;;; +;;; Maybe we want more info in mode-line-string. Status of props? Status +;;; compared to what's in the repository (svn st -u) ? +;;; +;;; VC passes the vc-svn-register function a COMMENT argument, which +;;; is like the file description in CVS and RCS. Could we store the +;;; COMMENT as a Subversion property? Would that show up in fancy DAV +;;; web folder displays, or would it just languish in obscurity, the +;;; way CVS and RCS descriptions do? +;;; +;;; After manual merging, need some way to run `svn resolved'. Perhaps +;;; we should just prompt for approval when somebody tries to commit a +;;; conflicted file? +;;; +;;; vc-svn ought to handle more gracefully an attempted commit that +;;; fails with "Transaction is out of date". Probably the best +;;; approach is to ask "file is not up-to-date; do you want to merge +;;; now?" I think vc-cvs does this. +;;; +;;; Perhaps show the "conflicted" marker in the modeline? +;;; +;;; If conflicted, before committing or merging, ask the user if they +;;; want to mark the file as resolved. +;;; +;;; Won't searching for strings in svn output cause trouble if the +;;; locale language is not English? +;;; +;;; After merging news, need to recheck our idea of which workfile +;;; version we have. Reverting the file does this but we need to +;;; force it. Note that this can be necessary even if the file has +;;; not changed. +;;; +;;; Does everything work properly if we're rolled back to an old +;;; revision? +;;; +;;; Perhaps need to implement vc-svn-latest-on-branch-p? + + +;;; To do in VC: +;;; +;;; Make sure vc's documentation for `workfile-unchanged-p' default +;;; function mentions that it must not run asynchronously, and the +;;; symptoms if it does. +;;; +;;; Fix logic for finding log entries. +;;; +;;; Allow historical diff to choose an appropriate default previous +;;; revision number. I think this entails moving vc-previous-revision +;;; et al into the back end. +;;; +;;; Should vc-BACKEND-checkout really have to set the workfile version +;;; itself? +;;; +;;; Fix smerge for svn conflict markers. +;;; +;;; We can have files which are not editable for reasons other than +;;; needing to be checked out. For example, they might be a read-only +;;; view of an old revision opened with [C-x v ~]. (See vc-merge) +;;; +;;; Would be nice if there was a way to mark a file as +;;; just-checked-out, aside from updating the checkout-time property +;;; which in theory is not to be changed by backends. + + +(add-to-list 'vc-handled-backends 'SVN) + +(defcustom vc-svn-program-name "svn" + "*Name of Subversion client program, for use by Emacs's VC package." + :type 'string + :group 'vc + :version "21.2.90.2") + +(defcustom vc-svn-diff-switches nil + "*A string or list of strings specifying extra switches for `svn diff' under VC." + :type '(repeat string) + :group 'vc + :version "21.2.90.2") + +(defun vc-svn-registered (file) + "Return true if FILE is registered under Subversion." + ;; First, a quick false positive test: is there a `.svn/entries' file? + (and (file-exists-p (expand-file-name ".svn/entries" + (file-name-directory file))) + (not (null (vc-svn-run-status file))))) + + +(put 'vc-svn-with-output-buffer 'lisp-indent-function 0) +(defmacro vc-svn-with-output-buffer (&rest body) + "Save excursion, switch to buffer ` *Subversion Output*', and erase it." + `(save-excursion + ;; Let's not delete this buffer when we're done --- leave + ;; it around for debugging. + (set-buffer (get-buffer-create " *Subversion Output*")) + (erase-buffer) + ,@body)) + + +(defun vc-svn-pop-up-error (&rest args) + "Pop up the Subversion output buffer, and raise an error with ARGS." + (pop-to-buffer " *Subversion Output*") + (goto-char (point-min)) + (shrink-window-if-larger-than-buffer) + (apply 'error args)) + + +(defun vc-svn-run-status (file &optional update) + "Run `svn status -v' on FILE, and return the result. +If optional arg UPDATE is true, pass the `-u' flag to check against +the repository, across the network. +See `vc-svn-parse-status' for a description of the result." + (vc-svn-with-output-buffer + + ;; We should call vc-do-command here, but Subversion exits with an + ;; error status if FILE isn't under its control, and we want to + ;; return that as nil, not display it to the user. We can tell + ;; vc-do-command to + + (let ((status (apply 'call-process vc-svn-program-name nil t nil + (append '("status" "-v") + (if update '("-u") '()) + (list file))))) + (goto-char (point-min)) + (if (not (equal 0 status)) ; not zerop; status can be a string + ;; If you ask for the status of a file that isn't even in a + ;; Subversion-controlled directory, then Subversion exits with + ;; this error. + (if (or (looking-at "\\(.*\n\\)*.*is not a working copy") + (looking-at "\\(.*\n\\)*.*is not a versioned resource") + (looking-at "\\(.*\n\\)*.*: No such file or directory")) + nil + ;; Other errors we should actually report to the user. + (vc-svn-pop-up-error + "Error running Subversion to check status of `%s'" + (file-name-nondirectory file))) + + ;; Otherwise, we've got valid status output in the buffer, so + ;; just parse that. + (vc-svn-parse-status))))) + + +(defun vc-svn-parse-status () + "Parse the output from `svn status -v' at point. +We return nil for a file not under Subversion's control, +or (STATE LOCAL CHANGED) for files that are, where: +STATE is the file's VC state (see the documentation for `vc-state'), +LOCAL is the base revision in the working copy, and +CHANGED is the last revision in which it was changed. +Both LOCAL and CHANGED are strings, not numbers. +If we passed `svn status' the `-u' flag, then CHANGED could be a later +revision than LOCAL. +If the file is newly added, LOCAL is \"0\" and CHANGED is nil." + (let ((state (vc-svn-parse-state-only))) + (cond + ((not state) nil) + ;; A newly added file has no revision. + ((looking-at "....\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\?") + (list state "0" nil)) + ((looking-at "....\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)") + (list state + (match-string 2) + (match-string 3))) + ((looking-at "^I +") nil) ;; An ignored file + ((looking-at " \\{40\\}") nil) ;; A file that is not in the wc nor svn? + (t (error "Couldn't parse output from `svn status -v'"))))) + + +(defun vc-svn-parse-state-only () + "Parse the output from `svn status -v' at point, and return a state. +The documentation for the function `vc-state' describes the possible values." + (cond + ;; Be careful --- some of the later clauses here could yield false + ;; positives, if the clauses preceding them didn't screen those + ;; out. Making a pattern more selective could break something. + + ;; nil The given file is not under version control, + ;; or does not exist. + ((looking-at "\\?\\|^$") nil) + + ;; 'needs-patch The file has not been edited by the + ;; user, but there is a more recent version + ;; on the current branch stored in the + ;; master file. + ((looking-at " ..\\s-+\\*") 'needs-patch) + + ;; 'up-to-date The working file is unmodified with + ;; respect to the latest version on the + ;; current branch, and not locked. + ;; + ;; This is also returned for files which do not + ;; exist, as will be the case when finding a + ;; new file in a svn-controlled directory. That + ;; case is handled in vc-svn-parse-status. + ((looking-at " ") 'up-to-date) + + ;; 'needs-merge The file has been edited by the user, + ;; and there is also a more recent version + ;; on the current branch stored in the + ;; master file. This state can only occur + ;; if locking is not used for the file. + ((looking-at "\\S-+\\s-+\\*") 'needs-merge) + + ;; 'edited The working file has been edited by the + ;; user. If locking is used for the file, + ;; this state means that the current + ;; version is locked by the calling user. + (t 'edited))) + + +;;; Is it really safe not to check for updates? I haven't seen any +;;; cases where failing to check causes a problem that is not caught +;;; in some other way. However, there *are* cases where checking +;;; needlessly causes network delay, such as C-x v v. The common case +;;; is for the commit to be OK; we can handle errors if they occur. -- mbp +(defun vc-svn-state (file) + "Return the current version control state of FILE. +For a list of possible return values, see `vc-state'. + +This function should do a full and reliable state computation; it is +usually called immediately after `C-x v v'. `vc-svn-state-heuristic' +provides a faster heuristic when visiting a file. + +For svn this does *not* check for updates in the repository, because +that needlessly slows down vc when the repository is remote. Instead, +we rely on Subversion to trap situations such as needing a merge +before commit." + (car (vc-svn-run-status file))) + + +(defun vc-svn-state-heuristic (file) + "Estimate the version control state of FILE at visiting time. +For a list of possible values, see the doc string of `vc-state'. +This is supposed to be considerably faster than `vc-svn-state'. It +just runs `svn status -v', without the `-u' flag, so it's a strictly +local operation." + (car (vc-svn-run-status file))) + + + +(defun vc-svn-workfile-version (file) + "Return the current workfile version of FILE." + (cadr (vc-svn-run-status file))) + + +(defun vc-svn-checkout-model (file) + 'implicit) + + +(defun vc-svn-register (file &optional rev comment) + "Register FILE with Subversion. +REV is an initial revision; Subversion ignores it. +COMMENT is an initial description of the file; currently this is ignored." + (vc-svn-with-output-buffer + (let ((status (call-process vc-svn-program-name nil t nil "add" file))) + (or (equal 0 status) ; not zerop; status can be a string + (vc-svn-pop-up-error "Error running Subversion to add `%s'" + (file-name-nondirectory file)))))) + + +(defun vc-svn-checkin (file rev comment) + (apply 'vc-do-command nil 0 vc-svn-program-name file + "commit" (if comment (list "-m" comment) '()))) + + +(defun vc-svn-checkout (file &optional editable rev destfile) + "Check out revision REV of FILE into the working area. +The EDITABLE argument must be non-nil, since Subversion doesn't +support locking. +If REV is non-nil, that is the revision to check out (default is +current workfile version). If REV is the empty string, that means to +check out the head of the trunk. For Subversion, that's equivalent to +passing nil. +If optional arg DESTFILE is given, it is an alternate filename to +write the contents to; we raise an error." + (unless editable + (error "VC asked Subversion to check out a read-only copy of file")) + (when destfile + (error "VC asked Subversion to check out a file under another name")) + (when (equal rev "") + (setq rev nil)) + (apply 'vc-do-command nil 0 vc-svn-program-name file + "update" (if rev (list "-r" rev) '())) + (vc-file-setprop file 'vc-workfile-version nil)) + + +(defun vc-svn-revert (file &optional contents-done) + "Revert FILE back to the current workfile version. +If optional arg CONTENTS-DONE is non-nil, then the contents of FILE +have already been reverted from a version backup, and this function +only needs to update the status of FILE within the backend. This +function ignores the CONTENTS-DONE argument." + (vc-do-command nil 0 vc-svn-program-name file "revert")) + + +(defun vc-svn-merge-news (file) + "Merge recent changes into FILE. + +This calls `svn update'. In the case of conflicts, Subversion puts +conflict markers into the file and leaves additional temporary files +containing the `ancestor', `mine', and `other' files. + +You may need to run `svn resolved' by hand once these conflicts have +been resolved. + +Returns a vc status, which is used to determine whether conflicts need +to be merged." + (prog1 + (vc-do-command nil 0 vc-svn-program-name file "update") + + ;; This file may not have changed in the revisions which were + ;; merged, which means that its mtime on disk will not have been + ;; updated. However, the workfile version may still have been + ;; updated, and we want that to be shown correctly in the + ;; modeline. + + ;; vc-cvs does something like this + (vc-file-setprop file 'vc-checkout-time 0) + (vc-file-setprop file 'vc-workfile-version + (vc-svn-workfile-version file)))) + + +(defun vc-svn-print-log (file) + "Insert the revision log of FILE into the *vc* buffer." + (vc-do-command nil 'async vc-svn-program-name file "log")) + + +(defun vc-svn-show-log-entry (version) + "Search the log entry for VERSION in the current buffer. +Make sure it is displayed in the buffer's window." + (when (re-search-forward (concat "^-+\n\\(rev\\) " + (regexp-quote version) + ":[^|]+|[^|]+| [0-9]+ lines?")) + (goto-char (match-beginning 1)) + (recenter 1))) + + +(defun vc-svn-diff (file &optional rev1 rev2) + "Insert the diff for FILE into the *vc-diff* buffer. +If REV1 and REV2 are non-nil, report differences from REV1 to REV2. +If REV1 is nil, use the current workfile version (as found in the +repository) as the older version; if REV2 is nil, use the current +workfile contents as the newer version. +This function returns a status of either 0 (no differences found), or +1 (either non-empty diff or the diff is run asynchronously)." + (let* ((diff-switches-list + ;; In Emacs 21.3.50 or so, the `vc-diff-switches-list' macro + ;; started requiring its symbol argument to be quoted. + (condition-case nil + (vc-diff-switches-list svn) + (void-variable (vc-diff-switches-list 'SVN)))) + (status (vc-svn-run-status file)) + (local (elt status 1)) + (changed (elt status 2)) + + ;; If rev1 is the default (the base revision) set it to nil. + ;; This is nice because it lets us recognize when the diff + ;; will run locally, and thus when we shouldn't bother to run + ;; it asynchronously. But it's also necessary, since a diff + ;; for vc-default-workfile-unchanged-p *must* run + ;; synchronously, or else you'll end up with two diffs in the + ;; *vc-diff* buffer. `vc-diff-workfile-unchanged-p' passes + ;; the base revision explicitly, but this kludge lets us + ;; recognize that we can run the diff synchronously anyway. + ;; Fragile, no? + (rev1 (if (and rev1 (not (equal rev1 local))) rev1)) + + (rev-switches-list + (cond + ;; Given base rev against given rev. + ((and rev1 rev2) (list "-r" (format "%s:%s" rev1 rev2))) + ;; Given base rev against working copy. + (rev1 (list "-r" rev1)) + ;; Working copy base against given rev. + (rev2 (list "-r" (format "%s:%s" local rev2))) + ;; Working copy base against working copy. + (t '()))) + + ;; Run diff asynchronously if we're going to have to go + ;; across the network. + (async (or rev1 rev2))) + + (let ((status (apply 'vc-do-command "*vc-diff*" (if async 'async 0) + vc-svn-program-name file + (append '("diff") rev-switches-list)))) + (if (or async (> (buffer-size (get-buffer "*vc-diff*")) 0)) + 1 0)))) + +(defun vc-svn-find-version (file rev buffer) + (vc-do-command buffer 0 vc-svn-program-name file + "cat" "-r" rev)) + +(provide 'vc-svn) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.6.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.6.9-r1.ebuild new file mode 100644 index 0000000000..22019ca8d6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.6.9-r1.ebuild @@ -0,0 +1,814 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.9.ebuild,v 1.5 2010/03/04 15:28:56 jer Exp $ + +EAPI="2" + +WANT_AUTOMAKE="none" + +inherit autotools bash-completion db-use depend.apache elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module python + +DESCRIPTION="Advanced version control system" +HOMEPAGE="http://subversion.tigris.org/" +SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2" + +LICENSE="Subversion" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf" + +CDEPEND=">=dev-db/sqlite-3.4[threadsafe] + >=dev-libs/apr-1.3:1 + >=dev-libs/apr-util-1.3:1 + dev-libs/expat + sys-libs/zlib + berkdb? ( =sys-libs/db-4* ) + emacs? ( virtual/emacs ) + gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) + kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) + ruby? ( >=dev-lang/ruby-1.8.2 ) + sasl? ( dev-libs/cyrus-sasl ) + dev-util/subversion + net-misc/neon + webdav-neon? ( >=net-libs/neon-0.28 ) + webdav-serf? ( >=net-libs/serf-0.3.0 )" +RDEPEND="${CDEPEND} + apache2? ( www-servers/apache[apache2_modules_dav] ) + java? ( >=virtual/jre-1.5 ) + kde? ( kde-base/kwalletd ) + nls? ( virtual/libintl ) + perl? ( dev-perl/URI )" +APACHE_TEST_DEPEND="|| ( + =www-servers/apache-2.4*[apache2_modules_auth_basic,apache2_modules_authn_core,apache2_modules_authn_file,apache2_modules_authz_core,apache2_modules_authz_user,apache2_modules_dav,apache2_modules_log_config,apache2_modules_unixd] + =www-servers/apache-2.2*[apache2_modules_auth_basic,apache2_modules_authn_file,apache2_modules_dav,apache2_modules_log_config] + )" +DEPEND="${CDEPEND} + >=sys-apps/sandbox-1.6 + ctypes-python? ( dev-python/ctypesgen ) + doc? ( app-doc/doxygen ) + gnome-keyring? ( dev-util/pkgconfig ) + java? ( >=virtual/jdk-1.5 ) + kde? ( dev-util/pkgconfig ) + nls? ( sys-devel/gettext ) + test? ( + webdav-neon? ( ${APACHE_TEST_DEPEND} ) + webdav-serf? ( ${APACHE_TEST_DEPEND} ) + ) + webdav-neon? ( dev-util/pkgconfig )" + +want_apache + +S="${WORKDIR}/${P/_/-}" + +# Allow for custom repository locations. +# This can't be in pkg_setup() because the variable needs to be available to pkg_config(). +: ${SVN_REPOS_LOC:=/var/svn} + +pkg_setup() { + if use kde && ! use nls; then + eerror "Support for KWallet (KDE) requires Native Language Support (NLS)." + die "Enable \"nls\" USE flag" + fi + + if use berkdb; then + einfo + if [[ -z "${SVN_BDB_VERSION}" ]]; then + SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" + einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." + fi + einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" + einfo + + local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then + eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" + eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." + eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." + eerror "Aborting to avoid possible run-time crashes." + die "Berkeley DB version mismatch" + fi + fi + + depend.apache_pkg_setup + + java-pkg-opt-2_pkg_setup + + if ! use webdav-neon && ! use webdav-serf; then + ewarn + ewarn "WebDAV support is disabled. You need WebDAV to" + ewarn "access repositories through the HTTP protocol." + ewarn + ewarn "WebDAV support needs one of the following USE flags enabled:" + ewarn " webdav-neon webdav-serf" + ewarn + ewarn "You can do this by enabling one of these flags in /etc/portage/package.use:" + ewarn " ${CATEGORY}/${PN} webdav-neon webdav-serf" + ewarn + ebeep + fi + + if use test; then + elog + elog "\e[1;31m************************************************************************************************\e[0m" + elog + elog "NOTES ABOUT TESTS" + elog + elog "You can set the following variables to enable testing of some features and configure testing:" + if use webdav-neon || use webdav-serf; then + elog " SVN_TEST_APACHE_PORT=integer - Set Apache port number (Default value: 62208)" + fi + elog " SVN_TEST_SVNSERVE_PORT=integer - Set svnserve port number (Default value: 62209)" + elog " SVN_TEST_FSFS_MEMCACHED=1 - Enable using of Memcached for FSFS repositories" + elog " SVN_TEST_FSFS_MEMCACHED_PORT=integer - Set Memcached port number (Default value: 62210)" + elog " SVN_TEST_FSFS_SHARDING=integer - Enable sharding of FSFS repositories and set default shard size for FSFS repositories" + elog " SVN_TEST_FSFS_PACKING=1 - Enable packing of FSFS repositories" + elog " (SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING)" +# if use sasl; then +# elog " SVN_TEST_SASL=1 - Enable SASL authentication" +# fi + if use ctypes-python || use java || use perl || use python || use ruby; then + elog " SVN_TEST_BINDINGS=1 - Enable testing of bindings" + fi + if use java || use perl || use python || use ruby; then + elog " (Testing of bindings requires ${CATEGORY}/${PF})" + fi + if use java; then + elog " (Testing of JavaHL library requires dev-java/junit:4)" + fi + elog + elog "\e[1;31m************************************************************************************************\e[0m" + elog + ebeep + epause 24 + + if ! use apache2 && { use webdav-neon || use webdav-serf; }; then + eerror "Testing of libsvn_ra_neon / libsvn_ra_serf requires support for Apache." + die "Enable \"apache2\" USE flag." + fi + + if [[ -n "${SVN_TEST_APACHE_PORT}" ]] && ! ([[ "$((${SVN_TEST_APACHE_PORT}))" == "${SVN_TEST_APACHE_PORT}" ]]) &>/dev/null; then + die "Value of SVN_TEST_APACHE_PORT must be an integer" + fi + + if [[ -n "${SVN_TEST_SVNSERVE_PORT}" ]] && ! ([[ "$((${SVN_TEST_SVNSERVE_PORT}))" == "${SVN_TEST_SVNSERVE_PORT}" ]]) &>/dev/null; then + die "Value of SVN_TEST_SVNSERVE_PORT must be an integer" + fi + + if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && ! has_version net-misc/memcached; then + die "net-misc/memcached must be installed" + fi + if [[ -n "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]] && ! ([[ "$((${SVN_TEST_FSFS_MEMCACHED_PORT}))" == "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]]) &>/dev/null; then + die "Value of SVN_TEST_FSFS_MEMCACHED_PORT must be an integer" + fi + if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]] && ! ([[ "$((${SVN_TEST_FSFS_SHARDING}))" == "${SVN_TEST_FSFS_SHARDING}" ]]) &>/dev/null; then + die "Value of SVN_TEST_FSFS_SHARDING must be an integer" + fi + if [[ -n "${SVN_TEST_FSFS_PACKING}" && -z "${SVN_TEST_FSFS_SHARDING}" ]]; then + die "SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING" + fi + + if [[ -n "${SVN_TEST_BINDINGS}" ]]; then + if { use java || use perl || use python || use ruby; } && ! has_version "=${CATEGORY}/${PF}"; then + die "${CATEGORY}/${PF} must be installed" + fi + if use java && ! has_version dev-java/junit:4; then + die "dev-java/junit:4 must be installed" + fi + fi + fi + + if use debug; then + append-cppflags -DSVN_DEBUG -DAP_DEBUG + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch" + epatch "${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch" + epatch "${FILESDIR}/${PN}-1.6.3-kwallet_window.patch" + chmod +x build/transform_libtool_scripts.sh || die "chmod failed" + + if ! use test; then + sed -i \ + -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ + -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac + fi + + eautoconf + elibtoolize +} + +src_configure() { + local myconf + + if use python || use perl || use ruby; then + myconf+=" --with-swig" + else + myconf+=" --without-swig" + fi + + if use java; then + if use test && [[ -n "${SVN_TEST_BINDINGS}" ]]; then + myconf+=" --with-junit=/usr/share/junit-4/lib/junit.jar" + else + myconf+=" --without-junit" + fi + fi + + econf --libdir="/usr/$(get_libdir)" \ + $(use_with apache2 apxs "${APXS}") \ + $(use_with berkdb berkeley-db "db.h:/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ + $(use_with ctypes-python ctypesgen /usr) \ + $(use_enable dso runtime-module-search) \ + $(use_with gnome-keyring) \ + $(use_enable java javahl) \ + $(use_with java jdk "${JAVA_HOME}") \ + $(use_with kde kwallet) \ + $(use_enable nls) \ + $(use_with sasl) \ + $(use_with webdav-neon neon) \ + $(use_with webdav-serf serf /usr) \ + ${myconf} \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --disable-experimental-libtool \ + --without-jikes \ + --enable-local-library-preloading \ + --disable-mod-activation \ + --disable-neon-version-check \ + --with-sqlite=/usr +} + +src_compile() { + einfo + einfo "Building of core of Subversion" + einfo + emake local-all || die "Building of core of Subversion failed" + + if use ctypes-python; then + einfo + einfo "Building of Subversion Ctypes Python bindings" + einfo + emake ctypes-python || die "Building of Subversion Ctypes Python bindings failed" + fi + + if use python; then + einfo + einfo "Building of Subversion SWIG Python bindings" + einfo + emake swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" swig-py \ + || die "Building of Subversion SWIG Python bindings failed" + fi + + if use perl; then + einfo + einfo "Building of Subversion SWIG Perl bindings" + einfo + emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed" + fi + + if use ruby; then + einfo + einfo "Building of Subversion SWIG Ruby bindings" + einfo + emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" + fi + + if use java; then + einfo + einfo "Building of Subversion JavaHL library" + einfo + emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \ + || die "Building of Subversion JavaHL library failed" + fi + + if use emacs; then + einfo + einfo "Compilation of Emacs modules" + einfo + elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-doc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed" + fi + + if use extras; then + einfo + einfo "Building of contrib and tools" + einfo + emake contrib || die "Building of contrib failed" + emake tools || die "Building of tools failed" + fi + + if use doc; then + einfo + einfo "Building of Subversion HTML documentation" + einfo + doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" + + if use java; then + einfo + einfo "Building of Subversion JavaHL library HTML documentation" + einfo + emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed" + fi + fi +} + +create_apache_tests_configuration() { + get_loadmodule_directive() { + if [[ "$("${APACHE_BIN}" -l)" != *"mod_$1.c"* ]]; then + echo "LoadModule $1_module \"${APACHE_MODULESDIR}/mod_$1.so\"" + fi + } + get_loadmodule_directives() { + if has_version "=www-servers/apache-2.4*"; then + get_loadmodule_directive auth_basic + get_loadmodule_directive authn_core + get_loadmodule_directive authn_file + get_loadmodule_directive authz_core + get_loadmodule_directive authz_user + get_loadmodule_directive dav + get_loadmodule_directive log_config + get_loadmodule_directive unixd + else + get_loadmodule_directive auth_basic + get_loadmodule_directive authn_file + get_loadmodule_directive dav + get_loadmodule_directive log_config + fi + } + + mkdir -p "${T}/apache" + cat << EOF > "${T}/apache/apache.conf" +$(get_loadmodule_directives) +LoadModule dav_svn_module "${S}/subversion/mod_dav_svn/.libs/mod_dav_svn.so" +LoadModule authz_svn_module "${S}/subversion/mod_authz_svn/.libs/mod_authz_svn.so" + +User $(id -un) +Group $(id -gn) +Listen localhost:${SVN_TEST_APACHE_PORT} +ServerName localhost +ServerRoot "${T}" +DocumentRoot "${T}" +CoreDumpDirectory "${T}" +PidFile "${T}/apache.pid" +CustomLog "${T}/apache/access_log" "%h %l %u %{%Y-%m-%dT%H:%M:%S}t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" +CustomLog "${T}/apache/svn_log" "%{%Y-%m-%dT%H:%M:%S}t %u %{SVN-REPOS-NAME}e %{SVN-ACTION}e" env=SVN-ACTION +ErrorLog "${T}/apache/error_log" +LogLevel Debug +MaxRequestsPerChild 0 + + + AllowOverride None + + + + DAV svn + SVNParentPath "${S}/subversion/tests/cmdline/svn-test-work/repositories" + AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz" + AuthType Basic + AuthName "Subversion Repository" + AuthUserFile "${T}/apache/users" + Require valid-user + + + + DAV svn + SVNPath "${S}/subversion/tests/cmdline/svn-test-work/local_tmp/repos" + AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz" + AuthType Basic + AuthName "Subversion Repository" + AuthUserFile "${T}/apache/users" + Require valid-user + +EOF + + cat << EOF > "${T}/apache/users" +jrandom:xCGl35kV9oWCY +jconstant:xCGl35kV9oWCY +EOF +} + +set_tests_variables() { + if [[ "$1" == "local" ]]; then + base_url="file://${S}/subversion/tests/cmdline" + http_library="" + fi + if [[ "$1" == "svn" ]]; then + base_url="svn://127.0.0.1:${SVN_TEST_SVNSERVE_PORT}" + http_library="" + fi + if [[ "$1" == "neon" || "$1" == "serf" ]]; then + base_url="http://127.0.0.1:${SVN_TEST_APACHE_PORT}" + http_library="$1" + fi +} + +src_test() { + if ! use test; then + die "Invalid configuration" + fi + + local fs_type fs_types ra_type ra_types options failed_tests + + fs_types="fsfs" + use berkdb && fs_types+=" bdb" + + ra_types="local svn" + use webdav-neon && ra_types+=" neon" + use webdav-serf && ra_types+=" serf" + + local pid_file + for pid_file in svnserve.pid apache.pid memcached.pid; do + rm -f "${T}/${pid_file}" + done + + termination() { + local die="$1" pid_file + if [[ -n "${die}" ]]; then + echo -e "\n\e[1;31mKilling of child processes...\e[0m\a" > /dev/tty + fi + for pid_file in svnserve.pid apache.pid memcached.pid; do + if [[ -f "${T}/${pid_file}" ]]; then + kill "$(<"${T}/${pid_file}")" + fi + done + if [[ -n "${die}" ]]; then + sleep 6 + die "Termination" + fi + } + + trap 'termination 1 &' SIGINT SIGTERM + + SVN_TEST_SVNSERVE_PORT="${SVN_TEST_SVNSERVE_PORT:-62209}" + LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --listen-port "${SVN_TEST_SVNSERVE_PORT}" --log-file "${T}/svnserve.log" --pid-file "${T}/svnserve.pid" + if use webdav-neon || use webdav-serf; then + SVN_TEST_APACHE_PORT="${SVN_TEST_APACHE_PORT:-62208}" + create_apache_tests_configuration + "${APACHE_BIN}" -f "${T}/apache/apache.conf" + fi + if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]]; then + SVN_TEST_FSFS_MEMCACHED_PORT="${SVN_TEST_FSFS_MEMCACHED_PORT:-62210}" + sed -e "/\[memcached-servers\]/akey = 127.0.0.1:${SVN_TEST_FSFS_MEMCACHED_PORT}" -i subversion/tests/tests.conf + memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid" + fi + if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]]; then + options+=" FSFS_SHARDING=${SVN_TEST_FSFS_SHARDING}" + fi + if [[ -n "${SVN_TEST_FSFS_PACKING}" ]]; then + options+=" FSFS_PACKING=1" + fi +# if [[ -n "${SVN_TEST_SASL}" ]]; then +# options+=" ENABLE_SASL=1" +# fi + + sleep 6 + + for ra_type in ${ra_types}; do + for fs_type in ${fs_types}; do + [[ "${ra_type}" == "local" && "${fs_type}" == "bdb" ]] && continue + einfo + einfo "\e[1;34mTesting of ra_${ra_type} + $(echo ${fs_type} | tr '[:lower:]' '[:upper:]')\e[0m" + einfo + set_tests_variables ${ra_type} + time emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="1" ${options} || failed_tests="1" + mv tests.log "${T}/tests-ra_${ra_type}-${fs_type}.log" + done + done + unset base_url http_library + termination + trap - SIGINT SIGTERM + + if [[ -n "${SVN_TEST_BINDINGS}" ]]; then + local swig_lingua swig_linguas + local -A linguas + if use ctypes-python; then + einfo + einfo "\e[1;34mTesting of Subversion Ctypes Python bindings\e[0m" + einfo + time emake check-ctypes-python || failed_tests="1" + fi + + use perl && swig_linguas+=" pl" + use python && swig_linguas+=" py" + use ruby && swig_linguas+=" rb" + + linguas[pl]="Perl" + linguas[py]="Python" + linguas[rb]="Ruby" + + for swig_lingua in ${swig_linguas}; do + einfo + einfo "\e[1;34mTesting of Subversion SWIG ${linguas[${swig_lingua}]} bindings\e[0m" + einfo + time emake check-swig-${swig_lingua} || failed_tests="1" + done + + if use java; then + einfo + einfo "\e[1;34mTesting of Subversion JavaHL library\e[0m" + einfo + time emake check-javahl || failed_tests="1" + fi + fi + + if [[ -n "${failed_tests}" ]]; then + ewarn + ewarn "\e[1;31mSome tests failed\e[0m" + ewarn + ebeep 12 + fi +} + +src_install() { + einfo + einfo "Installation of core of Subversion" + einfo + emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" + + if use ctypes-python; then + einfo + einfo "Installation of Subversion Ctypes Python bindings" + einfo + emake DESTDIR="${D}" install-ctypes-python || die "Installation of Subversion Ctypes Python bindings failed" + fi + + if use python; then + einfo + einfo "Installation of Subversion SWIG Python bindings" + einfo + emake -j1 DESTDIR="${D}" swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" install-swig-py \ + || die "Installation of Subversion SWIG Python bindings failed" + fi + + if use perl; then + einfo + einfo "Installation of Subversion SWIG Perl bindings" + einfo + emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed" + fixlocalpod + find "${D}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr + fi + + if use ruby; then + einfo + einfo "Installation of Subversion SWIG Ruby bindings" + einfo + emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed" + fi + + if use java; then + einfo + einfo "Installation of Subversion JavaHL library" + einfo + emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" + java-pkg_regso "${D}"usr/$(get_libdir)/libsvnjavahl*.so + java-pkg_dojar "${D}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -fr "${D}"usr/$(get_libdir)/svn-javahl/*.jar + fi + + # Install Apache module configuration. + if use apache2; then + dodir "${APACHE_MODULES_CONFDIR}" + cat << EOF > "${D}${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf + +LoadModule dav_svn_module modules/mod_dav_svn.so + +LoadModule authz_svn_module modules/mod_authz_svn.so + + +# Example configuration: +# +# DAV svn +# SVNPath ${SVN_REPOS_LOC}/repos +# AuthType Basic +# AuthName "Subversion repository" +# AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers +# Require valid-user +# + +EOF + fi + + # Install Bash Completion, bug 43179. + dobashcompletion tools/client-side/bash_completion subversion + rm -f tools/client-side/bash_completion + + # Install hot backup script, bug 54304. + newbin tools/backup/hot-backup.py svn-hot-backup + rm -fr tools/backup + + # Install svn_load_dirs.pl. + if use perl; then + dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl + fi + rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl + + # Install svnserve init-script and xinet.d snippet, bug 43245. + newinitd "${FILESDIR}"/svnserve.initd svnserve + if use apache2; then + newconfd "${FILESDIR}"/svnserve.confd svnserve + else + newconfd "${FILESDIR}"/svnserve.confd2 svnserve + fi + insinto /etc/xinetd.d + newins "${FILESDIR}"/svnserve.xinetd svnserve + + # Install documentation. + dodoc CHANGES COMMITTERS README + dodoc tools/xslt/svnindex.{css,xsl} + rm -fr tools/xslt + + # Install Vim syntax files. + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins contrib/client-side/vim/svn.vim + fi + rm -f contrib/client-side/vim/svn.vim + + # Install Emacs Lisps. + if use emacs; then + elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs modules failed" + elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} || die "Installation of Emacs modules failed" + touch "${D}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installation of Emacs site-init file failed" + fi + rm -fr contrib/client-side/emacs + + # Install extra files. + if use extras; then + einfo + einfo "Installation of contrib and tools" + einfo + + cat << EOF > 80subversion-extras +PATH="/usr/$(get_libdir)/subversion/bin" +ROOTPATH="/usr/$(get_libdir)/subversion/bin" +EOF + doenvd 80subversion-extras + + emake DESTDIR="${D}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed" + emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed" + + find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr + rm -fr contrib/client-side/svn-push + rm -fr contrib/server-side/svnstsw + rm -fr tools/client-side/svnmucc + rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* + rm -fr tools/{buildbot,dev,diff,po} + + insinto /usr/share/${PN} + doins -r contrib tools + fi + + if use doc; then + einfo + einfo "Installation of Subversion HTML documentation" + einfo + dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" + + insinto /usr/share/doc/${PF} + doins -r notes + ecompressdir /usr/share/doc/${PF}/notes + +# if use ruby; then +# emake DESTDIR="${D}" install-swig-rb-doc +# fi + + if use java; then + java-pkg_dojavadoc doc/javadoc + fi + fi +} + +pkg_preinst() { + # Compare versions of Berkeley DB, bug 122877. + if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]]; then + OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + NEW_BDB_VERSION="$(scanelf -nq "${D}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then + CHANGED_BDB_VERSION="1" + fi + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen + use perl && perl-module_pkg_postinst + + if use ctypes-python; then + python_mod_optimize "$(python_get_sitedir)/csvn" + fi + + elog "Subversion Server Notes" + elog "-----------------------" + elog + elog "If you intend to run a server, a repository needs to be created using" + elog "svnadmin (see man svnadmin) or the following command to create it in" + elog "${SVN_REPOS_LOC}:" + elog + elog " emerge --config =${CATEGORY}/${PF}" + elog + elog "Subversion has multiple server types, take your pick:" + elog + elog " - svnserve daemon: " + elog " 1. Edit /etc/conf.d/svnserve" + elog " 2. Fix the repository permissions (see \"Fixing the repository permissions\")" + elog " 3. Start daemon: /etc/init.d/svnserve start" + elog " 4. Make persistent: rc-update add svnserve default" + elog + elog " - svnserve via xinetd:" + elog " 1. Edit /etc/xinetd.d/svnserve (remove disable line)" + elog " 2. Fix the repository permissions (see \"Fixing the repository permissions\")" + elog " 3. Restart xinetd.d: /etc/init.d/xinetd restart" + elog + elog " - svn over ssh:" + elog " 1. Fix the repository permissions (see \"Fixing the repository permissions\")" + elog " Additionally run:" + elog " groupadd svnusers" + elog " chown -R root:svnusers ${SVN_REPOS_LOC}/repos" + elog " 2. Create an svnserve wrapper in /usr/local/bin to set the umask you" + elog " want, for example:" + elog " #!/bin/bash" + elog " . /etc/conf.d/svnserve" + elog " umask 007" + elog " exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\"" + elog + + if use apache2; then + elog " - http-based server:" + elog " 1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\"" + elog " 2. Create an htpasswd file:" + elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" + elog " 3. Fix the repository permissions (see \"Fixing the repository permissions\")" + elog " 4. Restart Apache: /etc/init.d/apache2 restart" + elog + fi + + elog " Fixing the repository permissions:" + elog " chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf" + elog " chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos" + elog " chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db" + elog " chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks" + elog + + elog "If you intend to use svn-hot-backup, you can specify the number of" + elog "backups to keep per repository by specifying an environment variable." + elog "If you want to keep e.g. 2 backups, do the following:" + elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion" + elog "echo 'SVN_HOTBACKUP_BACKUPS_NUMBER=2' >> /etc/env.d/80subversion" + elog + + elog "Subversion contains support for the use of Memcached" + elog "to cache data of FSFS repositories." + elog "You should install \"net-misc/memcached\", start memcached" + elog "and configure your FSFS repositories, if you want to use this feature." + elog "See the documentation for details." + elog + epause 6 + + if [[ -n "${CHANGED_BDB_VERSION}" ]]; then + ewarn "You upgraded from an older version of Berkeley DB and may experience" + ewarn "problems with your repository. Run the following commands as root to fix it:" + ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" + ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen + use perl && perl-module_pkg_postrm + + if use ctypes-python; then + python_mod_cleanup "$(python_get_sitedir)/csvn" + fi +} + +pkg_config() { + einfo ">>> Initializing the database in ${ROOT}${SVN_REPOS_LOC} ..." + if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then + echo "A Subversion repository already exists and I will not overwrite it." + echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." + else + mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf" + + einfo ">>> Populating repository directory ..." + # Create initial repository. + "${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos" + + einfo ">>> Setting repository permissions ..." + SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" + SVNSERVE_GROUP="$(. "${ROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" + if use apache2; then + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" + else + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" + enewgroup "${SVNSERVE_GROUP}" + enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}" + fi + chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos" + chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf" + chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/synaptics-touchpad.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/synaptics-touchpad.eclass new file mode 100644 index 0000000000..43fd332ba5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/eclass/synaptics-touchpad.eclass @@ -0,0 +1,85 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +EAPI="2" +inherit eutils cros-binary + +# Synaptics touchpad generic eclass. +IUSE="is_touchpad ps_touchpad" + +RDEPEND="x11-base/xorg-server" +DEPEND="${RDEPEND}" + +# @ECLASS-VARIABLE: SYNAPTICS_TOUCHPAD_PN +# @DESCRIPTION: The packagename used as part of the binary tarball filename. +: ${SYNAPTICS_TOUCHPAD_PN:=${PN}} + +export_uri() { + local XORG_VERSION_STRING + local XORG_VERSION + local X_VERSION + + XORG_VERSION_STRING=$(grep "XORG_VERSION_CURRENT" "$ROOT/usr/include/xorg/xorg-server.h") + XORG_VERSION_STRING=${XORG_VERSION_STRING/#\#define*XORG_VERSION_CURRENT} + XORG_VERSION=$(($XORG_VERSION_STRING)) + + if [ $XORG_VERSION -ge 11100000 ]; then + X_VERSION=1.11 + elif [ $XORG_VERSION -ge 11000000 ]; then + X_VERSION=1.10 + elif [ $XORG_VERSION -ge 10903000 ]; then + X_VERSION=1.9 + else + X_VERSION=1.7 + fi + CROS_BINARY_URI="http://commondatastorage.googleapis.com/synaptics/${SYNAPTICS_TOUCHPAD_PN}-xorg-${X_VERSION}-${PV}-${PR}.tar.gz" +} + +function synaptics-touchpad_src_unpack() { + export_uri + cros-binary_src_unpack +} + +function synaptics-touchpad_src_install() { + # Currently you must have files/* in each ebuild that inherits + # from here. These files will go away soon after they are pushed + # into the synaptics tarball. + export_uri + cros-binary_src_install + if [ $(ls "${D}" | wc -l) -eq 1 ]; then + local extra_dir="$(ls "${D}")" + mv "${D}/${extra_dir}/"* "${D}/" + rmdir "${D}/${extra_dir}/" + fi + + exeinto /opt/Synaptics/bin + doexe "${FILESDIR}/tpcontrol_syncontrol" || die + + # If it exists, install synlogger to log calls to the Synaptics binaries. + # The original binaries themselves are appended with _bin, and symlinks are + # created with their original names that point at synlogger. + if [ -f "${FILESDIR}/synlogger" ]; then + doexe "${FILESDIR}/synlogger" || die + local f + for f in syn{control,detect,reflash} ; do + mv "${D}"/opt/Synaptics/bin/${f}{,_bin} || die + dosym synlogger /opt/Synaptics/bin/${f} || die + done + fi + + # link the appropriate config files for the type of trackpad + if use is_touchpad && use ps_touchpad; then + die "Specify only one type of touchpad" + elif use is_touchpad; then + dosym HKLM_Kernel_IS /opt/Synaptics/HKLM_Kernel || die + dosym HKLM_User_IS /opt/Synaptics/HKLM_User || die + elif use ps_touchpad; then + dosym HKLM_Kernel_PS /opt/Synaptics/HKLM_Kernel || die + dosym HKLM_User_PS /opt/Synaptics/HKLM_User || die + else + die "Type of touchpad not specified" + fi + +} + diff --git a/sdk_container/src/third_party/coreos-overlay/inherit-review-settings-ok b/sdk_container/src/third_party/coreos-overlay/inherit-review-settings-ok new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sdk_container/src/third_party/coreos-overlay/licenses/Google-TOS b/sdk_container/src/third_party/coreos-overlay/licenses/Google-TOS new file mode 100644 index 0000000000..45f4409bd7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/licenses/Google-TOS @@ -0,0 +1,96 @@ +Google Terms of Service +Last modified: March 1, 2012 + +Welcome to Google! + +Thanks for using our products and services (“Services”). The Services are provided by Google Inc. (“Google”), located at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. + +By using our Services, you are agreeing to these terms. Please read them carefully. + +Our Services are very diverse, so sometimes additional terms or product requirements (including age requirements) may apply. Additional terms will be available with the relevant Services, and those additional terms become part of your agreement with us if you use those Services. + +Using our Services + +You must follow any policies made available to you within the Services. + +Don’t misuse our Services. For example, don’t interfere with our Services or try to access them using a method other than the interface and the instructions that we provide. You may use our Services only as permitted by law, including applicable export and re-export control laws and regulations. We may suspend or stop providing our Services to you if you do not comply with our terms or policies or if we are investigating suspected misconduct. + +Using our Services does not give you ownership of any intellectual property rights in our Services or the content you access. You may not use content from our Services unless you obtain permission from its owner or are otherwise permitted by law. These terms do not grant you the right to use any branding or logos used in our Services. Don’t remove, obscure, or alter any legal notices displayed in or along with our Services. + +Our Services display some content that is not Google’s. This content is the sole responsibility of the entity that makes it available. We may review content to determine whether it is illegal or violates our policies, and we may remove or refuse to display content that we reasonably believe violates our policies or the law. But that does not necessarily mean that we review content, so please don’t assume that we do. + +In connection with your use of the Services, we may send you service announcements, administrative messages, and other information. You may opt out of some of those communications. + +Your Google Account + +You may need a Google Account in order to use some of our Services. You may create your own Google Account, or your Google Account may be assigned to you by an administrator, such as your employer or educational institution. If you are using a Google Account assigned to you by an administrator, different or additional terms may apply and your administrator may be able to access or disable your account. + +If you learn of any unauthorized use of your password or account, follow these instructions. + +Privacy and Copyright Protection + +Google’s privacy policies explain how we treat your personal data and protect your privacy when you use our Services. By using our Services, you agree that Google can use such data in accordance with our privacy policies. + +We respond to notices of alleged copyright infringement and terminate accounts of repeat infringers according to the process set out in the U.S. Digital Millennium Copyright Act. + +We provide information to help copyright holders manage their intellectual property online. If you think somebody is violating your copyrights and want to notify us, you can find information about submitting notices and Google’s policy about responding to notices in our Help Center. + +Your Content in our Services + +Some of our Services allow you to submit content. You retain ownership of any intellectual property rights that you hold in that content. In short, what belongs to you stays yours. + +When you upload or otherwise submit content to our Services, you give Google (and those we work with) a worldwide license to use, host, store, reproduce, modify, create derivative works (such as those resulting from translations, adaptations or other changes we make so that your content works better with our Services), communicate, publish, publicly perform, publicly display and distribute such content. The rights you grant in this license are for the limited purpose of operating, promoting, and improving our Services, and to develop new ones. This license continues even if you stop using our Services (for example, for a business listing you have added to Google Maps). Some Services may offer you ways to access and remove content that has been provided to that Service. Also, in some of our Services, there are terms or settings that narrow the scope of our use of the content submitted in those Services. Make sure you have the necessary rights to grant us this license for any content that you submit to our Services. + +You can find more information about how Google uses and stores content in the privacy policy or additional terms for particular Services. If you submit feedback or suggestions about our Services, we may use your feedback or suggestions without obligation to you. + +About Software in our Services + +When a Service requires or includes downloadable software, this software may update automatically on your device once a new version or feature is available. Some Services may let you adjust your automatic update settings. + +Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the software provided to you by Google as part of the Services. This license is for the sole purpose of enabling you to use and enjoy the benefit of the Services as provided by Google, in the manner permitted by these terms. You may not copy, modify, distribute, sell, or lease any part of our Services or included software, nor may you reverse engineer or attempt to extract the source code of that software, unless laws prohibit those restrictions or you have our written permission. + +Open source software is important to us. Some software used in our Services may be offered under an open source license that we will make available to you. There may be provisions in the open source license that expressly override some of these terms. + +Modifying and Terminating our Services + +We are constantly changing and improving our Services. We may add or remove functionalities or features, and we may suspend or stop a Service altogether. + +You can stop using our Services at any time, although we’ll be sorry to see you go. Google may also stop providing Services to you, or add or create new limits to our Services at any time. + +We believe that you own your data and preserving your access to such data is important. If we discontinue a Service, where reasonably possible, we will give you reasonable advance notice and a chance to get information out of that Service. + +Our Warranties and Disclaimers + +We provide our Services using a commercially reasonable level of skill and care and we hope that you will enjoy using them. But there are certain things that we don’t promise about our Services. + +OTHER THAN AS EXPRESSLY SET OUT IN THESE TERMS OR ADDITIONAL TERMS, NEITHER GOOGLE NOR ITS SUPPLIERS OR DISTRIBUTORS MAKE ANY SPECIFIC PROMISES ABOUT THE SERVICES. FOR EXAMPLE, WE DON’T MAKE ANY COMMITMENTS ABOUT THE CONTENT WITHIN THE SERVICES, THE SPECIFIC FUNCTION OF THE SERVICES, OR THEIR RELIABILITY, AVAILABILITY, OR ABILITY TO MEET YOUR NEEDS. WE PROVIDE THE SERVICES “AS IS”. + +SOME JURISDICTIONS PROVIDE FOR CERTAIN WARRANTIES, LIKE THE IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. TO THE EXTENT PERMITTED BY LAW, WE EXCLUDE ALL WARRANTIES. + +Liability for our Services + +WHEN PERMITTED BY LAW, GOOGLE, AND GOOGLE’S SUPPLIERS AND DISTRIBUTORS, WILL NOT BE RESPONSIBLE FOR LOST PROFITS, REVENUES, OR DATA, FINANCIAL LOSSES OR INDIRECT, SPECIAL, CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE DAMAGES. + +TO THE EXTENT PERMITTED BY LAW, THE TOTAL LIABILITY OF GOOGLE, AND ITS SUPPLIERS AND DISTRIBUTORS, FOR ANY CLAIM UNDER THESE TERMS, INCLUDING FOR ANY IMPLIED WARRANTIES, IS LIMITED TO THE AMOUNT YOU PAID US TO USE THE SERVICES (OR, IF WE CHOOSE, TO SUPPLYING YOU THE SERVICES AGAIN). + +IN ALL CASES, GOOGLE, AND ITS SUPPLIERS AND DISTRIBUTORS, WILL NOT BE LIABLE FOR ANY LOSS OR DAMAGE THAT IS NOT REASONABLY FORESEEABLE. + +Business uses of our Services + +If you are using our Services on behalf of a business, that business accepts these terms. It will hold harmless and indemnify Google and its affiliates, officers, agents, and employees from any claim, suit or action arising from or related to the use of the Services or violation of these terms, including any liability or expense arising from claims, losses, damages, suits, judgments, litigation costs and attorneys’ fees. + +About these Terms + +We may modify these terms or any additional terms that apply to a Service to, for example, reflect changes to the law or changes to our Services. You should look at the terms regularly. We’ll post notice of modifications to these terms on this page. We’ll post notice of modified additional terms in the applicable Service. Changes will not apply retroactively and will become effective no sooner than fourteen days after they are posted. However, changes addressing new functions for a Service or changes made for legal reasons will be effective immediately. If you do not agree to the modified terms for a Service, you should discontinue your use of that Service. + +If there is a conflict between these terms and the additional terms, the additional terms will control for that conflict. + +These terms control the relationship between Google and you. They do not create any third party beneficiary rights. + +If you do not comply with these terms, and we don’t take action right away, this doesn’t mean that we are giving up any rights that we may have (such as taking action in the future). + +If it turns out that a particular term is not enforceable, this will not affect any other terms. + +The laws of California, U.S.A., excluding California’s conflict of laws rules, will apply to any disputes arising out of or relating to these terms or the Services. All claims arising out of or relating to these terms or the Services will be litigated exclusively in the federal or state courts of Santa Clara County, California, USA, and you and Google consent to personal jurisdiction in those courts. + +For information about how to contact Google, please visit our contact page. diff --git a/sdk_container/src/third_party/coreos-overlay/licenses/NVIDIA-codecs b/sdk_container/src/third_party/coreos-overlay/licenses/NVIDIA-codecs new file mode 100644 index 0000000000..e4e6daad98 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/licenses/NVIDIA-codecs @@ -0,0 +1,965 @@ +NVIDIA(r) Tegra(r) Software License Agreement - Tegra Linux Driver Package + +BY DOWNLOADING, INSTALLING, COPYING, ACCESSING, OR USING THE SOFTWARE +(AS DEFINED BELOW) THE END USER OF THE LICENSED MATERIALS ("YOU" OR +"LICENSEE") AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCEPTING +THESE TERMS ON BEHALF OF ANOTHER PERSON OR A COMPANY OR OTHER LEGAL +ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE FULL AUTHORITY TO BIND +THAT PERSON, COMPANY, OR LEGAL ENTITY TO THESE TERMS. IF YOU DO NOT +AGREE TO THESE TERMS, + + * DO NOT (A) DOWNLOAD, INSTALL, COPY THE SOFTWARE; OR (B) ACCESS + OR USE THE LICENSED MATERIALS; AND + * PROMPTLY DESTROY THE LICENSED MATERIALS, OR RETURN THEM TO + THE PARTY FROM WHOM YOU ACQUIRED IT. + +NVIDIA Tegra Software License Agreement- Tegra Linux Driver Package +(the "Agreement") is entered into by and between NVIDIA Corporation, a +Delaware corporation, having its principal place of business at 2701 +San Tomas Expressway, Santa Clara, CA 95050 ("NVIDIA") and the +individual person or single legal entity ("Licensee" or "You") who +acknowledges and agrees to fully abide the terms and conditions of +this Agreement. + +1. DEFINITIONS. + + 1.1 "Affiliate" means any company or legal entity that at various +times controls, is controlled by, or is under common control with +Licensee. Only for the purposes of this definition, "Control" means +(a) direct or indirect ownership of at least fifty percent (50%) of +the voting power of the shares or other securities for election of +directors (or other managing authority) of the controlled or commonly +controlled entity; (b) holding, directly or indirectly, the power to +exercise more than fifty percent (50%) of the entity's voting rights; +or (c) holding, directly or indirectly, the power to appoint the +majority of the members of the entity's board of directors (or similar +governing body), or in each case, the maximum percentage permitted +where a lesser percentage is required in a jurisdiction. The parties +shall be fully responsible for the actions / inactions of their +Affiliates under this Agreement. + + 1.2 "Competitors" shall mean any company that develops, +manufactures, produces, sells, distributes or licenses application +processors, computers-on-chips, systems-on-chips, CPUs, DSPs or GPU +technology. + + 1.3 "Confidential Information" shall mean (a) the Licensed +Materials; (b) either parties' technology, ideas, know-how, +documentation, processes, algorithms and trade secrets embodied in the +Licensed Materials; (c) any other information disclosed by either +party to the other that is (i) identified as "confidential," +"proprietary" or with a similar legend at the time of disclosure, or +(ii) if unmarked or disclosed orally or visually, are identified as +confidential at the time of disclosure and confirmed by a written +memorandum sent to the receiving party within thirty (30) calendar +days of disclosure summarizing the confidential information +sufficiently for identification; and (d) the terms and conditions of +this Agreement. + + Confidential Information shall not include any information which +is (e) published or otherwise available to the public other than by +breach of this Agreement by the receiving party; (f) rightfully +received by the receiving party from a third party without +confidentiality limitations; (g) independently developed by the +receiving party or its Affiliates as evidenced by appropriate records; +(h) known to the receiving party prior to its first receipt of same +from the disclosing party as evidenced by appropriate records; (i) +hereinafter disclosed by the disclosing party to a third party without +restriction on disclosure; or (j) approved for public release by +written authorization of the disclosing party. + + 1.4 "Contractor" shall mean any third party company or +individuals, including but not limited to original device +manufacturers, who Licensee engages for the purpose of such third +party performing services for the benefit of Licensee in connection +with this Agreement. + + 1.5 "Derivative Work(s)" means derivatives or modifications of the +Licensed Materials created by Licensee or NVIDIA, or a third party on +behalf of Licensee or NVIDIA respectively, which term shall include: +(i) for copyrightable or copyrighted material, any translation, +abridgement, revision or other form in which an existing work may be +recast, transformed or adapted; (ii) for work protected by topography +or mask right, any translation, abridgement, revision or other form in +which an existing work may be recast, transformed or adapted; (iii) +for patentable or patented material, any improvement; and (iv) for +material protected by trade secret, any new material derived from or +employing such existing trade secret. + + 1.6 "Excluded License" means any license that requires as a +condition of use, modification and/or distribution of software subject +to the Excluded License, that such software or other software +distributed and/or combined with such software be (i) disclosed or +distributed in source code form, (ii) licensed for the purpose of +making derivative works, or (iii) redistributable at no charge. + + 1.7 "Intellectual Property Rights" shall mean all proprietary +rights, including all patents, trademarks, copyrights, know-how, trade +secrets, mask works, including all applications and registrations +thereto, and any other similar protected rights in any country. + + 1.8 "Licensed Materials" shall mean the Software, related +documentation, Tegra development hardware (if applicable), and other +materials as NVIDIA may deliver hereunder from time to time. + + 1.9 "Licensee Products" shall mean Licensee's devices that have or +will contain NVIDIA's family of graphics, or media and communication, +or applications processors and related Software (as defined below) +supplied directly or indirectly by NVIDIA. + + 1.10 "Software" shall mean the NVIDIA Tegra Linux Driver Package, +full or partial copies thereof, and any Derivative Work(s) thereto +owned by NVIDIA. + +2. LICENSE. + + 2.1 Grant. Subject to the terms and conditions of this Agreement, +including applicable Exhibits, NVIDIA grants to Licensee and its +Affiliates a personal, nonexclusive, worldwide, nonsublicensable, +nontransferable, nonassignable and royalty-free right and license: + + (a) to execute, compile, reproduce, display, perform, modify, + and to prepare and have prepared Derivative Work(s) of the + Software (in source code form as provided by NVIDIA) + solely to develop and customize Licensee Products for + Licensee's internal development purposes only; + + (b) to reproduce, transmit, transfer, distribute and + sublicense object code forms of the Software and/or + Derivative Work(s) and related documentation incorporated + into Licensee Products with a form of end user license + agreement that is as protective of NVIDIA's Intellectual + Property Rights as this Agreement; + + (c) for Contractors to exercise the foregoing rights of + Section 2.1 of this Agreement solely on behalf of + Licensee; and + + (d) NVIDIA may, in its sole discretion, require Licensee to + accept, distribute, and/or incorporate certain + modifications, updates, fixes, changes, or revisions to + the Licensed Materials used in Licensee Products in a + timely manner. + + 2.2 Reservation of Rights. NVIDIA reserves all rights not +expressly granted to Licensee in Section 2.1 herein. + + 2.3 License Grant Back. Licensee hereby grants to NVIDIA and its +Affiliates an exclusive, worldwide, irrevocable, perpetual, +sublicensable (through multiple tiers of sublicensees), royalty-free +right, fully paid-up right and license to the Derivative Work(s) (in +source and object code form) created by Licensee's employees, +Affiliates or Contractors so that NVIDIA may copy, modify, create +Derivative Works thereof, to use, have used, import, make, have made, +sell, offer to sell, sublicense (through multiple tiers of +sublicensees), distribute (through multiple tiers of distributors) +such Derivative Work(s) on a stand-alone basis or as incorporated into +the Software or other NVIDIA products. For the sake of clarity, +NVIDIA is not prohibited or otherwise restricted from independently +developing new features or functionality with respect to the Licensed +Materials. + + 2.4 Delivery Obligation of Derivative Work(s) Licensee shall +deliver, upon NVIDIA's request, the Derivative Work(s) created by +Licensee or on behalf of Licensee to NVIDIA pursuant to Section 2.3 of +this Agreement. + +3. LIMITATIONS; OBLIGATIONS. + + 3.1 Restrictions. Except as expressly permitted by this +Agreement, Licensee shall not: + + (a) use the Software and/or the Derivative Work(s) created by + Licensee or on behalf of Licensee on any non-NVIDIA + application processors ("External Systems"), except on + External Systems for the sole purpose of programming, + configuration or performing diagnostics on an NVIDIA + application processor; + + (b) reverse engineer, decompile, disassemble, modify or create + derivative works of any portion of the Licensed Materials + (in object code form) or allow any third party (including + Licensee's Affiliates or Contractors) to do any of the + foregoing; + + (c) sublicense, rent, lease, loan, timeshare, sell, + distribute, disclose, publish, assign or transfer any + rights, grant a security interest in, or transfer + possession of the Licensed Materials to any third party + without NVIDIA's express prior written consent; + + (d) distribute the Licensed Materials on a standalone basis; + or + + (e) under any circumstances allow the Software to be used, + pursuant to this Agreement, on NVIDIA's Competitors' + software operating and/or hardware platforms. + + 3.2 No Implied Licenses. Nothing in this Agreement shall be +construed as granting to Licensee by implication, estoppel or +otherwise, (a) a license to any NVIDIA technology other than the +Licensed Materials; or (b) any additional license rights for the +Licensed Materials other than the licenses expressly granted in this +Agreement. + + 3.3 Additional Licensing Obligations. Licensee acknowledges and +agrees that it is Licensee's sole responsibility to obtain any, +additional, third party licenses required to make, have made, use, +have used, sell, import, and offer for sale Licensee Products that +include or incorporate any third party technology such as operating +systems, audio and/or video encoders and decoders or any technology +from, including but not limited to, Microsoft, Thomson, Fraunhofer +IIS, Sisvel S.p.A., MPEG-LA, and Coding Technologies ("Third Party +Components"). Licensee acknowledges and agrees that NVIDIA has not +granted to Licensee under this Agreement any necessary patent rights +with respect to those Third Party Components identified in the +exhibits of this Agreement ("Third Party Licensing Terms and +Notices"). As such, Licensee's use of the Third Party Components may +be subject to further restrictions and terms and conditions described +in the Third Party Licensing Terms and Notices. Licensee acknowledges +and agrees that Licensee is solely and exclusively responsible for +obtaining any and all authorizations and licenses required for the +distribution and/or incorporation of the Third Party Components +specified in the Third Party Licensing Terms and Notices. + +For the avoidance of doubt, except as expressly authorized by a +separate written agreement by and between Licensee and Adobe Systems, +Inc. ("Adobe"), Licensee has no right to distribute, sublicense, or +otherwise commercialize Adobe's Third Party Components identified in +Exhibit A-2. + +Excluding Section 9.5 of this Agreement, Licensee acknowledges and +agrees that NVIDIA may at various times update the Third Party +Licensing Terms and Notices without any advance written notice to +Licensee. Licensee agrees to be bound by such Third Party Licensing +Terms and Notices as they may be updated. In the event that NVIDIA's +license rights to the Third Party Components are terminated and/or +expired, Licensee agrees NVIDIA shall no longer have the obligation to +deliver such Third Party Components to Licensee affected by such +termination and/or expiration. + + Licensee shall, at its own expense fully indemnify, hold harmless, +defend, and settle any claim, suit or proceeding that is instituted by +a third party against NVIDIA and its officers, employees or agents, to +the extent such claim, suit or proceeding is based on (a) a breach by +Licensee of any of the representations and warranties in Section 7 +("Warranties") of this Agreement; or (b) Licensee's failure to fully +satisfy and/or comply with the third party licensing obligations +expressly contained in the Third Party Licensing Terms and Notices (a +"Claim"). + + In the event of a Claim, NVIDIA agrees to: + + (a) promptly inform Licensee and furnish Licensee a copy of + the Claim; + + (b) make commercially reasonable efforts to give such evidence + in NVIDIA's possession, custody or control as is + reasonable to Licensee, at Licensee's request and expense, + specifically and reasonably applicable to the Claim; + + (c) provide Licensee commercially reasonable assistance in the + defense thereof, at Licensee's expense; and + + (d) give Licensee sole control of the defense thereof and all + negotiations for its settlement and compromise, which + shall not be finalized without the prior written consent + of NVIDIA. + + NVIDIA's failure to promptly notify Licensee shall not relieve +Licensee of any liability or obligations that it has to NVIDIA, except +to the extent Licensee demonstrates that the defense of such action is +prejudiced by the failure or delay in giving notice. If NVIDIA +retains counsel, it will be at NVIDIA's own expense. + + In the event of a Claim, Licensee agrees to: + + (a) pay all damages finally awarded against NVIDIA or agreed + upon in settlement by Licensee, which shall not be + finalized without the prior written consent of NVIDIA, + (including other reasonable costs incurred by NVIDIA, + including reasonable attorneys fees, in connection with + enforcing this paragraph); + + (b) reimburse NVIDIA for any licensing fees and/or penalties + incurred by NVIDIA in connection with a Claim; and + + (c) immediately procure/satisfy the third party licensing + obligations expressly contained in the Third Party + Licensing Terms and Notices. + + 3.4 Proprietary Rights Notices. Licensee shall not remove, alter +or obscure any copyright, trademark, patent notices or other +proprietary rights notices that appear on the Licensed Materials. +Licensee shall use commercially reasonable efforts to require its +channel entities to comply with the provisions of this Section 3.4. + + 3.5 No Excluded Licenses. The licenses granted in Section 2.1 do +not include the right to, and Licensee shall not: (a) create +Derivative Work(s) of the Licensed Materials in any manner that would +cause the Licensed Materials, in whole or in part, to become subject +to the terms of an Excluded License; or (b) distribute the Licensed +Materials (or Derivative Works thereof) in any manner that would cause +the Licensed Materials, or any component thereof, to become subject to +the terms of an Excluded License. + + 3.6 Source Code Protection. In addition to Licensee's +restrictions and obligations in connection with the Licensed Materials +set forth in this Agreement, Licensee agrees that source code to the +Licensed Materials constitutes highly Confidential Information and +proprietary trade secrets of NVIDIA and shall be protected by (a) the +confidentiality obligations set forth in Section 5.1; and (b) any +applicable non-disclosure agreement ("NDA"). In addition to the +confidentiality obligations set forth in Section 5.1 and the NDA, +Licensee agrees to the following: + + (a) Licensee shall only allow its employees, Contractors, and + its Affiliates' employees and Contractors who have a need + to know basis to use the source code to the Software in + order for Licensee or its Affiliates to exercise their + license rights under this Agreement, provided that any + breach of this Agreement by such parties is considered + Licensee's breach of this Agreement and Licensee shall be + liable for such breach to the same extent as if it + committed the breach itself. Upon NVIDIA's request, + Licensee shall provide NVIDIA a list of all employees + (including employees of Affiliates), and Contractors who + have been granted source code access to the Licensed + Materials and update and maintain the accuracy of this + list at all times; + + (b) Licensee shall protect the source code of the Licensed + Materials to the same degree as Licensee protects its own + Confidential Information; + + (c) Licensee shall not grant third parties, excluding + Affiliates or Contractors, access to the source code of + the Licensed Materials; + + (d) Licensee shall restrict disclosure and access to and use + of the Licensed Materials (in source code form) to those + employees (including those of its Affiliates and/or + Contractors) who have agreed to be bound by a written + confidentiality agreement which incorporates the + protections and restrictions no less protective than those + set forth in this Agreement with respect to the Licensed + Materials; + + (e) Licensee shall secure the source code to the Software and + Licensed Materials in a secure location at all times; + + (f) Licensee shall not use the Licensed Materials and/or + Derivative Work(s) created by Licensee to compete against + NVIDIA or shall not use the Licensed Materials and/or + Derivative Work(s) in litigation against NVIDIA; and + + (g) Licensee's employees, Affiliates, or Contractors who have + been exposed to source code of the Licensed Materials + shall not be permitted to use any ideas, techniques or + know-how obtained from their respective use of the + Licensed Materials for any engagement, including but not + limited to services or product development (hardware or + software) work for the benefit of NVIDIA's Competitors. + + 3.7 Defensive Suspension. If Licensee and/or its Affiliates +commence or participates in any legal proceeding against NVIDIA, then +NVIDIA may, in its sole discretion, suspend or terminate all license +grants and any other rights provided under this Agreement during the +pendency of such legal proceedings. + +4. OWNERSHIP; FEEDBACK. + + 4.1 By NVIDIA. Except as expressly licensed to Licensee under +this Agreement, NVIDIA reserves all right, title and interest, +including but not limited to all Intellectual Property Rights, in and +to the Licensed Materials and any Derivative Work(s) made thereto by +or on behalf of NVIDIA. + + 4.2 Feedback by Licensee. Licensee may, but is not obligated to, +provide to NVIDIA any suggestions, comments and feedback regarding the +Licensed Materials that are delivered by NVIDIA to Licensee under this +Agreement (collectively, "Licensee Feedback"). NVIDIA may use and +include any Licensee Feedback that Licensee voluntarily provides to +improve the Licensed Materials or other related NVIDIA technologies. +Accordingly, if Licensee provides Licensee Feedback, Licensee grants +NVIDIA and its licensees a perpetual, irrevocable, worldwide, +royalty-free, fully paid-up license grant to freely use, have used, +sell, modify, reproduce, transmit, license, sublicense (through +multiple tiers of sublicensees), distribute (through multiple tiers of +distributors), and otherwise commercialize the Licensee Feedback in +the Licensed Materials or other related technologies. + +5. CONFIDENTIAL INFORMATION; ACCESS TO SOFTWARE. + + 5.1 Protection of Confidential Information. The parties shall not +use or disclose any Confidential Information received from the other +party, except as expressly authorized by this Agreement, and shall +protect all such Confidential Information using the same degree of +care which the receiving party uses with respect to its own +proprietary information, but in no event with safeguards less than a +reasonably prudent business would exercise under similar +circumstances. The parties shall not use the Confidential Information +for purposes other than those necessary to directly further the +purposes of this Agreement. Except as expressly provided in this +Agreement, no ownership or license rights are granted in any +Confidential Information. The parties shall use commercially +reasonable efforts to prevent any actual or threatened unauthorized +copying, use or disclosure of Confidential Information, and shall +promptly notify the other party of any such actual or threatened +unauthorized disclosure or use. If any Confidential Information must +be disclosed to any third party by reason of legal, accounting or +regulatory requirements beyond the reasonable control of the +disclosing party, the disclosing party shall promptly notify the other +party of the order or request and permit the other party (at its own +expense) to seek an appropriate protective order. + + For the sake of clarity, the parties agree that, notwithstanding +the preceding paragraph, any and all information identified as +Confidential Information (as defined in the NDA) by the disclosing +party in connection with this Agreement shall also be protected under +the NDA; provided, however, that in the event of any conflict between +the confidentiality obligations pursuant to this Agreement and the +obligations pursuant to the NDA with regard to any Confidential +Information (as defined in the NDA) in connection with this Agreement, +including, without limitation, the source code to the Licensed +Materials, the terms of this Agreement shall prevail. + +6. TERM; TERMINATION + + 6.1 Term. This Agreement and the licenses granted hereunder shall +be effective as of the date Licensee first uses the Licensed Materials +("Effective Date") and continue for a period of one (1) year (the +"Initial Term"), unless terminated in accordance with Section 6.2. +Unless either party notifies the other party of its intent to +terminate this Agreement at least one (1) month prior to the end of +the Initial Term or the applicable renewal period ("Renewal +Period(s)"), this Agreement will be automatically renewed for one (1) +year Renewal Periods, provided however that this Agreement will +automatically expire at such time when Licensee no longer intends to +use the Licensed Materials for the authorized purposes described in +this Agreement, at this time Licensee will comply with the termination +provisions in Section 6.2 below. + + 6.2 Termination. Either party may terminate this Agreement +immediately upon written notice for the material breach of the other +party, which material breach is curable and has remained uncured for a +period of thirty (30) days from the date of delivery of written notice +thereof to the other party. Upon the termination or expiration of +this Agreement, + + (a) Licensee shall (i) immediately cease using the Licensed + Materials for any purpose whatsoever; (ii) immediately + destroy or return to NVIDIA all materials belonging to + NVIDIA, including without limitation all copies of the + Software and NVIDIA Confidential Information then in + Licensee's possession or control; and (iii) certify to + NVIDIA in writing that it has done so; and + + (b) NVIDIA shall (i) immediately destroy or return to Licensee + all materials belonging to Licensee that were provided to + NVIDIA pursuant to this Agreement, including without + limitation, Licensee's Confidential Information then in + NVIDIA's possession or control; and (ii) certify to + Licensee in writing that it has done so. These remedies + shall be cumulative and in addition to any other remedies + available to NVIDIA. + + 6.3 Survival. Those provisions in this Agreement, which by their +nature need to survive the termination or expiration of this +Agreement, The following Sections shall survive termination or +expiration of the Agreement, including but not limited to Sections 1, +2.2, 2.3, 2.4, 3, 4, 5, 6.2 , 6.3, 7, 8, 9 and Exhibit A. + +7. WARRANTIES + + THE LICENSED MATERIALS ARE LICENSED FOR LICENSEE'S USE "AS IS" AND +NVIDIA AND ITS LICENSORS DISCLAIM ALL WARRANTIES, EXPRESS, IMPLIED AND +STATUTORY INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. NVIDIA DOES NOT REPRESENT OR WARRANT THAT THE +LICENSED MATERIALS WILL MEET LICENSEE'S REQUIREMENTS OR THAT THE +OPERATION OF THE SOFTWARE CONTAINED THEREIN OR RESULTING THEREFROM +WILL BE UNINTERRUPTED OR ERROR-FREE. NO INFORMATION OR ADVICE GIVEN +BY NVIDIA, ITS REPRESENTATIVES, AGENTS OR EMPLOYEES SHALL IN ANY WAY +INCREASE THE SCOPE OF THIS WARRANTY. + + (A) Licensee represents and warrants that it has, or will have +prior to the commercial release of the Licensee Products, a valid and +current license to all the Third Party Components referenced in the +exhibits of this Agreement, for use in connection with Licensed +Materials provided pursuant to this Agreement and Licensee Products. + + +8. LIMITATION OF LIABILITY + + IN NO EVENT SHALL: + + (A) NVIDIA BE LIABLE FOR ANY CONSEQUENTIAL, INDIRECT, INCIDENTAL, +PUNITIVE OR SPECIAL DAMAGES, OF ANY KIND OR CHARACTER, INCLUDING LOST +PROFITS, LOST REVENUE, FAILURE TO REALIZE SAVINGS OR OTHER BENEFITS, +LOSS OF DATA OR USE, AND CLAIMS BY ANY THIRD PARTY, ARISING OUT OF OR +RELATED TO THE SUBJECT MATTER OF THIS AGREEMENT; AND + + (B) NVIDIA'S AGGREGATE LIABILITY ARISING OUT OF THIS AGREEMENT +EXCEED THE AMOUNT PAID BY LICENSEE FOR USE OF THE LICENSED MATERIALS. +THE FOREGOING EXCLUSION AND LIABILITY LIMITATIONS APPLY EVEN IF SUCH +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THIS +EXCLUSION AND LIABILITY LIMITATION SHALL APPLY EVEN IF ANY REMEDY +FAILS OF ITS ESSENTIAL PURPOSE. + +9. GENERAL + + 9.2 Governing Law. This Agreement shall be governed in all +respects by the laws of the United States and of the State of +Delaware, without regard to the conflicts of laws principles thereof. + + 9.3 Jurisdiction. The state and/or federal courts residing in +Santa Clara County, California shall have exclusive jurisdiction over +any dispute or claim arising out of this Agreement. + + 9.4 Severability. If for any reason a court of competent +jurisdiction finds any provision of this Agreement, or portion +thereof, to be unenforceable, that provision of the Agreement will be +enforced to the maximum extent permissible so as to affect the intent +of the parties, and the remainder of this Agreement will continue in +full force and effect. This Agreement has been negotiated by the +parties and their respective counsel and will be interpreted fairly in +accordance with its terms and without any strict construction in favor +of or against either party. + + 9.5 Amendments. The Agreement shall not be modified except by a +written agreement that names this Agreement and any provision to be +modified, is dated subsequent to the Effective Date, and is signed by +duly authorized representatives of both parties. + + 9.6 No Waiver. No failure or delay on the part of either party in +the exercise of any right, power or remedy under this Agreement or +under law, or to insist upon or enforce performance by the other party +of any of the provisions of this Agreement or under law, shall operate +as a waiver thereof, nor shall any single or partial exercise of any +right, power or remedy preclude other or further exercise thereof, or +the exercise of any other right, power or remedy; rather the +provision, right, or remedy shall be and remain in full force and +effect. + + 9.7 No Assignment. This Agreement, and each party's rights and +obligations herein, may not be assigned, subcontracted, delegated, or +otherwise transferred by either party without the other party's prior +written consent, and any attempted assignment, subcontract, +delegation, or transfer in violation of the foregoing will be null and +void. The terms of this Agreement shall be binding upon assignees. + + 9.8 Independent Contractors. NVIDIA's relationship to Licensee is +that of an independent Contractor, and neither party is an agent or +partner of the other. Neither party will have, and will not represent +to any third party that it has, any authority to act on behalf of the +other party. + + 9.9 Export Restrictions. The parties acknowledge that the +Licensed Materials are subject to U.S. export control laws and +regulations. The parties agree to comply with all applicable +international and national laws that apply to the Licensed Materials, +including the U.S. Export Administration Regulations, as well as +end-user, end-use and destination restrictions issued by U.S. and +other governments. + + 9.10 U.S. Government Legend. If Licensee is a branch or agency of +the United States Government, the following provision applies. Any +software provided under this Agreement, including any releases are +comprised of "commercial computer software" and "commercial computer +software documentation" as such terms are used in 48 C.F.R. 12.212 and +are provided to the Government (i) for acquisition by or on behalf of +civilian agencies, consistent with the policy set forth in 48 +C.F.R. 12.212; or (ii) for acquisition by or on behalf of units of the +Department of Defense, consistent with the policies set forth in 48 +C.F.R. 227.7202-1 and 227.7202-3. + + 9.11 Headings. The headings in this Agreement are for the sole +purpose of convenience of reference and shall not in any way limit or +affect the meaning or interpretation of any of the terms or provisions +of this Agreement. + + 9.12 Counterparts. This Agreement may be executed in +counterparts, each of which shall be deemed an original, and all of +which together shall constitute one instrument. + + 9.13 No Third Party Beneficiaries. This Agreement is solely +between NVIDIA and Licensee. There are no third party beneficiaries, +express or implied, to this Agreement. + + 9.14 Entire Agreement. This Agreement constitutes the entire +agreement between the parties with respect to the subject matter +contemplated herein, and merges all prior and contemporaneous +communications. + + + +Exhibit A + + +1. Coding Technologies/AAC+ + + Licensee shall be solely responsible for either obtaining a proper +patent license under the Essential Patents for end products or to +notify Licensee's respective customers of their obligations to obtain +a proper patent license under the Essential Patents for end products +in which the NVIDIA application processor(s) and/or the NVIDIA +software package may be used. For the purpose of this paragraph, +"Essential Patents" means patents which are infringed by the +manufacture, offer for sale, sale (or other form of +commercialization), use or import of products (hardware or software) +implementing, incorporating, containing or using AACPLUSV2 or by the +application of processes involving AACPLUSV2, including those which +are infringed by any source code provided as part of any specification +characterizing AACPLUSV2. + +2. Thomson Multimedia/MP3 + + Supply of the Licensed Materials does not convey a license under +the relevant intellectual property of Thomson Multimedia and/or +Fraunhofer Gesellschaft nor imply any right to use the Licensed +Materials in any finished end user or ready-to-use final product. An +independent license for such use is required. For details, please +visit http://www.mp3licensing.com + +3. MPEG L.A., L.L.C./MPEG-2 + + USE OF THE APPLICABLE NVIDIA SOFTWARE PACKAGE IN ANY MANNER THAT +COMPLIES WITH THE MPEG-2 STANDARD IS EXPRESSLY PROHIBITED WITHOUT A +LICENSE UNDER APPLICABLE PATENTS IN THE MPEG-2 PATENT PORTFOLIO, WHICH +LICENSE IS AVAILABLE FROM MPEG LA, L.L.C., 250 STREELE STREET, SUITE +300, DENVER, COLORADO 80206. NO LICENSE IS GRANTED HEREIN, BY +IMPLICATION OR OTHERWISE, TO LICENSEE TO USE MPEG 2 INTERMEDIATE +PRODUCTS MANUFACTURED OR SOLD BY LICENSEE. + +4. MPEG-2 AAC + + Licensee shall be solely responsible for either obtaining a valid +and current license from AT&T Corp., Dolby Laboratories Licensing +Corporation, Fraunhofer-Gesellscaft, and Sony Corporation for the +applicable version of MPEG-2 AAC. + +5. Fraunhofer-Gesellschaft MPEG-4 HE-AAC + + Licensee understands and accepts that (a) it may be necessary to +execute a patent license with the appropriate licensing entities in +order to obtain all rights necessary to create Licensee's products; +and (b) Licensee will contact the appropriate licensing entities, +e.g. Via Licensing, and negotiate in good faith the adequate +contracts, if any. In addition, it is hereby understood that in the +event that, besides the Fraunhofer-Gesellschaft patents licensed +through such appropriate licensing entities, any further +Fraunhofer-Gesellschaft patent shall be required in order to use the +Licensed Materials, Fraunhofer-Gesellschaft shall not request from +Licensee any additional payment in order to receive a license to such +further Fraunhofer-Gesellschaft patent, as long as Licensee remains a +valid licensee of such appropriate licensing entity. + +6. Microsoft Windows Media + + Licensee acknowledges that Microsoft Windows Media is provided in +object code form only, solely for the Licensee's own internal +evaluation and testing purposes. + + + Licensee further acknowledges the following notice: "This product +includes technology owned by Microsoft Corporation and cannot be used +or further distributed without a license from Microsoft or a Microsoft +affiliate." + +7. Microsoft PlayReady or WMDRM technology + + Licensee acknowledges that the Licensed Materials (i) contain a +certain version of Microsoft PlayReady or WMDRM technology ("PlayReady +Technology"); and (ii) are subject to certain intellectual property +rights of Microsoft and cannot be used or distributed further without +the appropriate license(s) from Microsoft. + + Licensee represents and warrants that (i) Licensee holds a current +and valid license under a PlayReady Device Agreement and Intermediated +Product Distribution License, a PlayReady Final Product Distribution +License, or a like agreement, with Microsoft or a Microsoft affiliate; +and (ii) Licensee will use the PlayReady Technology provided under +this Agreement in Licensees' software, hardware product, or service +offering that (a) is intended for distribution to and/or use by end +users; and (b) is in a final form with Licensee-owned brand and/or +logo most prominently displayed brand in a fully functional user +interface. + +8. Ogg Vorbis Legal Information + +Copyright (c) 2002, Xiph.org Foundation + + Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of the Xiph.org Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +EXHIBIT A-2 + +Adobe Flash Demonstration and Evaluation License ("Adobe License") +Terms and Conditions + + 1. Software License. NVIDIA hereby grants to Licensee a +non-exclusive, non-transferable, royalty free right to use, install, +evaluate, test, demonstrate, publicly perform and display object code +versions of the Adobe Software together with Licensee's product. For +the avoidance of doubt, Licensee has no right to distribute, +sublicense, or otherwise commercialize the Adobe Software, unless and +until Adobe confirms in writing that Licensee has entered into an +appropriate license agreement with Adobe. + + "Adobe Software" means the Adobe Flash Player software version 10 +as modified by NVIDIA, in object code form as delivered by NVIDIA +hereunder. NVIDIA may update the Adobe Software from time to time, in +its sole discretion. + + 2. Period. Licensee's limited license hereunder shall commence on +the Effective Date and remain in effect until terminated by NVIDIA +upon five (5) days written notice. + + 3. Rights. Licensee agrees that it shall take no action in +furtherance of seeking any patent rights or other intellectual +property rights to the Adobe Software. The Software shall be returned +to NVIDIA within fifteen (15) days of the end of the Evaluation +Period. Licensee shall have no rights to sublicense or distribute the +Software. + + 4. Fees. There shall be no fees owed by either party under this +Adobe License. + + 5. Delivery. NVIDIA shall deliver the Adobe Software to Licensee +shortly after execution of this Adobe License. + + 6. Restrictions. Licensee does not have any rights to make use of +the Adobe Software, or in any manner, copy, disseminate, or in any way +circulate the Adobe Software other than as permitted under Section 1 +above. Licensee shall limit access to the Adobe Software to its +employees who need to know such information and who have agreed, +either as a condition to employment or prior to obtaining the Adobe +Software, to be bound by terms and conditions of confidentiality. The +rights herein do not entitle Licensee to use the Adobe Software, or +any technology or intellectual property contained within it, as +reference or inspiration for developing or creating another product in +any way based upon the Adobe Software. Licensee agrees not to +decompile, reverse engineer, reverse assemble, disassemble, or +otherwise reverse engineer or reduce the Adobe Software provided in +object code form to a human-perceivable form. + + 7. Ownership. All right, title, and interest in the Adobe +Software, shall be owned by Adobe. Except as set forth in Section 1 +above, Licensee acquires no license to any NVIDIA or Adobe +intellectual property rights pursuant to this Adobe License. The Adobe +Software, and any partial or whole copies thereof, and all copyright, +patent, trade secret and other intellectual property rights therein, +are and remain the property of Adobe and NVIDIA. The provisions of +this paragraph shall survive expiration or earlier termination of this +Adobe License. NVIDIA does not directly or indirectly grant, or +purport to grant, to Licensee any rights or immunities under Adobe's +intellectual property rights that will subject such intellectual +property rights to an open source license or scheme in which there is +or could be interpreted to be a requirement that as a condition of +use, modification and/or distribution, the Adobe Software be: (i) +disclosed or distributed in source code form; (ii) licensed for the +purpose of making derivative works; or (iii) redistributable at no +charge. + + + 8. Effect of Termination. Upon termination, the rights granted +hereunder shall cease and all materials furnished to Licensee by +NVIDIA hereunder relating to the Adobe Software shall be returned to +it promptly, together with any copies thereof. + + 9. Disclaimer. NVIDIA PROVIDES THE ADOBE SOFTWARE "AS IS" AND +WITHOUT ANY WARRANTIES. THE ENTIRE RISK AS TO THE RESULTS AND +PERFORMANCE OF THE ADOBE SOFTWARE IS ASSUMED BY LICENSEE. NVIDIA +DISCLAIMS ALL WARRANTIES, EXPRESS, IMPLIED OR STATUTORY, WITH REGARD +TO THE ADOBE SOFTWARE OR ANY OTHER INFORMATION PROVIDED HEREUNDER, +INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. + + 10. Limitation on Liability. NOTWITHSTANDING ANY PROVISION IN THIS +AGREEMENT, NEITHER NVIDIA NOR ADOBE SHALL BE LIABLE TO LICENSEE OR ANY +THIRD PARTY FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, ARISING OUT OF OR RELATED TO THIS AGREEMENT, INCLUDING, +WITHOUT LIMITATION, DAMAGES RESULTING FROM LOSS OF PROFITS, DATA, +BUSINESS, OR GOODWILL, HOWEVER CAUSED AND ON WHATEVER THEORY, WHETHER +BASED ON BREACH OF CONTRACT OR WARRANTY, TORT (INCLUDING NEGLIGENCE), +THE FAILURE OR ASSERTED FAILURE OF NVIDIA TO PERFORM ITS OBLIGATIONS +HEREUNDER, OR OTHERWISE, AND WHETHER OR NOT NVIDIA HAS BEEN ADVISED OR +IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES. NVIDIA's aggregate +liability to Licensee or any third party arising out of or in +connection with this Adobe License or any collateral agreement, +whether in contract, tort (including negligence), or otherwise, shall +be limited to fifty dollars (US$50). + + 11. Relief. As the unauthorized distribution of the Adobe Software +may diminish the value to NVIDIA or Adobe of the proprietary interests +that are the subject of this Adobe License, if Licensee breaches any +of its obligations under this Adobe License, NVIDIA or Adobe shall be +entitled to seek equitable relief to protect its interests therein, +including but not limited to injunctive relief, as well as money +damages. + + 12. Export Restrictions. The parties acknowledge that the Adobe +Software is subject to U.S. export control laws and regulations. The +parties agree to comply with all applicable international and national +laws that apply to the Adobe Software, including the U.S. Export +Administration Regulations and the United States Department of +Commerce, as well as end-user, end-use and destination restrictions +issued by U.S. and other governments. + + 13. Evaluation Feedback. + + 13.1 Feedback by Licensee. You must provide to NVIDIA any +suggestions, comments and feedback regarding the Adobe Software +("Licensee Feedback"). NVIDIA and Adobe may use and include any +Licensee Feedback that you provide to improve the Software or other +technologies and / or products. Accordingly, you grant to NVIDIA, its +subsidiaries, its affiliates and its licensees a perpetual, +irrevocable, worldwide, royalty-free, fully paid-up license to freely +use, have used, sell, modify, reproduce, transmit, license, sublicense +(through multiple tiers of sublicensees, including to Adobe), +distribute (through multiple tiers of distributors), and otherwise +commercialize the Licensee Feedback in the Adobe Software or other +NVIDIA or Adobe technologies and/or products. + + 13.2 Confidential Information. Licensee Feedback is considered +Adobe's confidential information ("Adobe Confidential Information"). +You shall not use or disclose any Adobe Confidential Information +except as expressly authorized herein, and you shall protect all such +Adobe Confidential Information using the same degree of care you use +with respect to your own proprietary information, but in no event with +safeguards less than a reasonably prudent business would exercise +under similar circumstances. You agree to take prompt and appropriate +action to prevent unauthorized use or disclosure of any Adobe +Confidential Information. + + + + +Exhibit E + +(Open Source Portions) + + Licensee agrees that the following terms and conditions shall +apply to its use of certain portions (as referenced below) of the +applicable software packages selected by the Licensee in connection +with this Agreement. For the sake of clarity, Licensee agrees that the +terms and conditions of the Agreement shall continue to govern +Licensee's use of the Software and Licensed Materials. The parties +agree that the capitalized terms used in this exhibit shall have the +same meaning ascribed to such term in the Agreement or any amendment +thereto. + + 1. NVIDIA agrees that the open source portions expressly licensed +under terms and conditions of Excluded Licenses (collectively the +"Open Source Portions"), shall not be subject to the restrictions set +forth in the following section ("No Excluded Licenses") of the +Agreement (or substantially similar provision in the Agreement signed +by Licensee): + + "3.5 No Excluded Licenses. The licenses granted in Section 2.1 do +not include the right to, and Licensee shall not: (a) create +Derivative Work(s) of the Licensed Materials in any manner that would +cause the Licensed Materials, in whole or in part, to become subject +to the terms of an Excluded License; or (b) distribute the Licensed +Materials (or Derivative Works thereof) in any manner that would cause +the Licensed Materials, or any component thereof, to become subject to +the terms of an Excluded License." + + 2. Licensee agrees that it shall not externally distribute, +license or otherwise disclose in any manner the Open Source Portions +until the later of (a) the Licensee Products (as defined in the +Agreement), that incorporates the Open Source Portions, in whole or in +part, is commercialized and made generally available for sale; or (b) +NVIDIA makes generally available to the public the Open Source +Portions in source code form. + + 3. Except as noted otherwise in this Exhibit E, the terms and +conditions of this Exhibit E will supercede any conflicting terms and +conditions between Exhibit E and the Agreement. + + + +EXHIBIT F + +Licensee acknowledges and agrees with this following third party +licensing obligations and/or notices in connection with its use of (a) +Tegra Linux Driver Package; and (b) Chromium: + + +1. GNU General Public License 2.0 + + (For notice purposes only) + + This product includes copyrighted third-party software licensed +under the terms of the GNU General Public License. All third-party +software packages are copyright by their respective authors. GNU +General Public License is hereby incorporated into the Agreement by +this reference. + + http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + +2. Apache License v2.0 + + (For notice purposes only) + + This product includes copyrighted third-party software licensed +under the terms of the Apache License. All third-party software +packages are copyright by their respective authors. Apache License is +hereby incorporated into the Agreement by this reference. + + http://www.apache.org/licenses/LICENSE-2.0.html + +3. BSD License + + (For notice purposes only) + + This product includes copyrighted third-party software licensed +under the terms of the BSD License. All third-party software packages +are copyright by their respective authors. BSD License is incorporated +into the Agreement by this reference. + + http://www.opensource.org/licenses/bsd-license.php + +4. MIT License + + (For notice purposes only) + + This product includes copyrighted third-party software licensed +under the terms of the MIT License. All third-party software packages +are copyright by their respective authors. MIT License is hereby +incorporated into the Agreement by this reference + + http://www.opensource.org/licenses/mit-license.php + + +REV. 02.28.2012 + + diff --git a/sdk_container/src/third_party/coreos-overlay/licenses/ralink-firmware b/sdk_container/src/third_party/coreos-overlay/licenses/ralink-firmware new file mode 100644 index 0000000000..18dd038e4f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/licenses/ralink-firmware @@ -0,0 +1,39 @@ +Copyright (c) 2007, Ralink Technology Corporation +All rights reserved. + +Redistribution. Redistribution and use in binary form, without +modification, are permitted provided that the following conditions are +met: + +* Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. +* Neither the name of Ralink Technology Corporation nor the names of its + suppliers may be used to endorse or promote products derived from this + software without specific prior written permission. +* No reverse engineering, decompilation, or disassembly of this software + is permitted. + +Limited patent license. Ralink Technology Corporation grants a world-wide, +royalty-free, non-exclusive license under patents it now or hereafter +owns or controls to make, have made, use, import, offer to sell and +sell ("Utilize") this software, but solely to the extent that any +such patent is necessary to Utilize the software alone, or in +combination with an operating system licensed under an approved Open +Source license as listed by the Open Source Initiative at +http://opensource.org/licenses. The patent license shall not apply to +any other combinations which include this software. No hardware per +se is licensed hereunder. + +DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/sdk_container/src/third_party/coreos-overlay/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild b/sdk_container/src/third_party/coreos-overlay/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild new file mode 100644 index 0000000000..55926e4cd4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit font + +DESCRIPTION="Arimo, Tinos and Cousine in 4 weights and Symbol Neu developed by Monotype Imaging for Chrom*OS" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd" +IUSE="" + +FONT_SUFFIX="ttf" +FONT_S="${S}" +FONTDIR="/usr/share/fonts/croscore" + + +# Only installs fonts +RESTRICT="strip binchecks" + +src_install() { + # call src_install() in font.eclass. + font_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-fonts/droidfonts-cros/droidfonts-cros-20121206.ebuild b/sdk_container/src/third_party/coreos-overlay/media-fonts/droidfonts-cros/droidfonts-cros-20121206.ebuild new file mode 100644 index 0000000000..9bd6c96eb8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-fonts/droidfonts-cros/droidfonts-cros-20121206.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit font + +DESCRIPTION="The latest fonts including Droid Thai, Hebrew and Arabic" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd" +IUSE="" + +FONT_SUFFIX="ttf" +FONT_S="${S}" +FONTDIR="/usr/share/fonts/droid-cros" + + +# Only installs fonts +RESTRICT="strip binchecks" + +src_install() { + # call src_install() in font.eclass. + font_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-fonts/ja-ipafonts/ja-ipafonts-003.03-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/media-fonts/ja-ipafonts/ja-ipafonts-003.03-r1.ebuild new file mode 100644 index 0000000000..4904acaec4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-fonts/ja-ipafonts/ja-ipafonts-003.03-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-fonts/ja-ipafonts/ja-ipafonts-003.01.ebuild,v 1.5 2009/10/07 20:54:14 maekke Exp $ + +inherit font + +MY_P="IPAMGTTC00303_r1" +DESCRIPTION="Japanese TrueType fonts developed by IPA (Information-technology Promotion Agency, Japan)" +HOMEPAGE="http://ossipedia.ipa.go.jp/ipafont/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz" + +LICENSE="IPAfont" +SLOT="0" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd" +IUSE="" + +S="${WORKDIR}/${MY_P}" +FONT_SUFFIX="ttc" +FONT_S="${S}" + +DOCS="Readme*.txt" + +# Only installs fonts +RESTRICT="strip binchecks" + +src_install() { + # call src_install() in font.eclass. + font_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-fonts/ko-nanumfonts/ko-nanumfonts-3.10.0.ebuild b/sdk_container/src/third_party/coreos-overlay/media-fonts/ko-nanumfonts/ko-nanumfonts-3.10.0.ebuild new file mode 100644 index 0000000000..c55a6bf877 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-fonts/ko-nanumfonts/ko-nanumfonts-3.10.0.ebuild @@ -0,0 +1,29 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit font + +DESCRIPTION="Korean fonts released by Naver Inc. under OFL : NanumGothic (regular, bold), NanumMyeongjo (regular, bold)" +HOMEPAGE="http://hangeul.naver.com/index.nhn" + +# download link does not have a version number. +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd" +IUSE="" + +FONT_SUFFIX="ttf" +FONT_S="${S}" +FONTDIR="/usr/share/fonts/ko-nanum" + + +# Only installs fonts +RESTRICT="strip binchecks" + +src_install() { + # call src_install() in font.eclass. + font_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-fonts/lohitfonts-cros/lohitfonts-cros-2.5.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/media-fonts/lohitfonts-cros/lohitfonts-cros-2.5.0-r1.ebuild new file mode 100644 index 0000000000..75186053bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-fonts/lohitfonts-cros/lohitfonts-cros-2.5.0-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit font + +DESCRIPTION="6 Lohit fonts for Indic scripts" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" +HOMEPAGE="http://fedorahosted.org/lohit" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd" +IUSE="" + +FONT_SUFFIX="ttf" +FONT_S="${S}" +FONTDIR="/usr/share/fonts/lohit-cros" + + +# Only installs fonts +RESTRICT="strip binchecks" + +src_install() { + # call src_install() in font.eclass. + font_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-fonts/ml-anjalioldlipi/ml-anjalioldlipi-0.740.ebuild b/sdk_container/src/third_party/coreos-overlay/media-fonts/ml-anjalioldlipi/ml-anjalioldlipi-0.740.ebuild new file mode 100644 index 0000000000..73bd2b0f3a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-fonts/ml-anjalioldlipi/ml-anjalioldlipi-0.740.ebuild @@ -0,0 +1,27 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit font + +DESCRIPTION="AnjaliOldLipi font for the correct Malayalam rendering" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" +HOMEPAGE="https://sites.google.com/site/cibu/anjalioldlipi-font" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd" +IUSE="" + +FONT_SUFFIX="ttf" +FONT_S="${S}" +FONTDIR="/usr/share/fonts/ml-anjali" + + +# Only installs fonts +RESTRICT="strip binchecks" + +src_install() { + # call src_install() in font.eclass. + font_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-fonts/notofonts/notofonts-20121206.ebuild b/sdk_container/src/third_party/coreos-overlay/media-fonts/notofonts/notofonts-20121206.ebuild new file mode 100644 index 0000000000..2fdf092a9a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-fonts/notofonts/notofonts-20121206.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit font + +DESCRIPTION="Noto fonts developed by Monotype" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd" +IUSE="" + +FONT_SUFFIX="ttc ttf" +FONT_S="${S}" +FONTDIR="/usr/share/fonts/noto" + + +# Only installs fonts +RESTRICT="strip binchecks" + +src_install() { + # call src_install() in font.eclass. + font_src_install +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/Manifest b/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/Manifest new file mode 100644 index 0000000000..601dd89fdd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/Manifest @@ -0,0 +1 @@ +DIST ImageMagick-6.5.8-8.tar.bz2 8711782 RMD160 1417878f2adae344f840807710e7f9485d5945ce SHA1 15212833489826f7d2d919d1442309d6dc504402 SHA256 3a81e6c6759f6266dd18e8bb6c6c6791d5af8871e2dc2e50fb9c9362f3e689eb diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch b/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch new file mode 100644 index 0000000000..3c71fb63c0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch @@ -0,0 +1,36 @@ +the AC_SYS_LARGEFILE macro sets up ac_cv_sys_file_offset_bits, and when +it uses a value of "no", it means "does not need special lfs behavior". +so let's not second guess the behavior of it by running our own little +bit of code which breaks cross-compiling. instead, only try the run +test if we get back "unknown". + +--- a/configure.ac ++++ b/configure.ac +@@ -434,9 +434,11 @@ + AC_FUNC_FSEEKO + LFS_CPPFLAGS='' + if test "$enable_largefile" != no; then +- if test "$ac_cv_sys_file_offset_bits" != 'no'; then +- LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" +- else ++ case $ac_cv_sys_file_offset_bits in ++ no) ++ # nothing to do here as the host supports LFS fine ++ ;; ++ unknown) + AC_MSG_CHECKING([for native large file support]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([#include + main () { +@@ -445,7 +447,11 @@ + [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) +- fi ++ ;; ++ *) ++ LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" ++ ;; ++ esac + if test "$ac_cv_sys_large_files" != 'no'; then + LFS_CPPFLAGS="$LFS_CPPFLAGS -D_LARGE_FILES=1" + fi diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/imagemagick-6.5.8.8-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/imagemagick-6.5.8.8-r6.ebuild new file mode 100644 index 0000000000..9cbc4ea251 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/imagemagick/imagemagick-6.5.8.8-r6.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild,v 1.6 2010/03/04 19:55:56 armin76 Exp $ + +EAPI="2" + +inherit eutils multilib perl-app toolchain-funcs versionator flag-o-matic autotools + +MY_PN=ImageMagick +MY_P=${MY_PN}-${PV%.*} +MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.} + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="http://www.imagemagick.org/" +SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2 + mirror://imagemagick/legacy/${MY_P2}.tar.bz2" + +# perl tests fail with userpriv +RESTRICT="perl? ( userpriv )" +LICENSE="imagemagick" +SLOT="0" +KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86" +IUSE="autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri + jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw svg tiff + truetype X wmf xml zlib" + +RDEPEND=" + autotrace? ( >=media-gfx/autotrace-0.31.1 ) + bzip2? ( app-arch/bzip2 ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( media-libs/libfpx ) + graphviz? ( >=media-gfx/graphviz-2.6 ) + gs? ( app-text/ghostscript-gpl ) + jbig? ( media-libs/jbigkit ) + jpeg? ( virtual/jpeg ) + jpeg2k? ( media-libs/jasper ) + lcms? ( >=media-libs/lcms-1.06 ) + lqr? ( >=media-libs/liblqr-0.1.0 ) + openexr? ( media-libs/openexr ) + perl? ( >=dev-lang/perl-5.8.6-r6 ) + png? ( media-libs/libpng ) + raw? ( media-gfx/ufraw ) + tiff? ( >=media-libs/tiff-3.5.5 ) + truetype? ( =media-libs/freetype-2* + corefonts? ( media-fonts/corefonts ) ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + xml? ( >=dev-libs/libxml2-2.4.10 ) + zlib? ( sys-libs/zlib ) + X? ( + x11-libs/libXext + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + svg? ( >=gnome-base/librsvg-2.9.0 ) + ) + !dev-perl/perlmagick + !media-gfx/graphicsmagick[imagemagick] + !sys-apps/compare + >=sys-devel/libtool-1.5.2-r6" + +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + X? ( x11-proto/xextproto )" + +S="${WORKDIR}/${MY_P2}" + +pkg_setup() { + # for now, only build svg support when X is enabled, as librsvg + # pulls in quite some X dependencies. + if use svg && ! use X ; then + elog "the svg USE-flag requires the X USE-flag set." + elog "disabling svg support for now." + fi + + if use corefonts && ! use truetype ; then + elog "corefonts USE-flag requires the truetype USE-flag to be set." + elog "disabling corefonts support for now." + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-6.7.2.6-lfs.patch + eautoreconf + # fix doc dir, bug #91911 + sed -i -e \ + 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/local/share/doc/${PF}":g' \ + "${S}"/configure || die +} + +src_configure() { + append-flags -L"${ROOT}"/usr/$(get_libdir) + + local myconf + if use q32 ; then + myconf="${myconf} --with-quantum-depth=32" + elif use q8 ; then + myconf="${myconf} --with-quantum-depth=8" + else + myconf="${myconf} --with-quantum-depth=16" + fi + + if use X && use svg ; then + myconf="${myconf} --with-rsvg" + else + myconf="${myconf} --without-rsvg" + fi + + # openmp support only works with >=sys-devel/gcc-4.3, bug #223825 + if use openmp && version_is_at_least 4.3 $(gcc-version) ; then + if has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then + myconf="${myconf} --enable-openmp" + else + elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')" + myconf="${myconf} --disable-openmp" + fi + else + elog "disabling openmp support (requires >=sys-devel/gcc-4.3)" + myconf="${myconf} --disable-openmp" + fi + + use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)" + + econf \ + ${myconf} \ + --without-included-ltdl \ + --with-ltdl-include=/usr/include \ + --with-ltdl-lib=/usr/$(get_libdir) \ + --with-threads \ + --with-modules \ + $(use_with perl) \ + --with-perl-options='INSTALLDIRS=vendor' \ + --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ + $(use_enable hdri) \ + $(use_with !nocxx magick-plus-plus) \ + $(use_with autotrace) \ + $(use_with bzip2 bzlib) \ + $(use_with djvu) \ + $(use_with fftw) \ + $(use_with fontconfig) \ + $(use_with fpx) \ + $(use_with gs dps) \ + $(use_with gs gslib) \ + $(use_with graphviz gvc) \ + $(use_with jbig) \ + $(use_with jpeg jpeg) \ + $(use_with jpeg2k jp2) \ + $(use_with lcms) \ + $(use_with openexr) \ + $(use_with png) \ + $(use_with svg rsvg) \ + $(use_with tiff) \ + $(use_with truetype freetype) \ + $(use_with wmf) \ + $(use_with xml) \ + $(use_with zlib) \ + $(use_with X x) \ + --prefix=/usr/local \ + --mandir=/usr/local/share/man \ + --infodir=/usr/local/share/info \ + --datadir=/usr/local/share +} + +src_test() { + einfo "please note that the tests will only be run when the installed" + einfo "version and current emerging version are the same" + + if has_version ~${CATEGORY}/${P} ; then + emake -j1 check || die "make check failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation of files into image failed" + + elog "Preserving .la files needed at runtime by placing in tar file." + elog " Avoids removal due to *.la in INSTALL_MASK" + pushd "${D}"/usr/local/$(get_libdir) || die + tar zcf "${S}"/la_files.tar.gz $(find -name '*.la' -type f) || die + popd + insinto /usr/local/$(get_libdir)/${P} + doins "${S}"/la_files.tar.gz + + # dont need these files with runtime plugins + rm -f "${D}"/usr/local/$(get_libdir)/*/*/*.{la,a} + + use doc || rm -r "${D}"/usr/local/share/doc/${PF}/{www,images,index.html} + dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt + + # Fix perllocal.pod file collision + use perl && fixlocalpod +} + +pkg_postinst() { + elog "Restoring .la files from tar file" + pushd "${ROOT}"/usr/local/$(get_libdir) || die + tar -xvzpf ${P}/la_files.tar.gz || die + popd +} + +pkg_prerm() { + elog "Clean up untarred .la files" + pushd "${ROOT}"/usr/local/$(get_libdir) || die + tar -tf ${P}/la_files.tar.gz | xargs rm + assert + popd +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/files/CMakeFiles-search-in-SYSROOT.patch b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/files/CMakeFiles-search-in-SYSROOT.patch new file mode 100644 index 0000000000..2b7eda3757 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/files/CMakeFiles-search-in-SYSROOT.patch @@ -0,0 +1,16 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,11 +11,13 @@ + + # look for freeimage + FIND_PATH(FREEIMAGE_INCLUDE_DIR FreeImage.h ++ $ENV{SYSROOT}/usr/include + /usr/local/include + /usr/include + /opt/local/include + ) + FIND_LIBRARY(FREEIMAGE_LIBRARY freeimage ++ $ENV{SYSROOT}/usr/lib + /usr/lib + /usr/local/lib + /opt/local/lib diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/files/Metric.cpp-printf-needs-stdio.patch b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/files/Metric.cpp-printf-needs-stdio.patch new file mode 100644 index 0000000000..c589fb51c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/files/Metric.cpp-printf-needs-stdio.patch @@ -0,0 +1,10 @@ +--- a/Metric.cpp ++++ b/Metric.cpp +@@ -19,6 +19,7 @@ + #include "RGBAImage.h" + #include "LPyramid.h" + #include ++#include + + #ifndef M_PI + #define M_PI 3.14159265f diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/perceptualdiff-1.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/perceptualdiff-1.1.1-r1.ebuild new file mode 120000 index 0000000000..0505a79772 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/perceptualdiff-1.1.1-r1.ebuild @@ -0,0 +1 @@ +perceptualdiff-1.1.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/perceptualdiff-1.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/perceptualdiff-1.1.1.ebuild new file mode 100644 index 0000000000..f3d4ac93f2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/perceptualdiff/perceptualdiff-1.1.1.ebuild @@ -0,0 +1,38 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" +inherit eutils multilib + +DESCRIPTION="An image comparison utility" +HOMEPAGE="http://pdiff.sourceforge.net/" +SRC_URI="mirror://sourceforge/pdiff/${P}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="media-libs/freeimage" +RDEPEND="${DEPEND}" + +DOCS="gpl.txt README.txt" + +src_prepare() { + epatch "${FILESDIR}"/CMakeFiles-search-in-SYSROOT.patch + epatch "${FILESDIR}"/Metric.cpp-printf-needs-stdio.patch + # Use the correct ABI lib dir. + sed -i \ + -e "s:/lib$:/$(get_libdir):" \ + CMakeLists.txt || die +} + +src_configure() { + tc-export CC CXX AR RANLIB LD NM + cmake . || die cmake failed +} + +src_install() { + dobin perceptualdiff +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/ply-image/ply-image-0.0.1-r37.ebuild b/sdk_container/src/third_party/coreos-overlay/media-gfx/ply-image/ply-image-0.0.1-r37.ebuild new file mode 100644 index 0000000000..365a62db6b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/ply-image/ply-image-0.0.1-r37.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="ef0350689d0cc3bf2c845c098adf6efb666cbbec" +CROS_WORKON_TREE="b3354be712b630953df065a934a4063b12fa2843" +CROS_WORKON_PROJECT="chromiumos/third_party/ply-image" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="Utility that dumps a png image to the frame buffer." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="" + +DEPEND="media-libs/libpng + x11-libs/libdrm" +RDEPEND="${DEPEND}" + +src_compile() { + if tc-is-cross-compiler ; then + tc-getCC + fi + emake || die "emake failed" +} + +src_install() { + mkdir -p "${D}/usr/bin" + cp "${S}/src/ply-image" "${D}/usr/bin" +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-gfx/ply-image/ply-image-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/media-gfx/ply-image/ply-image-9999.ebuild new file mode 100644 index 0000000000..e608e896ca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-gfx/ply-image/ply-image-9999.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/ply-image" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="Utility that dumps a png image to the frame buffer." +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="" + +DEPEND="media-libs/libpng + x11-libs/libdrm" +RDEPEND="${DEPEND}" + +src_compile() { + if tc-is-cross-compiler ; then + tc-getCC + fi + emake || die "emake failed" +} + +src_install() { + mkdir -p "${D}/usr/bin" + cp "${S}/src/ply-image" "${D}/usr/bin" +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/Manifest b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/Manifest new file mode 100644 index 0000000000..e3681bc48e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/Manifest @@ -0,0 +1 @@ +DIST fontconfig-2.7.1.tar.gz 1539165 RMD160 34e0f6348486ab5304d6ecee4fe33f932689f380 SHA1 2e66fdf848f5002ba9a095998604ead2d3c392f1 SHA256 08502404aa451ddc5f9ca4bf45cc3b3f1e86e3f0779ff273c72e1c48e0c25b94 diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/README b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/README new file mode 100644 index 0000000000..2e3bba5ca2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/README @@ -0,0 +1,8 @@ +chromiumos has different needs for fontconfig than is typical. Our list of +fonts is the same for every user (there is only one linux user anyway). +Also, the list can never change. + +We modify the fontconfig ebuild to support patching fonts.conf to have only one +directory to search for fonts (/usr/share/fonts). We also output the caches to +/usr/share/cache/fontconfig because /var isn't located on the readonly +partition. In addition we remove the rescan directive. diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-conf-d.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-conf-d.patch new file mode 100644 index 0000000000..c8b92418cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-conf-d.patch @@ -0,0 +1,120 @@ +diff -urN fontconfig-2.7.1-orig/conf.d/10-antialias.conf fontconfig-2.7.1/conf.d/10-antialias.conf +--- fontconfig-2.7.1-orig/conf.d/10-antialias.conf 1969-12-31 16:00:00.000000000 -0800 ++++ fontconfig-2.7.1/conf.d/10-antialias.conf 2011-04-29 12:49:40.000000000 -0700 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ true ++ ++ +diff -urN fontconfig-2.7.1-orig/conf.d/10-hinting.conf fontconfig-2.7.1/conf.d/10-hinting.conf +--- fontconfig-2.7.1-orig/conf.d/10-hinting.conf 1969-12-31 16:00:00.000000000 -0800 ++++ fontconfig-2.7.1/conf.d/10-hinting.conf 2011-04-29 12:49:40.000000000 -0700 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ true ++ ++ +diff -urN fontconfig-2.7.1-orig/conf.d/10-hinting-full.conf fontconfig-2.7.1/conf.d/10-hinting-full.conf +--- fontconfig-2.7.1-orig/conf.d/10-hinting-full.conf 1969-12-31 16:00:00.000000000 -0800 ++++ fontconfig-2.7.1/conf.d/10-hinting-full.conf 2011-04-29 12:49:40.000000000 -0700 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ hintfull ++ ++ +diff -urN fontconfig-2.7.1-orig/conf.d/10-hinting-slight.conf fontconfig-2.7.1/conf.d/10-hinting-slight.conf +--- fontconfig-2.7.1-orig/conf.d/10-hinting-slight.conf 1969-12-31 16:00:00.000000000 -0800 ++++ fontconfig-2.7.1/conf.d/10-hinting-slight.conf 2011-04-29 12:49:40.000000000 -0700 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ hintslight ++ ++ +diff -urN fontconfig-2.7.1-orig/conf.d/Makefile.am fontconfig-2.7.1/conf.d/Makefile.am +--- fontconfig-2.7.1-orig/conf.d/Makefile.am 2009-03-18 14:02:20.000000000 -0700 ++++ fontconfig-2.7.1/conf.d/Makefile.am 2011-04-29 13:09:05.000000000 -0700 +@@ -25,7 +25,11 @@ + README + + CONF_FILES = \ ++ 10-antialias.conf \ + 10-autohint.conf \ ++ 10-hinting.conf \ ++ 10-hinting-slight.conf \ ++ 10-hinting-full.conf \ + 10-no-sub-pixel.conf \ + 10-sub-pixel-bgr.conf \ + 10-sub-pixel-rgb.conf \ +@@ -53,6 +57,10 @@ + 90-synthetic.conf + + CONF_LINKS = \ ++ 10-autohint.conf \ ++ 10-hinting.conf \ ++ 10-hinting-slight.conf \ ++ 10-sub-pixel-rgb.conf \ + 20-fix-globaladvance.conf \ + 20-unhint-small-vera.conf \ + 30-urw-aliases.conf \ +@@ -62,9 +70,6 @@ + 49-sansserif.conf \ + 50-user.conf \ + 51-local.conf \ +- 60-latin.conf \ +- 65-fonts-persian.conf \ +- 65-nonlatin.conf \ + 69-unifont.conf \ + 80-delicious.conf \ + 90-synthetic.conf +diff -urN fontconfig-2.7.1-orig/conf.d/Makefile.in fontconfig-2.7.1/conf.d/Makefile.in +--- fontconfig-2.7.1-orig/conf.d/Makefile.in 2009-07-27 14:56:45.000000000 -0700 ++++ fontconfig-2.7.1/conf.d/Makefile.in 2011-04-29 13:09:20.000000000 -0700 +@@ -246,7 +246,11 @@ + README + + CONF_FILES = \ ++ 10-antialias.conf \ + 10-autohint.conf \ ++ 10-hinting.conf \ ++ 10-hinting-slight.conf \ ++ 10-hinting-full.conf \ + 10-no-sub-pixel.conf \ + 10-sub-pixel-bgr.conf \ + 10-sub-pixel-rgb.conf \ +@@ -274,6 +278,10 @@ + 90-synthetic.conf + + CONF_LINKS = \ ++ 10-autohint.conf \ ++ 10-hinting.conf \ ++ 10-hinting-slight.conf \ ++ 10-sub-pixel-rgb.conf \ + 20-fix-globaladvance.conf \ + 20-unhint-small-vera.conf \ + 30-urw-aliases.conf \ +@@ -283,9 +291,6 @@ + 49-sansserif.conf \ + 50-user.conf \ + 51-local.conf \ +- 60-latin.conf \ +- 65-fonts-persian.conf \ +- 65-nonlatin.conf \ + 69-unifont.conf \ + 80-delicious.conf \ + 90-synthetic.conf diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-fonts-config.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-fonts-config.patch new file mode 100644 index 0000000000..34b23f85c7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-fonts-config.patch @@ -0,0 +1,32 @@ +--- fonts.conf.in-orig 2010-04-14 11:52:02.000000000 -0700 ++++ fonts.conf.in 2010-04-14 11:52:25.000000000 -0700 +@@ -24,8 +24,6 @@ + + + @FC_DEFAULT_FONTS@ +- @FC_FONTPATH@ +- ~/.fonts + + + + @FC_CACHEDIR@ +- ~/.fontconfig + + + + 0xFFFB + +- +- +- 30 +- + + + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch new file mode 100644 index 0000000000..6ecf6cb9df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch @@ -0,0 +1,50 @@ +diff -Naurp fontconfig-2.7.1-orig/conf.d/60-latin.conf fontconfig-2.7.1/conf.d/60-latin.conf +--- fontconfig-2.7.1-orig/conf.d/60-latin.conf 2009-07-10 11:09:33.000000000 -0600 ++++ fontconfig-2.7.1/conf.d/60-latin.conf 2009-08-16 15:25:38.347701112 -0600 +@@ -4,8 +4,8 @@ + + serif + +- Bitstream Vera Serif + DejaVu Serif ++ Bitstream Vera Serif + Times New Roman + Thorndale AMT + Luxi Serif +@@ -16,14 +16,14 @@ + + sans-serif + +- Bitstream Vera Sans + DejaVu Sans +- Verdana +- Arial +- Albany AMT ++ Bitstream Vera Sans + Luxi Sans + Nimbus Sans L ++ Arial ++ Albany AMT + Helvetica ++ Verdana + Lucida Sans Unicode + BPG Glaho International + Tahoma +@@ -32,14 +32,14 @@ + + monospace + +- Bitstream Vera Sans Mono + DejaVu Sans Mono ++ Bitstream Vera Sans Mono + Inconsolata ++ Luxi Mono ++ Nimbus Mono L + Andale Mono + Courier New + Cumberland AMT +- Luxi Mono +- Nimbus Mono L + Courier + + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-metric-aliases.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-metric-aliases.patch new file mode 100644 index 0000000000..2a7af03e2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/fontconfig-2.7.1-metric-aliases.patch @@ -0,0 +1,86 @@ +--- fontconfig-2.7.1-orig/conf.d/30-metric-aliases.conf 2009-06-28 10:48:47.000000000 -0700 ++++ fontconfig-2.7.1/conf.d/30-metric-aliases.conf 2010-08-02 13:34:53.000000000 -0700 +@@ -29,6 +29,15 @@ + Albany AMT + Thorndale AMT + Cumberland AMT ++ Chrom*OS fonts: ++ Arimo ++ Tinos ++ Cousine ++ Ascender fonts (eval): ++ Ascender Sans ++ Ascender Serif ++ Ascender Sans Mono ++ Ascender Symbol + + Of these, URW fonts are design compatible with PostScrict fonts, + and the Liberation, StarOffice, and AMT ones are compatible with +@@ -75,6 +84,8 @@ + + + ++ Arimo ++ Ascender Sans + Liberation Sans + Albany + Albany AMT +@@ -84,6 +95,8 @@ + + + ++ Tinos ++ Ascender Serif + Liberation Serif + Thorndale + Thorndale AMT +@@ -93,6 +106,8 @@ + + + ++ Cousine ++ Ascender Sans Mono + Liberation Mono + Cumberland + Cumberland AMT +@@ -101,6 +116,13 @@ + + + ++ ++ Ascender Symbol ++ ++ Symbol ++ ++ ++ + + + +@@ -183,6 +205,8 @@ + + Arial + ++ Arimo ++ Ascender Sans + Liberation Sans + Albany + Albany AMT +@@ -192,6 +216,8 @@ + + Times New Roman + ++ Tinos ++ Ascender Serif + Liberation Serif + Thorndale + Thorndale AMT +@@ -201,6 +227,8 @@ + + Courier New + ++ Cousine ++ Ascender Sans Mono + Liberation Mono + Cumberland + Cumberland AMT diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/local.conf b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/local.conf new file mode 100644 index 0000000000..e6365e7483 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/files/local.conf @@ -0,0 +1,715 @@ + + + + + + + serif + + Tinos + Noto Serif + MSung GB18030 + MSung B5HK + NanumMyeongjo + Droid Arabic Naskh + Noto Serif Thai + Noto Serif Armenian + Noto Serif Georgian + Mangal + Lohit Hindi + Lohit Bangali + Lohit Tamil + AnjaliOldLipi + Lohit Punjabi + Lohit Gujarati + Lohit Oriya + Abssinica SIL + Droid Emoji + DejaVu Serif + + + + sans-serif + + Arimo + Noto Sans + MYingHeiGB18030 + MYingHeiB5HK + NanumGothic + Droid Arabic Kufi + Noto Sans Thai + Noto Sans Devanagari + Noto Sans Tamil + Noto Sans Hebrew + Mangal + Lohit Hindi + Lohit Bangali + Lohit Tamil + AnjaliOldLipi + Lohit Punjabi + Lohit Gujarati + Lohit Oriya + Noto Sans Armenian + Noto Sans Georgian + Noto Sans Ethiopic + Droid Sans Fallback + Droid Emoji + DejaVu Sans + + + + monospace + + Cousine + Droid Sans Mono + MYingHeiGB18030 + MYingHeiB5HK + NanumGothic + Droid Arabic Kufi + Noto Sans Thai + Mangal + Noto Sans Devanagari + Noto Sans Tamil + Lohit Bangali + Lohit Malayalam + Lohit Punjabi + Lohit Gujarati + Lohit Oriya + Noto Sans Armenian + Noto Sans Georgian + Noto Sans Ethiopic + Droid Sans Fallback + Droid Emoji + DejaVu Sans Mono + + + + + ui-sans + + Noto Sans UI + MYingHeiGB18030 + MYingHeiB5HK + NanumGothic + Droid Arabic Kufi + Noto Sans Thai UI + Noto Sans Devanagari UI + Noto Sans Tamil UI + Noto Sans Hebrew + Lohit Bangali + AnjaliOldLipi + Lohit Punjabi + Lohit Gujarati + Lohit Oriya + Noto Sans Armenian + Noto Sans Georgian + Noto Sans Ethiopic + Droid Sans Fallback + Droid Emoji + DejaVu Sans + + + + + + + zh + + + 14 + + + 14 + + + + + + + Arimo + true + hintfull + false + + + + + Chrome Droid Sans + true + hintslight + true + + + + + Cousine + true + hintfull + false + + + + + Tinos + true + hintfull + false + + + + + IPA + false + hintnone + false + + + + + MotoyaG04 + false + hintnone + false + + + + + NanumGothic + true + hintfull + false + + + + + + MotoyaG04Gothic + IPAPGothic + + MS PGothic + + + + MotoyaG04Gothic + IPAPGothic + + ＭＳ Ｐゴシック + + + + MS PGothic + + IPAPGothic + + + + ＭＳ Ｐゴシック + + IPAPGothic + + + + + MotoyaG04GothicMono + IPAGothic + + MS Gothic + + + + MotoyaG04GothicMono + IPAGothic + + ＭＳ ゴシック + + + + MS Gothic + + IPAGothic + + + + ＭＳ ゴシック + + IPAGothic + + + + + MotoyaG04MinchoMono + IPAMincho + + MS Mincho + + + + MotoyaG04MinchoMono + IPAMincho + + ＭＳ 明朝 + + + + MS Mincho + + IPAMincho + + + + ＭＳ 明朝 + + IPAMincho + + + + + MotoyaG04Mincho + IPAPMincho + + MS PMincho + + + + MotoyaG04Mincho + IPAPMincho + + ＭＳ Ｐ明朝 + + + + MS PMincho + + IPAPMincho + + + + ＭＳ Ｐ明朝 + + IPAPMincho + + + + + + IPAPGothic + + MotoyaG04Gothic + + + + + IPAGothic + + MotoyaG04GothicMono + + + + + IPAPMincho + + MotoyaG04Mincho + + + + + IPAMincho + + MotoyaG04MinchoMono + + + + + + MSung GB18030 + + Simsun + + + + MSung GB18030 + + 宋体 + + + + Simsun + + MSung GB18030 + + + + 宋体 + + MSung GB18030 + + + + + MSung GB18030 + + NSimsun + + + + MSung GB18030 + + 新宋体 + + + + NSimsun + + MSung GB18030 + + + + 新宋体 + + MSung GB18030 + + + + + MYingHeiGB18030 + + SimHei + + + + MYingHeiGB18030 + + 黑体 + + + + SimHei + + MYingHeiGB18030 + + + + 黑体 + + MYingHeiGB18030 + + + + + + + MSung B5HK + + PMingLiU + + + + MSung B5HK + + PMingLiU_HKSCS + + + + MSung B5HK + + 新細明體 + + + + MSung B5HK + + 新細明體_HKSCS + + + + PMingLiU + + MSung B5HK + + + + PMingLiU_HKSCS + + MSung B5HK + + + + 新細明體 + + MSung B5HK + + + + 新細明體_HKSCS + + MSung B5HK + + + + + MSung B5HK + + MingLiU + + + + MSung B5HK + + MingLiU_HKSCS + + + + MSung B5HK + + 細明體 + + + + MSung B5HK + + 細明體_HKSCS + + + + MingLiU + + MSung B5HK + + + + MingLiU_HKSCS + + MSung B5HK + + + + 細明體 + + MSung B5HK + + + + 細明體_HKSCS + + MSung B5HK + + + + + + Gulim + 굴림 + GulimChe + 굴림체 + Dotum + 돋움 + Dotumche + 돋움체 + MalgunGothic + 맑은고딕 + + NanumGothic + + + + Batang + 바탕 + Batangche + 바탕체 + + NanumMyeongjo + + + + + + + zh-CN + + + serif + + + MSung GB18030 + + + + + zh-CN + + + sans-serif + + + MYingHeiGB18030 + MYingHeiB5HK + Droid Sans Fallback + + + + + zh-CN + + + monospace + + + MYingHeiGB18030 + MYingHeiB5HK + Droid Sans Fallback + + + + + + + zh-TW + + + serif + + + MSung B5HK + MSung GB18030 + + + + + zh-TW + + + sans-serif + + + MYingHeiB5HK + MYingHeiGB18030 + Droid Sans Fallback + + + + + zh-TW + + + monospace + + + MYingHeiB5HK + MYingHeiGB18030 + Droid Sans Fallback + + + + + + + ja + + + serif + + + MotoyaG04Mincho + IPAPMincho + + + + + ja + + + sans-serif + + + MotoyaG04Gothic + IPAPGothic + + + + + ja + + + monospace + + + MotoyaG04GothicMono + IPAGothic + + + + + + + ko + + + serif + + + NanumMyeongjo + + + + + ko + + + sans-serif + + + NanumGothic + + + + + + MYingHeiB5HK + MYingHeiGB18030 + MSung GB18030 + MSung B5HK + + + + true + true + hintslight + true + none + + + + + Noto Sans Thai + Noto Sans Thai UI + Noto Serif Thai + Noto Serif Thai UI + Noto Sans Devanagari + Noto Sans Devanagari UI + Noto Sans Tamil + Noto Sans Tamil UI + Noto Sans Armenian + Noto Serif Armenian + Noto Sans Georgian + Noto Serif Georgian + Noto Sans Hebrew + Noto Sans Ethiopic + + true + false + hintfull + true + + + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/fontconfig-2.7.1-r34.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/fontconfig-2.7.1-r34.ebuild new file mode 120000 index 0000000000..d976016660 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/fontconfig-2.7.1-r34.ebuild @@ -0,0 +1 @@ +fontconfig-2.7.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/fontconfig-2.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/fontconfig-2.7.1.ebuild new file mode 100644 index 0000000000..777586a263 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/fontconfig/fontconfig-2.7.1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.7.1-r1.ebuild,v 1.1 2009/08/23 22:48:21 dirtyepic Exp $ + +EAPI="2" + +inherit eutils libtool toolchain-funcs flag-o-matic + +DESCRIPTION="A library for configuring and customizing font access" +HOMEPAGE="http://fontconfig.org/" +SRC_URI="http://fontconfig.org/release/${P}.tar.gz" + +LICENSE="fontconfig" +SLOT="1.0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="cros_host doc -highdpi -is_desktop" + +# Purposefully dropped the xml USE flag and libxml2 support. Having this is +# silly since expat is the preferred way to go per upstream and libxml2 support +# simply exists as a fallback when expat isn't around. expat support is the main +# way to go and every other distro uses it. By using the xml USE flag to enable +# libxml2 support, this confuses users and results in most people getting the +# non-standard behavior of libxml2 usage since most profiles have USE=xml + +RDEPEND=">=media-libs/freetype-2.2.1 + >=dev-libs/expat-1.95.3" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( + app-text/docbook-sgml-utils[jadetex] + =app-text/docbook-sgml-dtd-3.1* + )" +PDEPEND="app-admin/eselect-fontconfig" + +# Checks that a passed-in fontconfig default symlink (e.g. "10-autohint.conf") +# is present and dies if it isn't. +check_fontconfig_default() { + local path="${D}"/etc/fonts/conf.d/"$1" + if [ ! -L "$path" ]; then + die "Didn't find $1 among default fontconfig settings (at $path)." + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-latin-reorder.patch #130466 + epatch "${FILESDIR}"/${P}-fonts-config.patch + epatch "${FILESDIR}"/${P}-metric-aliases.patch + epatch "${FILESDIR}"/${P}-conf-d.patch + epunt_cxx #74077 + + # Needed to get a sane .so versioning on fbsd, please dont drop + # If you have to run eautoreconf, you can also leave the elibtoolize call as + # it will be a no-op. + elibtoolize +} + +src_configure() { + local myconf + if tc-is-cross-compiler; then + myconf="--with-arch=${ARCH}" + replace-flags -mtune=* -DMTUNE_CENSORED + replace-flags -march=* -DMARCH_CENSORED + filter-flags -mfpu=* -mfloat-abi=* + fi + # Make the global font cache be /usr/share/cache/fontconfig + # by passing /usr/share for the localstatedir + econf $(use_enable doc docs) \ + --localstatedir=/usr/share \ + --with-docdir=/usr/share/doc/${PF} \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/local/share/fonts \ + ${myconf} || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + #fc-lang directory contains language coverage datafiles + #which are needed to test the coverage of fonts. + insinto /usr/share/fc-lang + doins fc-lang/*.orth + + insinto /etc/fonts + doins "${S}"/fonts.conf + doins "${FILESDIR}"/local.conf + + # Test that fontconfig's defaults for basic rendering settings match what we + # want to use. + check_fontconfig_default 10-autohint.conf + check_fontconfig_default 10-hinting.conf + check_fontconfig_default 10-hinting-slight.conf + check_fontconfig_default 10-sub-pixel-rgb.conf + + # There's a lot of variability across different displays with subpixel + # rendering. Until we have a better solution, turn it off and use grayscale + # instead on desktop boards. Also disable it on high-DPI displays, since + # they have little need for it and use subpixel positioning, which can + # interact poorly with it (http://crbug.com/125066#c8). Additionally, + # disable it when installing to the host sysroot so the images in the + # initramfs package won't use subpixel rendering (http://crosbug.com/27872). + if use is_desktop || use highdpi || use cros_host; then + rm "${D}"/etc/fonts/conf.d/10-sub-pixel-rgb.conf + dosym ../conf.avail/10-no-sub-pixel.conf /etc/fonts/conf.d/. + check_fontconfig_default 10-no-sub-pixel.conf + fi + + # Disable hinting on high-DPI displays, where we're already using subpixel + # positioning. + if use highdpi; then + rm "${D}"/etc/fonts/conf.d/10-hinting.conf + dosym ../conf.avail/10-unhinted.conf /etc/fonts/conf.d/. + check_fontconfig_default 10-unhinted.conf + fi + + doman $(find "${S}" -type f -name *.1 -print) + newman doc/fonts-conf.5 fonts.conf.5 + dodoc doc/fontconfig-user.{txt,pdf} + + if use doc; then + doman doc/Fc*.3 + dohtml doc/fontconfig-devel.html + dodoc doc/fontconfig-devel.{txt,pdf} + fi + + dodoc AUTHORS ChangeLog README || die + + # Changes should be made to /etc/fonts/local.conf, and as we had + # too much problems with broken fonts.conf, we force update it ... + # (11 Dec 2002) + echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig + doenvd "${T}"/37fontconfig + + # As of fontconfig 2.7, everything sticks their noses in here. + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/usr/share/cache/fontconfig"' > "${D}"/etc/sandbox.d/37fontconfig +} + +pkg_postinst() { + einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/" + find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete + + echo + ewarn "Please make fontconfig configuration changes using \`eselect fontconfig\`" + ewarn "Any changes made to /etc/fonts/fonts.conf will be overwritten." + ewarn + ewarn "If you need to reset your configuration to upstream defaults, delete" + ewarn "the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig." + echo + + if [[ ${ROOT} = / ]]; then + ebegin "Creating global font cache" + /usr/bin/fc-cache -sr + eend $? + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/Manifest b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/Manifest new file mode 100644 index 0000000000..202a6ea9a3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/Manifest @@ -0,0 +1,2 @@ +DIST FreeImage3153.pdf 1004540 SHA256 325767978f0208a6dd2d2f6cb1cc184cea6aec843d9948a051c41b6a16284546 SHA512 91775a5ec9227fc5a42431383157d82d2d2bd40b92e234518e4b347cfd20c873fb29ec84289d7bdee127b01c02b9eb5da24c386d6f78a7346684fccee158f939 WHIRLPOOL afdad90143a9ed3a62fa8dd0666355fdeaa3689e15873778b47927f6a6c170da88d7891f94f5889c94a5a54d608845c16a6c033a65afc9477d9deec9f12af5ee +DIST FreeImage3153.zip 4681769 SHA256 4618d59f2d9a20583b0f5fec99dcf832ccc3f317897b10592b85e7648375c044 SHA512 2cc38218cf1e8d403faa71d2337009ff6c0c60e1833eea2e19ddaf2fedba001198f4bff9805c4e815653d7bee79bac6a9132a7c9af69f59d5ee1cae531ad2069 WHIRLPOOL 89f8ecd1152d303b7c5613314ab7f2b68d66fb5c1cccf214e58a8c031a6d22ad842a5b37240ab38d9f6eb035f6d6a688afe6591da9c22898e882b1baecac0e50 diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/files/freeimage-3.15.3-libpng-1.2.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/files/freeimage-3.15.3-libpng-1.2.patch new file mode 100644 index 0000000000..cc15a17e65 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/files/freeimage-3.15.3-libpng-1.2.patch @@ -0,0 +1,74 @@ +freeimage assumes libpng-1.4.x api in a few places + +--- a/Source/FreeImage/PluginPNG.cpp ++++ b/Source/FreeImage/PluginPNG.cpp +@@ -106,7 +106,11 @@ ReadMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) { + tag = FreeImage_CreateTag(); + if(!tag) return FALSE; + ++#ifdef PNG_iTXt_SUPPORTED + DWORD tag_length = (DWORD) MAX(text_ptr[i].text_length, text_ptr[i].itxt_length); ++#else ++ DWORD tag_length = (DWORD) text_ptr[i].text_length; ++#endif + + FreeImage_SetTagLength(tag, tag_length); + FreeImage_SetTagCount(tag, tag_length); +@@ -153,9 +157,11 @@ WriteMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) { + text_metadata.key = (char*)FreeImage_GetTagKey(tag); // keyword, 1-79 character description of "text" + text_metadata.text = (char*)FreeImage_GetTagValue(tag); // comment, may be an empty string (ie "") + text_metadata.text_length = FreeImage_GetTagLength(tag);// length of the text string ++#ifdef PNG_iTXt_SUPPORTED + text_metadata.itxt_length = FreeImage_GetTagLength(tag);// length of the itxt string + text_metadata.lang = 0; // language code, 0-79 characters or a NULL pointer + text_metadata.lang_key = 0; // keyword translated UTF-8 string, 0 or more chars or a NULL pointer ++#endif + + // set the tag + png_set_text(png_ptr, info_ptr, &text_metadata, 1); +@@ -175,9 +181,11 @@ WriteMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) { + text_metadata.key = (char*)g_png_xmp_keyword; // keyword, 1-79 character description of "text" + text_metadata.text = (char*)FreeImage_GetTagValue(tag); // comment, may be an empty string (ie "") + text_metadata.text_length = FreeImage_GetTagLength(tag);// length of the text string ++#ifdef PNG_iTXt_SUPPORTED + text_metadata.itxt_length = FreeImage_GetTagLength(tag);// length of the itxt string + text_metadata.lang = 0; // language code, 0-79 characters or a NULL pointer + text_metadata.lang_key = 0; // keyword translated UTF-8 string, 0 or more chars or a NULL pointer ++#endif + + // set the tag + png_set_text(png_ptr, info_ptr, &text_metadata, 1); +@@ -559,7 +559,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { + + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) { + png_charp profile_name = NULL; ++#if PNG_LIBPNG_VER_MINOR < 4 ++ png_charp profile_data = NULL; ++#else + png_bytep profile_data = NULL; ++#endif + png_uint_32 profile_length = 0; + int compression_type; + +@@ -599,7 +599,9 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { + row_pointers[height - 1 - k] = FreeImage_GetScanLine(dib, k); + } + ++#ifdef PNG_BENIGN_ERRORS_SUPPORTED + png_set_benign_errors(png_ptr, 1); ++#endif + png_read_image(png_ptr, row_pointers); + + // check if the bitmap contains transparency, if so enable it in the header +@@ -833,7 +835,11 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void + + FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(dib); + if (iccProfile->size && iccProfile->data) { ++#if PNG_LIBPNG_VER_MINOR < 4 ++ png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_charp)iccProfile->data, iccProfile->size); ++#else + png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_const_bytep)iccProfile->data, iccProfile->size); ++#endif + } + + // write metadata diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/files/freeimage-3.15.3-r2-unbundling.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/files/freeimage-3.15.3-r2-unbundling.patch new file mode 100644 index 0000000000..f83d87f5ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/files/freeimage-3.15.3-r2-unbundling.patch @@ -0,0 +1,639 @@ +lots of fixes here: + - use system graphics libraries + - make all of them optional + - drop root users from install (fix user installs) + - make static lib build optional + - link with CXX and CXXFLAGS (since this is C++ code) + +--- Makefile.gnu ++++ Makefile.gnu +@@ -11,7 +11,24 @@ + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-LIBRARIES = -lstdc++ ++PKG_CONFIG ?= pkg-config ++ ++USE_EXR ?= yes ++USE_JPEG ?= yes ++USE_JPEG2K ?= yes ++USE_MNG ?= yes ++USE_PNG ?= yes ++USE_TIFF ?= yes ++USE_RAW ?= yes ++ ++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib) ++LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR) ++LIBRARIES-$(USE_JPEG) += -ljpeg ++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg) ++LIBRARIES-$(USE_MNG) += -lmng ++LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) ++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) ++LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) + + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) +@@ -64,13 +81,15 @@ + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) ++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ifneq ($(STATICLIB),) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) ++endif ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) + ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) + # ldconfig +--- Source/FreeImage/J2KHelper.cpp ++++ Source/FreeImage/J2KHelper.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + + /** + Divide an integer by a power of 2 and round upwards +--- Source/FreeImage/PluginEXR.cpp ++++ Source/FreeImage/PluginEXR.cpp +@@ -22,16 +22,16 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../OpenEXR/IlmImf/ImfIO.h" +-#include "../OpenEXR/Iex/Iex.h" +-#include "../OpenEXR/IlmImf/ImfOutputFile.h" +-#include "../OpenEXR/IlmImf/ImfInputFile.h" +-#include "../OpenEXR/IlmImf/ImfRgbaFile.h" +-#include "../OpenEXR/IlmImf/ImfChannelList.h" +-#include "../OpenEXR/IlmImf/ImfRgba.h" +-#include "../OpenEXR/IlmImf/ImfArray.h" +-#include "../OpenEXR/IlmImf/ImfPreviewImage.h" +-#include "../OpenEXR/Half/half.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + + // ========================================================== +--- Source/FreeImage/PluginJ2K.cpp ++++ Source/FreeImage/PluginJ2K.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + + // ========================================================== + // Plugin Interface +--- Source/FreeImage/PluginJP2.cpp ++++ Source/FreeImage/PluginJP2.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + + // ========================================================== + // Plugin Interface +--- Source/FreeImage/PluginPNG.cpp ++++ Source/FreeImage/PluginPNG.cpp +@@ -37,8 +37,8 @@ + + // ---------------------------------------------------------- + +-#include "../ZLib/zlib.h" +-#include "../LibPNG/png.h" ++#include ++#include + + // ---------------------------------------------------------- + +--- Source/transupp.c ++++ Source/transupp.c +@@ -15,8 +15,7 @@ + /* Although this file really shouldn't have access to the library internals, + * it's helpful to let it call jround_up() and jcopy_block_row(). + */ +-#define JPEG_INTERNALS +- ++#include + #include "jinclude.h" + #include "jpeglib.h" + #include "transupp.h" /* My own external interface */ +--- Source/FreeImage/ZLibInterface.cpp ++++ Source/FreeImage/ZLibInterface.cpp +@@ -19,10 +19,10 @@ + // Use at your own risk! + // ========================================================== + +-#include "../ZLib/zlib.h" ++#include + #include "FreeImage.h" + #include "Utilities.h" +-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ ++#define OS_CODE 0x03 + + /** + Compresses a source buffer into a target buffer, using the ZLib library. +--- Source/FreeImage/PluginG3.cpp ++++ Source/FreeImage/PluginG3.cpp +@@ -20,7 +20,7 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibTIFF4/tiffiop.h" ++#include "tiffiop.h" + + #include "FreeImage.h" + #include "Utilities.h" +--- Source/FreeImage/PluginJPEG.cpp ++++ Source/FreeImage/PluginJPEG.cpp +@@ -35,11 +35,15 @@ + #undef FAR + #include + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" ++#include ++#include ++#include ++#include ++#include + } + ++#define SIZEOF(object) ((size_t) sizeof(object)) ++ + #include "FreeImage.h" + #include "Utilities.h" + +--- Source/FreeImageToolkit/JPEGTransform.cpp ++++ Source/FreeImageToolkit/JPEGTransform.cpp +@@ -25,10 +25,11 @@ + #undef FAR + #include + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" +-#include "../LibJPEG/transupp.h" ++#include ++#include ++#include ++#include ++#include "transupp.h" + } + + #include "FreeImage.h" +--- Makefile.fip ++++ Makefile.fip +@@ -11,7 +11,24 @@ + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-LIBRARIES = -lstdc++ ++PKG_CONFIG ?= pkg-config ++ ++USE_EXR ?= yes ++USE_JPEG ?= yes ++USE_JPEG2K ?= yes ++USE_MNG ?= yes ++USE_PNG ?= yes ++USE_TIFF ?= yes ++USE_RAW ?= yes ++ ++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib) ++LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR) ++LIBRARIES-$(USE_JPEG) += -ljpeg ++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg) ++LIBRARIES-$(USE_MNG) += -lmng ++LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) ++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) ++LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) + + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) +@@ -65,14 +82,18 @@ + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) ++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(HEADERFIP) $(INCDIR) ++ifneq ($(STATICLIB),) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) ++endif ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) ++ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) ++ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) +--- Makefile.srcs ++++ Makefile.srcs +@@ -1,6 +1,14 @@ ++USE_EXR ?= yes ++USE_JPEG ?= yes ++USE_JPEG2K ?= yes ++USE_MNG ?= yes ++USE_PNG ?= yes ++USE_TIFF ?= yes ++USE_RAW ?= yes ++ + VER_MAJOR = 3 + VER_MINOR = 15.3 +-SRCS = \ ++SRCS-yes = \ + Source/FreeImage/BitmapAccess.cpp \ + Source/FreeImage/ColorLookup.cpp \ + Source/FreeImage/FreeImage.cpp \ +@@ -17,36 +25,74 @@ SRCS = \ + Source/FreeImage/GetType.cpp \ + Source/FreeImage/MemoryIO.cpp \ + Source/FreeImage/PixelAccess.cpp \ ++ ++SRCS-$(USE_JPEG2K) += \ + Source/FreeImage/J2KHelper.cpp \ ++ ++SRCS-$(USE_MNG) += \ + Source/FreeImage/MNGHelper.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/Plugin.cpp \ + Source/FreeImage/PluginBMP.cpp \ + Source/FreeImage/PluginCUT.cpp \ + Source/FreeImage/PluginDDS.cpp \ ++ ++SRCS-$(USE_EXR) += \ + Source/FreeImage/PluginEXR.cpp \ ++ ++SRCS-$(USE_TIFF) += \ + Source/FreeImage/PluginG3.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginGIF.cpp \ + Source/FreeImage/PluginHDR.cpp \ + Source/FreeImage/PluginICO.cpp \ + Source/FreeImage/PluginIFF.cpp \ ++ ++SRCS-$(USE_JPEG2K) += \ + Source/FreeImage/PluginJ2K.cpp \ ++ ++SRCS-$(USE_MNG) += \ + Source/FreeImage/PluginJNG.cpp \ ++ ++SRCS-$(USE_JPEG2K) += \ + Source/FreeImage/PluginJP2.cpp \ ++ ++SRCS-$(USE_JPEG) += \ + Source/FreeImage/PluginJPEG.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginKOALA.cpp \ ++ ++SRCS-$(USE_MNG) += \ + Source/FreeImage/PluginMNG.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginPCD.cpp \ + Source/FreeImage/PluginPCX.cpp \ + Source/FreeImage/PluginPFM.cpp \ + Source/FreeImage/PluginPICT.cpp \ ++ ++SRCS-$(USE_PNG) += \ + Source/FreeImage/PluginPNG.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginPNM.cpp \ + Source/FreeImage/PluginPSD.cpp \ + Source/FreeImage/PluginRAS.cpp \ ++ ++SRCS-$(USE_RAW) += \ + Source/FreeImage/PluginRAW.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginSGI.cpp \ + Source/FreeImage/PluginTARGA.cpp \ ++ ++SRCS-$(USE_TIFF) += \ + Source/FreeImage/PluginTIFF.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginWBMP.cpp \ + Source/FreeImage/PluginXBM.cpp \ + Source/FreeImage/PluginXPM.cpp \ +@@ -83,7 +129,11 @@ SRCS = \ + Source/Metadata/IPTC.cpp \ + Source/Metadata/TagConversion.cpp \ + Source/Metadata/TagLib.cpp \ ++ ++SRCS-$(USE_TIFF) += \ + Source/Metadata/XTIFF.cpp \ ++ ++SRCS-yes += \ + Source/FreeImageToolkit/Background.cpp \ + Source/FreeImageToolkit/BSplineRotate.cpp \ + Source/FreeImageToolkit/Channels.cpp \ +@@ -92,10 +142,18 @@ SRCS = \ + Source/FreeImageToolkit/CopyPaste.cpp \ + Source/FreeImageToolkit/Display.cpp \ + Source/FreeImageToolkit/Flip.cpp \ ++ ++SRCS-$(USE_JPEG) += \ + Source/FreeImageToolkit/JPEGTransform.cpp \ ++ ++SRCS-yes += \ + Source/FreeImageToolkit/MultigridPoissonSolver.cpp \ + Source/FreeImageToolkit/Rescale.cpp \ + Source/FreeImageToolkit/Resize.cpp \ ++ ++SRCS-$(USE_JPEG) += \ ++ Source/transupp.c ++SRCS = $(SRCS-yes) + INCLS = \ + Examples/OpenGL/TextureManager/TextureManager.h \ + Examples/Plugin/PluginCradle.h \ +@@ -116,7 +174,17 @@ + Wrapper/FreeImagePlus/test/fipTest.h \ + TestAPI/TestSuite.h + +-INCLUDE = -I. \ ++INCLUDE-yes = -I. \ + -ISource \ + -ISource/Metadata \ + -ISource/FreeImageToolkit \ ++ ++INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib) ++INCLUDE-$(USE_EXR) += -DUSE_EXR $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR) ++INCLUDE-$(USE_JPEG) += -DUSE_JPEG ++INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjpeg) ++INCLUDE-$(USE_MNG) += -DUSE_MNG ++INCLUDE-$(USE_PNG) += -DUSE_PNG $(shell $(PKG_CONFIG) --cflags-only-I libpng) ++INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase) ++INCLUDE-$(USE_RAW) += -DUSE_RAW $(shell $(PKG_CONFIG) --cflags-only-I libraw) ++INCLUDE = $(INCLUDE-yes) +--- fipMakefile.srcs ++++ fipMakefile.srcs +@@ -1,6 +1,14 @@ ++USE_EXR ?= yes ++USE_JPEG ?= yes ++USE_JPEG2K ?= yes ++USE_MNG ?= yes ++USE_PNG ?= yes ++USE_TIFF ?= yes ++USE_RAW ?= yes ++ + VER_MAJOR = 3 + VER_MINOR = 15.3 +-SRCS = \ ++SRCS-yes = \ + Source/FreeImage/BitmapAccess.cpp \ + Source/FreeImage/ColorLookup.cpp \ + Source/FreeImage/FreeImage.cpp \ +@@ -9,36 +17,74 @@ + Source/FreeImage/GetType.cpp \ + Source/FreeImage/MemoryIO.cpp \ + Source/FreeImage/PixelAccess.cpp \ ++ ++SRCS-$(USE_JPEG2K) += \ + Source/FreeImage/J2KHelper.cpp \ ++ ++SRCS-$(USE_MNG) += \ + Source/FreeImage/MNGHelper.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/Plugin.cpp \ + Source/FreeImage/PluginBMP.cpp \ + Source/FreeImage/PluginCUT.cpp \ + Source/FreeImage/PluginDDS.cpp \ ++ ++SRCS-$(USE_EXR) += \ + Source/FreeImage/PluginEXR.cpp \ ++ ++SRCS-$(USE_TIFF) += \ + Source/FreeImage/PluginG3.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginGIF.cpp \ + Source/FreeImage/PluginHDR.cpp \ + Source/FreeImage/PluginICO.cpp \ + Source/FreeImage/PluginIFF.cpp \ ++ ++SRCS-$(USE_JPEG2K) += \ + Source/FreeImage/PluginJ2K.cpp \ ++ ++SRCS-$(USE_MNG) += \ + Source/FreeImage/PluginJNG.cpp \ ++ ++SRCS-$(USE_JPEG2K) += \ + Source/FreeImage/PluginJP2.cpp \ ++ ++SRCS-$(USE_JPEG) += \ + Source/FreeImage/PluginJPEG.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginKOALA.cpp \ ++ ++SRCS-$(USE_MNG) += \ + Source/FreeImage/PluginMNG.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginPCD.cpp \ + Source/FreeImage/PluginPCX.cpp \ + Source/FreeImage/PluginPFM.cpp \ + Source/FreeImage/PluginPICT.cpp \ ++ ++SRCS-$(USE_PNG) += \ + Source/FreeImage/PluginPNG.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginPNM.cpp \ + Source/FreeImage/PluginPSD.cpp \ + Source/FreeImage/PluginRAS.cpp \ ++ ++SRCS-$(USE_RAW) += \ + Source/FreeImage/PluginRAW.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginSGI.cpp \ + Source/FreeImage/PluginTARGA.cpp \ ++ ++SRCS-$(USE_TIFF) += \ + Source/FreeImage/PluginTIFF.cpp \ ++ ++SRCS-yes += \ + Source/FreeImage/PluginWBMP.cpp \ + Source/FreeImage/PluginXBM.cpp \ + Source/FreeImage/PluginXPM.cpp \ +@@ -75,7 +121,11 @@ + Source/Metadata/IPTC.cpp \ + Source/Metadata/TagConversion.cpp \ + Source/Metadata/TagLib.cpp \ ++ ++SRCS-$(USE_TIFF) += \ + Source/Metadata/XTIFF.cpp \ ++ ++SRCS-yes += \ + Source/FreeImageToolkit/Background.cpp \ + Source/FreeImageToolkit/BSplineRotate.cpp \ + Source/FreeImageToolkit/Channels.cpp \ +@@ -84,7 +134,11 @@ + Source/FreeImageToolkit/CopyPaste.cpp \ + Source/FreeImageToolkit/Display.cpp \ + Source/FreeImageToolkit/Flip.cpp \ ++ ++SRCS-$(USE_JPEG) += \ + Source/FreeImageToolkit/JPEGTransform.cpp \ ++ ++SRCS-yes += \ + Source/FreeImageToolkit/MultigridPoissonSolver.cpp \ + Source/FreeImageToolkit/Rescale.cpp \ + Source/FreeImageToolkit/Resize.cpp \ +@@ -95,6 +149,11 @@ + Wrapper/FreeImagePlus/src/fipTag.cpp \ + Wrapper/FreeImagePlus/src/fipWinImage.cpp \ + Wrapper/FreeImagePlus/src/FreeImagePlus.cpp ++ ++SRCS-$(USE_JPEG) += \ ++ Source/transupp.c ++ ++SRCS = $(SRCS-yes) + INCLUDE = -I. \ + -ISource \ + -ISource/Metadata \ +--- Source/FreeImage/PluginRAW.cpp ++++ Source/FreeImage/PluginRAW.cpp +@@ -19,7 +19,7 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibRawLite/libraw/libraw.h" ++#include + + #include "FreeImage.h" + #include "Utilities.h" +--- Source/Metadata/XTIFF.cpp ++++ Source/Metadata/XTIFF.cpp +@@ -29,7 +29,7 @@ + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + +-#include "../LibTIFF4/tiffiop.h" ++#include "tiffiop.h" + + #include "FreeImage.h" + #include "Utilities.h" +--- Source/FreeImage/PluginTIFF.cpp ++++ Source/FreeImage/PluginTIFF.cpp +@@ -37,9 +37,9 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibTIFF4/tiffiop.h" ++#include "tiffiop.h" + #include "../Metadata/FreeImageTag.h" +-#include "../OpenEXR/Half/half.h" ++#include + + #include "FreeImageIO.h" + #include "PSDParser.h" +--- Source/tiffiop.h ++++ Source/tiffiop.h +@@ -30,7 +30,9 @@ + * ``Library-private'' definitions. + */ + +-#include "tif_config.h" ++#include ++#define HAVE_SEARCH_H ++#define HAVE_FCNTL_H + + #ifdef HAVE_FCNTL_H + # include +--- Source/FreeImage/Plugin.cpp ++++ Source/FreeImage/Plugin.cpp +@@ -223,23 +223,33 @@ + */ + s_plugins->AddNode(InitBMP); + s_plugins->AddNode(InitICO); ++#ifdef USE_JPEG + s_plugins->AddNode(InitJPEG); ++#endif ++#ifdef USE_MNG + s_plugins->AddNode(InitJNG); ++#endif + s_plugins->AddNode(InitKOALA); + s_plugins->AddNode(InitIFF); ++#ifdef USE_MNG + s_plugins->AddNode(InitMNG); ++#endif + s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1"); + s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4"); + s_plugins->AddNode(InitPCD); + s_plugins->AddNode(InitPCX); + s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2"); + s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5"); ++#ifdef USE_PNG + s_plugins->AddNode(InitPNG); ++#endif + s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3"); + s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6"); + s_plugins->AddNode(InitRAS); + s_plugins->AddNode(InitTARGA); ++#ifdef USE_TIFF + s_plugins->AddNode(InitTIFF); ++#endif + s_plugins->AddNode(InitWBMP); + s_plugins->AddNode(InitPSD); + s_plugins->AddNode(InitCUT); +@@ -248,14 +258,22 @@ + s_plugins->AddNode(InitDDS); + s_plugins->AddNode(InitGIF); + s_plugins->AddNode(InitHDR); ++#ifdef USE_TIFF + s_plugins->AddNode(InitG3); ++#endif + s_plugins->AddNode(InitSGI); ++#ifdef USE_EXR + s_plugins->AddNode(InitEXR); ++#endif ++#ifdef USE_JPEG2K + s_plugins->AddNode(InitJ2K); + s_plugins->AddNode(InitJP2); ++#endif + s_plugins->AddNode(InitPFM); + s_plugins->AddNode(InitPICT); ++#ifdef USE_RAW + s_plugins->AddNode(InitRAW); ++#endif + + // external plugin initialization + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/freeimage-3.15.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/freeimage-3.15.3-r2.ebuild new file mode 100644 index 0000000000..c879b6095c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/freeimage/freeimage-3.15.3-r2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.3-r1.ebuild,v 1.1 2013/01/09 23:38:23 vapier Exp $ + +EAPI="4" + +inherit toolchain-funcs eutils multilib + +MY_PN=FreeImage +MY_PV=${PV//.} +MY_P=${MY_PN}${MY_PV} + +DESCRIPTION="Image library supporting many formats" +HOMEPAGE="http://freeimage.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip + mirror://sourceforge/${PN}/${MY_P}.pdf" + +LICENSE="|| ( GPL-2 FIPL-1.0 )" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff" + +RDEPEND="sys-libs/zlib + jpeg? ( virtual/jpeg ) + jpeg2k? ( media-libs/openjpeg ) + mng? ( media-libs/libmng ) + openexr? ( media-libs/openexr ) + png? ( media-libs/libpng ) + raw? ( media-libs/libraw ) + tiff? ( + media-libs/ilmbase + media-libs/tiff + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + app-arch/unzip" + +S=${WORKDIR}/${MY_PN} + +src_prepare() { + cd Source + cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die + cp LibTIFF4/{tiffiop,tif_dir}.h . || die + rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die + cd .. + edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp + sed -i \ + -e "s:/./:/:g" \ + -e "s: ./: :g" \ + -e 's: Source: \\\n\tSource:g' \ + -e 's: Wrapper: \\\n\tWrapper:g' \ + -e 's: Examples: \\\n\tExamples:g' \ + -e 's: TestAPI: \\\n\tTestAPI:g' \ + -e 's: -ISource: \\\n\t-ISource:g' \ + -e 's: -IWrapper: \\\n\t-IWrapper:g' \ + Makefile.srcs fipMakefile.srcs || die + sed -i \ + -e "/LibJPEG/d" \ + -e "/LibPNG/d" \ + -e "/LibTIFF/d" \ + -e "/Source\/ZLib/d" \ + -e "/LibOpenJPEG/d" \ + -e "/OpenEXR/d" \ + -e "/LibRawLite/d" \ + -e "/LibMNG/d" \ + Makefile.srcs fipMakefile.srcs || die + epatch "${FILESDIR}"/${PF}-unbundling.patch + epatch "${FILESDIR}"/${P}-libpng-1.2.patch +} + +foreach_make() { + local m + for m in Makefile.{gnu,fip} ; do + emake -f ${m} \ + USE_EXR=$(usex openexr) \ + USE_JPEG=$(usex jpeg) \ + USE_JPEG2K=$(usex jpeg2k) \ + USE_MNG=$(usex mng) \ + USE_PNG=$(usex png) \ + USE_TIFF=$(usex tiff) \ + USE_RAW=$(usex raw) \ + $(usex static-libs '' STATICLIB=) \ + "$@" + done +} + +src_compile() { + tc-export AR PKG_CONFIG + foreach_make \ + CXX="$(tc-getCXX) -fPIC" \ + CC="$(tc-getCC) -fPIC" \ + ${MY_PN} +} + +src_install() { + foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir) + dodoc Whatsnew.txt "${DISTDIR}"/${MY_P}.pdf +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/Manifest b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/Manifest new file mode 100644 index 0000000000..9008bedccf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/Manifest @@ -0,0 +1,6 @@ +DIST freetype-2.3.11.tar.bz2 1446474 RMD160 ac69ed97aa662bc1dfb25422e64fc2afce1f863d SHA1 693e1b4e423557975c2b2aca63559bc592533a0e SHA256 8a033b1e6018a1e9ea381b09b2347b02c6686bdf7e4ee86a6714b6b90f1e2ec9 +DIST freetype-2.4.8.tar.bz2 1492568 RMD160 ae0e68a8a84a201ed133e964ee56c0cc0de84521 SHA1 1634cef894460ab98dd37eadfcdd055ffda9a27c SHA256 a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71 +DIST freetype-doc-2.3.11.tar.bz2 104260 RMD160 c57fa7ba7a9c3744d7825eb7613507f7cf89d07d SHA1 c0c63423d2316933718d791b5282fc8ba9aa4f58 SHA256 2955083068a410588b84b71c5b393b9b853052bc3ffff0ede07562fe694df860 +DIST freetype-doc-2.4.8.tar.bz2 106657 RMD160 224a3d05712c1f21a583f29d811425af11c89dce SHA1 20669faa8d9bab5402ecf15e727e61461659b3dc SHA256 540e4d824534afe0145fd99ed1ca0ead49f7de77c14336146ee06cb106ff0014 +DIST ft2demos-2.3.11.tar.bz2 159695 RMD160 2fcef4a0f150c5a41c7c0e454543738a468e1b92 SHA1 e4ae1de9419e551291bb9e2d111f574b49bd7c8d SHA256 eefcb3c8886b93f273933d01cf12ac84ac1d9567838b1a9727c72a43e6a314f7 +DIST ft2demos-2.4.8.tar.bz2 163264 RMD160 005851bc56cae29ce36634a1bee29fb542b8929c SHA1 c81789301a15c30e2c12560d74d69a4c00d19bac SHA256 071bfbf1bca26ec8d62068026a0e3d17284f6d9b640435f99d149190f0198bc7 diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch new file mode 100644 index 0000000000..44f3bf6e1c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch @@ -0,0 +1,22 @@ +Enables gxvalid and otvalid modules for use with ftvalid. + +--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +@@ -110,7 +110,7 @@ + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -124,7 +124,7 @@ + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/freetype-2.4.11.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/freetype-2.4.11.ebuild new file mode 100644 index 0000000000..8eb81e3053 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/freetype-2.4.11.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.6.ebuild,v 1.11 2011/08/31 08:35:05 mduft Exp $ + +EAPI="4" + +inherit autotools autotools-utils eutils flag-o-matic libtool multilib + +DESCRIPTION="A high-quality and portable font engine" +HOMEPAGE="http://www.freetype.org/" +SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 ) + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )" + +LICENSE="FTL GPL-2" +SLOT="2" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="X auto-hinter bindist bzip2 debug doc fontforge static-libs utils" + +DEPEND="sys-libs/zlib + bzip2? ( app-arch/bzip2 ) + X? ( x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp )" + +RDEPEND="${DEPEND}" + +src_prepare() { + enable_option() { + sed -i -e "/#define $1/a #define $1" \ + include/freetype/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ + include/freetype/config/ftoption.h \ + || die "unable to disable option $1" + } + + if ! use bindist; then + # See http://freetype.org/patents.html + # ClearType is covered by several Microsoft patents in the US + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING + fi + + if use auto-hinter; then + disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER + enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING + fi + + if use debug; then + enable_option FT_DEBUG_LEVEL_TRACE + enable_option FT_DEBUG_MEMORY + fi + + disable_option FT_CONFIG_OPTION_OLD_INTERNALS + + epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch + + if use utils; then + cd "${WORKDIR}/ft2demos-${PV}" + sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile || die + # Disable tests needing X11 when USE="-X". (bug #177597) + if ! use X; then + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die + fi + fi + + if use prefix; then + cd "${S}"/builds/unix + eautoreconf + else + elibtoolize + fi + epunt_cxx +} + +src_configure() { + append-flags -fno-strict-aliasing + type -P gmake &> /dev/null && export GNUMAKE=gmake + + # we need non-/bin/sh to run configure + [[ -n ${CONFIG_SHELL} ]] && \ + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ + "${S}"/builds/unix/configure + + econf \ + $(use_enable static-libs static) \ + $(use_with bzip2) +} + +src_compile() { + emake + + if use utils; then + cd "${WORKDIR}/ft2demos-${PV}" + # fix for Prefix, bug #339334 + emake X11_PATH="${EPREFIX}/usr/$(get_libdir)" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc ChangeLog README + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO} + + use doc && dohtml -r docs/* + + if use utils; then + rm "${WORKDIR}"/ft2demos-${PV}/bin/README + for ft2demo in ../ft2demos-${PV}/bin/*; do + ./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ + "${ED}"/usr/bin + done + fi + + if use fontforge; then + # Probably fontforge needs less but this way makes things simplier... + einfo "Installing internal headers required for fontforge" + find src/truetype include/freetype/internal -name '*.h' | \ + while read header; do + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" + done + fi + + if ! use static-libs; then + remove_libtool_files || die "failed removing libtool files" + fi +} + +pkg_postinst() { + elog "The TrueType bytecode interpreter is no longer patented and thus no" + elog "longer controlled by the bindist USE flag. Enable the auto-hinter" + elog "USE flag if you want the old USE="bindist" hinting behavior." +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/glmark2/glmark2-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/glmark2/glmark2-0.0.1-r7.ebuild new file mode 100644 index 0000000000..9c18b4c015 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/glmark2/glmark2-0.0.1-r7.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +CROS_WORKON_COMMIT="5b1ea6f9c4bfc9e22c62eb3a5e6ec1dd379d03e8" +CROS_WORKON_TREE="bdda989e471e778cc25f09f0334c2d4ee8d40ae7" +CROS_WORKON_PROJECT="chromiumos/third_party/glmark2" + +inherit toolchain-funcs waf-utils cros-workon + +DESCRIPTION="Opengl test suite" +HOMEPAGE="https://launchpad.net/glmark2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="gles2 drm" + +RDEPEND="media-libs/libpng + media-libs/mesa[gles2?] + x11-libs/libX11" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + rm -rf src/libpng + sed -i -e 's:libpng12:libpng:g' wscript src/wscript_build || die +} + +src_configure() { + local myconf="--enable-gl" + + if use gles2; then + myconf+="--enable-glesv2" + fi + + if use drm; then + myconf+=" --enable-gl-drm" + if use gles2; then + myconf+=" --enable-glesv2-drm" + fi + fi + + export PKGCONFIG=$(tc-getPKG_CONFIG) + waf-utils_src_configure ${myconf} +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/glmark2/glmark2-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/glmark2/glmark2-9999.ebuild new file mode 100644 index 0000000000..e66429da5c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/glmark2/glmark2-9999.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/third_party/glmark2" + +inherit toolchain-funcs waf-utils cros-workon + +DESCRIPTION="Opengl test suite" +HOMEPAGE="https://launchpad.net/glmark2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gles2 drm" + +RDEPEND="media-libs/libpng + media-libs/mesa[gles2?] + x11-libs/libX11" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + rm -rf src/libpng + sed -i -e 's:libpng12:libpng:g' wscript src/wscript_build || die +} + +src_configure() { + local myconf="--enable-gl" + + if use gles2; then + myconf+="--enable-glesv2" + fi + + if use drm; then + myconf+=" --enable-gl-drm" + if use gles2; then + myconf+=" --enable-glesv2-drm" + fi + fi + + export PKGCONFIG=$(tc-getPKG_CONFIG) + waf-utils_src_configure ${myconf} +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/glu/glu-9.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/glu/glu-9.0.0.ebuild new file mode 100644 index 0000000000..39667c8ef2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/glu/glu-9.0.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/glu/glu-9.0.0.ebuild,v 1.2 2012/09/20 11:57:23 chithanh Exp $ + +EAPI=4 + +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/glu" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-2" + EXPERIMENTAL="true" +fi + +inherit autotools-utils multilib ${GIT_ECLASS} + +DESCRIPTION="The OpenGL Utility Library" +HOMEPAGE="http://cgit.freedesktop.org/mesa/glu/" + +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PN}/${P}.tar.bz2" +fi + +LICENSE="SGI-B-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="multilib static-libs" + +DEPEND="virtual/opengl" +RDEPEND="${DEPEND} + multilib? ( !app-emulation/emul-linux-x86-opengl )" + +foreachabi() { + if use multilib; then + local ABI + for ABI in $(get_all_abis); do + multilib_toolchain_setup ${ABI} + AUTOTOOLS_BUILD_DIR=${WORKDIR}/${ABI} "${@}" + done + else + "${@}" + fi +} + +src_unpack() { + default + [[ $PV = 9999* ]] && git-2_src_unpack +} + +src_prepare() { + AUTOTOOLS_AUTORECONF=1 autotools-utils_src_prepare +} + +src_configure() { + foreachabi autotools-utils_src_configure +} + +src_compile() { + foreachabi autotools-utils_src_compile +} + +src_install() { + foreachabi autotools-utils_src_install +} + +src_test() { + :; +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/jpeg/Manifest b/sdk_container/src/third_party/coreos-overlay/media-libs/jpeg/Manifest new file mode 100644 index 0000000000..edd947bcd5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/jpeg/Manifest @@ -0,0 +1,2 @@ +DIST jpeg-6b-patches-2.tar.bz2 3703 RMD160 71f15f911baa0c60d5b2d78069c25f8a23f367b1 SHA1 dfb1a237f0984d3d3f03cdf3503b1ce72d50a81b SHA256 62d8496764330c57cc29137ee46c3cd76ce6463680f9e2e63af8bc4483439b2d +DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/jpeg/jpeg-6b-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/jpeg/jpeg-6b-r11.ebuild new file mode 100644 index 0000000000..9617ed69be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/jpeg/jpeg-6b-r11.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v 1.3 2010/01/18 15:35:38 ssuominen Exp $ + +# this ebuild is only for the libjpeg.so.62 SONAME for ABI compat + +EAPI="2" + +inherit eutils libtool multilib toolchain-funcs + +PATCH_VER="2" +DESCRIPTION="library to load, handle and manipulate images in the JPEG format (transition package)" +HOMEPAGE="http://www.ijg.org/" +SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +IUSE="" + +RDEPEND="!~media-libs/jpeg-6b:0 + !media-libs/jpeg-compat" + +src_prepare() { + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + elibtoolize +} + +src_configure() { + tc-export CC + econf \ + --enable-shared \ + --disable-static \ + --enable-maxmem=64 +} + +src_compile() { + emake libjpeg.la || die +} + +src_install() { + dodir /usr/include /usr/$(get_libdir) + emake install-lib \ + prefix="${D}/usr/" \ + libdir='$(exec_prefix)/'$(get_libdir) || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/libmtp/libmtp-0.0.1-r12.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/libmtp/libmtp-0.0.1-r12.ebuild new file mode 100644 index 0000000000..806e2dcca0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/libmtp/libmtp-0.0.1-r12.ebuild @@ -0,0 +1,50 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="7bc42f093d644eeaf1c77fab60883881843c3c65" +CROS_WORKON_TREE="62ba988dca03df08f1aac5d601d47b64ffb869ea" +CROS_WORKON_PROJECT="chromium/deps/libmtp" +CROS_WORKON_LOCALNAME="../../chromium/src/third_party/libmtp" + +inherit autotools cros-workon + +DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)." +HOMEPAGE="http://libmtp.sourceforge.net/" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="+crypt doc examples static-libs" + +RDEPEND="virtual/libusb:1 + crypt? ( dev-libs/libgcrypt )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +DOCS="AUTHORS ChangeLog README TODO" + +src_prepare() { + if [[ ${PV} == *9999* ]]; then + touch config.rpath # This is from upstream autogen.sh + eautoreconf + fi +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable doc doxygen) \ + $(use_enable crypt mtpz) +} + +src_install() { + default + find "${ED}" -name '*.la' -exec rm -f {} + + + if use examples; then + docinto examples + dodoc examples/*.{c,h,sh} + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/libmtp/libmtp-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/libmtp/libmtp-9999.ebuild new file mode 100644 index 0000000000..0a4a55b4c4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/libmtp/libmtp-9999.ebuild @@ -0,0 +1,48 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromium/deps/libmtp" +CROS_WORKON_LOCALNAME="../../chromium/src/third_party/libmtp" + +inherit autotools cros-workon + +DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)." +HOMEPAGE="http://libmtp.sourceforge.net/" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+crypt doc examples static-libs" + +RDEPEND="virtual/libusb:1 + crypt? ( dev-libs/libgcrypt )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +DOCS="AUTHORS ChangeLog README TODO" + +src_prepare() { + if [[ ${PV} == *9999* ]]; then + touch config.rpath # This is from upstream autogen.sh + eautoreconf + fi +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable doc doxygen) \ + $(use_enable crypt mtpz) +} + +src_install() { + default + find "${ED}" -name '*.la' -exec rm -f {} + + + if use examples; then + docinto examples + dodoc examples/*.{c,h,sh} + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/libpng/files/libpng-1.2.45-build.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/libpng/files/libpng-1.2.45-build.patch new file mode 100644 index 0000000000..df1a0af9a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/libpng/files/libpng-1.2.45-build.patch @@ -0,0 +1,11 @@ +--- Makefile.am ++++ Makefile.am +@@ -102,7 +102,7 @@ + + libpng.sym: png.h pngconf.h + rm -f $@ $@.new +- $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@ ++ $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h > $(srcdir)/$@ + cat $(srcdir)/$@ | \ + $(SED) -n -e \ + 's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \ diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/libpng/libpng-1.2.49.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/libpng/libpng-1.2.49.ebuild new file mode 100644 index 0000000000..053c6c6378 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/libpng/libpng-1.2.49.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.47.ebuild,v 1.2 2012/02/20 11:56:37 ssuominen Exp $ + +# This ebuild uses compiles and installs everything from the package, rather +# than just libpng12.so.0 as upstream does. The additional installed files +# are needed by other packages. The x11-libs/cairo package is one example. + +EAPI=4 + +inherit multilib libtool + +DESCRIPTION="Portable Network Graphics library" +HOMEPAGE="http://www.libpng.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="sys-libs/zlib + !=media-libs/libpng-1.2*:0" +DEPEND="${RDEPEND} + app-arch/xz-utils" + +src_prepare() { + elibtoolize +} + +src_configure() { + econf --disable-static +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/libresample-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/libresample-0.0.1-r7.ebuild new file mode 100644 index 0000000000..2b81cc1851 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/libresample-0.0.1-r7.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +CROS_WORKON_COMMIT="cc9f20f439396b7d45e94b8301edd95d33f26a46" +CROS_WORKON_TREE="172744c4f8686f99baa15072d6e47716ff67e6e9" +CROS_WORKON_PROJECT="chromiumos/third_party/libresample" + +inherit cros-workon + +DESCRIPTION="resampling library (see README.chromiumos)" +HOMEPAGE="http://www-ccrma.stanford.edu/~jos/resample/" +SRC_URI="" + +LICENSE="LGPL" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/libresample-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/libresample-9999.ebuild new file mode 100644 index 0000000000..9678fcb5f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/libresample-9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/third_party/libresample" + +inherit cros-workon + +DESCRIPTION="resampling library (see README.chromiumos)" +HOMEPAGE="http://www-ccrma.stanford.edu/~jos/resample/" +SRC_URI="" + +LICENSE="LGPL" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/metadata.xml b/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/metadata.xml new file mode 100644 index 0000000000..fbec0a5899 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/libresample/metadata.xml @@ -0,0 +1,8 @@ + + + + libresample + + chaitanyag@chromium.org + + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11-mesa-st-no-flush-front.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11-mesa-st-no-flush-front.patch new file mode 100644 index 0000000000..096257c22b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11-mesa-st-no-flush-front.patch @@ -0,0 +1,13 @@ +diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c +index c95514c..4582bc3 100644 +--- a/src/mesa/state_tracker/st_manager.c ++++ b/src/mesa/state_tracker/st_manager.c +@@ -503,8 +503,6 @@ st_context_flush(struct st_context_iface *stctxi, unsigned flags, + { + struct st_context *st = (struct st_context *) stctxi; + st_flush(st, fence); +- if (flags & ST_FLUSH_FRONT) +- st_manager_flush_frontbuffer(st); + } + + static boolean diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11-state_tracker-gallium-fix-crash-with-st_renderbuffer.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11-state_tracker-gallium-fix-crash-with-st_renderbuffer.patch new file mode 100644 index 0000000000..c88ebc9fe0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11-state_tracker-gallium-fix-crash-with-st_renderbuffer.patch @@ -0,0 +1,68 @@ +From 4f684afcab21b4d2f04c3c2414fde5d1183a2e98 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= +Date: Tue, 6 Sep 2011 15:46:53 -0700 +Subject: [PATCH] state_tracker/gallium: fix crash with st_renderbuffers + surfaces that outlive their context. + +Because of context sharing, we sometimes end up with surfaces that outlive their context. To be able to destroy them later we keep a pointer to the destroy function. +--- + src/gallium/auxiliary/util/u_inlines.h | 2 +- + src/gallium/drivers/i915/i915_surface.c | 1 + + src/gallium/drivers/llvmpipe/lp_texture.c | 1 + + src/gallium/include/pipe/p_state.h | 3 +++ + 4 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h +index ddb81b5..db57b83 100644 +--- a/src/gallium/auxiliary/util/u_inlines.h ++++ b/src/gallium/auxiliary/util/u_inlines.h +@@ -109,7 +109,7 @@ pipe_surface_reference(struct pipe_surface **ptr, struct pipe_surface *surf) + + if (pipe_reference_described(&(*ptr)->reference, &surf->reference, + (debug_reference_descriptor)debug_describe_surface)) +- old_surf->context->surface_destroy(old_surf->context, old_surf); ++ old_surf->surface_destroy(old_surf->context, old_surf); + *ptr = surf; + } + +diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c +index 41146be..ccc5a7f 100644 +--- a/src/gallium/drivers/i915/i915_surface.c ++++ b/src/gallium/drivers/i915/i915_surface.c +@@ -294,6 +294,7 @@ i915_create_surface(struct pipe_context *ctx, + ps->u.tex.last_layer = surf_tmpl->u.tex.last_layer; + ps->usage = surf_tmpl->usage; + ps->context = ctx; ++ ps->surface_destroy = ctx->surface_destroy; + } + return ps; + } +diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c +index fa4ce5b..a2e657d 100644 +--- a/src/gallium/drivers/llvmpipe/lp_texture.c ++++ b/src/gallium/drivers/llvmpipe/lp_texture.c +@@ -532,6 +532,7 @@ llvmpipe_create_surface(struct pipe_context *pipe, + ps->u.tex.level = surf_tmpl->u.tex.level; + ps->u.tex.first_layer = surf_tmpl->u.tex.first_layer; + ps->u.tex.last_layer = surf_tmpl->u.tex.last_layer; ++ ps->surface_destroy = pipe->surface_destroy; + } + return ps; + } +diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h +index 840b3ee..c81c82d 100644 +--- a/src/gallium/include/pipe/p_state.h ++++ b/src/gallium/include/pipe/p_state.h +@@ -304,6 +304,9 @@ struct pipe_surface + unsigned last_element; + } buf; + } u; ++ ++ void (*surface_destroy)(struct pipe_context *ctx, ++ struct pipe_surface *); + }; + + +-- +1.7.5.3.367.ga9930 + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11_p2-Revert-i965-Avoid-generating-MOVs-for-most-ir_assign.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11_p2-Revert-i965-Avoid-generating-MOVs-for-most-ir_assign.patch new file mode 100644 index 0000000000..1c28b14cca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11_p2-Revert-i965-Avoid-generating-MOVs-for-most-ir_assign.patch @@ -0,0 +1,98 @@ +From 2d44f205007e0928ebf9a9b914c9308ae3dd2a12 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= +Date: Wed, 19 Oct 2011 19:26:08 -0700 +Subject: [PATCH] Revert "i965: Avoid generating MOVs for most ir_assignment + handling." + +This reverts commit dc7f449d1ac53a66e6efb56ccf2a5953418a26ca. +--- + src/mesa/drivers/dri/i965/brw_fs.h | 5 --- + src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 43 -------------------------- + 2 files changed, 0 insertions(+), 48 deletions(-) + +diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h +index f344330..435ac98 100644 +--- a/src/mesa/drivers/dri/i965/brw_fs.h ++++ b/src/mesa/drivers/dri/i965/brw_fs.h +@@ -528,11 +528,6 @@ public: + + void emit_color_write(int index, int first_color_mrf, fs_reg color); + void emit_fb_writes(); +- bool try_rewrite_rhs_to_dst(ir_assignment *ir, +- fs_reg dst, +- fs_reg src, +- fs_inst *pre_rhs_inst, +- fs_inst *last_rhs_inst); + void emit_assignment_writes(fs_reg &l, fs_reg &r, + const glsl_type *type, bool predicated); + +diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +index e523ae7..d328454 100644 +--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp ++++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +@@ -505,42 +505,6 @@ fs_visitor::emit_assignment_writes(fs_reg &l, fs_reg &r, + } + } + +-/* If the RHS processing resulted in an instruction generating a +- * temporary value, and it would be easy to rewrite the instruction to +- * generate its result right into the LHS instead, do so. This ends +- * up reliably removing instructions where it can be tricky to do so +- * later without real UD chain information. +- */ +-bool +-fs_visitor::try_rewrite_rhs_to_dst(ir_assignment *ir, +- fs_reg dst, +- fs_reg src, +- fs_inst *pre_rhs_inst, +- fs_inst *last_rhs_inst) +-{ +- if (pre_rhs_inst == last_rhs_inst) +- return false; /* No instructions generated to work with. */ +- +- /* Only attempt if we're doing a direct assignment. */ +- if (ir->condition || +- !(ir->lhs->type->is_scalar() || +- (ir->lhs->type->is_vector() && +- ir->write_mask == (1 << ir->lhs->type->vector_elements) - 1))) +- return false; +- +- /* Make sure the last instruction generated our source reg. */ +- if (last_rhs_inst->predicated || +- last_rhs_inst->force_uncompressed || +- last_rhs_inst->force_sechalf || +- !src.equals(&last_rhs_inst->dst)) +- return false; +- +- /* Success! Rewrite the instruction. */ +- last_rhs_inst->dst = dst; +- +- return true; +-} +- + void + fs_visitor::visit(ir_assignment *ir) + { +@@ -551,19 +515,12 @@ fs_visitor::visit(ir_assignment *ir) + ir->lhs->accept(this); + l = this->result; + +- fs_inst *pre_rhs_inst = (fs_inst *) this->instructions.get_tail(); +- + ir->rhs->accept(this); + r = this->result; + +- fs_inst *last_rhs_inst = (fs_inst *) this->instructions.get_tail(); +- + assert(l.file != BAD_FILE); + assert(r.file != BAD_FILE); + +- if (try_rewrite_rhs_to_dst(ir, l, r, pre_rhs_inst, last_rhs_inst)) +- return; +- + if (ir->condition) { + emit_bool_to_cond_code(ir->condition); + } +-- +1.7.5.3.367.ga9930 + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11_p2-pkgconfig.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11_p2-pkgconfig.patch new file mode 100644 index 0000000000..1b70a17666 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/7.11_p2-pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/configs/default b/configs/default +index 2b1bf9b..2c3d827 100644 +--- a/configs/default ++++ b/configs/default +@@ -40,7 +40,7 @@ MKDEP_OPTIONS = -fdepend + MAKE = make + FLEX = flex + BISON = bison +-PKG_CONFIG = pkg-config ++#PKG_CONFIG = pkg-config + + # Use MINSTALL for installing libraries, INSTALL for everything else + MINSTALL = $(SHELL) $(TOP)/bin/minstall diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-array-overflow.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-array-overflow.patch new file mode 100644 index 0000000000..416cde5448 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-array-overflow.patch @@ -0,0 +1,12 @@ +diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp +index 2f1c9f5..9991c90 100644 +--- a/src/glsl/link_uniforms.cpp ++++ b/src/glsl/link_uniforms.cpp +@@ -270,6 +270,7 @@ private: + * array elements for arrays. + */ + this->next_sampler += MAX2(1, this->uniforms[id].array_elements); ++ this->next_sampler = MIN2(this->next_sampler, MAX_SAMPLERS); + + const gl_texture_index target = base_type->sampler_index(); + const unsigned shadow = base_type->sampler_shadow; diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-dead-code-local-hack.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-dead-code-local-hack.patch new file mode 100644 index 0000000000..5ad2fa48d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-dead-code-local-hack.patch @@ -0,0 +1,41 @@ +From 0d50be1a1ff4264bd48f93b0e85544ace1807c0a Mon Sep 17 00:00:00 2001 +From: Chris Wolfe +Date: Tue, 7 Aug 2012 18:57:05 -0400 +Subject: [PATCH] glsl: Restrict opt_dead_code_local to variable assignment + +Temporary fix to Chrome OS bug + +Change-Id: I4ca51603da18e3156f90ed77490902b3f8229f5c +--- + src/glsl/opt_dead_code_local.cpp | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/src/glsl/opt_dead_code_local.cpp b/src/glsl/opt_dead_code_local.cpp +index 4af78a7..0e3a7f4 100644 +--- a/src/glsl/opt_dead_code_local.cpp ++++ b/src/glsl/opt_dead_code_local.cpp +@@ -252,10 +252,20 @@ process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments) + } + } + ++ if (ir->lhs->as_dereference_variable() == NULL) { ++ /* HACK: Chrome has encountered bugs when this optimization processes ++ * array elements in the lhs. For example: ++ * vec4 tmp; tmp[3] = 1.0; ++ * is incorrectly recorded as writing to only the (x) element, and will ++ * be killed if a later statement replaces (x). To sidestep this problem ++ * temporarily, trim only assignments to bare variables. ++ */ ++ return progress; ++ } ++ + /* Add this instruction to the assignment list available to be removed. */ + assignment_entry *entry = new(ctx) assignment_entry(var, ir); + assignments->push_tail(entry); +- + if (debug) { + printf("add %s\n", var->name); + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-disable-guardband.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-disable-guardband.patch new file mode 100644 index 0000000000..a799e010c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-disable-guardband.patch @@ -0,0 +1,24 @@ +diff -Naur Mesa-8.1.0/src/mesa/drivers/dri/i965/gen6_clip_state.c Mesa-8.1.0_b/src/mesa/drivers/dri/i965/gen6_clip_state.c +--- Mesa-8.1.0/src/mesa/drivers/dri/i965/gen6_clip_state.c 2012-10-25 17:50:33.900301412 -0700 ++++ Mesa-8.1.0_b/src/mesa/drivers/dri/i965/gen6_clip_state.c 2012-10-26 18:09:15.959711652 -0700 +@@ -74,7 +74,7 @@ + GEN6_CLIP_MODE_NORMAL | + nonperspective_barycentric_enable_flag | + GEN6_CLIP_XY_TEST | +- GEN6_CLIP_GB_TEST | ++ //GEN6_CLIP_GB_TEST | + userclip << GEN6_USER_CLIP_CLIP_DISTANCES_SHIFT | + depth_clamp | + provoking); +diff -Naur Mesa-8.1.0/src/mesa/drivers/dri/i965/gen7_clip_state.c Mesa-8.1.0_b/src/mesa/drivers/dri/i965/gen7_clip_state.c +--- Mesa-8.1.0/src/mesa/drivers/dri/i965/gen7_clip_state.c 2012-10-25 17:50:33.900301412 -0700 ++++ Mesa-8.1.0_b/src/mesa/drivers/dri/i965/gen7_clip_state.c 2012-10-26 18:10:35.230562103 -0700 +@@ -101,7 +101,7 @@ + GEN6_CLIP_MODE_NORMAL | + nonperspective_barycentric_enable_flag | + GEN6_CLIP_XY_TEST | +- GEN6_CLIP_GB_TEST | ++ //GEN6_CLIP_GB_TEST | + userclip << GEN6_USER_CLIP_CLIP_DISTANCES_SHIFT | + depth_clamp | + provoking); diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-lastlevel.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-lastlevel.patch new file mode 100644 index 0000000000..777822e5d6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/8.1-lastlevel.patch @@ -0,0 +1,16 @@ +diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c +index 68f4ff4..2d8ef91 100644 +--- a/src/mesa/drivers/dri/intel/intel_tex_image.c ++++ b/src/mesa/drivers/dri/intel/intel_tex_image.c +@@ -88,6 +88,11 @@ intel_miptree_create_for_teximage(struct intel_context *intel, + lastLevel = firstLevel; + } else { + lastLevel = firstLevel + _mesa_logbase2(MAX2(MAX2(width, height), depth)); ++ /* We tried to guess the last level based on the texture size, make ++ * sure we don't go past MAX_TEXTURE_LEVELS since it's hardcoded ++ * in many places. ++ */ ++ lastLevel = MIN2(lastLevel, MAX_TEXTURE_LEVELS - 1); + } + } + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-Add-builtin-function-cpp.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-Add-builtin-function-cpp.patch new file mode 100644 index 0000000000..06926cd84b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-Add-builtin-function-cpp.patch @@ -0,0 +1,14661 @@ +From 3fcdc6beb6adb1102e51abc6c678b714e5ccb056 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= +Date: Thu, 1 Nov 2012 16:43:26 -0700 +Subject: [PATCH] Add builtin_function.cpp + +--- + src/glsl/builtin_function.cpp |14642 +++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 14642 insertions(+), 0 deletions(-) + create mode 100644 src/glsl/builtin_function.cpp + +diff --git src/glsl/builtin_function.cpp src/glsl/builtin_function.cpp +new file mode 100644 +index 0000000..afdfc68 +--- /dev/null ++++ src/glsl/builtin_function.cpp +@@ -0,0 +1,14642 @@ ++/* DO NOT MODIFY - automatically generated by generate_builtins.py */ ++/* ++ * Copyright © 2010 Intel Corporation ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include ++#include "main/core.h" /* for struct gl_shader */ ++#include "glsl_parser_extras.h" ++#include "ir_reader.h" ++#include "program.h" ++#include "ast.h" ++ ++extern "C" struct gl_shader * ++_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type); ++ ++gl_shader * ++read_builtins(GLenum target, const char *protos, const char **functions, unsigned count) ++{ ++ struct gl_context fakeCtx; ++ fakeCtx.API = API_OPENGL; ++ fakeCtx.Const.GLSLVersion = 140; ++ fakeCtx.Extensions.ARB_ES2_compatibility = true; ++ fakeCtx.Const.ForceGLSLExtensionsWarn = false; ++ gl_shader *sh = _mesa_new_shader(NULL, 0, target); ++ struct _mesa_glsl_parse_state *st = ++ new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh); ++ ++ st->language_version = 140; ++ st->symbols->language_version = 140; ++ st->ARB_texture_rectangle_enable = true; ++ st->EXT_texture_array_enable = true; ++ st->OES_EGL_image_external_enable = true; ++ st->ARB_shader_bit_encoding_enable = true; ++ _mesa_glsl_initialize_types(st); ++ ++ sh->ir = new(sh) exec_list; ++ sh->symbols = st->symbols; ++ ++ /* Read the IR containing the prototypes */ ++ _mesa_glsl_read_ir(st, sh->ir, protos, true); ++ ++ /* Read ALL the function bodies, telling the IR reader not to scan for ++ * prototypes (we've already created them). The IR reader will skip any ++ * signature that does not already exist as a prototype. ++ */ ++ for (unsigned i = 0; i < count; i++) { ++ _mesa_glsl_read_ir(st, sh->ir, functions[i], false); ++ ++ if (st->error) { ++ printf("error reading builtin: %.35s ...\n", functions[i]); ++ printf("Info log:\n%s\n", st->info_log); ++ ralloc_free(sh); ++ return NULL; ++ } ++ } ++ ++ reparent_ir(sh->ir, sh); ++ delete st; ++ ++ return sh; ++} ++ ++static const char builtin_abs[] = ++ "((function abs\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) int arg0))\n" ++ " ((return (expression int abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0))\n" ++ " ((return (expression ivec2 abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0))\n" ++ " ((return (expression ivec3 abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0))\n" ++ " ((return (expression ivec4 abs (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_acos[] = ++ "((function acos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((declare () float s)\n" ++ " (call asin (var_ref s) ((var_ref x)))\n" ++ " (return (expression float - (constant float (1.5707964)) (var_ref s)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((declare () vec2 s)\n" ++ " (call asin (var_ref s) ((var_ref x)))\n" ++ " (return (expression vec2 - (constant float (1.5707964)) (var_ref s)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((declare () vec3 s)\n" ++ " (call asin (var_ref s) ((var_ref x)))\n" ++ " (return (expression vec3 - (constant float (1.5707964)) (var_ref s)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((declare () vec4 s)\n" ++ " (call asin (var_ref s) ((var_ref x)))\n" ++ " (return (expression vec4 - (constant float (1.5707964)) (var_ref s)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_acosh[] = ++ "((function acosh\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float log (expression float + (var_ref x) (expression float sqrt (expression float - (expression float * (var_ref x) (var_ref x)) (constant float (1)))))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 log (expression vec2 + (var_ref x) (expression vec2 sqrt (expression vec2 - (expression vec2 * (var_ref x) (var_ref x)) (constant float (1)))))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 log (expression vec3 + (var_ref x) (expression vec3 sqrt (expression vec3 - (expression vec3 * (var_ref x) (var_ref x)) (constant float (1)))))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 log (expression vec4 + (var_ref x) (expression vec4 sqrt (expression vec4 - (expression vec4 * (var_ref x) (var_ref x)) (constant float (1)))))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_all[] = ++ "((function all\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 arg0))\n" ++ " ((return (expression bool && (swiz x (var_ref arg0))(swiz y (var_ref arg0))))))\n" ++ "\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 arg0))\n" ++ " ((return (expression bool && (expression bool && (swiz x (var_ref arg0))(swiz y (var_ref arg0))) (swiz z (var_ref arg0))))))\n" ++ "\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 arg0))\n" ++ " ((return (expression bool && (expression bool && (expression bool && (swiz x (var_ref arg0))(swiz y (var_ref arg0))) (swiz z (var_ref arg0))) (swiz w (var_ref arg0))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_any[] = ++ "((function any\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 arg0))\n" ++ " ((return (expression bool any (var_ref arg0)))))\n" ++ "\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 arg0))\n" ++ " ((return (expression bool any (var_ref arg0)))))\n" ++ "\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 arg0))\n" ++ " ((return (expression bool any (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_asin[] = ++ "((function asin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float *\n" ++ " (expression float sign (var_ref x))\n" ++ " (expression float -\n" ++ " (constant float (1.5707964))\n" ++ " (expression float *\n" ++ " (expression float sqrt\n" ++ " (expression float -\n" ++ " (constant float (1.0))\n" ++ " (expression float abs (var_ref x))))\n" ++ " (expression float +\n" ++ " (constant float (1.5707964))\n" ++ " (expression float *\n" ++ " (expression float abs (var_ref x))\n" ++ " (expression float +\n" ++ " (constant float (-0.21460183))\n" ++ " (expression float *\n" ++ " (expression float abs (var_ref x))\n" ++ " (expression float +\n" ++ " (constant float (0.086566724))\n" ++ " (expression float *\n" ++ " (expression float abs (var_ref x))\n" ++ " (constant float (-0.03102955))\n" ++ " ))))))))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 *\n" ++ " (expression vec2 sign (var_ref x))\n" ++ " (expression vec2 -\n" ++ " (constant float (1.5707964))\n" ++ " (expression vec2 *\n" ++ " (expression vec2 sqrt\n" ++ " (expression vec2 -\n" ++ " (constant float (1.0))\n" ++ " (expression vec2 abs (var_ref x))))\n" ++ " (expression vec2 +\n" ++ " (constant float (1.5707964))\n" ++ " (expression vec2 *\n" ++ " (expression vec2 abs (var_ref x))\n" ++ " (expression vec2 +\n" ++ " (constant float (-0.21460183))\n" ++ " (expression vec2 *\n" ++ " (expression vec2 abs (var_ref x))\n" ++ " (expression vec2 +\n" ++ " (constant float (0.086566724))\n" ++ " (expression vec2 *\n" ++ " (expression vec2 abs (var_ref x))\n" ++ " (constant float (-0.03102955))\n" ++ " ))))))))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 *\n" ++ " (expression vec3 sign (var_ref x))\n" ++ " (expression vec3 -\n" ++ " (constant float (1.5707964))\n" ++ " (expression vec3 *\n" ++ " (expression vec3 sqrt\n" ++ " (expression vec3 -\n" ++ " (constant float (1.0))\n" ++ " (expression vec3 abs (var_ref x))))\n" ++ " (expression vec3 +\n" ++ " (constant float (1.5707964))\n" ++ " (expression vec3 *\n" ++ " (expression vec3 abs (var_ref x))\n" ++ " (expression vec3 +\n" ++ " (constant float (-0.21460183))\n" ++ " (expression vec3 *\n" ++ " (expression vec3 abs (var_ref x))\n" ++ " (expression vec3 +\n" ++ " (constant float (0.086566724))\n" ++ " (expression vec3 *\n" ++ " (expression vec3 abs (var_ref x))\n" ++ " (constant float (-0.03102955))\n" ++ " ))))))))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 *\n" ++ " (expression vec4 sign (var_ref x))\n" ++ " (expression vec4 -\n" ++ " (constant float (1.5707964))\n" ++ " (expression vec4 *\n" ++ " (expression vec4 sqrt\n" ++ " (expression vec4 -\n" ++ " (constant float (1.0))\n" ++ " (expression vec4 abs (var_ref x))))\n" ++ " (expression vec4 +\n" ++ " (constant float (1.5707964))\n" ++ " (expression vec4 *\n" ++ " (expression vec4 abs (var_ref x))\n" ++ " (expression vec4 +\n" ++ " (constant float (-0.21460183))\n" ++ " (expression vec4 *\n" ++ " (expression vec4 abs (var_ref x))\n" ++ " (expression vec4 +\n" ++ " (constant float (0.086566724))\n" ++ " (expression vec4 *\n" ++ " (expression vec4 abs (var_ref x))\n" ++ " (constant float (-0.03102955))\n" ++ " ))))))))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_asinh[] = ++ "((function asinh\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float *\n" ++ " (expression float sign (var_ref x))\n" ++ " (expression float log\n" ++ " (expression float +\n" ++ " (expression float abs (var_ref x))\n" ++ " (expression float sqrt\n" ++ " (expression float +\n" ++ " (expression float * (var_ref x) (var_ref x))\n" ++ " (constant float (1))))))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 *\n" ++ " (expression vec2 sign (var_ref x))\n" ++ " (expression vec2 log\n" ++ " (expression vec2 +\n" ++ " (expression vec2 abs (var_ref x))\n" ++ " (expression vec2 sqrt\n" ++ " (expression vec2 +\n" ++ " (expression vec2 * (var_ref x) (var_ref x))\n" ++ " (constant float (1))))))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 *\n" ++ " (expression vec3 sign (var_ref x))\n" ++ " (expression vec3 log\n" ++ " (expression vec3 +\n" ++ " (expression vec3 abs (var_ref x))\n" ++ " (expression vec3 sqrt\n" ++ " (expression vec3 +\n" ++ " (expression vec3 * (var_ref x) (var_ref x))\n" ++ " (constant float (1))))))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 *\n" ++ " (expression vec4 sign (var_ref x))\n" ++ " (expression vec4 log\n" ++ " (expression vec4 +\n" ++ " (expression vec4 abs (var_ref x))\n" ++ " (expression vec4 sqrt\n" ++ " (expression vec4 +\n" ++ " (expression vec4 * (var_ref x) (var_ref x))\n" ++ " (constant float (1))))))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_atan[] = ++ "((function atan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float y_over_x))\n" ++ " ((declare () float s)\n" ++ " (call asin (var_ref s)\n" ++ " ((expression float *\n" ++ " (var_ref y_over_x)\n" ++ " (expression float rsq\n" ++ " (expression float +\n" ++ " (expression float *\n" ++ " (var_ref y_over_x)\n" ++ " (var_ref y_over_x))\n" ++ " (constant float (1.0)))))))\n" ++ " (return (var_ref s))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y_over_x))\n" ++ " ((declare () vec2 s)\n" ++ " (call asin (var_ref s)\n" ++ " ((expression vec2 *\n" ++ " (var_ref y_over_x)\n" ++ " (expression vec2 rsq\n" ++ " (expression vec2 +\n" ++ " (expression vec2 *\n" ++ " (var_ref y_over_x)\n" ++ " (var_ref y_over_x))\n" ++ " (constant float (1.0)))))))\n" ++ " (return (var_ref s))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y_over_x))\n" ++ " ((declare () vec3 s)\n" ++ " (call asin (var_ref s)\n" ++ " ((expression vec3 *\n" ++ " (var_ref y_over_x)\n" ++ " (expression vec3 rsq\n" ++ " (expression vec3 +\n" ++ " (expression vec3 *\n" ++ " (var_ref y_over_x)\n" ++ " (var_ref y_over_x))\n" ++ " (constant float (1.0)))))))\n" ++ " (return (var_ref s))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y_over_x))\n" ++ " ((declare () vec4 s)\n" ++ " (call asin (var_ref s)\n" ++ " ((expression vec4 *\n" ++ " (var_ref y_over_x)\n" ++ " (expression vec4 rsq\n" ++ " (expression vec4 +\n" ++ " (expression vec4 *\n" ++ " (var_ref y_over_x)\n" ++ " (var_ref y_over_x))\n" ++ " (constant float (1.0)))))))\n" ++ " (return (var_ref s))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in ) float y)\n" ++ " (declare (in ) float x)\n" ++ " )\n" ++ " (\n" ++ " (declare () float r)\n" ++ " (if (expression bool >\n" ++ " (expression float abs (var_ref x))\n" ++ " (expression float * (constant float (1.0e-8)) (expression float abs (var_ref y)))) (\n" ++ " (call atan (var_ref r) ((expression float / (var_ref y) (var_ref x))))\n" ++ " (if (expression bool < (var_ref x) (constant float (0.000000)) ) (\n" ++ " (if (expression bool >= (var_ref y) (constant float (0.000000)) )\n" ++ " ((assign (x) (var_ref r) (expression float + (var_ref r) (constant float (3.141593)))))\n" ++ " ((assign (x) (var_ref r) (expression float - (var_ref r) (constant float (3.141593))))))\n" ++ " )\n" ++ " (\n" ++ " ))\n" ++ " )\n" ++ " (\n" ++ " (declare () float sgn)\n" ++ " (assign (x) (var_ref sgn) (expression float sign (var_ref y)))\n" ++ " (assign (x) (var_ref r) (expression float * (var_ref sgn) (constant float (1.5707965))))\n" ++ " ))\n" ++ "\n" ++ " (return (var_ref r) )\n" ++ " ))\n" ++ "\n" ++ "\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) vec2 x))\n" ++ " ((declare () vec2 r)\n" ++ " (declare () float temp)\n" ++ " (call atan (var_ref temp) ((swiz x (var_ref y)) (swiz x (var_ref x))))\n" ++ " (assign (x) (var_ref r) (var_ref temp))\n" ++ " (call atan (var_ref temp) ((swiz y (var_ref y)) (swiz y (var_ref x))))\n" ++ " (assign (y) (var_ref r) (var_ref temp))\n" ++ " (return (var_ref r))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) vec3 x))\n" ++ " ((declare () vec3 r)\n" ++ " (declare () float temp)\n" ++ " (call atan (var_ref temp) ((swiz x (var_ref y)) (swiz x (var_ref x))))\n" ++ " (assign (x) (var_ref r) (var_ref temp))\n" ++ " (call atan (var_ref temp) ((swiz y (var_ref y)) (swiz y (var_ref x))))\n" ++ " (assign (y) (var_ref r) (var_ref temp))\n" ++ " (call atan (var_ref temp) ((swiz z (var_ref y)) (swiz z (var_ref x))))\n" ++ " (assign (z) (var_ref r) (var_ref temp))\n" ++ " (return (var_ref r))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) vec4 x))\n" ++ " ((declare () vec4 r)\n" ++ " (declare () float temp)\n" ++ " (call atan (var_ref temp) ((swiz x (var_ref y)) (swiz x (var_ref x))))\n" ++ " (assign (x) (var_ref r) (var_ref temp))\n" ++ " (call atan (var_ref temp) ((swiz y (var_ref y)) (swiz y (var_ref x))))\n" ++ " (assign (y) (var_ref r) (var_ref temp))\n" ++ " (call atan (var_ref temp) ((swiz z (var_ref y)) (swiz z (var_ref x))))\n" ++ " (assign (z) (var_ref r) (var_ref temp))\n" ++ " (call atan (var_ref temp) ((swiz w (var_ref y)) (swiz w (var_ref x))))\n" ++ " (assign (w) (var_ref r) (var_ref temp))\n" ++ " (return (var_ref r))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_atanh[] = ++ "((function atanh\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float * (constant float (0.5))\n" ++ " (expression float log\n" ++ " (expression float /\n" ++ " (expression float + (constant float (1)) (var_ref x))\n" ++ " (expression float - (constant float (1)) (var_ref x))))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 * (constant float (0.5))\n" ++ " (expression vec2 log\n" ++ " (expression vec2 /\n" ++ " (expression vec2 + (constant float (1)) (var_ref x))\n" ++ " (expression vec2 - (constant float (1)) (var_ref x))))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 * (constant float (0.5))\n" ++ " (expression vec3 log\n" ++ " (expression vec3 /\n" ++ " (expression vec3 + (constant float (1)) (var_ref x))\n" ++ " (expression vec3 - (constant float (1)) (var_ref x))))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 * (constant float (0.5))\n" ++ " (expression vec4 log\n" ++ " (expression vec4 /\n" ++ " (expression vec4 + (constant float (1)) (var_ref x))\n" ++ " (expression vec4 - (constant float (1)) (var_ref x))))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_ceil[] = ++ "((function ceil\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float ceil (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 ceil (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 ceil (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 ceil (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_clamp[] = ++ "((function clamp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0)\n" ++ " (declare (in) float arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression float max (expression float min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1)\n" ++ " (declare (in) vec2 arg2))\n" ++ " ((return (expression vec2 max (expression vec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1)\n" ++ " (declare (in) vec3 arg2))\n" ++ " ((return (expression vec3 max (expression vec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1)\n" ++ " (declare (in) vec4 arg2))\n" ++ " ((return (expression vec4 max (expression vec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) float arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression vec2 max (expression vec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) float arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression vec3 max (expression vec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) float arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression vec4 max (expression vec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) int arg0)\n" ++ " (declare (in) int arg1)\n" ++ " (declare (in) int arg2))\n" ++ " ((return (expression int max (expression int min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1)\n" ++ " (declare (in) ivec2 arg2))\n" ++ " ((return (expression ivec2 max (expression ivec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1)\n" ++ " (declare (in) ivec3 arg2))\n" ++ " ((return (expression ivec3 max (expression ivec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1)\n" ++ " (declare (in) ivec4 arg2))\n" ++ " ((return (expression ivec4 max (expression ivec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) int arg1)\n" ++ " (declare (in) int arg2))\n" ++ " ((return (expression ivec2 max (expression ivec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) int arg1)\n" ++ " (declare (in) int arg2))\n" ++ " ((return (expression ivec3 max (expression ivec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) int arg1)\n" ++ " (declare (in) int arg2))\n" ++ " ((return (expression ivec4 max (expression ivec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uint\n" ++ " (parameters\n" ++ " (declare (in) uint arg0)\n" ++ " (declare (in) uint arg1)\n" ++ " (declare (in) uint arg2))\n" ++ " ((return (expression uint max (expression uint min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1)\n" ++ " (declare (in) uvec2 arg2))\n" ++ " ((return (expression uvec2 max (expression uvec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1)\n" ++ " (declare (in) uvec3 arg2))\n" ++ " ((return (expression uvec3 max (expression uvec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1)\n" ++ " (declare (in) uvec4 arg2))\n" ++ " ((return (expression uvec4 max (expression uvec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uint arg1)\n" ++ " (declare (in) uint arg2))\n" ++ " ((return (expression uvec2 max (expression uvec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uint arg1)\n" ++ " (declare (in) uint arg2))\n" ++ " ((return (expression uvec3 max (expression uvec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uint arg1)\n" ++ " (declare (in) uint arg2))\n" ++ " ((return (expression uvec4 max (expression uvec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_cos[] = ++ "((function cos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ((return (expression float cos (var_ref angle)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ((return (expression vec2 cos (var_ref angle)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ((return (expression vec3 cos (var_ref angle)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ((return (expression vec4 cos (var_ref angle)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_cosh[] = ++ "((function cosh\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float * (constant float (0.5))\n" ++ " (expression float +\n" ++ " (expression float exp (var_ref x))\n" ++ " (expression float exp (expression float neg (var_ref x))))))))\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 * (constant float (0.5))\n" ++ " (expression vec2 +\n" ++ " (expression vec2 exp (var_ref x))\n" ++ " (expression vec2 exp (expression vec2 neg (var_ref x))))))))\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 * (constant float (0.5))\n" ++ " (expression vec3 +\n" ++ " (expression vec3 exp (var_ref x))\n" ++ " (expression vec3 exp (expression vec3 neg (var_ref x))))))))\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 * (constant float (0.5))\n" ++ " (expression vec4 +\n" ++ " (expression vec4 exp (var_ref x))\n" ++ " (expression vec4 exp (expression vec4 neg (var_ref x))))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_cross[] = ++ "((function cross\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 a)\n" ++ " (declare (in) vec3 b))\n" ++ " ((return (expression vec3 -\n" ++ " (expression vec3 * (swiz yzx (var_ref a)) (swiz zxy (var_ref b)))\n" ++ " (expression vec3 * (swiz zxy (var_ref a)) (swiz yzx (var_ref b)))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_dFdx[] = ++ "((function dFdx\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ((return (expression float dFdx (var_ref p)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ((return (expression vec2 dFdx (var_ref p)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ((return (expression vec3 dFdx (var_ref p)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ((return (expression vec4 dFdx (var_ref p)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_dFdy[] = ++ "((function dFdy\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ((return (expression float dFdy (var_ref p)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ((return (expression vec2 dFdy (var_ref p)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ((return (expression vec3 dFdy (var_ref p)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ((return (expression vec4 dFdy (var_ref p)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_degrees[] = ++ "((function degrees\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float * (var_ref arg0) (constant float (57.295780))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 * (var_ref arg0) (constant float (57.295780))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 * (var_ref arg0) (constant float (57.295780))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 * (var_ref arg0) (constant float (57.295780))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_distance[] = ++ "((function distance\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p0)\n" ++ " (declare (in) float p1))\n" ++ " ((return (expression float abs (expression float - (var_ref p0) (var_ref p1))))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 p0)\n" ++ " (declare (in) vec2 p1))\n" ++ " ((declare () vec2 p)\n" ++ " (assign (xy) (var_ref p) (expression vec2 - (var_ref p0) (var_ref p1)))\n" ++ " (return (expression float sqrt (expression float dot (var_ref p) (var_ref p))))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 p0)\n" ++ " (declare (in) vec3 p1))\n" ++ " ((declare () vec3 p)\n" ++ " (assign (xyz) (var_ref p) (expression vec3 - (var_ref p0) (var_ref p1)))\n" ++ " (return (expression float sqrt (expression float dot (var_ref p) (var_ref p))))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 p0)\n" ++ " (declare (in) vec4 p1))\n" ++ " ((declare () vec4 p)\n" ++ " (assign (xyzw) (var_ref p) (expression vec4 - (var_ref p0) (var_ref p1)))\n" ++ " (return (expression float sqrt (expression float dot (var_ref p) (var_ref p))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_dot[] = ++ "((function dot\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression float * (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression float dot (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression float dot (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression float dot (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_equal[] = ++ "((function equal\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 arg0)\n" ++ " (declare (in) bvec2 arg1))\n" ++ " ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 arg0)\n" ++ " (declare (in) bvec3 arg1))\n" ++ " ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 arg0)\n" ++ " (declare (in) bvec4 arg1))\n" ++ " ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_exp[] = ++ "((function exp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float exp (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 exp (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 exp (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 exp (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_exp2[] = ++ "((function exp2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float exp2 (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 exp2 (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 exp2 (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 exp2 (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_faceforward[] = ++ "((function faceforward\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float N)\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float Nref))\n" ++ " ((if (expression bool < (expression float * (var_ref Nref) (var_ref I)) (constant float (0)))\n" ++ " ((return (var_ref N)))\n" ++ " ((return (expression float neg (var_ref N)))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 N)\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 Nref))\n" ++ " ((if (expression bool < (expression float dot (var_ref Nref) (var_ref I)) (constant float (0)))\n" ++ " ((return (var_ref N)))\n" ++ " ((return (expression vec2 neg (var_ref N)))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 N)\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 Nref))\n" ++ " ((if (expression bool < (expression float dot (var_ref Nref) (var_ref I)) (constant float (0)))\n" ++ " ((return (var_ref N)))\n" ++ " ((return (expression vec3 neg (var_ref N)))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 N)\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 Nref))\n" ++ " ((if (expression bool < (expression float dot (var_ref Nref) (var_ref I)) (constant float (0)))\n" ++ " ((return (var_ref N)))\n" ++ " ((return (expression vec4 neg (var_ref N)))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_floatBitsToInt[] = ++ "((function floatBitsToInt\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) float arg))\n" ++ " ((return (expression int bitcast_f2i (var_ref arg)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg))\n" ++ " ((return (expression ivec2 bitcast_f2i (var_ref arg)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg))\n" ++ " ((return (expression ivec3 bitcast_f2i (var_ref arg)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg))\n" ++ " ((return (expression ivec4 bitcast_f2i (var_ref arg)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_floatBitsToUint[] = ++ "((function floatBitsToUint\n" ++ " (signature uint\n" ++ " (parameters\n" ++ " (declare (in) float arg))\n" ++ " ((return (expression uint bitcast_f2u (var_ref arg)))))\n" ++ "\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg))\n" ++ " ((return (expression uvec2 bitcast_f2u (var_ref arg)))))\n" ++ "\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg))\n" ++ " ((return (expression uvec3 bitcast_f2u (var_ref arg)))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg))\n" ++ " ((return (expression uvec4 bitcast_f2u (var_ref arg)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_floor[] = ++ "((function floor\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float floor (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 floor (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 floor (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 floor (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_fract[] = ++ "((function fract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float fract (var_ref x)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 fract (var_ref x)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 fract (var_ref x)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 fract (var_ref x)))))\n" ++ "))\n" ++ "\n" ++ "" ++; ++static const char builtin_ftransform[] = ++ "((declare (uniform) mat4 gl_ModelViewProjectionMatrix)\n" ++ " (declare (in) vec4 gl_Vertex)\n" ++ " (function ftransform\n" ++ " (signature vec4\n" ++ " (parameters)\n" ++ " ((return (expression vec4 *\n" ++ " (var_ref gl_ModelViewProjectionMatrix)\n" ++ " (var_ref gl_Vertex)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_fwidth[] = ++ "((function fwidth\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ((return (expression float +\n" ++ " (expression float abs (expression float dFdx (var_ref p)))\n" ++ " (expression float abs (expression float dFdy (var_ref p)))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ((return (expression vec2 +\n" ++ " (expression vec2 abs (expression vec2 dFdx (var_ref p)))\n" ++ " (expression vec2 abs (expression vec2 dFdy (var_ref p)))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ((return (expression vec3 +\n" ++ " (expression vec3 abs (expression vec3 dFdx (var_ref p)))\n" ++ " (expression vec3 abs (expression vec3 dFdy (var_ref p)))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ((return (expression vec4 +\n" ++ " (expression vec4 abs (expression vec4 dFdx (var_ref p)))\n" ++ " (expression vec4 abs (expression vec4 dFdy (var_ref p)))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_greaterThan[] = ++ "((function greaterThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression bvec2 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression bvec3 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression bvec4 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression bvec2 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression bvec3 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression bvec4 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression bvec2 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression bvec3 > (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression bvec4 > (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_greaterThanEqual[] = ++ "((function greaterThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression bvec2 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression bvec3 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression bvec4 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression bvec2 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression bvec3 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression bvec4 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression bvec2 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression bvec3 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression bvec4 >= (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_intBitsToFloat[] = ++ "((function intBitsToFloat\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) int arg))\n" ++ " ((return (expression float bitcast_i2f (var_ref arg)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg))\n" ++ " ((return (expression vec2 bitcast_i2f (var_ref arg)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg))\n" ++ " ((return (expression vec3 bitcast_i2f (var_ref arg)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg))\n" ++ " ((return (expression vec4 bitcast_i2f (var_ref arg)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_inverse[] = ++ "(\n" ++ "(function inverse\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) mat2 m))\n" ++ " (\n" ++ " (declare () float det)\n" ++ " (declare () mat2 adj)\n" ++ " (declare (temporary) float assignment_tmp)\n" ++ " (assign (x) (var_ref assignment_tmp) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (0))) (var_ref assignment_tmp)) \n" ++ " (declare (temporary) float assignment_tmp@2)\n" ++ " (assign (x) (var_ref assignment_tmp@2) (expression float neg (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (1))) (var_ref assignment_tmp@2)) \n" ++ " (declare (temporary) float assignment_tmp@3)\n" ++ " (assign (x) (var_ref assignment_tmp@3) (expression float neg (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (0))) (var_ref assignment_tmp@3)) \n" ++ " (declare (temporary) float assignment_tmp@4)\n" ++ " (assign (x) (var_ref assignment_tmp@4) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (1))) (var_ref assignment_tmp@4)) \n" ++ " (declare (temporary) float assignment_tmp@5)\n" ++ " (assign (x) (var_ref assignment_tmp@5) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1)))))) \n" ++ " (assign (x) (var_ref det) (var_ref assignment_tmp@5)) \n" ++ " (return (expression mat2 / (var_ref adj) (var_ref det)))))\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) mat3 m))\n" ++ " (\n" ++ " (declare () float det)\n" ++ " (declare () mat3 adj)\n" ++ " (declare (temporary) float assignment_tmp)\n" ++ " (assign (x) (var_ref assignment_tmp) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2)))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (0))) (var_ref assignment_tmp)) \n" ++ " (declare (temporary) float assignment_tmp@6)\n" ++ " (assign (x) (var_ref assignment_tmp@6) (expression float neg (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (0))) (var_ref assignment_tmp@6)) \n" ++ " (declare (temporary) float assignment_tmp@7)\n" ++ " (assign (x) (var_ref assignment_tmp@7) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1)))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (0))) (var_ref assignment_tmp@7)) \n" ++ " (declare (temporary) float assignment_tmp@8)\n" ++ " (assign (x) (var_ref assignment_tmp@8) (expression float neg (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (1))) (var_ref assignment_tmp@8)) \n" ++ " (declare (temporary) float assignment_tmp@9)\n" ++ " (assign (x) (var_ref assignment_tmp@9) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2)))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (1))) (var_ref assignment_tmp@9)) \n" ++ " (declare (temporary) float assignment_tmp@10)\n" ++ " (assign (x) (var_ref assignment_tmp@10) (expression float neg (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (1))) (var_ref assignment_tmp@10)) \n" ++ " (declare (temporary) float assignment_tmp@11)\n" ++ " (assign (x) (var_ref assignment_tmp@11) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2)))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (2))) (var_ref assignment_tmp@11)) \n" ++ " (declare (temporary) float assignment_tmp@12)\n" ++ " (assign (x) (var_ref assignment_tmp@12) (expression float neg (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (2))) (var_ref assignment_tmp@12)) \n" ++ " (declare (temporary) float assignment_tmp@13)\n" ++ " (assign (x) (var_ref assignment_tmp@13) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1)))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (2))) (var_ref assignment_tmp@13)) \n" ++ " (declare (temporary) float assignment_tmp@14)\n" ++ " (assign (x) (var_ref assignment_tmp@14) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1)))))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))))))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0)))))))) \n" ++ " (assign (x) (var_ref det) (var_ref assignment_tmp@14)) \n" ++ " (return (expression mat3 / (var_ref adj) (var_ref det)))))\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) mat4 m))\n" ++ " (\n" ++ " (declare () float det)\n" ++ " (declare () mat4 adj)\n" ++ " (declare () float SubFactor18)\n" ++ " (declare () float SubFactor17)\n" ++ " (declare () float SubFactor16)\n" ++ " (declare () float SubFactor15)\n" ++ " (declare () float SubFactor14)\n" ++ " (declare () float SubFactor13)\n" ++ " (declare () float SubFactor12)\n" ++ " (declare () float SubFactor11)\n" ++ " (declare () float SubFactor10)\n" ++ " (declare () float SubFactor09)\n" ++ " (declare () float SubFactor08)\n" ++ " (declare () float SubFactor07)\n" ++ " (declare () float SubFactor06)\n" ++ " (declare () float SubFactor05)\n" ++ " (declare () float SubFactor04)\n" ++ " (declare () float SubFactor03)\n" ++ " (declare () float SubFactor02)\n" ++ " (declare () float SubFactor01)\n" ++ " (declare () float SubFactor00)\n" ++ " (declare (temporary) float assignment_tmp)\n" ++ " (assign (x) (var_ref assignment_tmp) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor00) (var_ref assignment_tmp)) \n" ++ " (declare (temporary) float assignment_tmp@15)\n" ++ " (assign (x) (var_ref assignment_tmp@15) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor01) (var_ref assignment_tmp@15)) \n" ++ " (declare (temporary) float assignment_tmp@16)\n" ++ " (assign (x) (var_ref assignment_tmp@16) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))))) \n" ++ " (assign (x) (var_ref SubFactor02) (var_ref assignment_tmp@16)) \n" ++ " (declare (temporary) float assignment_tmp@17)\n" ++ " (assign (x) (var_ref assignment_tmp@17) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor03) (var_ref assignment_tmp@17)) \n" ++ " (declare (temporary) float assignment_tmp@18)\n" ++ " (assign (x) (var_ref assignment_tmp@18) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))))) \n" ++ " (assign (x) (var_ref SubFactor04) (var_ref assignment_tmp@18)) \n" ++ " (declare (temporary) float assignment_tmp@19)\n" ++ " (assign (x) (var_ref assignment_tmp@19) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1)))))) \n" ++ " (assign (x) (var_ref SubFactor05) (var_ref assignment_tmp@19)) \n" ++ " (declare (temporary) float assignment_tmp@20)\n" ++ " (assign (x) (var_ref assignment_tmp@20) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor06) (var_ref assignment_tmp@20)) \n" ++ " (declare (temporary) float assignment_tmp@21)\n" ++ " (assign (x) (var_ref assignment_tmp@21) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor07) (var_ref assignment_tmp@21)) \n" ++ " (declare (temporary) float assignment_tmp@22)\n" ++ " (assign (x) (var_ref assignment_tmp@22) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2)))))) \n" ++ " (assign (x) (var_ref SubFactor08) (var_ref assignment_tmp@22)) \n" ++ " (declare (temporary) float assignment_tmp@23)\n" ++ " (assign (x) (var_ref assignment_tmp@23) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor09) (var_ref assignment_tmp@23)) \n" ++ " (declare (temporary) float assignment_tmp@24)\n" ++ " (assign (x) (var_ref assignment_tmp@24) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2)))))) \n" ++ " (assign (x) (var_ref SubFactor10) (var_ref assignment_tmp@24)) \n" ++ " (declare (temporary) float assignment_tmp@25)\n" ++ " (assign (x) (var_ref assignment_tmp@25) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor11) (var_ref assignment_tmp@25)) \n" ++ " (declare (temporary) float assignment_tmp@26)\n" ++ " (assign (x) (var_ref assignment_tmp@26) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (3))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1)))))) \n" ++ " (assign (x) (var_ref SubFactor12) (var_ref assignment_tmp@26)) \n" ++ " (declare (temporary) float assignment_tmp@27)\n" ++ " (assign (x) (var_ref assignment_tmp@27) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor13) (var_ref assignment_tmp@27)) \n" ++ " (declare (temporary) float assignment_tmp@28)\n" ++ " (assign (x) (var_ref assignment_tmp@28) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor14) (var_ref assignment_tmp@28)) \n" ++ " (declare (temporary) float assignment_tmp@29)\n" ++ " (assign (x) (var_ref assignment_tmp@29) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2)))))) \n" ++ " (assign (x) (var_ref SubFactor15) (var_ref assignment_tmp@29)) \n" ++ " (declare (temporary) float assignment_tmp@30)\n" ++ " (assign (x) (var_ref assignment_tmp@30) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (3)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3)))))) \n" ++ " (assign (x) (var_ref SubFactor16) (var_ref assignment_tmp@30)) \n" ++ " (declare (temporary) float assignment_tmp@31)\n" ++ " (assign (x) (var_ref assignment_tmp@31) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (2)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2)))))) \n" ++ " (assign (x) (var_ref SubFactor17) (var_ref assignment_tmp@31)) \n" ++ " (declare (temporary) float assignment_tmp@32)\n" ++ " (assign (x) (var_ref assignment_tmp@32) (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (1)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (2))) (constant int (0))) (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1)))))) \n" ++ " (assign (x) (var_ref SubFactor18) (var_ref assignment_tmp@32)) \n" ++ " (declare (temporary) float assignment_tmp@33)\n" ++ " (assign (x) (var_ref assignment_tmp@33) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (var_ref SubFactor00)) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))) (var_ref SubFactor01))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3))) (var_ref SubFactor02)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (0))) (var_ref assignment_tmp@33)) \n" ++ " (declare (temporary) float assignment_tmp@34)\n" ++ " (assign (x) (var_ref assignment_tmp@34) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (var_ref SubFactor00)) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))) (var_ref SubFactor03))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3))) (var_ref SubFactor04))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (0))) (var_ref assignment_tmp@34)) \n" ++ " (declare (temporary) float assignment_tmp@35)\n" ++ " (assign (x) (var_ref assignment_tmp@35) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (var_ref SubFactor01)) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (var_ref SubFactor03))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (3))) (var_ref SubFactor05)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (0))) (var_ref assignment_tmp@35)) \n" ++ " (declare (temporary) float assignment_tmp@36)\n" ++ " (assign (x) (var_ref assignment_tmp@36) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (0))) (var_ref SubFactor02)) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (1))) (var_ref SubFactor04))) (expression float * (array_ref (array_ref (var_ref m) (constant int (1))) (constant int (2))) (var_ref SubFactor05))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (3))) (constant int (0))) (var_ref assignment_tmp@36)) \n" ++ " (declare (temporary) float assignment_tmp@37)\n" ++ " (assign (x) (var_ref assignment_tmp@37) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor00)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor01))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor02))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (1))) (var_ref assignment_tmp@37)) \n" ++ " (declare (temporary) float assignment_tmp@38)\n" ++ " (assign (x) (var_ref assignment_tmp@38) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor00)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor03))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor04)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (1))) (var_ref assignment_tmp@38)) \n" ++ " (declare (temporary) float assignment_tmp@39)\n" ++ " (assign (x) (var_ref assignment_tmp@39) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor01)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor03))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor05))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (1))) (var_ref assignment_tmp@39)) \n" ++ " (declare (temporary) float assignment_tmp@40)\n" ++ " (assign (x) (var_ref assignment_tmp@40) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor02)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor04))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor05)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (3))) (constant int (1))) (var_ref assignment_tmp@40)) \n" ++ " (declare (temporary) float assignment_tmp@41)\n" ++ " (assign (x) (var_ref assignment_tmp@41) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor06)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor07))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor08)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (2))) (var_ref assignment_tmp@41)) \n" ++ " (declare (temporary) float assignment_tmp@42)\n" ++ " (assign (x) (var_ref assignment_tmp@42) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor06)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor09))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor10))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (2))) (var_ref assignment_tmp@42)) \n" ++ " (declare (temporary) float assignment_tmp@43)\n" ++ " (assign (x) (var_ref assignment_tmp@43) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor11)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor09))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor12)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (2))) (var_ref assignment_tmp@43)) \n" ++ " (declare (temporary) float assignment_tmp@44)\n" ++ " (assign (x) (var_ref assignment_tmp@44) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor08)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor10))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor12))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (3))) (constant int (2))) (var_ref assignment_tmp@44)) \n" ++ " (declare (temporary) float assignment_tmp@45)\n" ++ " (assign (x) (var_ref assignment_tmp@45) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor13)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor14))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor15))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (3))) (var_ref assignment_tmp@45)) \n" ++ " (declare (temporary) float assignment_tmp@46)\n" ++ " (assign (x) (var_ref assignment_tmp@46) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor13)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor16))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor17)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (3))) (var_ref assignment_tmp@46)) \n" ++ " (declare (temporary) float assignment_tmp@47)\n" ++ " (assign (x) (var_ref assignment_tmp@47) (expression float neg (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor14)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor16))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (var_ref SubFactor18))))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (3))) (var_ref assignment_tmp@47)) \n" ++ " (declare (temporary) float assignment_tmp@48)\n" ++ " (assign (x) (var_ref assignment_tmp@48) (expression float + (expression float - (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (var_ref SubFactor15)) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (var_ref SubFactor17))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (var_ref SubFactor18)))) \n" ++ " (assign (x) (array_ref (array_ref (var_ref adj) (constant int (3))) (constant int (3))) (var_ref assignment_tmp@48)) \n" ++ " (declare (temporary) float assignment_tmp@49)\n" ++ " (assign (x) (var_ref assignment_tmp@49) (expression float + (expression float + (expression float + (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (0))) (array_ref (array_ref (var_ref adj) (constant int (0))) (constant int (0)))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (1))) (array_ref (array_ref (var_ref adj) (constant int (1))) (constant int (0))))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (2))) (array_ref (array_ref (var_ref adj) (constant int (2))) (constant int (0))))) (expression float * (array_ref (array_ref (var_ref m) (constant int (0))) (constant int (3))) (array_ref (array_ref (var_ref adj) (constant int (3))) (constant int (0)))))) \n" ++ " (assign (x) (var_ref det) (var_ref assignment_tmp@49)) \n" ++ " (return (expression mat4 / (var_ref adj) (var_ref det)))))))" ++; ++static const char builtin_inversesqrt[] = ++ "((function inversesqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float rsq (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 rsq (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 rsq (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 rsq (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_isinf[] = ++ "((function isinf\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression bool == (expression float abs (var_ref x)) (constant float (+INF))))))\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression bvec2 == (expression vec2 abs (var_ref x)) (constant vec2 (+INF +INF))))))\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression bvec3 == (expression vec3 abs (var_ref x)) (constant vec3 (+INF +INF +INF))))))\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression bvec4 == (expression vec4 abs (var_ref x)) (constant vec4 (+INF +INF +INF +INF))))))))\n" ++ "" ++; ++static const char builtin_isnan[] = ++ "((function isnan\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression bool != (var_ref x) (var_ref x)))))\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression bvec2 != (var_ref x) (var_ref x)))))\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression bvec3 != (var_ref x) (var_ref x)))))\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression bvec4 != (var_ref x) (var_ref x)))))))\n" ++ "" ++; ++static const char builtin_length[] = ++ "((function length\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float abs (var_ref arg0)))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression float sqrt (expression float dot (var_ref arg0) (var_ref arg0))))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression float sqrt (expression float dot (var_ref arg0) (var_ref arg0))))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression float sqrt (expression float dot (var_ref arg0) (var_ref arg0))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_lessThan[] = ++ "((function lessThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression bvec2 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression bvec3 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression bvec4 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression bvec2 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression bvec3 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression bvec4 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression bvec2 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression bvec3 < (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression bvec4 < (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_lessThanEqual[] = ++ "((function lessThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression bvec2 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression bvec3 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression bvec4 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression bvec2 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression bvec3 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression bvec4 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression bvec2 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression bvec3 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression bvec4 <= (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_log[] = ++ "((function log\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float log (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 log (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 log (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 log (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_log2[] = ++ "((function log2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float log2 (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 log2 (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 log2 (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 log2 (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_matrixCompMult[] = ++ "((function matrixCompMult\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) mat2 x)\n" ++ " (declare (in) mat2 y))\n" ++ " ((declare () mat2 z)\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (0))) (expression vec2 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (1))) (expression vec2 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) mat3 x)\n" ++ " (declare (in) mat3 y))\n" ++ " ((declare () mat3 z)\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (0))) (expression vec3 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (1))) (expression vec3 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (2))) (expression vec3 * (array_ref (var_ref x) (constant int (2))) (array_ref (var_ref y) (constant int (2)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) mat4 x)\n" ++ " (declare (in) mat4 y))\n" ++ " ((declare () mat4 z)\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (0))) (expression vec4 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (1))) (expression vec4 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (2))) (expression vec4 * (array_ref (var_ref x) (constant int (2))) (array_ref (var_ref y) (constant int (2)))))\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (3))) (expression vec4 * (array_ref (var_ref x) (constant int (3))) (array_ref (var_ref y) (constant int (3)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat2x3\n" ++ " (parameters\n" ++ " (declare (in) mat2x3 x)\n" ++ " (declare (in) mat2x3 y))\n" ++ " ((declare () mat2x3 z)\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (0))) (expression vec3 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (1))) (expression vec3 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat3x2\n" ++ " (parameters\n" ++ " (declare (in) mat3x2 x)\n" ++ " (declare (in) mat3x2 y))\n" ++ " ((declare () mat3x2 z)\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (0))) (expression vec2 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (1))) (expression vec2 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (2))) (expression vec2 * (array_ref (var_ref x) (constant int (2))) (array_ref (var_ref y) (constant int (2)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat2x4\n" ++ " (parameters\n" ++ " (declare (in) mat2x4 x)\n" ++ " (declare (in) mat2x4 y))\n" ++ " ((declare () mat2x4 z)\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (0))) (expression vec4 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (1))) (expression vec4 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat4x2\n" ++ " (parameters\n" ++ " (declare (in) mat4x2 x)\n" ++ " (declare (in) mat4x2 y))\n" ++ " ((declare () mat4x2 z)\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (0))) (expression vec2 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (1))) (expression vec2 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (2))) (expression vec2 * (array_ref (var_ref x) (constant int (2))) (array_ref (var_ref y) (constant int (2)))))\n" ++ " (assign (xy) (array_ref (var_ref z) (constant int (3))) (expression vec2 * (array_ref (var_ref x) (constant int (3))) (array_ref (var_ref y) (constant int (3)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat3x4\n" ++ " (parameters\n" ++ " (declare (in) mat3x4 x)\n" ++ " (declare (in) mat3x4 y))\n" ++ " ((declare () mat3x4 z)\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (0))) (expression vec4 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (1))) (expression vec4 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ " (assign (xyzw) (array_ref (var_ref z) (constant int (2))) (expression vec4 * (array_ref (var_ref x) (constant int (2))) (array_ref (var_ref y) (constant int (2)))))\n" ++ "(return (var_ref z))))\n" ++ "\n" ++ " (signature mat4x3\n" ++ " (parameters\n" ++ " (declare (in) mat4x3 x)\n" ++ " (declare (in) mat4x3 y))\n" ++ " ((declare () mat4x3 z)\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (0))) (expression vec3 * (array_ref (var_ref x) (constant int (0))) (array_ref (var_ref y) (constant int (0)))))\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (1))) (expression vec3 * (array_ref (var_ref x) (constant int (1))) (array_ref (var_ref y) (constant int (1)))))\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (2))) (expression vec3 * (array_ref (var_ref x) (constant int (2))) (array_ref (var_ref y) (constant int (2)))))\n" ++ " (assign (xyz) (array_ref (var_ref z) (constant int (3))) (expression vec3 * (array_ref (var_ref x) (constant int (3))) (array_ref (var_ref y) (constant int (3)))))\n" ++ "(return (var_ref z))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_max[] = ++ "((function max\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression float max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression vec2 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression vec3 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression vec4 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec2 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec3 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec4 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) int arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression int max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression ivec2 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression ivec3 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression ivec4 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression ivec2 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression ivec3 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression ivec4 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uint\n" ++ " (parameters\n" ++ " (declare (in) uint arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uint max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression uvec2 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression uvec3 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression uvec4 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uvec2 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uvec3 max (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uvec4 max (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_min[] = ++ "((function min\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression float min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression vec2 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression vec3 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression vec4 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec2 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec3 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec4 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) int arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression int min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression ivec2 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression ivec3 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression ivec4 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression ivec2 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression ivec3 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) int arg1))\n" ++ " ((return (expression ivec4 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uint\n" ++ " (parameters\n" ++ " (declare (in) uint arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uint min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression uvec2 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression uvec3 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression uvec4 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uvec2 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uvec3 min (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uint arg1))\n" ++ " ((return (expression uvec4 min (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_mix[] = ++ "((function mix\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0)\n" ++ " (declare (in) float arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression float + (expression float * (var_ref arg0) (expression float - (constant float (1.000000)) (var_ref arg2))) (expression float * (var_ref arg1) (var_ref arg2))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1)\n" ++ " (declare (in) vec2 arg2))\n" ++ " ((return (expression vec2 + (expression vec2 * (var_ref arg0) (expression vec2 - (constant float (1.000000)) (var_ref arg2))) (expression vec2 * (var_ref arg1) (var_ref arg2))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1)\n" ++ " (declare (in) vec3 arg2))\n" ++ " ((return (expression vec3 + (expression vec3 * (var_ref arg0) (expression vec3 - (constant float (1.000000)) (var_ref arg2))) (expression vec3 * (var_ref arg1) (var_ref arg2))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1)\n" ++ " (declare (in) vec4 arg2))\n" ++ " ((return (expression vec4 + (expression vec4 * (var_ref arg0) (expression vec4 - (constant float (1.000000)) (var_ref arg2))) (expression vec4 * (var_ref arg1) (var_ref arg2))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression vec2 + (expression vec2 * (var_ref arg0) (expression float - (constant float (1.000000)) (var_ref arg2))) (expression vec2 * (var_ref arg1) (var_ref arg2))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression vec3 + (expression vec3 * (var_ref arg0) (expression float - (constant float (1.000000)) (var_ref arg2))) (expression vec3 * (var_ref arg1) (var_ref arg2))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1)\n" ++ " (declare (in) float arg2))\n" ++ " ((return (expression vec4 + (expression vec4 * (var_ref arg0) (expression float - (constant float (1.000000)) (var_ref arg2))) (expression vec4 * (var_ref arg1) (var_ref arg2))))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float v1)\n" ++ " (declare (in) float v2)\n" ++ " (declare (in) bool a))\n" ++ " ((assign (var_ref a) (x) (var_ref v1) (var_ref v2))\n" ++ " (return (var_ref v1))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 v1)\n" ++ " (declare (in) vec2 v2)\n" ++ " (declare (in) bvec2 a))\n" ++ " ((assign (swiz x (var_ref a)) (x) (var_ref v1) (swiz x (var_ref v2)))\n" ++ " (assign (swiz y (var_ref a)) (y) (var_ref v1) (swiz y (var_ref v2)))\n" ++ " (return (var_ref v1))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 v1)\n" ++ " (declare (in) vec3 v2)\n" ++ " (declare (in) bvec3 a))\n" ++ " ((assign (swiz x (var_ref a)) (x) (var_ref v1) (swiz x (var_ref v2)))\n" ++ " (assign (swiz y (var_ref a)) (y) (var_ref v1) (swiz y (var_ref v2)))\n" ++ " (assign (swiz z (var_ref a)) (z) (var_ref v1) (swiz z (var_ref v2)))\n" ++ " (return (var_ref v1))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 v1)\n" ++ " (declare (in) vec4 v2)\n" ++ " (declare (in) bvec4 a))\n" ++ " ((assign (swiz x (var_ref a)) (x) (var_ref v1) (swiz x (var_ref v2)))\n" ++ " (assign (swiz y (var_ref a)) (y) (var_ref v1) (swiz y (var_ref v2)))\n" ++ " (assign (swiz z (var_ref a)) (z) (var_ref v1) (swiz z (var_ref v2)))\n" ++ " (assign (swiz w (var_ref a)) (w) (var_ref v1) (swiz w (var_ref v2)))\n" ++ " (return (var_ref v1))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_mod[] = ++ "((function mod\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression float % (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression vec2 % (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression vec3 % (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression vec4 % (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec2 % (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec3 % (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression vec4 % (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_modf[] = ++ "((function modf\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (out) float i))\n" ++ " ((declare () float t)\n" ++ " (assign (x) (var_ref t) (expression float trunc (var_ref x)))\n" ++ " (assign (x) (var_ref i) (var_ref t))\n" ++ " (return (expression float - (var_ref x) (var_ref t)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (out) vec2 i))\n" ++ " ((declare () vec2 t)\n" ++ " (assign (xy) (var_ref t) (expression vec2 trunc (var_ref x)))\n" ++ " (assign (xy) (var_ref i) (var_ref t))\n" ++ " (return (expression vec2 - (var_ref x) (var_ref t)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (out) vec3 i))\n" ++ " ((declare () vec3 t)\n" ++ " (assign (xyz) (var_ref t) (expression vec3 trunc (var_ref x)))\n" ++ " (assign (xyz) (var_ref i) (var_ref t))\n" ++ " (return (expression vec3 - (var_ref x) (var_ref t)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (out) vec4 i))\n" ++ " ((declare () vec4 t)\n" ++ " (assign (xyzw) (var_ref t) (expression vec4 trunc (var_ref x)))\n" ++ " (assign (xyzw) (var_ref i) (var_ref t))\n" ++ " (return (expression vec4 - (var_ref x) (var_ref t)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_noise1[] = ++ "((function noise1\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float noise (var_ref x)))))\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression float noise (var_ref x)))))\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression float noise (var_ref x)))))\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression float noise (var_ref x)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_noise2[] = ++ "((function noise2\n" ++ " (signature vec2\n" ++ " (parameters (declare (in) vec4 p))\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () vec2 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression vec4 + (var_ref p) (constant vec4 (601.0 313.0 29.0 277.0)))))\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters (declare (in) vec3 p))\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () vec2 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression vec3 + (var_ref p) (constant vec3 (601.0 313.0 29.0)))))\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in ) vec2 p)\n" ++ " )\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () vec2 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression vec2 + (var_ref p) (constant vec2 (601.0 313.0)))))\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in ) float p)\n" ++ " )\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () vec2 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression float + (var_ref p) (constant float (601.0)))))\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "))\n" ++ "" ++; ++static const char builtin_noise3[] = ++ "((function noise3\n" ++ " (signature vec3\n" ++ " (parameters (declare (in) vec4 p))\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () float c)\n" ++ " (declare () vec3 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression vec4 + (var_ref p) (constant vec4 (601.0 313.0 29.0 277.0)))))\n" ++ " (assign (x) (var_ref c) (expression float noise (expression vec4 + (var_ref p) (constant vec4 (1559.0 113.0 1861.0 797.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (assign (z) (var_ref t) (var_ref c))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters (declare (in) vec3 p))\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () float c)\n" ++ " (declare () vec3 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression vec3 + (var_ref p) (constant vec3 (601.0 313.0 29.0)))))\n" ++ " (assign (x) (var_ref c) (expression float noise (expression vec3 + (var_ref p) (constant vec3 (1559.0 113.0 1861.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (assign (z) (var_ref t) (var_ref c))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters (declare (in) vec2 p))\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () float c)\n" ++ " (declare () vec3 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression vec2 + (var_ref p) (constant vec2 (601.0 313.0)))))\n" ++ " (assign (x) (var_ref c) (expression float noise (expression vec2 + (var_ref p) (constant vec2 (1559.0 113.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (assign (z) (var_ref t) (var_ref c))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters (declare (in) float p))\n" ++ " (\n" ++ " (declare () float a)\n" ++ " (declare () float b)\n" ++ " (declare () float c)\n" ++ " (declare () vec3 t)\n" ++ "\n" ++ " (assign (x) (var_ref a) (expression float noise (var_ref p)))\n" ++ " (assign (x) (var_ref b) (expression float noise (expression float + (var_ref p) (constant float (601.0)))))\n" ++ " (assign (x) (var_ref c) (expression float noise (expression float + (var_ref p) (constant float (1559.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref t) (var_ref a))\n" ++ " (assign (y) (var_ref t) (var_ref b))\n" ++ " (assign (z) (var_ref t) (var_ref c))\n" ++ " (return (var_ref t))\n" ++ " ))\n" ++ "))\n" ++ "" ++; ++static const char builtin_noise4[] = ++ "((function noise4\n" ++ " (signature vec4\n" ++ " (parameters (declare (in) vec4 p))\n" ++ " (\n" ++ " (declare () float _x)\n" ++ " (declare () float _y)\n" ++ " (declare () float _z)\n" ++ " (declare () float _w)\n" ++ " (declare () vec4 _r)\n" ++ "\n" ++ " (declare () vec4 _p)\n" ++ " (assign (xyzw) (var_ref _p) (expression vec4 + (var_ref p) (constant vec4 (1559.0 113.0 1861.0 797.0))) )\n" ++ "\n" ++ " (assign (x) (var_ref _x) (expression float noise(var_ref p)))\n" ++ " (assign (x) (var_ref _y) (expression float noise(expression vec4 + (var_ref p) (constant vec4 (601.0 313.0 29.0 277.0)))))\n" ++ " (assign (x) (var_ref _z) (expression float noise(var_ref _p)))\n" ++ " (assign (x) (var_ref _w) (expression float noise(expression vec4 + (var_ref _p) (constant vec4 (601.0 313.0 29.0 277.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref _r) (var_ref _x))\n" ++ " (assign (y) (var_ref _r) (var_ref _y))\n" ++ " (assign (z) (var_ref _r) (var_ref _z))\n" ++ " (assign (w) (var_ref _r) (var_ref _w))\n" ++ " (return (var_ref _r))\n" ++ " ))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters (declare (in) vec3 p))\n" ++ " (\n" ++ " (declare () float _x)\n" ++ " (declare () float _y)\n" ++ " (declare () float _z)\n" ++ " (declare () float _w)\n" ++ " (declare () vec4 _r)\n" ++ "\n" ++ " (declare () vec3 _p)\n" ++ " (assign (xyz) (var_ref _p) (expression vec3 + (var_ref p) (constant vec3 (1559.0 113.0 1861.0))) )\n" ++ "\n" ++ " (assign (x) (var_ref _x) (expression float noise(var_ref p)))\n" ++ " (assign (x) (var_ref _y) (expression float noise(expression vec3 + (var_ref p) (constant vec3 (601.0 313.0 29.0)))))\n" ++ " (assign (x) (var_ref _z) (expression float noise(var_ref _p)))\n" ++ " (assign (x) (var_ref _w) (expression float noise(expression vec3 + (var_ref _p) (constant vec3 (601.0 313.0 29.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref _r) (var_ref _x))\n" ++ " (assign (y) (var_ref _r) (var_ref _y))\n" ++ " (assign (z) (var_ref _r) (var_ref _z))\n" ++ " (assign (w) (var_ref _r) (var_ref _w))\n" ++ " (return (var_ref _r))\n" ++ " ))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters (declare (in) vec2 p))\n" ++ " (\n" ++ " (declare () float _x)\n" ++ " (declare () float _y)\n" ++ " (declare () float _z)\n" ++ " (declare () float _w)\n" ++ " (declare () vec4 _r)\n" ++ "\n" ++ " (declare () vec2 _p)\n" ++ " (assign (xy) (var_ref _p) (expression vec2 + (var_ref p) (constant vec2 (1559.0 113.0))) )\n" ++ "\n" ++ " (assign (x) (var_ref _x) (expression float noise(var_ref p)))\n" ++ " (assign (x) (var_ref _y) (expression float noise(expression vec2 + (var_ref p) (constant vec2 (601.0 313.0)))))\n" ++ " (assign (x) (var_ref _z) (expression float noise(var_ref _p)))\n" ++ " (assign (x) (var_ref _w) (expression float noise(expression vec2 + (var_ref _p) (constant vec2 (601.0 313.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref _r) (var_ref _x))\n" ++ " (assign (y) (var_ref _r) (var_ref _y))\n" ++ " (assign (z) (var_ref _r) (var_ref _z))\n" ++ " (assign (w) (var_ref _r) (var_ref _w))\n" ++ " (return (var_ref _r))\n" ++ " ))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters (declare (in) float p))\n" ++ " (\n" ++ " (declare () float _x)\n" ++ " (declare () float _y)\n" ++ " (declare () float _z)\n" ++ " (declare () float _w)\n" ++ " (declare () vec4 _r)\n" ++ "\n" ++ " (declare () float _p)\n" ++ " (assign (x) (var_ref _p) (expression float + (var_ref p) (constant float (1559.0))) )\n" ++ "\n" ++ " (assign (x) (var_ref _x) (expression float noise(var_ref p)))\n" ++ " (assign (x) (var_ref _y) (expression float noise(expression float + (var_ref p) (constant float (601.0)))))\n" ++ " (assign (x) (var_ref _z) (expression float noise(var_ref _p)))\n" ++ " (assign (x) (var_ref _w) (expression float noise(expression float + (var_ref _p) (constant float (601.0)))))\n" ++ "\n" ++ " (assign (x) (var_ref _r) (var_ref _x))\n" ++ " (assign (y) (var_ref _r) (var_ref _y))\n" ++ " (assign (z) (var_ref _r) (var_ref _z))\n" ++ " (assign (w) (var_ref _r) (var_ref _w))\n" ++ " (return (var_ref _r))\n" ++ " ))\n" ++ "))\n" ++ "" ++; ++static const char builtin_normalize[] = ++ "((function normalize\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float sign (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 * (var_ref arg0) (expression float rsq (expression float dot (var_ref arg0) (var_ref arg0)))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 * (var_ref arg0) (expression float rsq (expression float dot (var_ref arg0) (var_ref arg0)))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 * (var_ref arg0) (expression float rsq (expression float dot (var_ref arg0) (var_ref arg0)))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_not[] = ++ "((function not\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 arg0))\n" ++ " ((return (expression bvec2 ! (var_ref arg0)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 arg0))\n" ++ " ((return (expression bvec3 ! (var_ref arg0)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 arg0))\n" ++ " ((return (expression bvec4 ! (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_notEqual[] = ++ "((function notEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 arg0)\n" ++ " (declare (in) bvec2 arg1))\n" ++ " ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 arg0)\n" ++ " (declare (in) bvec3 arg1))\n" ++ " ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 arg0)\n" ++ " (declare (in) bvec4 arg1))\n" ++ " ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 arg0)\n" ++ " (declare (in) ivec2 arg1))\n" ++ " ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 arg0)\n" ++ " (declare (in) ivec3 arg1))\n" ++ " ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 arg0)\n" ++ " (declare (in) ivec4 arg1))\n" ++ " ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg0)\n" ++ " (declare (in) uvec2 arg1))\n" ++ " ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg0)\n" ++ " (declare (in) uvec3 arg1))\n" ++ " ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg0)\n" ++ " (declare (in) uvec4 arg1))\n" ++ " ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_outerProduct[] = ++ "((function outerProduct\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) vec2 u)\n" ++ " (declare (in) vec2 v))\n" ++ " ((declare () mat2 m)\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (0))) (expression vec2 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (1))) (expression vec2 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "\n" ++ " (signature mat2x3\n" ++ " (parameters\n" ++ " (declare (in) vec3 u)\n" ++ " (declare (in) vec2 v))\n" ++ " ((declare () mat2x3 m)\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (0))) (expression vec3 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (1))) (expression vec3 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "\n" ++ " (signature mat2x4\n" ++ " (parameters\n" ++ " (declare (in) vec4 u)\n" ++ " (declare (in) vec2 v))\n" ++ " ((declare () mat2x4 m)\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (0))) (expression vec4 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (1))) (expression vec4 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "\n" ++ " (signature mat3x2\n" ++ " (parameters\n" ++ " (declare (in) vec2 u)\n" ++ " (declare (in) vec3 v))\n" ++ " ((declare () mat3x2 m)\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (0))) (expression vec2 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (1))) (expression vec2 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (2))) (expression vec2 * (var_ref u) (swiz z (var_ref v))))\n" ++ " (return (var_ref m))\n" ++ " ))\n" ++ "\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) vec3 u)\n" ++ " (declare (in) vec3 v))\n" ++ " ((declare () mat3 m)\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (0))) (expression vec3 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (1))) (expression vec3 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (2))) (expression vec3 * (var_ref u) (swiz z (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "\n" ++ " (signature mat3x4\n" ++ " (parameters\n" ++ " (declare (in) vec4 u)\n" ++ " (declare (in) vec3 v))\n" ++ " ((declare () mat3x4 m)\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (0))) (expression vec4 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (1))) (expression vec4 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (2))) (expression vec4 * (var_ref u) (swiz z (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "\n" ++ " (signature mat4x2\n" ++ " (parameters\n" ++ " (declare (in) vec2 u)\n" ++ " (declare (in) vec4 v))\n" ++ " ((declare () mat4x2 m)\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (0))) (expression vec2 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (1))) (expression vec2 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (2))) (expression vec2 * (var_ref u) (swiz z (var_ref v))))\n" ++ " (assign (xy) (array_ref (var_ref m) (constant int (3))) (expression vec2 * (var_ref u) (swiz w (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "\n" ++ " (signature mat4x3\n" ++ " (parameters\n" ++ " (declare (in) vec3 u)\n" ++ " (declare (in) vec4 v))\n" ++ " ((declare () mat4x3 m)\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (0))) (expression vec3 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (1))) (expression vec3 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (2))) (expression vec3 * (var_ref u) (swiz z (var_ref v))))\n" ++ " (assign (xyz) (array_ref (var_ref m) (constant int (3))) (expression vec3 * (var_ref u) (swiz w (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) vec4 u)\n" ++ " (declare (in) vec4 v))\n" ++ " ((declare () mat4 m)\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (0))) (expression vec4 * (var_ref u) (swiz x (var_ref v))))\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (1))) (expression vec4 * (var_ref u) (swiz y (var_ref v))))\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (2))) (expression vec4 * (var_ref u) (swiz z (var_ref v))))\n" ++ " (assign (xyzw) (array_ref (var_ref m) (constant int (3))) (expression vec4 * (var_ref u) (swiz w (var_ref v))))\n" ++ " (return (var_ref m))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_pow[] = ++ "((function pow\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0)\n" ++ " (declare (in) float arg1))\n" ++ " ((return (expression float pow (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0)\n" ++ " (declare (in) vec2 arg1))\n" ++ " ((return (expression vec2 pow (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0)\n" ++ " (declare (in) vec3 arg1))\n" ++ " ((return (expression vec3 pow (var_ref arg0) (var_ref arg1)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0)\n" ++ " (declare (in) vec4 arg1))\n" ++ " ((return (expression vec4 pow (var_ref arg0) (var_ref arg1)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_radians[] = ++ "((function radians\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float * (var_ref arg0) (constant float (0.0174532925))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 * (var_ref arg0) (constant float (0.0174532925))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 * (var_ref arg0) (constant float (0.0174532925))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 * (var_ref arg0) (constant float (0.0174532925))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_reflect[] = ++ "((function reflect\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float i)\n" ++ " (declare (in) float n))\n" ++ " ((return (expression float -\n" ++ " (var_ref i)\n" ++ " (expression float *\n" ++ " (constant float (2.0))\n" ++ " (expression float *\n" ++ " (expression float *\n" ++ " (var_ref n)\n" ++ " (var_ref i))\n" ++ " (var_ref n)))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 i)\n" ++ " (declare (in) vec2 n))\n" ++ " ((return (expression vec2 -\n" ++ " (var_ref i)\n" ++ " (expression vec2 *\n" ++ " (constant float (2.0))\n" ++ " (expression vec2 *\n" ++ " (expression float dot\n" ++ " (var_ref n)\n" ++ " (var_ref i))\n" ++ " (var_ref n)))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 i)\n" ++ " (declare (in) vec3 n))\n" ++ " ((return (expression vec3 -\n" ++ " (var_ref i)\n" ++ " (expression vec3 *\n" ++ " (constant float (2.0))\n" ++ " (expression vec3 *\n" ++ " (expression float dot\n" ++ " (var_ref n)\n" ++ " (var_ref i))\n" ++ " (var_ref n)))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 i)\n" ++ " (declare (in) vec4 n))\n" ++ " ((return (expression vec4 -\n" ++ " (var_ref i)\n" ++ " (expression vec4 *\n" ++ " (constant float (2.0))\n" ++ " (expression vec4 *\n" ++ " (expression float dot\n" ++ " (var_ref n)\n" ++ " (var_ref i))\n" ++ " (var_ref n)))))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_refract[] = ++ "((function refract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float i)\n" ++ " (declare (in) float n)\n" ++ " (declare (in) float eta))\n" ++ " ((declare () float k)\n" ++ " (assign (x) (var_ref k)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * \n" ++ " (expression float * (var_ref n) (var_ref i))\n" ++ " (expression float * (var_ref n) (var_ref i))))))))\n" ++ " (if (expression bool < (var_ref k) (constant float (0.0)))\n" ++ " ((return (constant float (0.0))))\n" ++ " ((return (expression float -\n" ++ " (expression float * (var_ref eta) (var_ref i))\n" ++ " (expression float *\n" ++ " (expression float +\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float * (var_ref n) (var_ref i)))\n" ++ " (expression float sqrt (var_ref k)))\n" ++ " (var_ref n))))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 i)\n" ++ " (declare (in) vec2 n)\n" ++ " (declare (in) float eta))\n" ++ " ((declare () float k)\n" ++ " (assign (x) (var_ref k)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * \n" ++ " (expression float dot (var_ref n) (var_ref i))\n" ++ " (expression float dot (var_ref n) (var_ref i))))))))\n" ++ " (if (expression bool < (var_ref k) (constant float (0.0)))\n" ++ " ((return (constant vec2 (0.0 0.0))))\n" ++ " ((return (expression vec2 -\n" ++ " (expression vec2 * (var_ref eta) (var_ref i))\n" ++ " (expression vec2 *\n" ++ " (expression float +\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float dot (var_ref n) (var_ref i)))\n" ++ " (expression float sqrt (var_ref k)))\n" ++ " (var_ref n))))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 i)\n" ++ " (declare (in) vec3 n)\n" ++ " (declare (in) float eta))\n" ++ " ((declare () float k)\n" ++ " (assign (x) (var_ref k)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * \n" ++ " (expression float dot (var_ref n) (var_ref i))\n" ++ " (expression float dot (var_ref n) (var_ref i))))))))\n" ++ " (if (expression bool < (var_ref k) (constant float (0.0)))\n" ++ " ((return (constant vec3 (0.0 0.0 0.0))))\n" ++ " ((return (expression vec3 -\n" ++ " (expression vec3 * (var_ref eta) (var_ref i))\n" ++ " (expression vec3 *\n" ++ " (expression float +\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float dot (var_ref n) (var_ref i)))\n" ++ " (expression float sqrt (var_ref k)))\n" ++ " (var_ref n))))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 i)\n" ++ " (declare (in) vec4 n)\n" ++ " (declare (in) float eta))\n" ++ " ((declare () float k)\n" ++ " (assign (x) (var_ref k)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float - (constant float (1.0))\n" ++ " (expression float * \n" ++ " (expression float dot (var_ref n) (var_ref i))\n" ++ " (expression float dot (var_ref n) (var_ref i))))))))\n" ++ " (if (expression bool < (var_ref k) (constant float (0.0)))\n" ++ " ((return (constant vec4 (0.0 0.0 0.0 0.0))))\n" ++ " ((return (expression vec4 -\n" ++ " (expression vec4 * (var_ref eta) (var_ref i))\n" ++ " (expression vec4 *\n" ++ " (expression float +\n" ++ " (expression float * (var_ref eta)\n" ++ " (expression float dot (var_ref n) (var_ref i)))\n" ++ " (expression float sqrt (var_ref k)))\n" ++ " (var_ref n))))))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_round[] = ++ "((function round\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float round_even (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 round_even (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 round_even (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 round_even (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_roundEven[] = ++ "((function roundEven\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float round_even (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 round_even (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 round_even (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 round_even (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1D[] = ++ "((function shadow1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1DArray[] = ++ "((function shadow1DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1DArrayLod[] = ++ "((function shadow1DArrayLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1DGradARB[] = ++ "((function shadow1DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1DLod[] = ++ "((function shadow1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1DProj[] = ++ "((function shadow1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1DProjGradARB[] = ++ "((function shadow1DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow1DProjLod[] = ++ "((function shadow1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2D[] = ++ "((function shadow2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DArray[] = ++ "((function shadow2DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 1 (swiz w (var_ref P)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DGradARB[] = ++ "((function shadow2DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DLod[] = ++ "((function shadow2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DProj[] = ++ "((function shadow2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DProjGradARB[] = ++ "((function shadow2DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DProjLod[] = ++ "((function shadow2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DRect[] = ++ "((function shadow2DRect\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DRectGradARB[] = ++ "((function shadow2DRectGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DRectProj[] = ++ "((function shadow2DRectProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_shadow2DRectProjGradARB[] = ++ "((function shadow2DRectProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_sign[] = ++ "((function sign\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float sign (var_ref x)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 sign (var_ref x)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 sign (var_ref x)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 sign (var_ref x)))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) int x))\n" ++ " ((return (expression int sign (var_ref x)))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x))\n" ++ " ((return (expression ivec2 sign (var_ref x)))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x))\n" ++ " ((return (expression ivec3 sign (var_ref x)))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x))\n" ++ " ((return (expression ivec4 sign (var_ref x)))))\n" ++ "))\n" ++ "\n" ++ "" ++; ++static const char builtin_sin[] = ++ "((function sin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ((return (expression float sin (var_ref angle)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ((return (expression vec2 sin (var_ref angle)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ((return (expression vec3 sin (var_ref angle)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ((return (expression vec4 sin (var_ref angle)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_sinh[] = ++ "((function sinh\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float * (constant float (0.5))\n" ++ " (expression float -\n" ++ " (expression float exp (var_ref x))\n" ++ " (expression float exp (expression float neg (var_ref x))))))))\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 * (constant float (0.5))\n" ++ " (expression vec2 -\n" ++ " (expression vec2 exp (var_ref x))\n" ++ " (expression vec2 exp (expression vec2 neg (var_ref x))))))))\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 * (constant float (0.5))\n" ++ " (expression vec3 -\n" ++ " (expression vec3 exp (var_ref x))\n" ++ " (expression vec3 exp (expression vec3 neg (var_ref x))))))))\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 * (constant float (0.5))\n" ++ " (expression vec4 -\n" ++ " (expression vec4 exp (var_ref x))\n" ++ " (expression vec4 exp (expression vec4 neg (var_ref x))))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_smoothstep[] = ++ "((function smoothstep\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) float x))\n" ++ " ((declare () float t)\n" ++ " (assign (x) (var_ref t)\n" ++ " (expression float max\n" ++ " (expression float min\n" ++ " (expression float / (expression float - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n" ++ " (constant float (1.0)))\n" ++ " (constant float (0.0))))\n" ++ " (return (expression float * (var_ref t) (expression float * (var_ref t) (expression float - (constant float (3.0)) (expression float * (constant float (2.0)) (var_ref t))))))))\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ((declare () vec2 t)\n" ++ " (assign (xy) (var_ref t)\n" ++ " (expression vec2 max\n" ++ " (expression vec2 min\n" ++ " (expression vec2 / (expression vec2 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n" ++ " (constant float (1.0)))\n" ++ " (constant float (0.0))))\n" ++ " (return (expression vec2 * (var_ref t) (expression vec2 * (var_ref t) (expression vec2 - (constant float (3.0)) (expression vec2 * (constant float (2.0)) (var_ref t))))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ((declare () vec3 t)\n" ++ " (assign (xyz) (var_ref t)\n" ++ " (expression vec3 max\n" ++ " (expression vec3 min\n" ++ " (expression vec3 / (expression vec3 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n" ++ " (constant float (1.0)))\n" ++ " (constant float (0.0))))\n" ++ " (return (expression vec3 * (var_ref t) (expression vec3 * (var_ref t) (expression vec3 - (constant float (3.0)) (expression vec3 * (constant float (2.0)) (var_ref t))))))))\n" ++ "\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ((declare () vec4 t)\n" ++ " (assign (xyzw) (var_ref t)\n" ++ " (expression vec4 max\n" ++ " (expression vec4 min\n" ++ " (expression vec4 / (expression vec4 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n" ++ " (constant float (1.0)))\n" ++ " (constant float (0.0))))\n" ++ " (return (expression vec4 * (var_ref t) (expression vec4 * (var_ref t) (expression vec4 - (constant float (3.0)) (expression vec4 * (constant float (2.0)) (var_ref t))))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge0)\n" ++ " (declare (in) vec2 edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ((declare () vec2 t)\n" ++ " (assign (xy) (var_ref t)\n" ++ " (expression vec2 max\n" ++ " (expression vec2 min\n" ++ " (expression vec2 / (expression vec2 - (var_ref x) (var_ref edge0)) (expression vec2 - (var_ref edge1) (var_ref edge0)))\n" ++ " (constant float (1.0)))\n" ++ " (constant float (0.0))))\n" ++ " (return (expression vec2 * (var_ref t) (expression vec2 * (var_ref t) (expression vec2 - (constant float (3.0)) (expression vec2 * (constant float (2.0)) (var_ref t))))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge0)\n" ++ " (declare (in) vec3 edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ((declare () vec3 t)\n" ++ " (assign (xyz) (var_ref t)\n" ++ " (expression vec3 max\n" ++ " (expression vec3 min\n" ++ " (expression vec3 / (expression vec3 - (var_ref x) (var_ref edge0)) (expression vec3 - (var_ref edge1) (var_ref edge0)))\n" ++ " (constant float (1.0)))\n" ++ " (constant float (0.0))))\n" ++ " (return (expression vec3 * (var_ref t) (expression vec3 * (var_ref t) (expression vec3 - (constant float (3.0)) (expression vec3 * (constant float (2.0)) (var_ref t))))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge0)\n" ++ " (declare (in) vec4 edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ((declare () vec4 t)\n" ++ " (assign (xyzw) (var_ref t)\n" ++ " (expression vec4 max\n" ++ " (expression vec4 min\n" ++ " (expression vec4 / (expression vec4 - (var_ref x) (var_ref edge0)) (expression vec4 - (var_ref edge1) (var_ref edge0)))\n" ++ " (constant float (1.0)))\n" ++ " (constant float (0.0))))\n" ++ " (return (expression vec4 * (var_ref t) (expression vec4 * (var_ref t) (expression vec4 - (constant float (3.0)) (expression vec4 * (constant float (2.0)) (var_ref t))))))))\n" ++ "))\n" ++ "\n" ++ "" ++; ++static const char builtin_sqrt[] = ++ "((function sqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float sqrt (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 sqrt (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 sqrt (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 sqrt (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_step[] = ++ "((function step\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float b2f (expression bool >= (var_ref x) (var_ref edge))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ((declare () vec2 t)\n" ++ " (assign (x) (var_ref t) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))\n" ++ " (assign (y) (var_ref t) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))\n" ++ " (return (var_ref t))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ((declare () vec3 t)\n" ++ " (assign (x) (var_ref t) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))\n" ++ " (assign (y) (var_ref t) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))\n" ++ " (assign (z) (var_ref t) (expression float b2f (expression bool >= (swiz z (var_ref x))(var_ref edge))))\n" ++ " (return (var_ref t))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ((declare () vec4 t)\n" ++ " (assign (x) (var_ref t) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))\n" ++ " (assign (y) (var_ref t) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))\n" ++ " (assign (z) (var_ref t) (expression float b2f (expression bool >= (swiz z (var_ref x))(var_ref edge))))\n" ++ " (assign (w) (var_ref t) (expression float b2f (expression bool >= (swiz w (var_ref x))(var_ref edge))))\n" ++ " (return (var_ref t))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ((declare () vec2 t)\n" ++ " (assign (x) (var_ref t) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))\n" ++ " (assign (y) (var_ref t) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))\n" ++ " (return (var_ref t))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ((declare () vec3 t)\n" ++ " (assign (x) (var_ref t) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))\n" ++ " (assign (y) (var_ref t) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))\n" ++ " (assign (z) (var_ref t) (expression float b2f (expression bool >= (swiz z (var_ref x))(swiz z (var_ref edge)))))\n" ++ " (return (var_ref t))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ((declare () vec4 t)\n" ++ " (assign (x) (var_ref t) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))\n" ++ " (assign (y) (var_ref t) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))\n" ++ " (assign (z) (var_ref t) (expression float b2f (expression bool >= (swiz z (var_ref x))(swiz z (var_ref edge)))))\n" ++ " (assign (w) (var_ref t) (expression float b2f (expression bool >= (swiz w (var_ref x))(swiz w (var_ref edge)))))\n" ++ " (return (var_ref t))))\n" ++ "))\n" ++ "\n" ++ "" ++; ++static const char builtin_tan[] = ++ "((function tan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ((return (expression float / (expression float sin (var_ref angle)) (expression float cos (var_ref angle))))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ((return (expression vec2 / (expression vec2 sin (var_ref angle)) (expression vec2 cos (var_ref angle))))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ((return (expression vec3 / (expression vec3 sin (var_ref angle)) (expression vec3 cos (var_ref angle))))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ((return (expression vec4 / (expression vec4 sin (var_ref angle)) (expression vec4 cos (var_ref angle))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_tanh[] = ++ "((function tanh\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ((return (expression float /\n" ++ " (expression float -\n" ++ " (expression float exp (var_ref x))\n" ++ " (expression float exp (expression float neg (var_ref x))))\n" ++ " (expression float +\n" ++ " (expression float exp (var_ref x))\n" ++ " (expression float exp (expression float neg (var_ref x))))))))\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ((return (expression vec2 /\n" ++ " (expression vec2 -\n" ++ " (expression vec2 exp (var_ref x))\n" ++ " (expression vec2 exp (expression vec2 neg (var_ref x))))\n" ++ " (expression vec2 +\n" ++ " (expression vec2 exp (var_ref x))\n" ++ " (expression vec2 exp (expression vec2 neg (var_ref x))))))))\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ((return (expression vec3 /\n" ++ " (expression vec3 -\n" ++ " (expression vec3 exp (var_ref x))\n" ++ " (expression vec3 exp (expression vec3 neg (var_ref x))))\n" ++ " (expression vec3 +\n" ++ " (expression vec3 exp (var_ref x))\n" ++ " (expression vec3 exp (expression vec3 neg (var_ref x))))))))\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ((return (expression vec4 /\n" ++ " (expression vec4 -\n" ++ " (expression vec4 exp (var_ref x))\n" ++ " (expression vec4 exp (expression vec4 neg (var_ref x))))\n" ++ " (expression vec4 +\n" ++ " (expression vec4 exp (var_ref x))\n" ++ " (expression vec4 exp (expression vec4 neg (var_ref x))))))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_texelFetch[] = ++ "((function texelFetch\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) int P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) int P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) int P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) ivec2 P) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) 0 (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) ivec2 P) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) 0 (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) ivec2 P) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) 0 (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) 0 (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerBuffer sampler) \n" ++ " (declare (in) int P) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) 0 (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerBuffer sampler) \n" ++ " (declare (in) int P) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) 0 (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerBuffer sampler) \n" ++ " (declare (in) int P) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) 0 (constant int (0))\n" ++ "))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texelFetchOffset[] = ++ "((function texelFetchOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) int P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) int P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) int P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) (var_ref offset) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) (var_ref offset) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) (var_ref offset) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) ivec2 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf vec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf ivec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) ivec3 P) \n" ++ " (declare (in) int lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txf uvec4 (var_ref sampler) (var_ref P) (var_ref offset) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture[] = ++ "((function texture\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) samplerCubeShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xyz (var_ref P)) 0 1 (swiz w (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xyz (var_ref P)) 0 1 (swiz w (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) samplerCubeShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xyz (var_ref P)) 0 1 (swiz w (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xyz (var_ref P)) 0 1 (swiz w (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1D[] = ++ "((function texture1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1DArray[] = ++ "((function texture1DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1DArrayLod[] = ++ "((function texture1DArrayLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1DGradARB[] = ++ "((function texture1DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1DLod[] = ++ "((function texture1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1DProj[] = ++ "((function texture1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1DProjGradARB[] = ++ "((function texture1DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture1DProjLod[] = ++ "((function texture1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2D[] = ++ "((function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerExternalOES sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DArray[] = ++ "((function texture2DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DArrayLod[] = ++ "((function texture2DArrayLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DGradARB[] = ++ "((function texture2DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DLod[] = ++ "((function texture2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DProj[] = ++ "((function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerExternalOES sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerExternalOES sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DProjGradARB[] = ++ "((function texture2DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DProjLod[] = ++ "((function texture2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DRect[] = ++ "((function texture2DRect\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DRectGradARB[] = ++ "((function texture2DRectGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DRectProj[] = ++ "((function texture2DRectProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture2DRectProjGradARB[] = ++ "((function texture2DRectProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture3D[] = ++ "((function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture3DGradARB[] = ++ "((function texture3DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture3DLod[] = ++ "((function texture3DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture3DProj[] = ++ "((function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture3DProjGradARB[] = ++ "((function texture3DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_texture3DProjLod[] = ++ "((function texture3DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureCube[] = ++ "((function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) 0 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureCubeGradARB[] = ++ "((function textureCubeGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureCubeLod[] = ++ "((function textureCubeLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureGrad[] = ++ "((function textureGrad\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) 0 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) samplerCubeShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xyz (var_ref P)) 0 1 (swiz w (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xyz (var_ref P)) 0 1 (swiz w (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureGradOffset[] = ++ "((function textureGradOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) 1 (swiz w (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureLod[] = ++ "((function textureLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) 0 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl float (var_ref sampler) (swiz x (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl float (var_ref sampler) (swiz xy (var_ref P)) 0 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureLodOffset[] = ++ "((function textureLodOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureOffset[] = ++ "((function textureOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) float P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec3 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec3 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec3 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (var_ref P) (var_ref offset) 1 () (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) 1 (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureProj[] = ++ "((function textureProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec3 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec4 P) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureProjGrad[] = ++ "((function textureProjGrad\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureProjGradOffset[] = ++ "((function textureProjGradOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec3 dPdx) \n" ++ " (declare (in) vec3 dPdy) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float dPdx) \n" ++ " (declare (in) float dPdy) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) vec2 dPdx) \n" ++ " (declare (in) vec2 dPdy) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txd float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) ((var_ref dPdx) (var_ref dPdy)) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureProjLod[] = ++ "((function textureProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz y (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz z (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz xyz (var_ref P)) 0 (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl float (var_ref sampler) (swiz x (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) )\n" ++ " ((return (txl float (var_ref sampler) (swiz xy (var_ref P)) 0 (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureProjLodOffset[] = ++ "((function textureProjLodOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txl vec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txl ivec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (txl uvec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (txl float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (in) float lod) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (txl float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref lod) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureProjOffset[] = ++ "((function textureProjOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec3 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) )\n" ++ " ((return (tex float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) )\n" ++ " ((return (tex float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec2 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz y (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec3 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz z (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec3 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb vec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec3 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb ivec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec3 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb uvec4 (var_ref sampler) (swiz xyz (var_ref P)) (var_ref offset) (swiz w (var_ref P)) () (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) int offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz x (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) vec4 P) \n" ++ " (declare (const_in) ivec2 offset) \n" ++ " (declare (in) float bias) )\n" ++ " ((return (txb float (var_ref sampler) (swiz xy (var_ref P)) (var_ref offset) (swiz w (var_ref P)) (swiz z (var_ref P)) (var_ref bias) ))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_textureSize[] = ++ "((function textureSize\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs int (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs int (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs int (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec3 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec3 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec3 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec3 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec3 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec3 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs int (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) samplerCubeShadow sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler) \n" ++ " (declare (in) int lod) )\n" ++ " ((return (txs ivec3 (var_ref sampler) (var_ref lod) ))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) isampler2DRect sampler) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) usampler2DRect sampler) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler) )\n" ++ " ((return (txs ivec2 (var_ref sampler) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) samplerBuffer sampler) )\n" ++ " ((return (txs int (var_ref sampler) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) isamplerBuffer sampler) )\n" ++ " ((return (txs int (var_ref sampler) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) usamplerBuffer sampler) )\n" ++ " ((return (txs int (var_ref sampler) (constant int (0))\n" ++ "))))\n" ++ "\n" ++ "))\n" ++ "" ++; ++static const char builtin_transpose[] = ++ "((function transpose\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) mat2 m))\n" ++ " ((declare () mat2 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat3x2\n" ++ " (parameters\n" ++ " (declare (in) mat2x3 m))\n" ++ " ((declare () mat3x2 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (1)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat4x2\n" ++ " (parameters\n" ++ " (declare (in) mat2x4 m))\n" ++ " ((declare () mat4x2 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (1)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat2x3\n" ++ " (parameters\n" ++ " (declare (in) mat3x2 m))\n" ++ " ((declare () mat2x3 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (2)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) mat3 m))\n" ++ " ((declare () mat3 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (2)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat4x3\n" ++ " (parameters\n" ++ " (declare (in) mat3x4 m))\n" ++ " ((declare () mat4x3 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (2)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat2x4\n" ++ " (parameters\n" ++ " (declare (in) mat4x2 m))\n" ++ " ((declare () mat2x4 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (3)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (3)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat3x4\n" ++ " (parameters\n" ++ " (declare (in) mat4x3 m))\n" ++ " ((declare () mat3x4 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (3)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (3)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (3)))))\n" ++ "(return (var_ref t))))\n" ++ "\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) mat4 m))\n" ++ " ((declare () mat4 t)\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (x) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (0)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (y) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (1)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (z) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (2)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (0))) (swiz x (array_ref (var_ref m) (constant int (3)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (1))) (swiz y (array_ref (var_ref m) (constant int (3)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (2))) (swiz z (array_ref (var_ref m) (constant int (3)))))\n" ++ " (assign (w) (array_ref (var_ref t) (constant int (3))) (swiz w (array_ref (var_ref m) (constant int (3)))))\n" ++ "(return (var_ref t))))\n" ++ ")\n" ++ "\n" ++ ")\n" ++ "\n" ++ "" ++; ++static const char builtin_trunc[] = ++ "((function trunc\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float arg0))\n" ++ " ((return (expression float trunc (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 arg0))\n" ++ " ((return (expression vec2 trunc (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 arg0))\n" ++ " ((return (expression vec3 trunc (var_ref arg0)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 arg0))\n" ++ " ((return (expression vec4 trunc (var_ref arg0)))))\n" ++ "))\n" ++ "" ++; ++static const char builtin_uintBitsToFloat[] = ++ "((function uintBitsToFloat\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) uint arg))\n" ++ " ((return (expression float bitcast_u2f (var_ref arg)))))\n" ++ "\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 arg))\n" ++ " ((return (expression vec2 bitcast_u2f (var_ref arg)))))\n" ++ "\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 arg))\n" ++ " ((return (expression vec3 bitcast_u2f (var_ref arg)))))\n" ++ "\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 arg))\n" ++ " ((return (expression vec4 bitcast_u2f (var_ref arg)))))\n" ++ "))\n" ++ "" ++; ++static const char prototypes_for_100_frag[] = ++ "(\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())))" ++; ++static const char *functions_for_100_frag [] = { ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_textureCube, ++}; ++static const char prototypes_for_100_glsl[] = ++ "(\n" ++ "(function radians\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float degrees))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 degrees))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 degrees))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 degrees))\n" ++ " ()))\n" ++ "(function degrees\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float radians))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 radians))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 radians))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 radians))\n" ++ " ()))\n" ++ "(function sin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function cos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function tan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function asin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function acos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function atan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float y)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float y_over_x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y_over_x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y_over_x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y_over_x))\n" ++ " ()))\n" ++ "(function pow\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function exp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function log\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function exp2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function log2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function sqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function inversesqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function abs\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function sign\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function floor\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function ceil\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function fract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function mod\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function min\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ()))\n" ++ "(function max\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ()))\n" ++ "(function clamp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 minVal)\n" ++ " (declare (in) vec2 maxVal))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 minVal)\n" ++ " (declare (in) vec3 maxVal))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 minVal)\n" ++ " (declare (in) vec4 maxVal))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ()))\n" ++ "(function mix\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) vec2 a))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) vec3 a))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) vec4 a))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) float a))\n" ++ " ()))\n" ++ "(function step\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function smoothstep\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge0)\n" ++ " (declare (in) vec2 edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge0)\n" ++ " (declare (in) vec3 edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge0)\n" ++ " (declare (in) vec4 edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function length\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function distance\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p0)\n" ++ " (declare (in) float p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 p0)\n" ++ " (declare (in) vec2 p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 p0)\n" ++ " (declare (in) vec3 p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 p0)\n" ++ " (declare (in) vec4 p1))\n" ++ " ()))\n" ++ "(function dot\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function cross\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ()))\n" ++ "(function normalize\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function faceforward\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float N)\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float Nref))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 N)\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 Nref))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 N)\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 Nref))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 N)\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 Nref))\n" ++ " ()))\n" ++ "(function reflect\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float N))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 N))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 N))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 N))\n" ++ " ()))\n" ++ "(function refract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 N)\n" ++ " (declare (in) float eta))\n" ++ " ()))\n" ++ "(function matrixCompMult\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) mat2 x)\n" ++ " (declare (in) mat2 y))\n" ++ " ())\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) mat3 x)\n" ++ " (declare (in) mat3 y))\n" ++ " ())\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) mat4 x)\n" ++ " (declare (in) mat4 y))\n" ++ " ()))\n" ++ "(function lessThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function lessThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function greaterThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function greaterThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function equal\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x)\n" ++ " (declare (in) bvec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x)\n" ++ " (declare (in) bvec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x)\n" ++ " (declare (in) bvec4 y))\n" ++ " ()))\n" ++ "(function notEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x)\n" ++ " (declare (in) bvec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x)\n" ++ " (declare (in) bvec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x)\n" ++ " (declare (in) bvec4 y))\n" ++ " ()))\n" ++ "(function any\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function all\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function not\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())))" ++; ++static const char *functions_for_100_glsl [] = { ++ builtin_abs, ++ builtin_acos, ++ builtin_all, ++ builtin_any, ++ builtin_asin, ++ builtin_atan, ++ builtin_ceil, ++ builtin_clamp, ++ builtin_cos, ++ builtin_cross, ++ builtin_degrees, ++ builtin_distance, ++ builtin_dot, ++ builtin_equal, ++ builtin_exp, ++ builtin_exp2, ++ builtin_faceforward, ++ builtin_floor, ++ builtin_fract, ++ builtin_greaterThan, ++ builtin_greaterThanEqual, ++ builtin_inversesqrt, ++ builtin_length, ++ builtin_lessThan, ++ builtin_lessThanEqual, ++ builtin_log, ++ builtin_log2, ++ builtin_matrixCompMult, ++ builtin_max, ++ builtin_min, ++ builtin_mix, ++ builtin_mod, ++ builtin_normalize, ++ builtin_not, ++ builtin_notEqual, ++ builtin_pow, ++ builtin_radians, ++ builtin_reflect, ++ builtin_refract, ++ builtin_sign, ++ builtin_sin, ++ builtin_smoothstep, ++ builtin_sqrt, ++ builtin_step, ++ builtin_tan, ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_textureCube, ++}; ++static const char prototypes_for_100_vert[] = ++ "(\n" ++ "(function texture2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function textureCubeLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())))" ++; ++static const char *functions_for_100_vert [] = { ++ builtin_texture2DLod, ++ builtin_texture2DProjLod, ++ builtin_textureCubeLod, ++}; ++static const char prototypes_for_110_frag[] = ++ "(\n" ++ "(function texture1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function dFdx\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function dFdy\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function fwidth\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ())))" ++; ++static const char *functions_for_110_frag [] = { ++ builtin_dFdx, ++ builtin_dFdy, ++ builtin_fwidth, ++ builtin_shadow1D, ++ builtin_shadow1DProj, ++ builtin_shadow2D, ++ builtin_shadow2DProj, ++ builtin_texture1D, ++ builtin_texture1DProj, ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_texture3D, ++ builtin_texture3DProj, ++ builtin_textureCube, ++}; ++static const char prototypes_for_110_glsl[] = ++ "(\n" ++ "(function radians\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float degrees))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 degrees))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 degrees))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 degrees))\n" ++ " ()))\n" ++ "(function degrees\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float radians))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 radians))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 radians))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 radians))\n" ++ " ()))\n" ++ "(function sin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function cos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function tan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function asin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function acos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function atan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float y)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float y_over_x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y_over_x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y_over_x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y_over_x))\n" ++ " ()))\n" ++ "(function pow\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function exp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function log\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function exp2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function log2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function sqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function inversesqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function abs\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function sign\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function floor\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function ceil\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function fract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function mod\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function min\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ()))\n" ++ "(function max\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ()))\n" ++ "(function clamp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 minVal)\n" ++ " (declare (in) vec2 maxVal))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 minVal)\n" ++ " (declare (in) vec3 maxVal))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 minVal)\n" ++ " (declare (in) vec4 maxVal))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ()))\n" ++ "(function mix\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) vec2 a))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) vec3 a))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) vec4 a))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) float a))\n" ++ " ()))\n" ++ "(function step\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function smoothstep\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge0)\n" ++ " (declare (in) vec2 edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge0)\n" ++ " (declare (in) vec3 edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge0)\n" ++ " (declare (in) vec4 edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function length\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function distance\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p0)\n" ++ " (declare (in) float p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 p0)\n" ++ " (declare (in) vec2 p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 p0)\n" ++ " (declare (in) vec3 p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 p0)\n" ++ " (declare (in) vec4 p1))\n" ++ " ()))\n" ++ "(function dot\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function cross\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ()))\n" ++ "(function normalize\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function faceforward\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float N)\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float Nref))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 N)\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 Nref))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 N)\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 Nref))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 N)\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 Nref))\n" ++ " ()))\n" ++ "(function reflect\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float N))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 N))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 N))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 N))\n" ++ " ()))\n" ++ "(function refract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 N)\n" ++ " (declare (in) float eta))\n" ++ " ()))\n" ++ "(function matrixCompMult\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) mat2 x)\n" ++ " (declare (in) mat2 y))\n" ++ " ())\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) mat3 x)\n" ++ " (declare (in) mat3 y))\n" ++ " ())\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) mat4 x)\n" ++ " (declare (in) mat4 y))\n" ++ " ()))\n" ++ "(function lessThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function lessThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function greaterThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function greaterThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function equal\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x)\n" ++ " (declare (in) bvec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x)\n" ++ " (declare (in) bvec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x)\n" ++ " (declare (in) bvec4 y))\n" ++ " ()))\n" ++ "(function notEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x)\n" ++ " (declare (in) bvec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x)\n" ++ " (declare (in) bvec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x)\n" ++ " (declare (in) bvec4 y))\n" ++ " ()))\n" ++ "(function any\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function all\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function not\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function texture1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord))\n" ++ " ()))\n" ++ "(function texture1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function shadow2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function noise1\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function noise2\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function noise3\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function noise4\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ())))" ++; ++static const char *functions_for_110_glsl [] = { ++ builtin_abs, ++ builtin_acos, ++ builtin_all, ++ builtin_any, ++ builtin_asin, ++ builtin_atan, ++ builtin_ceil, ++ builtin_clamp, ++ builtin_cos, ++ builtin_cross, ++ builtin_degrees, ++ builtin_distance, ++ builtin_dot, ++ builtin_equal, ++ builtin_exp, ++ builtin_exp2, ++ builtin_faceforward, ++ builtin_floor, ++ builtin_fract, ++ builtin_greaterThan, ++ builtin_greaterThanEqual, ++ builtin_inversesqrt, ++ builtin_length, ++ builtin_lessThan, ++ builtin_lessThanEqual, ++ builtin_log, ++ builtin_log2, ++ builtin_matrixCompMult, ++ builtin_max, ++ builtin_min, ++ builtin_mix, ++ builtin_mod, ++ builtin_noise1, ++ builtin_noise2, ++ builtin_noise3, ++ builtin_noise4, ++ builtin_normalize, ++ builtin_not, ++ builtin_notEqual, ++ builtin_pow, ++ builtin_radians, ++ builtin_reflect, ++ builtin_refract, ++ builtin_shadow1D, ++ builtin_shadow1DProj, ++ builtin_shadow2D, ++ builtin_shadow2DProj, ++ builtin_sign, ++ builtin_sin, ++ builtin_smoothstep, ++ builtin_sqrt, ++ builtin_step, ++ builtin_tan, ++ builtin_texture1D, ++ builtin_texture1DProj, ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_texture3D, ++ builtin_texture3DProj, ++ builtin_textureCube, ++}; ++static const char prototypes_for_110_vert[] = ++ "(\n" ++ "(function ftransform\n" ++ " (signature vec4\n" ++ " (parameters)\n" ++ " ()))\n" ++ "(function texture1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture3DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture3DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function textureCubeLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())))" ++; ++static const char *functions_for_110_vert [] = { ++ builtin_ftransform, ++ builtin_shadow1DLod, ++ builtin_shadow1DProjLod, ++ builtin_shadow2DLod, ++ builtin_shadow2DProjLod, ++ builtin_texture1DLod, ++ builtin_texture1DProjLod, ++ builtin_texture2DLod, ++ builtin_texture2DProjLod, ++ builtin_texture3DLod, ++ builtin_texture3DProjLod, ++ builtin_textureCubeLod, ++}; ++static const char prototypes_for_120_frag[] = ++ "(\n" ++ "(function texture1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function dFdx\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function dFdy\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function fwidth\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ())))" ++; ++static const char *functions_for_120_frag [] = { ++ builtin_dFdx, ++ builtin_dFdy, ++ builtin_fwidth, ++ builtin_shadow1D, ++ builtin_shadow1DProj, ++ builtin_shadow2D, ++ builtin_shadow2DProj, ++ builtin_texture1D, ++ builtin_texture1DProj, ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_texture3D, ++ builtin_texture3DProj, ++ builtin_textureCube, ++}; ++static const char prototypes_for_120_glsl[] = ++ "(\n" ++ "(function radians\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float degrees))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 degrees))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 degrees))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 degrees))\n" ++ " ()))\n" ++ "(function degrees\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float radians))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 radians))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 radians))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 radians))\n" ++ " ()))\n" ++ "(function sin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function cos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function tan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function asin\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function acos\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float angle))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 angle))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 angle))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 angle))\n" ++ " ()))\n" ++ "(function atan\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float y)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float y_over_x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 y_over_x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 y_over_x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 y_over_x))\n" ++ " ()))\n" ++ "(function pow\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function exp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function log\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function exp2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function log2\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function sqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function inversesqrt\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function abs\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function sign\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function floor\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function ceil\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function fract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function mod\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function min\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ()))\n" ++ "(function max\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float y))\n" ++ " ()))\n" ++ "(function clamp\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 minVal)\n" ++ " (declare (in) vec2 maxVal))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 minVal)\n" ++ " (declare (in) vec3 maxVal))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 minVal)\n" ++ " (declare (in) vec4 maxVal))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) float minVal)\n" ++ " (declare (in) float maxVal))\n" ++ " ()))\n" ++ "(function mix\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) vec2 a))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) vec3 a))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) vec4 a))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y)\n" ++ " (declare (in) float a))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y)\n" ++ " (declare (in) float a))\n" ++ " ()))\n" ++ "(function step\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge)\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function smoothstep\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 edge0)\n" ++ " (declare (in) vec2 edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 edge0)\n" ++ " (declare (in) vec3 edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 edge0)\n" ++ " (declare (in) vec4 edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float edge0)\n" ++ " (declare (in) float edge1)\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function length\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function distance\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p0)\n" ++ " (declare (in) float p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 p0)\n" ++ " (declare (in) vec2 p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 p0)\n" ++ " (declare (in) vec3 p1))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 p0)\n" ++ " (declare (in) vec4 p1))\n" ++ " ()))\n" ++ "(function dot\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x)\n" ++ " (declare (in) float y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ()))\n" ++ "(function cross\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ()))\n" ++ "(function normalize\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function faceforward\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float N)\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float Nref))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 N)\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 Nref))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 N)\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 Nref))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 N)\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 Nref))\n" ++ " ()))\n" ++ "(function reflect\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float N))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 N))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 N))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 N))\n" ++ " ()))\n" ++ "(function refract\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float I)\n" ++ " (declare (in) float N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 I)\n" ++ " (declare (in) vec2 N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 I)\n" ++ " (declare (in) vec3 N)\n" ++ " (declare (in) float eta))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 I)\n" ++ " (declare (in) vec4 N)\n" ++ " (declare (in) float eta))\n" ++ " ()))\n" ++ "(function matrixCompMult\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) mat2 x)\n" ++ " (declare (in) mat2 y))\n" ++ " ())\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) mat3 x)\n" ++ " (declare (in) mat3 y))\n" ++ " ())\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) mat4 x)\n" ++ " (declare (in) mat4 y))\n" ++ " ())\n" ++ " (signature mat2x3\n" ++ " (parameters\n" ++ " (declare (in) mat2x3 x)\n" ++ " (declare (in) mat2x3 y))\n" ++ " ())\n" ++ " (signature mat2x4\n" ++ " (parameters\n" ++ " (declare (in) mat2x4 x)\n" ++ " (declare (in) mat2x4 y))\n" ++ " ())\n" ++ " (signature mat3x2\n" ++ " (parameters\n" ++ " (declare (in) mat3x2 x)\n" ++ " (declare (in) mat3x2 y))\n" ++ " ())\n" ++ " (signature mat3x4\n" ++ " (parameters\n" ++ " (declare (in) mat3x4 x)\n" ++ " (declare (in) mat3x4 y))\n" ++ " ())\n" ++ " (signature mat4x2\n" ++ " (parameters\n" ++ " (declare (in) mat4x2 x)\n" ++ " (declare (in) mat4x2 y))\n" ++ " ())\n" ++ " (signature mat4x3\n" ++ " (parameters\n" ++ " (declare (in) mat4x3 x)\n" ++ " (declare (in) mat4x3 y))\n" ++ " ()))\n" ++ "(function outerProduct\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) vec2 c)\n" ++ " (declare (in) vec2 r))\n" ++ " ())\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) vec3 c)\n" ++ " (declare (in) vec3 r))\n" ++ " ())\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) vec4 c)\n" ++ " (declare (in) vec4 r))\n" ++ " ())\n" ++ " (signature mat2x3\n" ++ " (parameters\n" ++ " (declare (in) vec3 c)\n" ++ " (declare (in) vec2 r))\n" ++ " ())\n" ++ " (signature mat3x2\n" ++ " (parameters\n" ++ " (declare (in) vec2 c)\n" ++ " (declare (in) vec3 r))\n" ++ " ())\n" ++ " (signature mat2x4\n" ++ " (parameters\n" ++ " (declare (in) vec4 c)\n" ++ " (declare (in) vec2 r))\n" ++ " ())\n" ++ " (signature mat4x2\n" ++ " (parameters\n" ++ " (declare (in) vec2 c)\n" ++ " (declare (in) vec4 r))\n" ++ " ())\n" ++ " (signature mat3x4\n" ++ " (parameters\n" ++ " (declare (in) vec4 c)\n" ++ " (declare (in) vec3 r))\n" ++ " ())\n" ++ " (signature mat4x3\n" ++ " (parameters\n" ++ " (declare (in) vec3 c)\n" ++ " (declare (in) vec4 r))\n" ++ " ()))\n" ++ "(function transpose\n" ++ " (signature mat2\n" ++ " (parameters\n" ++ " (declare (in) mat2 m))\n" ++ " ())\n" ++ " (signature mat3\n" ++ " (parameters\n" ++ " (declare (in) mat3 m))\n" ++ " ())\n" ++ " (signature mat4\n" ++ " (parameters\n" ++ " (declare (in) mat4 m))\n" ++ " ())\n" ++ " (signature mat2x3\n" ++ " (parameters\n" ++ " (declare (in) mat3x2 m))\n" ++ " ())\n" ++ " (signature mat3x2\n" ++ " (parameters\n" ++ " (declare (in) mat2x3 m))\n" ++ " ())\n" ++ " (signature mat2x4\n" ++ " (parameters\n" ++ " (declare (in) mat4x2 m))\n" ++ " ())\n" ++ " (signature mat4x2\n" ++ " (parameters\n" ++ " (declare (in) mat2x4 m))\n" ++ " ())\n" ++ " (signature mat3x4\n" ++ " (parameters\n" ++ " (declare (in) mat4x3 m))\n" ++ " ())\n" ++ " (signature mat4x3\n" ++ " (parameters\n" ++ " (declare (in) mat3x4 m))\n" ++ " ()))\n" ++ "(function lessThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function lessThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function greaterThan\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function greaterThanEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ()))\n" ++ "(function equal\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x)\n" ++ " (declare (in) bvec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x)\n" ++ " (declare (in) bvec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x)\n" ++ " (declare (in) bvec4 y))\n" ++ " ()))\n" ++ "(function notEqual\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x)\n" ++ " (declare (in) vec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x)\n" ++ " (declare (in) vec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x)\n" ++ " (declare (in) vec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 x)\n" ++ " (declare (in) ivec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 x)\n" ++ " (declare (in) ivec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 x)\n" ++ " (declare (in) ivec4 y))\n" ++ " ())\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x)\n" ++ " (declare (in) bvec2 y))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x)\n" ++ " (declare (in) bvec3 y))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x)\n" ++ " (declare (in) bvec4 y))\n" ++ " ()))\n" ++ "(function any\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function all\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bool\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function not\n" ++ " (signature bvec2\n" ++ " (parameters\n" ++ " (declare (in) bvec2 x))\n" ++ " ())\n" ++ " (signature bvec3\n" ++ " (parameters\n" ++ " (declare (in) bvec3 x))\n" ++ " ())\n" ++ " (signature bvec4\n" ++ " (parameters\n" ++ " (declare (in) bvec4 x))\n" ++ " ()))\n" ++ "(function texture1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord))\n" ++ " ()))\n" ++ "(function texture1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function shadow2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function noise1\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function noise2\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function noise3\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ()))\n" ++ "(function noise4\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) float x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec2 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec3 x))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 x))\n" ++ " ())))" ++; ++static const char *functions_for_120_glsl [] = { ++ builtin_abs, ++ builtin_acos, ++ builtin_all, ++ builtin_any, ++ builtin_asin, ++ builtin_atan, ++ builtin_ceil, ++ builtin_clamp, ++ builtin_cos, ++ builtin_cross, ++ builtin_degrees, ++ builtin_distance, ++ builtin_dot, ++ builtin_equal, ++ builtin_exp, ++ builtin_exp2, ++ builtin_faceforward, ++ builtin_floor, ++ builtin_fract, ++ builtin_greaterThan, ++ builtin_greaterThanEqual, ++ builtin_inversesqrt, ++ builtin_length, ++ builtin_lessThan, ++ builtin_lessThanEqual, ++ builtin_log, ++ builtin_log2, ++ builtin_matrixCompMult, ++ builtin_max, ++ builtin_min, ++ builtin_mix, ++ builtin_mod, ++ builtin_noise1, ++ builtin_noise2, ++ builtin_noise3, ++ builtin_noise4, ++ builtin_normalize, ++ builtin_not, ++ builtin_notEqual, ++ builtin_outerProduct, ++ builtin_pow, ++ builtin_radians, ++ builtin_reflect, ++ builtin_refract, ++ builtin_shadow1D, ++ builtin_shadow1DProj, ++ builtin_shadow2D, ++ builtin_shadow2DProj, ++ builtin_sign, ++ builtin_sin, ++ builtin_smoothstep, ++ builtin_sqrt, ++ builtin_step, ++ builtin_tan, ++ builtin_texture1D, ++ builtin_texture1DProj, ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_texture3D, ++ builtin_texture3DProj, ++ builtin_textureCube, ++ builtin_transpose, ++}; ++static const char prototypes_for_120_vert[] = ++ "(\n" ++ "(function ftransform\n" ++ " (signature vec4\n" ++ " (parameters)\n" ++ " ()))\n" ++ "(function texture1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture3DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture3DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function textureCubeLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())))" ++; ++static const char *functions_for_120_vert [] = { ++ builtin_ftransform, ++ builtin_shadow1DLod, ++ builtin_shadow1DProjLod, ++ builtin_shadow2DLod, ++ builtin_shadow2DProjLod, ++ builtin_texture1DLod, ++ builtin_texture1DProjLod, ++ builtin_texture2DLod, ++ builtin_texture2DProjLod, ++ builtin_texture3DLod, ++ builtin_texture3DProjLod, ++ builtin_textureCubeLod, ++}; ++static const char prototypes_for_130_frag[] = ++ "(\n" ++ "(function texture\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) samplerCubeShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow samp)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureProjOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow s)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow s)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function dFdx\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function dFdy\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function fwidth\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ())))" ++; ++static const char *functions_for_130_frag [] = { ++ builtin_dFdx, ++ builtin_dFdy, ++ builtin_fwidth, ++ builtin_shadow1D, ++ builtin_shadow1DProj, ++ builtin_shadow2D, ++ builtin_shadow2DProj, ++ builtin_texture, ++ builtin_texture1D, ++ builtin_texture1DProj, ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_texture3D, ++ builtin_texture3DProj, ++ builtin_textureCube, ++ builtin_textureOffset, ++ builtin_textureProj, ++ builtin_textureProjOffset, ++}; ++static const char prototypes_for_130_glsl[] = ++{'(', ++'(','f','u','n','c','t','i','o','n',' ','r','a','d','i','a','n','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','d','e','g','r','e','e','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','i','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','o','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','s','i','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','c','o','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','t','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','i','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','o','s','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','a','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','s','i','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','c','o','s','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','t','a','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','p','o','w',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','e','x','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','o','g',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','e','x','p','2',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','o','g','2',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','q','r','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','i','n','v','e','r','s','e','s','q','r','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','b','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','i','g','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','f','l','o','o','r',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','r','u','n','c',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','o','u','n','d',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','o','u','n','d','E','v','e','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','e','i','l',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','f','r','a','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','o','d','f',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','f','l','o','a','t',' ','i',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','v','e','c','2',' ','i',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','v','e','c','3',' ','i',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','v','e','c','4',' ','i',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','i','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','a','x',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','l','a','m','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','i','x',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','o','o','l',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','a',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','t','e','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','m','o','o','t','h','s','t','e','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','i','s','n','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','i','s','i','n','f',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','e','n','g','t','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','d','i','s','t','a','n','c','e',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','p','1',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','p','1',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','p','1',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','p','1',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','d','o','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','r','o','s','s',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','r','m','a','l','i','z','e',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','f','a','c','e','f','o','r','w','a','r','d',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N','r','e','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N','r','e','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N','r','e','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N','r','e','f',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','e','f','l','e','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','e','f','r','a','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','a','t','r','i','x','C','o','m','p','M','u','l','t',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','3',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','o','u','t','e','r','P','r','o','d','u','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','r','a','n','s','p','o','s','e',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','2',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','3',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','2',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','4',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','3',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','4',' ','m',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','e','s','s','T','h','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','e','s','s','T','h','a','n','E','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','g','r','e','a','t','e','r','T','h','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','g','r','e','a','t','e','r','T','h','a','n','E','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','e','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','t','E','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','n','y',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','l','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','t',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','S','i','z','e',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','e','l','F','e','t','c','h',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','e','l','F','e','t','c','h','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','L','o','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','L','o','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','G','r','a','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','G','r','a','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','G','r','a','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','G','r','a','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','C','u','b','e',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','C','u','b','e','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','1',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','2',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','3',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','4',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')',')'} ; ++static const char *functions_for_130_glsl [] = { ++ builtin_abs, ++ builtin_acos, ++ builtin_acosh, ++ builtin_all, ++ builtin_any, ++ builtin_asin, ++ builtin_asinh, ++ builtin_atan, ++ builtin_atanh, ++ builtin_ceil, ++ builtin_clamp, ++ builtin_cos, ++ builtin_cosh, ++ builtin_cross, ++ builtin_degrees, ++ builtin_distance, ++ builtin_dot, ++ builtin_equal, ++ builtin_exp, ++ builtin_exp2, ++ builtin_faceforward, ++ builtin_floor, ++ builtin_fract, ++ builtin_greaterThan, ++ builtin_greaterThanEqual, ++ builtin_inversesqrt, ++ builtin_isinf, ++ builtin_isnan, ++ builtin_length, ++ builtin_lessThan, ++ builtin_lessThanEqual, ++ builtin_log, ++ builtin_log2, ++ builtin_matrixCompMult, ++ builtin_max, ++ builtin_min, ++ builtin_mix, ++ builtin_mod, ++ builtin_modf, ++ builtin_noise1, ++ builtin_noise2, ++ builtin_noise3, ++ builtin_noise4, ++ builtin_normalize, ++ builtin_not, ++ builtin_notEqual, ++ builtin_outerProduct, ++ builtin_pow, ++ builtin_radians, ++ builtin_reflect, ++ builtin_refract, ++ builtin_round, ++ builtin_roundEven, ++ builtin_shadow1D, ++ builtin_shadow1DLod, ++ builtin_shadow1DProj, ++ builtin_shadow1DProjLod, ++ builtin_shadow2D, ++ builtin_shadow2DLod, ++ builtin_shadow2DProj, ++ builtin_shadow2DProjLod, ++ builtin_sign, ++ builtin_sin, ++ builtin_sinh, ++ builtin_smoothstep, ++ builtin_sqrt, ++ builtin_step, ++ builtin_tan, ++ builtin_tanh, ++ builtin_texelFetch, ++ builtin_texelFetchOffset, ++ builtin_texture, ++ builtin_texture1D, ++ builtin_texture1DLod, ++ builtin_texture1DProj, ++ builtin_texture1DProjLod, ++ builtin_texture2D, ++ builtin_texture2DLod, ++ builtin_texture2DProj, ++ builtin_texture2DProjLod, ++ builtin_texture3D, ++ builtin_texture3DLod, ++ builtin_texture3DProj, ++ builtin_texture3DProjLod, ++ builtin_textureCube, ++ builtin_textureCubeLod, ++ builtin_textureGrad, ++ builtin_textureGradOffset, ++ builtin_textureLod, ++ builtin_textureLodOffset, ++ builtin_textureOffset, ++ builtin_textureProj, ++ builtin_textureProjGrad, ++ builtin_textureProjGradOffset, ++ builtin_textureProjLod, ++ builtin_textureProjLodOffset, ++ builtin_textureProjOffset, ++ builtin_textureSize, ++ builtin_transpose, ++ builtin_trunc, ++}; ++static const char prototypes_for_130_vert[] = ++ "(\n" ++ "(function ftransform\n" ++ " (signature vec4\n" ++ " (parameters)\n" ++ " ())))" ++; ++static const char *functions_for_130_vert [] = { ++ builtin_ftransform, ++}; ++static const char prototypes_for_140_frag[] = ++ "(\n" ++ "(function texture\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isamplerCube sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usamplerCube sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) samplerCubeShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1DArray sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2DArray sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow samp)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureProjOffset\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) isampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) usampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec3 offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow s)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) int offset)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow s)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) ivec2 offset)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function textureCube\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function dFdx\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function dFdy\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function fwidth\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ())))" ++; ++static const char *functions_for_140_frag [] = { ++ builtin_dFdx, ++ builtin_dFdy, ++ builtin_fwidth, ++ builtin_shadow1D, ++ builtin_shadow1DProj, ++ builtin_shadow2D, ++ builtin_shadow2DProj, ++ builtin_texture, ++ builtin_texture1D, ++ builtin_texture1DProj, ++ builtin_texture2D, ++ builtin_texture2DProj, ++ builtin_texture3D, ++ builtin_texture3DProj, ++ builtin_textureCube, ++ builtin_textureOffset, ++ builtin_textureProj, ++ builtin_textureProjOffset, ++}; ++static const char prototypes_for_140_glsl[] = ++{'(', ++'(','f','u','n','c','t','i','o','n',' ','r','a','d','i','a','n','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','d','e','g','r','e','e','s',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','d','e','g','r','e','e','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r','a','d','i','a','n','s',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','i','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','o','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','s','i','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','c','o','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a','n','g','l','e',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a','n','g','l','e',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','t','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y','_','o','v','e','r','_','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','i','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','o','s','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','a','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','s','i','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','c','o','s','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','t','a','n','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','p','o','w',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','e','x','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','o','g',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','e','x','p','2',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','o','g','2',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','q','r','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','i','n','v','e','r','s','e','s','q','r','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','b','s',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','i','g','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','f','l','o','o','r',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','r','u','n','c',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','o','u','n','d',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','o','u','n','d','E','v','e','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','e','i','l',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','f','r','a','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','o','d','f',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','f','l','o','a','t',' ','i',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','v','e','c','2',' ','i',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','v','e','c','3',' ','i',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','o','u','t',')',' ','v','e','c','4',' ','i',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','i','n',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','a','x',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','l','a','m','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','i','n','V','a','l',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','i','n','t',' ','m','a','x','V','a','l',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','i','x',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','o','o','l',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','a',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','t','e','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','m','o','o','t','h','s','t','e','p',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','d','g','e','1',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','i','s','n','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','i','s','i','n','f',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','e','n','g','t','h',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','d','i','s','t','a','n','c','e',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','p','1',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','p','1',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','p','1',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','p','0',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','p','1',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','d','o','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','c','r','o','s','s',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','r','m','a','l','i','z','e',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','f','a','c','e','f','o','r','w','a','r','d',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N','r','e','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N','r','e','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N','r','e','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N','r','e','f',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','e','f','l','e','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','r','e','f','r','a','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','I',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','N',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','e','t','a',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','m','a','t','r','i','x','C','o','m','p','M','u','l','t',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','3',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','o','u','t','e','r','P','r','o','d','u','c','t',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','r',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','r','a','n','s','p','o','s','e',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','2',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','3',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','2',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2','x','4',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3','x','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4','x','3',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4','x','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3','x','4',' ','m',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','i','n','v','e','r','s','e',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','2',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','3',' ','m',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','m','a','t','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','m','a','t','4',' ','m',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','e','s','s','T','h','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','l','e','s','s','T','h','a','n','E','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','g','r','e','a','t','e','r','T','h','a','n',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','g','r','e','a','t','e','r','T','h','a','n','E','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','e','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','t','E','q','u','a','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','v','e','c','4',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','n','y',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','a','l','l',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','o','o','l',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','t',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','b','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','b','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','S','i','z','e',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','B','u','f','f','e','r',' ','s','a','m','p','l','e','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','B','u','f','f','e','r',' ','s','a','m','p','l','e','r',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','n','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','B','u','f','f','e','r',' ','s','a','m','p','l','e','r',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','e','l','F','e','t','c','h',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','B','u','f','f','e','r',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','B','u','f','f','e','r',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','B','u','f','f','e','r',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','e','l','F','e','t','c','h','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','L','o','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','L','o','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','G','r','a','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','G','r','a','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f','s','e','t',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','A','r','r','a','y',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','A','r','r','a','y','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','A','r','r','a','y','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','G','r','a','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','P','d','y',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','P','d','y',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','P','r','o','j','G','r','a','d','O','f','f','s','e','t',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','1','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','2','D','R','e','c','t',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','R','e','c','t','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','i','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','u','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','u','s','a','m','p','l','e','r','3','D',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','3',' ','o','f','f',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','n','t',' ','o',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','P',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','x',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','d','y',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','i','v','e','c','2',' ','o',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','1','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','2','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','3','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','3','D',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','C','u','b','e',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','t','e','x','t','u','r','e','C','u','b','e','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','C','u','b','e',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D','P','r','o','j',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','1','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','1','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','s','h','a','d','o','w','2','D','P','r','o','j','L','o','d',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','s','a','m','p','l','e','r','2','D','S','h','a','d','o','w',' ','s','a','m','p','l','e','r',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','c','o','o','r','d',')',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','l','o','d',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','1',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','f','l','o','a','t',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','2',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','2',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','3',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','3',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')', ++'(','f','u','n','c','t','i','o','n',' ','n','o','i','s','e','4',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','f','l','o','a','t',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','2',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','3',' ','x',')',')',' ','(',')',')',' ','(','s','i','g','n','a','t','u','r','e',' ','v','e','c','4',' ','(','p','a','r','a','m','e','t','e','r','s',' ','(','d','e','c','l','a','r','e',' ','(','i','n',')',' ','v','e','c','4',' ','x',')',')',' ','(',')',')',')',')'} ; ++static const char *functions_for_140_glsl [] = { ++ builtin_abs, ++ builtin_acos, ++ builtin_acosh, ++ builtin_all, ++ builtin_any, ++ builtin_asin, ++ builtin_asinh, ++ builtin_atan, ++ builtin_atanh, ++ builtin_ceil, ++ builtin_clamp, ++ builtin_cos, ++ builtin_cosh, ++ builtin_cross, ++ builtin_degrees, ++ builtin_distance, ++ builtin_dot, ++ builtin_equal, ++ builtin_exp, ++ builtin_exp2, ++ builtin_faceforward, ++ builtin_floor, ++ builtin_fract, ++ builtin_greaterThan, ++ builtin_greaterThanEqual, ++ builtin_inverse, ++ builtin_inversesqrt, ++ builtin_isinf, ++ builtin_isnan, ++ builtin_length, ++ builtin_lessThan, ++ builtin_lessThanEqual, ++ builtin_log, ++ builtin_log2, ++ builtin_matrixCompMult, ++ builtin_max, ++ builtin_min, ++ builtin_mix, ++ builtin_mod, ++ builtin_modf, ++ builtin_noise1, ++ builtin_noise2, ++ builtin_noise3, ++ builtin_noise4, ++ builtin_normalize, ++ builtin_not, ++ builtin_notEqual, ++ builtin_outerProduct, ++ builtin_pow, ++ builtin_radians, ++ builtin_reflect, ++ builtin_refract, ++ builtin_round, ++ builtin_roundEven, ++ builtin_shadow1D, ++ builtin_shadow1DLod, ++ builtin_shadow1DProj, ++ builtin_shadow1DProjLod, ++ builtin_shadow2D, ++ builtin_shadow2DLod, ++ builtin_shadow2DProj, ++ builtin_shadow2DProjLod, ++ builtin_sign, ++ builtin_sin, ++ builtin_sinh, ++ builtin_smoothstep, ++ builtin_sqrt, ++ builtin_step, ++ builtin_tan, ++ builtin_tanh, ++ builtin_texelFetch, ++ builtin_texelFetchOffset, ++ builtin_texture, ++ builtin_texture1D, ++ builtin_texture1DLod, ++ builtin_texture1DProj, ++ builtin_texture1DProjLod, ++ builtin_texture2D, ++ builtin_texture2DLod, ++ builtin_texture2DProj, ++ builtin_texture2DProjLod, ++ builtin_texture3D, ++ builtin_texture3DLod, ++ builtin_texture3DProj, ++ builtin_texture3DProjLod, ++ builtin_textureCube, ++ builtin_textureCubeLod, ++ builtin_textureGrad, ++ builtin_textureGradOffset, ++ builtin_textureLod, ++ builtin_textureLodOffset, ++ builtin_textureOffset, ++ builtin_textureProj, ++ builtin_textureProjGrad, ++ builtin_textureProjGradOffset, ++ builtin_textureProjLod, ++ builtin_textureProjLodOffset, ++ builtin_textureProjOffset, ++ builtin_textureSize, ++ builtin_transpose, ++ builtin_trunc, ++}; ++static const char prototypes_for_ARB_shader_bit_encoding_glsl[] = ++ "(\n" ++ "(function floatBitsToInt\n" ++ " (signature int\n" ++ " (parameters\n" ++ " (declare (in) float value))\n" ++ " ())\n" ++ " (signature ivec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 value))\n" ++ " ())\n" ++ " (signature ivec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 value))\n" ++ " ())\n" ++ " (signature ivec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 value))\n" ++ " ()))\n" ++ "(function floatBitsToUint\n" ++ " (signature uint\n" ++ " (parameters\n" ++ " (declare (in) float value))\n" ++ " ())\n" ++ " (signature uvec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 value))\n" ++ " ())\n" ++ " (signature uvec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 value))\n" ++ " ())\n" ++ " (signature uvec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 value))\n" ++ " ()))\n" ++ "(function intBitsToFloat\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) int value))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) ivec2 value))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) ivec3 value))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) ivec4 value))\n" ++ " ()))\n" ++ "(function uintBitsToFloat\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) uint value))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) uvec2 value))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) uvec3 value))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) uvec4 value))\n" ++ " ())))" ++; ++static const char *functions_for_ARB_shader_bit_encoding_glsl [] = { ++ builtin_floatBitsToInt, ++ builtin_floatBitsToUint, ++ builtin_intBitsToFloat, ++ builtin_uintBitsToFloat, ++}; ++static const char prototypes_for_ARB_shader_texture_lod_frag[] = ++ "(\n" ++ "(function texture1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture3DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture3DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function textureCubeLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow1DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow2DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow1DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow2DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())))" ++; ++static const char *functions_for_ARB_shader_texture_lod_frag [] = { ++ builtin_shadow1DLod, ++ builtin_shadow1DProjLod, ++ builtin_shadow2DLod, ++ builtin_shadow2DProjLod, ++ builtin_texture1DLod, ++ builtin_texture1DProjLod, ++ builtin_texture2DLod, ++ builtin_texture2DProjLod, ++ builtin_texture3DLod, ++ builtin_texture3DProjLod, ++ builtin_textureCubeLod, ++}; ++static const char prototypes_for_ARB_shader_texture_lod_glsl[] = ++ "(\n" ++ "(function texture1DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) float P)\n" ++ " (declare (in) float dPdx)\n" ++ " (declare (in) float dPdy))\n" ++ " ()))\n" ++ "(function texture1DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) float dPdx)\n" ++ " (declare (in) float dPdy))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float dPdx)\n" ++ " (declare (in) float dPdy))\n" ++ " ()))\n" ++ "(function texture2DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ()))\n" ++ "(function texture2DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ()))\n" ++ "(function texture3DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) vec3 dPdx)\n" ++ " (declare (in) vec3 dPdy))\n" ++ " ()))\n" ++ "(function texture3DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) vec3 dPdx)\n" ++ " (declare (in) vec3 dPdy))\n" ++ " ()))\n" ++ "(function textureCubeGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerCube sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) vec3 dPdx)\n" ++ " (declare (in) vec3 dPdy))\n" ++ " ()))\n" ++ "(function shadow1DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) float dPdx)\n" ++ " (declare (in) float dPdy))\n" ++ " ()))\n" ++ "(function shadow1DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) float dPdx)\n" ++ " (declare (in) float dPdy))\n" ++ " ()))\n" ++ "(function shadow2DGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ()))\n" ++ "(function shadow2DProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ()))\n" ++ "(function texture2DRectGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler)\n" ++ " (declare (in) vec2 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ()))\n" ++ "(function texture2DRectProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ()))\n" ++ "(function shadow2DRectGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler)\n" ++ " (declare (in) vec3 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ()))\n" ++ "(function shadow2DRectProjGradARB\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler)\n" ++ " (declare (in) vec4 P)\n" ++ " (declare (in) vec2 dPdx)\n" ++ " (declare (in) vec2 dPdy))\n" ++ " ())))" ++; ++static const char *functions_for_ARB_shader_texture_lod_glsl [] = { ++ builtin_shadow1DGradARB, ++ builtin_shadow1DProjGradARB, ++ builtin_shadow2DGradARB, ++ builtin_shadow2DProjGradARB, ++ builtin_shadow2DRectGradARB, ++ builtin_shadow2DRectProjGradARB, ++ builtin_texture1DGradARB, ++ builtin_texture1DProjGradARB, ++ builtin_texture2DGradARB, ++ builtin_texture2DProjGradARB, ++ builtin_texture2DRectGradARB, ++ builtin_texture2DRectProjGradARB, ++ builtin_texture3DGradARB, ++ builtin_texture3DProjGradARB, ++ builtin_textureCubeGradARB, ++}; ++static const char prototypes_for_ARB_texture_rectangle_glsl[] = ++ "(\n" ++ "(function texture2DRect\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ()))\n" ++ "(function texture2DRectProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRect sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function shadow2DRect\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow2DRectProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DRectShadow sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ())))" ++; ++static const char *functions_for_ARB_texture_rectangle_glsl [] = { ++ builtin_shadow2DRect, ++ builtin_shadow2DRectProj, ++ builtin_texture2DRect, ++ builtin_texture2DRectProj, ++}; ++static const char prototypes_for_EXT_texture_array_frag[] = ++ "(\n" ++ "(function texture1DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture2DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow1DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function shadow2DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ())))" ++; ++static const char *functions_for_EXT_texture_array_frag [] = { ++ builtin_shadow1DArray, ++ builtin_shadow2DArray, ++ builtin_texture1DArray, ++ builtin_texture2DArray, ++}; ++static const char prototypes_for_EXT_texture_array_vert[] = ++ "(\n" ++ "(function texture1DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ()))\n" ++ "(function texture1DArrayLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArray sampler)\n" ++ " (declare (in) vec2 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture2DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function texture2DArrayLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArray sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow1DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function shadow1DArrayLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler1DArrayShadow sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function shadow2DArray\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler2DArrayShadow sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ())))" ++; ++static const char *functions_for_EXT_texture_array_vert [] = { ++ builtin_shadow1DArray, ++ builtin_shadow1DArrayLod, ++ builtin_shadow2DArray, ++ builtin_texture1DArray, ++ builtin_texture1DArrayLod, ++ builtin_texture2DArray, ++ builtin_texture2DArrayLod, ++}; ++static const char prototypes_for_OES_EGL_image_external_glsl[] = ++ "(\n" ++ "(function texture2D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerExternalOES sampler)\n" ++ " (declare (in) vec2 coord))\n" ++ " ()))\n" ++ "(function texture2DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerExternalOES sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) samplerExternalOES sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ())))" ++; ++static const char *functions_for_OES_EGL_image_external_glsl [] = { ++ builtin_texture2D, ++ builtin_texture2DProj, ++}; ++static const char prototypes_for_OES_standard_derivatives_frag[] = ++ "(\n" ++ "(function dFdx\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function dFdy\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ()))\n" ++ "(function fwidth\n" ++ " (signature float\n" ++ " (parameters\n" ++ " (declare (in) float p))\n" ++ " ())\n" ++ " (signature vec2\n" ++ " (parameters\n" ++ " (declare (in) vec2 p))\n" ++ " ())\n" ++ " (signature vec3\n" ++ " (parameters\n" ++ " (declare (in) vec3 p))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) vec4 p))\n" ++ " ())))" ++; ++static const char *functions_for_OES_standard_derivatives_frag [] = { ++ builtin_dFdx, ++ builtin_dFdy, ++ builtin_fwidth, ++}; ++static const char prototypes_for_OES_texture_3D_frag[] = ++ "(\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float bias))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ())\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float bias))\n" ++ " ())))" ++; ++static const char *functions_for_OES_texture_3D_frag [] = { ++ builtin_texture3D, ++ builtin_texture3DProj, ++}; ++static const char prototypes_for_OES_texture_3D_vert[] = ++ "(\n" ++ "(function texture3D\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord))\n" ++ " ()))\n" ++ "(function texture3DProj\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord))\n" ++ " ()))\n" ++ "(function texture3DLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec3 coord)\n" ++ " (declare (in) float lod))\n" ++ " ()))\n" ++ "(function texture3DProjLod\n" ++ " (signature vec4\n" ++ " (parameters\n" ++ " (declare (in) sampler3D sampler)\n" ++ " (declare (in) vec4 coord)\n" ++ " (declare (in) float lod))\n" ++ " ())))" ++; ++static const char *functions_for_OES_texture_3D_vert [] = { ++ builtin_texture3D, ++ builtin_texture3DLod, ++ builtin_texture3DProj, ++ builtin_texture3DProjLod, ++}; ++static gl_shader *builtin_profiles[24]; ++ ++static void *builtin_mem_ctx = NULL; ++ ++void ++_mesa_glsl_release_functions(void) ++{ ++ ralloc_free(builtin_mem_ctx); ++ builtin_mem_ctx = NULL; ++ memset(builtin_profiles, 0, sizeof(builtin_profiles)); ++} ++ ++static void ++_mesa_read_profile(struct _mesa_glsl_parse_state *state, ++ int profile_index, ++ const char *prototypes, ++ const char **functions, ++ int count) ++{ ++ gl_shader *sh = builtin_profiles[profile_index]; ++ ++ if (sh == NULL) { ++ sh = read_builtins(GL_VERTEX_SHADER, prototypes, functions, count); ++ ralloc_steal(builtin_mem_ctx, sh); ++ builtin_profiles[profile_index] = sh; ++ } ++ ++ state->builtins_to_link[state->num_builtins_to_link] = sh; ++ state->num_builtins_to_link++; ++} ++ ++void ++_mesa_glsl_initialize_functions(struct _mesa_glsl_parse_state *state) ++{ ++ /* If we've already initialized the built-ins, bail early. */ ++ if (state->num_builtins_to_link > 0) ++ return; ++ ++ if (builtin_mem_ctx == NULL) { ++ builtin_mem_ctx = ralloc_context(NULL); // "GLSL built-in functions" ++ memset(&builtin_profiles, 0, sizeof(builtin_profiles)); ++ } ++ ++ if (state->target == fragment_shader && state->language_version == 100) { ++ _mesa_read_profile(state, 0, ++ prototypes_for_100_frag, ++ functions_for_100_frag, ++ Elements(functions_for_100_frag)); ++ } ++ ++ if (state->language_version == 100) { ++ _mesa_read_profile(state, 1, ++ prototypes_for_100_glsl, ++ functions_for_100_glsl, ++ Elements(functions_for_100_glsl)); ++ } ++ ++ if (state->target == vertex_shader && state->language_version == 100) { ++ _mesa_read_profile(state, 2, ++ prototypes_for_100_vert, ++ functions_for_100_vert, ++ Elements(functions_for_100_vert)); ++ } ++ ++ if (state->target == fragment_shader && state->language_version == 110) { ++ _mesa_read_profile(state, 3, ++ prototypes_for_110_frag, ++ functions_for_110_frag, ++ Elements(functions_for_110_frag)); ++ } ++ ++ if (state->language_version == 110) { ++ _mesa_read_profile(state, 4, ++ prototypes_for_110_glsl, ++ functions_for_110_glsl, ++ Elements(functions_for_110_glsl)); ++ } ++ ++ if (state->target == vertex_shader && state->language_version == 110) { ++ _mesa_read_profile(state, 5, ++ prototypes_for_110_vert, ++ functions_for_110_vert, ++ Elements(functions_for_110_vert)); ++ } ++ ++ if (state->target == fragment_shader && state->language_version == 120) { ++ _mesa_read_profile(state, 6, ++ prototypes_for_120_frag, ++ functions_for_120_frag, ++ Elements(functions_for_120_frag)); ++ } ++ ++ if (state->language_version == 120) { ++ _mesa_read_profile(state, 7, ++ prototypes_for_120_glsl, ++ functions_for_120_glsl, ++ Elements(functions_for_120_glsl)); ++ } ++ ++ if (state->target == vertex_shader && state->language_version == 120) { ++ _mesa_read_profile(state, 8, ++ prototypes_for_120_vert, ++ functions_for_120_vert, ++ Elements(functions_for_120_vert)); ++ } ++ ++ if (state->target == fragment_shader && state->language_version == 130) { ++ _mesa_read_profile(state, 9, ++ prototypes_for_130_frag, ++ functions_for_130_frag, ++ Elements(functions_for_130_frag)); ++ } ++ ++ if (state->language_version == 130) { ++ _mesa_read_profile(state, 10, ++ prototypes_for_130_glsl, ++ functions_for_130_glsl, ++ Elements(functions_for_130_glsl)); ++ } ++ ++ if (state->target == vertex_shader && state->language_version == 130) { ++ _mesa_read_profile(state, 11, ++ prototypes_for_130_vert, ++ functions_for_130_vert, ++ Elements(functions_for_130_vert)); ++ } ++ ++ if (state->target == fragment_shader && state->language_version == 140) { ++ _mesa_read_profile(state, 12, ++ prototypes_for_140_frag, ++ functions_for_140_frag, ++ Elements(functions_for_140_frag)); ++ } ++ ++ if (state->language_version == 140) { ++ _mesa_read_profile(state, 13, ++ prototypes_for_140_glsl, ++ functions_for_140_glsl, ++ Elements(functions_for_140_glsl)); ++ } ++ ++ if (state->ARB_shader_bit_encoding_enable) { ++ _mesa_read_profile(state, 14, ++ prototypes_for_ARB_shader_bit_encoding_glsl, ++ functions_for_ARB_shader_bit_encoding_glsl, ++ Elements(functions_for_ARB_shader_bit_encoding_glsl)); ++ } ++ ++ if (state->target == fragment_shader && state->ARB_shader_texture_lod_enable) { ++ _mesa_read_profile(state, 15, ++ prototypes_for_ARB_shader_texture_lod_frag, ++ functions_for_ARB_shader_texture_lod_frag, ++ Elements(functions_for_ARB_shader_texture_lod_frag)); ++ } ++ ++ if (state->ARB_shader_texture_lod_enable) { ++ _mesa_read_profile(state, 16, ++ prototypes_for_ARB_shader_texture_lod_glsl, ++ functions_for_ARB_shader_texture_lod_glsl, ++ Elements(functions_for_ARB_shader_texture_lod_glsl)); ++ } ++ ++ if (state->ARB_texture_rectangle_enable) { ++ _mesa_read_profile(state, 17, ++ prototypes_for_ARB_texture_rectangle_glsl, ++ functions_for_ARB_texture_rectangle_glsl, ++ Elements(functions_for_ARB_texture_rectangle_glsl)); ++ } ++ ++ if (state->target == fragment_shader && state->EXT_texture_array_enable) { ++ _mesa_read_profile(state, 18, ++ prototypes_for_EXT_texture_array_frag, ++ functions_for_EXT_texture_array_frag, ++ Elements(functions_for_EXT_texture_array_frag)); ++ } ++ ++ if (state->target == vertex_shader && state->EXT_texture_array_enable) { ++ _mesa_read_profile(state, 19, ++ prototypes_for_EXT_texture_array_vert, ++ functions_for_EXT_texture_array_vert, ++ Elements(functions_for_EXT_texture_array_vert)); ++ } ++ ++ if (state->OES_EGL_image_external_enable) { ++ _mesa_read_profile(state, 20, ++ prototypes_for_OES_EGL_image_external_glsl, ++ functions_for_OES_EGL_image_external_glsl, ++ Elements(functions_for_OES_EGL_image_external_glsl)); ++ } ++ ++ if (state->target == fragment_shader && state->OES_standard_derivatives_enable) { ++ _mesa_read_profile(state, 21, ++ prototypes_for_OES_standard_derivatives_frag, ++ functions_for_OES_standard_derivatives_frag, ++ Elements(functions_for_OES_standard_derivatives_frag)); ++ } ++ ++ if (state->target == fragment_shader && state->OES_texture_3D_enable) { ++ _mesa_read_profile(state, 22, ++ prototypes_for_OES_texture_3D_frag, ++ functions_for_OES_texture_3D_frag, ++ Elements(functions_for_OES_texture_3D_frag)); ++ } ++ ++ if (state->target == vertex_shader && state->OES_texture_3D_enable) { ++ _mesa_read_profile(state, 23, ++ prototypes_for_OES_texture_3D_vert, ++ functions_for_OES_texture_3D_vert, ++ Elements(functions_for_OES_texture_3D_vert)); ++ } ++ ++} +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-Revert-llvmpipe-fix-overflow-bug-in-total-texture-si.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-Revert-llvmpipe-fix-overflow-bug-in-total-texture-si.patch new file mode 100644 index 0000000000..e44251126c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-Revert-llvmpipe-fix-overflow-bug-in-total-texture-si.patch @@ -0,0 +1,57 @@ +From fa40a7a1b8bf8399365fe250902d76aa5b6b3b83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= +Date: Mon, 26 Nov 2012 11:38:43 -0800 +Subject: [PATCH] Revert "llvmpipe: fix overflow bug in total texture size + computation" + +This reverts commit 0bcad0295543425f5ec4b44bfe6e600794e9c166. +--- + src/gallium/drivers/llvmpipe/lp_texture.c | 18 ++---------------- + 1 files changed, 2 insertions(+), 16 deletions(-) + +diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c +index b4ea94c..a138621 100644 +--- a/src/gallium/drivers/llvmpipe/lp_texture.c ++++ b/src/gallium/drivers/llvmpipe/lp_texture.c +@@ -113,7 +113,7 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen, + unsigned width = pt->width0; + unsigned height = pt->height0; + unsigned depth = pt->depth0; +- uint64_t total_size = 0; ++ size_t total_size = 0; + + assert(LP_MAX_TEXTURE_2D_LEVELS <= LP_MAX_TEXTURE_LEVELS); + assert(LP_MAX_TEXTURE_3D_LEVELS <= LP_MAX_TEXTURE_LEVELS); +@@ -140,12 +140,6 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen, + + lpr->row_stride[level] = align(nblocksx * block_size, 16); + +- /* if row_stride * height > LP_MAX_TEXTURE_SIZE */ +- if (lpr->row_stride[level] > LP_MAX_TEXTURE_SIZE / nblocksy) { +- /* image too large */ +- goto fail; +- } +- + lpr->img_stride[level] = lpr->row_stride[level] * nblocksy; + } + +@@ -178,15 +172,7 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen, + } + } + +- /* if img_stride * num_slices_faces > LP_MAX_TEXTURE_SIZE */ +- if (lpr->img_stride[level] > +- LP_MAX_TEXTURE_SIZE / lpr->num_slices_faces[level]) { +- /* volume too large */ +- goto fail; +- } +- +- total_size += (uint64_t) lpr->num_slices_faces[level] +- * (uint64_t) lpr->img_stride[level]; ++ total_size += lpr->num_slices_faces[level] * lpr->img_stride[level]; + if (total_size > LP_MAX_TEXTURE_SIZE) { + goto fail; + } +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-builtin_function.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-builtin_function.patch new file mode 100644 index 0000000000..46687a8117 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-builtin_function.patch @@ -0,0 +1,14 @@ +diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am +index 1ecc003..6cdc264 100644 +--- a/src/glsl/Makefile.am ++++ b/src/glsl/Makefile.am +@@ -92,9 +92,6 @@ glsl_parser.cc glsl_parser.h: glsl_parser.yy + BUILT_SOURCES = glsl_parser.h builtin_function.cpp + CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES) + +-builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py builtin_compiler$(EXEEXT) +- $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp +- + glcpp/libglcpp.la: + cd glcpp ; $(MAKE) $(AM_MAKEFLAGS) + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-cross-compile.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-cross-compile.patch new file mode 100644 index 0000000000..502065d12c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-cross-compile.patch @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index b55473f..45528ed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -404,15 +404,6 @@ MESA_ASM_SOURCES="" + GLAPI_ASM_SOURCES="" + AC_MSG_CHECKING([whether to enable assembly]) + test "x$enable_asm" = xno && AC_MSG_RESULT([no]) +-# disable if cross compiling on x86/x86_64 since we must run gen_matypes +-if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then +- case "$host_cpu" in +- i?86 | x86_64) +- enable_asm=no +- AC_MSG_RESULT([no, cross compiling]) +- ;; +- esac +-fi + # check for supported arches + if test "x$enable_asm" = xyes; then + case "$host_cpu" in diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-fail-compile-on-bad-uniform-access.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-fail-compile-on-bad-uniform-access.patch new file mode 100644 index 0000000000..34932c278a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-fail-compile-on-bad-uniform-access.patch @@ -0,0 +1,31 @@ +diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp +index 56cb447..a86c9bd 100644 +--- a/src/mesa/drivers/dri/i965/brw_fs.cpp ++++ b/src/mesa/drivers/dri/i965/brw_fs.cpp +@@ -1121,7 +1121,12 @@ fs_visitor::remove_dead_constants() + if (inst->src[i].file != UNIFORM) + continue; + +- assert(constant_nr < (int)c->prog_data.nr_params); ++ if (constant_nr >= (int)c->prog_data.nr_params) { ++ ralloc_free(this->params_remap); ++ this->params_remap = NULL; ++ fail("accessed non-existent uniform"); ++ return false; ++ } + + /* For now, set this to non-negative. We'll give it the + * actual new number in a moment, in order to keep the +diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +index 2dd212a..0593a1f 100644 +--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp ++++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +@@ -2270,6 +2270,8 @@ fs_visitor::fs_visitor(struct brw_wm_compile *c, struct gl_shader_program *prog, + this->virtual_grf_use = NULL; + this->live_intervals_valid = false; + ++ this->params_remap = NULL; ++ + this->force_uncompressed_stack = 0; + this->force_sechalf_stack = 0; + } diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-force_s3tc_enable.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-force_s3tc_enable.patch new file mode 100644 index 0000000000..93c65a74f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-force_s3tc_enable.patch @@ -0,0 +1,15 @@ +diff --git a/src/gallium/auxiliary/util/u_format_s3tc.c b/src/gallium/auxiliary/util/u_format_s3tc.c +index 4a9dc22..31a6c19 100644 +--- a/src/gallium/auxiliary/util/u_format_s3tc.c ++++ b/src/gallium/auxiliary/util/u_format_s3tc.c +@@ -120,8 +120,8 @@ util_format_s3tc_init(void) + + library = util_dl_open(DXTN_LIBNAME); + if (!library) { +- if ((force_s3tc_enable = getenv("force_s3tc_enable")) && +- !strcmp(force_s3tc_enable, "true")) { ++ if (1 /*(force_s3tc_enable = getenv("force_s3tc_enable")) && ++ !strcmp(force_s3tc_enable, "true")*/) { + debug_printf("couldn't open " DXTN_LIBNAME ", enabling DXTn due to " + "force_s3tc_enable=true environment variable\n"); + util_format_s3tc_enabled = TRUE; diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-glx-Check-that-swap_buffers_reply-is-non-NULL-before.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-glx-Check-that-swap_buffers_reply-is-non-NULL-before.patch new file mode 100644 index 0000000000..eec2f84ce3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-glx-Check-that-swap_buffers_reply-is-non-NULL-before.patch @@ -0,0 +1,36 @@ +From ce8c34e6efc671b1f8e19346cc9e199b972772db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= +Date: Mon, 28 Jan 2013 14:05:42 -0800 +Subject: [PATCH] glx: Check that swap_buffers_reply is non-NULL before using + it + +Check that the return value from xcb_dri2_swap_buffers_reply is +non-NULL before accessing the struct members. + +Change-Id: Ia289c04ed1237326873e23c093675faa8708b557 +--- + src/glx/dri2_glx.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c +index 12b3026..141af1c 100644 +--- a/src/glx/dri2_glx.c ++++ b/src/glx/dri2_glx.c +@@ -787,9 +787,11 @@ dri2SwapBuffers(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor, + XSync(pdraw->psc->dpy, False); + swap_buffers_reply = + xcb_dri2_swap_buffers_reply(c, swap_buffers_cookie, NULL); +- ret = merge_counter(swap_buffers_reply->swap_hi, +- swap_buffers_reply->swap_lo); +- free(swap_buffers_reply); ++ if (swap_buffers_reply) { ++ ret = merge_counter(swap_buffers_reply->swap_hi, ++ swap_buffers_reply->swap_lo); ++ free(swap_buffers_reply); ++ } + } + + if (psc->show_fps) { +-- +1.8.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-i965-Allow-the-case-where-multiple-flush-types-are-e.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-i965-Allow-the-case-where-multiple-flush-types-are-e.patch new file mode 100644 index 0000000000..561a1e9119 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-i965-Allow-the-case-where-multiple-flush-types-are-e.patch @@ -0,0 +1,27 @@ +From 3ce50709aac9199e4d9fa8f1c42af29776eced64 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= +Date: Tue, 17 Apr 2012 18:16:18 -0700 +Subject: [PATCH 1/2] i965: Allow the case where multiple flush types are + enqueued. + +This happens when the miptree is allocated with intel_miptree_alloc_hiz +which adds NEED_HIZ_RESOLVE and then NEED_DEPTH_RESOLVE is added to it. +--- + src/mesa/drivers/dri/intel/intel_resolve_map.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mesa/drivers/dri/intel/intel_resolve_map.c b/src/mesa/drivers/dri/intel/intel_resolve_map.c +index 04b5c94..cb4b838 100644 +--- a/src/mesa/drivers/dri/intel/intel_resolve_map.c ++++ b/src/mesa/drivers/dri/intel/intel_resolve_map.c +@@ -42,8 +42,8 @@ intel_resolve_map_set(struct intel_resolve_map *head, + struct intel_resolve_map *prev = head; + + while (*tail) { +- if ((*tail)->level == level && (*tail)->layer == layer) { +- (*tail)->need = need; ++ if ((*tail)->level == level && (*tail)->layer == layer ++ && (*tail)->need == need ) { + return; + } + prev = *tail; diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch new file mode 100644 index 0000000000..590b13b4c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch @@ -0,0 +1,81 @@ +From 1547bb37e97c8d7069d5be4e8b9b0d34ac28f7e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= +Date: Tue, 17 Apr 2012 18:17:35 -0700 +Subject: [PATCH 2/2] i965: Make sure we do render between two hiz flushes + +Hiz flushes touch the URB allocation, which doesn't work if you don't +draw in between. This includes on startup where the GPU hasn't been +used and we lockup. To avoid this situation make sure that some +primitives get rendered before every hiz flush. +--- + src/mesa/drivers/dri/i965/brw_context.c | 1 + + src/mesa/drivers/dri/i965/brw_context.h | 1 + + src/mesa/drivers/dri/i965/brw_draw.c | 12 +++++++++--- + 3 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c +index 1448965..9ba1742 100644 +--- a/src/mesa/drivers/dri/i965/brw_context.c ++++ b/src/mesa/drivers/dri/i965/brw_context.c +@@ -332,6 +332,7 @@ brwCreateContext(int api, + brw->urb.max_gs_entries = 256; + } + brw->urb.gen6_gs_previously_active = false; ++ brw->urb.prims_since_last_flush = 0; + } else if (intel->gen == 5) { + brw->urb.size = 1024; + brw->max_vs_threads = 72; +diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h +index 9232a72..d13e85c 100644 +--- a/src/mesa/drivers/dri/i965/brw_context.h ++++ b/src/mesa/drivers/dri/i965/brw_context.h +@@ -871,6 +871,7 @@ struct brw_context + * URB space for the GS. + */ + bool gen6_gs_previously_active; ++ int prims_since_last_flush; + } urb; + + +diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c +index 323310a..211d68d 100644 +--- a/src/mesa/drivers/dri/i965/brw_draw.c ++++ b/src/mesa/drivers/dri/i965/brw_draw.c +@@ -293,10 +293,14 @@ static void brw_merge_inputs( struct brw_context *brw, + * Resolve the depth buffer's HiZ buffer and resolve the depth buffer of each + * enabled depth texture. + * ++ * We don't resolve the depth buffer's HiZ if no primitives have been drawn ++ * since the last flush. This avoids a case where we lockup the GPU on boot ++ * when this is the first thing we do. ++ * + * (In the future, this will also perform MSAA resolves). + */ + static void +-brw_predraw_resolve_buffers(struct brw_context *brw) ++brw_predraw_resolve_buffers(struct brw_context *brw, int nr_prims) + { + struct gl_context *ctx = &brw->intel.ctx; + struct intel_context *intel = &brw->intel; +@@ -305,9 +309,11 @@ brw_predraw_resolve_buffers(struct brw_context *brw) + + /* Resolve the depth buffer's HiZ buffer. */ + depth_irb = intel_get_renderbuffer(ctx->DrawBuffer, BUFFER_DEPTH); +- if (depth_irb) ++ if (depth_irb && brw->urb.prims_since_last_flush > 0 ) + intel_renderbuffer_resolve_hiz(intel, depth_irb); + ++ brw->urb.prims_since_last_flush = nr_prims; ++ + /* Resolve depth buffer of each enabled depth texture. */ + for (int i = 0; i < BRW_MAX_TEX_UNIT; i++) { + if (!ctx->Texture.Unit[i]._ReallyEnabled) +@@ -438,7 +444,7 @@ static bool brw_try_draw_prims( struct gl_context *ctx, + * and finalizing textures but before setting up any hardware state for + * this draw call. + */ +- brw_predraw_resolve_buffers(brw); ++ brw_predraw_resolve_buffers(brw, nr_prims); + + /* This workaround has to happen outside of brw_state_upload() because it + * may flush the batchbuffer for a blit, affecting the state flags. diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-intel-disable-msaa.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-intel-disable-msaa.patch new file mode 100644 index 0000000000..69c18151e0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-intel-disable-msaa.patch @@ -0,0 +1,46 @@ +The original patch disabled MSAA because it caused a corruption issue: +http://code.google.com/p/chromium-os/issues/detail?id=32528 + +MSAA now seems to work, but it causes GPU lockups, so is still disabled: +http://code.google.com/p/chromium-os/issues/detail?id=36508 + +diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c +index 10a8c7f..4d7c4d6 100644 +--- a/src/mesa/drivers/dri/intel/intel_fbo.c ++++ b/src/mesa/drivers/dri/intel/intel_fbo.c +@@ -185,34 +185,7 @@ intel_unmap_renderbuffer(struct gl_context *ctx, + unsigned + intel_quantize_num_samples(struct intel_screen *intel, unsigned num_samples) + { +- switch (intel->gen) { +- case 6: +- /* Gen6 supports only 4x multisampling. */ +- if (num_samples > 0) +- return 4; +- else +- return 0; +- case 7: +- /* Gen7 supports 4x and 8x multisampling. */ +- if (num_samples > 4) +- return 8; +- else if (num_samples > 0) +- return 4; +- else +- return 0; +- return 0; +- default: +- /* MSAA unsupported. However, a careful reading of +- * EXT_framebuffer_multisample reveals that we need to permit +- * num_samples to be 1 (since num_samples is permitted to be as high as +- * GL_MAX_SAMPLES, and GL_MAX_SAMPLES must be at least 1). Since +- * platforms before Gen6 don't support MSAA, this is safe, because +- * multisampling won't happen anyhow. +- */ +- if (num_samples > 0) +- return 1; +- return 0; +- } ++ return 0; + } + + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-uniform-array-bounds-check.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-uniform-array-bounds-check.patch new file mode 100644 index 0000000000..4553103936 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/9.0-uniform-array-bounds-check.patch @@ -0,0 +1,60 @@ +diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp +index bddb8f9..66a2399 100644 +--- a/src/mesa/main/uniform_query.cpp ++++ b/src/mesa/main/uniform_query.cpp +@@ -237,11 +237,14 @@ validate_uniform_parameters(struct gl_context *ctx, + return false; + } + +- /* This case should be impossible. The implication is that a call like +- * glGetUniformLocation(prog, "foo[8]") was successful but "foo" is not an +- * array. ++ /* If the uniform is an array, check that array_index is in bounds. ++ * If not an array, check that array_index is zero. ++ * array_index is unsigned so no need to check for less than zero. + */ +- if (*array_index != 0 && shProg->UniformStorage[*loc].array_elements == 0) { ++ unsigned limit = shProg->UniformStorage[*loc].array_elements; ++ if (limit == 0) ++ limit = 1; ++ if (*array_index >= limit) { + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", + caller, location); + return false; +@@ -728,9 +731,6 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, + * will have already generated an error. + */ + if (uni->array_elements != 0) { +- if (offset >= uni->array_elements) +- return; +- + count = MIN2(count, (int) (uni->array_elements - offset)); + } + +@@ -885,9 +885,6 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, + * will have already generated an error. + */ + if (uni->array_elements != 0) { +- if (offset >= uni->array_elements) +- return; +- + count = MIN2(count, (int) (uni->array_elements - offset)); + } + +@@ -1021,10 +1018,13 @@ _mesa_get_uniform_location(struct gl_context *ctx, + if (!found) + return GL_INVALID_INDEX; + +- /* Since array_elements is 0 for non-arrays, this causes look-ups of 'a[0]' +- * to (correctly) fail if 'a' is not an array. ++ /* If the uniform is an array, fail if the index is out of bounds. ++ * (A negative index is caught above.) This also fails if the uniform ++ * is not an array, but the user is trying to index it, because ++ * array_elements is zero and offset >= 0. + */ +- if (array_lookup && shProg->UniformStorage[location].array_elements == 0) { ++ if (array_lookup ++ && offset >= shProg->UniformStorage[location].array_elements) { + return GL_INVALID_INDEX; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/chromeos-version.sh new file mode 100755 index 0000000000..41b1869333 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/chromeos-version.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +echo 'MESA_MAJOR.MESA_MINOR.MESA_PATCH' | \ + cpp -include "$1"/src/mesa/main/version.h | \ + sed -n '${s: ::g;p}' diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/drirc b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/drirc new file mode 100644 index 0000000000..bea0c73e77 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/drirc @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/eselect-mesa.conf.7.9 b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/eselect-mesa.conf.7.9 new file mode 100644 index 0000000000..70d9a075ed --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/eselect-mesa.conf.7.9 @@ -0,0 +1,39 @@ +# mesa classic/gallium implementations in this release + +# Syntax description: +# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable +# classic/gallium implementations. +# * MESA_DRIVERS is an associative array, for each member "foo" of +# MESA_IMPLEMENTATIONS it contains the following elements: +# foo,description - Human-readable description of the driver +# foo,classicdriver - Filename of the classic driver +# foo,galliumdriver - Filename of the gallium driver +# foo,default - which of classic or gallium is chosen by default + +MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw" +declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative." + +MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)" +MESA_DRIVERS[i915,classicdriver]="i915_dri.so" +MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so" +MESA_DRIVERS[i915,default]="classic" + +MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)" +MESA_DRIVERS[i965,classicdriver]="i965_dri.so" +MESA_DRIVERS[i965,galliumdriver]="i965g_dri.so" +MESA_DRIVERS[i965,default]="classic" + +MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)" +MESA_DRIVERS[r300,classicdriver]="r300_dri.so" +MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so" +MESA_DRIVERS[r300,default]="gallium" + +MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen)" +MESA_DRIVERS[r600,classicdriver]="r600_dri.so" +MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so" +MESA_DRIVERS[r600,default]="classic" + +MESA_DRIVERS[sw,description]="sw (Software renderer)" +MESA_DRIVERS[sw,classicdriver]="swrast_dri.so" +MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so" +MESA_DRIVERS[sw,default]="gallium" diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/lib/libGL.la b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/lib/libGL.la new file mode 100644 index 0000000000..5c3f25a3bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/lib/libGL.la @@ -0,0 +1,32 @@ +# libGL.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libGL.so.1' + +# Names of this library. +library_names='libGL.so.1.2 libGL.so.1 libGL.so' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs='-lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread' + +# Version information for libGL. +current=3 +age=2 +revision=0 + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/${libdir}' diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/lib/libGLU.la b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/lib/libGLU.la new file mode 100644 index 0000000000..a87a7ad6d5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/files/lib/libGLU.la @@ -0,0 +1,32 @@ +# libGLU.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libGLU.so.1' + +# Names of this library. +library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs='-lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread -lstdc++' + +# Version information for libGLU. +current=4 +age=3 +revision=0 + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/lib' diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9.0-r5.ebuild new file mode 100644 index 0000000000..e69a5b84d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9.0-r5.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.ebuild,v 1.3 2010/12/05 17:19:14 arfrever Exp $ +CROS_WORKON_COMMIT="fc2cf1403860ebc8769dfa36cf7dcdebc1baa305" +CROS_WORKON_TREE="9fac2f50764a0dd604f1d1c3458343cedc871d1d" + +EAPI=4 + +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" +CROS_WORKON_PROJECT="chromiumos/third_party/mesa" +CROS_WORKON_LOCALNAME="../third_party/mesa" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-2" + EXPERIMENTAL="true" +fi + +inherit base autotools multilib flag-o-matic python toolchain-funcs ${GIT_ECLASS} cros-workon + +OPENGL_DIR="xorg-x11" + +MY_PN="${PN/m/M}" +MY_P="${MY_PN}-${PV/_/-}" +MY_SRC_P="${MY_PN}Lib-${PV/_/-}" + +FOLDER="${PV/_rc*/}" +[[ ${PV/_rc*/} == ${PV} ]] || FOLDER+="/RC" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="http://mesa3d.sourceforge.net/" + +#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" +if [[ $PV = 9999* ]] || [[ -n ${CROS_WORKON_COMMIT} ]]; then + SRC_URI="${SRC_PATCHES}" +else + SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 + ${SRC_PATCHES}" +fi + +# Most of the code is MIT/X11. +# ralloc is LGPL-3 +# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 +LICENSE="MIT LGPL-3 SGI-B-2.0" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 x86-fbsd" + +INTEL_CARDS="intel" +RADEON_CARDS="radeon" +VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} mach64 mga nouveau r128 savage sis vmware tdfx via" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic debug egl +gallium -gbm gles1 gles2 +llvm motif +nptl pic selinux shared-glapi kernel_FreeBSD" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31" +# keep correct libdrm and dri2proto dep +# keep blocks in rdepend for binpkg +RDEPEND=" + !=x11-proto/dri2proto-2.2 + >=x11-proto/glproto-1.4.11 + dev-libs/expat + gbm? ( sys-fs/udev ) + x11-libs/libICE + >=x11-libs/libX11-1.3.99.901 + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXxf86vm + motif? ( x11-libs/openmotif ) + ${LIBDRM_DEPSTRING} +" + +DEPEND="${RDEPEND} + =dev-lang/python-2* + dev-libs/libxml2 + dev-util/pkgconfig + x11-misc/makedepend + x11-proto/inputproto + >=x11-proto/xextproto-7.0.99.1 + x11-proto/xf86driproto + x11-proto/xf86vidmodeproto + !arm? ( sys-devel/llvm ) +" + +S="${WORKDIR}/${MY_P}" + +# It is slow without texrels, if someone wants slow +# mesa without texrels +pic use is worth the shot +QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*" +QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*" + +# Think about: ggi, fbcon, no-X configs + +pkg_setup() { + # workaround toc-issue wrt #386545 + use ppc64 && append-flags -mminimal-toc +} + +src_prepare() { + # apply patches + if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/patches" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + # FreeBSD 6.* doesn't have posix_memalign(). + if [[ ${CHOST} == *-freebsd6.* ]]; then + sed -i \ + -e "s/-DHAVE_POSIX_MEMALIGN//" \ + configure.ac || die + fi + + epatch "${FILESDIR}"/9.0-cross-compile.patch + epatch "${FILESDIR}"/7.11-mesa-st-no-flush-front.patch + epatch "${FILESDIR}"/7.11-state_tracker-gallium-fix-crash-with-st_renderbuffer.patch + epatch "${FILESDIR}"/7.11_p2-pkgconfig.patch + epatch "${FILESDIR}"/9.0-builtin_function.patch + epatch "${FILESDIR}"/9.0-force_s3tc_enable.patch + epatch "${FILESDIR}"/9.0-i965-Allow-the-case-where-multiple-flush-types-are-e.patch + epatch "${FILESDIR}"/9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch + epatch "${FILESDIR}"/9.0-Add-builtin-function-cpp.patch + epatch "${FILESDIR}"/8.1-dead-code-local-hack.patch + epatch "${FILESDIR}"/8.1-array-overflow.patch + epatch "${FILESDIR}"/8.1-lastlevel.patch + epatch "${FILESDIR}"/8.1-disable-guardband.patch + epatch "${FILESDIR}"/9.0-uniform-array-bounds-check.patch + epatch "${FILESDIR}"/9.0-Revert-llvmpipe-fix-overflow-bug-in-total-texture-si.patch + epatch "${FILESDIR}"/9.0-fail-compile-on-bad-uniform-access.patch + epatch "${FILESDIR}"/9.0-glx-Check-that-swap_buffers_reply-is-non-NULL-before.patch + + base_src_prepare + + eautoreconf +} + +src_configure() { + tc-getPROG PKG_CONFIG pkg-config + + if use !gallium && use !classic; then + ewarn "You enabled neither classic nor gallium USE flags. No hardware" + ewarn "drivers will be built." + fi + + if use classic; then + # Configurable DRI drivers + # Intel code + driver_enable video_cards_intel i915 i965 + + # Nouveau code + driver_enable video_cards_nouveau nouveau + + # ATI code + driver_enable video_cards_radeon radeon r200 + fi + + if use gallium; then + # Configurable gallium drivers + gallium_driver_enable swrast + + # Intel code + gallium_driver_enable video_cards_intel i915 + + # Nouveau code + gallium_driver_enable video_cards_nouveau nouveau + + # ATI code + gallium_driver_enable video_cards_radeon r300 r600 + fi + + export LLVM_CONFIG=${SYSROOT}/usr/bin/llvm-config-host + + # --with-driver=dri|xlib|osmesa || do we need osmesa? + econf \ + --disable-option-checking \ + --with-driver=dri \ + --disable-glu \ + --disable-glut \ + --without-demos \ + --enable-texture-float \ + --enable-xcb \ + $(use_enable llvm llvm-gallium) \ + $(use_enable egl) \ + $(use_enable gbm) \ + $(use_enable gles1) \ + $(use_enable gles2) \ + $(use_enable shared-glapi) \ + $(use_enable gallium) \ + $(use_enable debug) \ + $(use_enable nptl glx-tls) \ + $(use_enable motif glw) \ + $(use_enable motif) \ + $(use_enable !pic asm) \ + --with-dri-drivers=${DRI_DRIVERS} \ + --with-gallium-drivers=${GALLIUM_DRIVERS} \ + $(use gbm && echo "--with-egl-platforms=drm") +} + +src_install() { + base_src_install + + # Save the glsl-compiler for later use + if ! tc-is-cross-compiler; then + dobin "${S}"/src/glsl/glsl_compiler || die + fi + # Remove redundant headers + # GLU and GLUT + rm -f "${D}"/usr/include/GL/glu*.h || die "Removing GLU and GLUT headers failed." + # Glew includes + rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \ + || die "Removing glew includes failed." + + # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib + # because user can eselect desired GL provider. + ebegin "Moving libGL and friends for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} + local x + for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ + || die "Failed to move ${x}" + fi + done + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \ + || die "Failed to move ${x}" + fi + done + eend $? + + dodir /usr/$(get_libdir)/dri + insinto "/usr/$(get_libdir)/dri/" + insopts -m0755 + # install the gallium drivers we use + local gallium_drivers_files=( i915_dri.so nouveau_dri.so r300_dri.so r600_dri.so swrast_dri.so ) + for x in ${gallium_drivers_files[@]}; do + if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then + doins "${S}/$(get_libdir)/gallium/${x}" + fi + done + + # install classic drivers we use + local classic_drivers_files=( i810_dri.so i965_dri.so nouveau_vieux_dri.so radeon_dri.so r200_dri.so ) + for x in ${classic_drivers_files[@]}; do + if [ -f "${S}/$(get_libdir)/${x}" ]; then + doins "${S}/$(get_libdir)/${x}" + fi + done + + # Set driconf option to enable S3TC hardware decompression + insinto "/etc/" + doins "${FILESDIR}"/drirc +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +driver_enable() { + case $# in + # for enabling unconditionally + 1) + DRI_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + DRI_DRIVERS+=",${i}" + done + fi + ;; + esac +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +gallium_driver_enable() { + case $# in + # for enabling unconditionally + 1) + GALLIUM_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + GALLIUM_DRIVERS+=",${i}" + done + fi + ;; + esac +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9999.ebuild new file mode 100644 index 0000000000..eb73378ae2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9999.ebuild @@ -0,0 +1,301 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.ebuild,v 1.3 2010/12/05 17:19:14 arfrever Exp $ + +EAPI=4 + +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" +CROS_WORKON_PROJECT="chromiumos/third_party/mesa" +CROS_WORKON_LOCALNAME="../third_party/mesa" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-2" + EXPERIMENTAL="true" +fi + +inherit base autotools multilib flag-o-matic python toolchain-funcs ${GIT_ECLASS} cros-workon + +OPENGL_DIR="xorg-x11" + +MY_PN="${PN/m/M}" +MY_P="${MY_PN}-${PV/_/-}" +MY_SRC_P="${MY_PN}Lib-${PV/_/-}" + +FOLDER="${PV/_rc*/}" +[[ ${PV/_rc*/} == ${PV} ]] || FOLDER+="/RC" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="http://mesa3d.sourceforge.net/" + +#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" +if [[ $PV = 9999* ]] || [[ -n ${CROS_WORKON_COMMIT} ]]; then + SRC_URI="${SRC_PATCHES}" +else + SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 + ${SRC_PATCHES}" +fi + +# Most of the code is MIT/X11. +# ralloc is LGPL-3 +# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 +LICENSE="MIT LGPL-3 SGI-B-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +INTEL_CARDS="intel" +RADEON_CARDS="radeon" +VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} mach64 mga nouveau r128 savage sis vmware tdfx via" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic debug egl +gallium -gbm gles1 gles2 +llvm motif +nptl pic selinux shared-glapi kernel_FreeBSD" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31" +# keep correct libdrm and dri2proto dep +# keep blocks in rdepend for binpkg +RDEPEND=" + !=x11-proto/dri2proto-2.2 + >=x11-proto/glproto-1.4.11 + dev-libs/expat + gbm? ( sys-fs/udev ) + x11-libs/libICE + >=x11-libs/libX11-1.3.99.901 + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXxf86vm + motif? ( x11-libs/openmotif ) + ${LIBDRM_DEPSTRING} +" + +DEPEND="${RDEPEND} + =dev-lang/python-2* + dev-libs/libxml2 + dev-util/pkgconfig + x11-misc/makedepend + x11-proto/inputproto + >=x11-proto/xextproto-7.0.99.1 + x11-proto/xf86driproto + x11-proto/xf86vidmodeproto + !arm? ( sys-devel/llvm ) +" + +S="${WORKDIR}/${MY_P}" + +# It is slow without texrels, if someone wants slow +# mesa without texrels +pic use is worth the shot +QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*" +QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*" + +# Think about: ggi, fbcon, no-X configs + +pkg_setup() { + # workaround toc-issue wrt #386545 + use ppc64 && append-flags -mminimal-toc +} + +src_prepare() { + # apply patches + if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/patches" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + # FreeBSD 6.* doesn't have posix_memalign(). + if [[ ${CHOST} == *-freebsd6.* ]]; then + sed -i \ + -e "s/-DHAVE_POSIX_MEMALIGN//" \ + configure.ac || die + fi + + epatch "${FILESDIR}"/9.0-cross-compile.patch + epatch "${FILESDIR}"/7.11-mesa-st-no-flush-front.patch + epatch "${FILESDIR}"/7.11-state_tracker-gallium-fix-crash-with-st_renderbuffer.patch + epatch "${FILESDIR}"/7.11_p2-pkgconfig.patch + epatch "${FILESDIR}"/9.0-builtin_function.patch + epatch "${FILESDIR}"/9.0-force_s3tc_enable.patch + epatch "${FILESDIR}"/9.0-i965-Allow-the-case-where-multiple-flush-types-are-e.patch + epatch "${FILESDIR}"/9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch + epatch "${FILESDIR}"/9.0-Add-builtin-function-cpp.patch + epatch "${FILESDIR}"/8.1-dead-code-local-hack.patch + epatch "${FILESDIR}"/8.1-array-overflow.patch + epatch "${FILESDIR}"/8.1-lastlevel.patch + epatch "${FILESDIR}"/8.1-disable-guardband.patch + epatch "${FILESDIR}"/9.0-uniform-array-bounds-check.patch + epatch "${FILESDIR}"/9.0-Revert-llvmpipe-fix-overflow-bug-in-total-texture-si.patch + epatch "${FILESDIR}"/9.0-fail-compile-on-bad-uniform-access.patch + epatch "${FILESDIR}"/9.0-glx-Check-that-swap_buffers_reply-is-non-NULL-before.patch + + base_src_prepare + + eautoreconf +} + +src_configure() { + tc-getPROG PKG_CONFIG pkg-config + + if use !gallium && use !classic; then + ewarn "You enabled neither classic nor gallium USE flags. No hardware" + ewarn "drivers will be built." + fi + + if use classic; then + # Configurable DRI drivers + # Intel code + driver_enable video_cards_intel i915 i965 + + # Nouveau code + driver_enable video_cards_nouveau nouveau + + # ATI code + driver_enable video_cards_radeon radeon r200 + fi + + if use gallium; then + # Configurable gallium drivers + gallium_driver_enable swrast + + # Intel code + gallium_driver_enable video_cards_intel i915 + + # Nouveau code + gallium_driver_enable video_cards_nouveau nouveau + + # ATI code + gallium_driver_enable video_cards_radeon r300 r600 + fi + + export LLVM_CONFIG=${SYSROOT}/usr/bin/llvm-config-host + + # --with-driver=dri|xlib|osmesa || do we need osmesa? + econf \ + --disable-option-checking \ + --with-driver=dri \ + --disable-glu \ + --disable-glut \ + --without-demos \ + --enable-texture-float \ + --enable-xcb \ + $(use_enable llvm llvm-gallium) \ + $(use_enable egl) \ + $(use_enable gbm) \ + $(use_enable gles1) \ + $(use_enable gles2) \ + $(use_enable shared-glapi) \ + $(use_enable gallium) \ + $(use_enable debug) \ + $(use_enable nptl glx-tls) \ + $(use_enable motif glw) \ + $(use_enable motif) \ + $(use_enable !pic asm) \ + --with-dri-drivers=${DRI_DRIVERS} \ + --with-gallium-drivers=${GALLIUM_DRIVERS} \ + $(use gbm && echo "--with-egl-platforms=drm") +} + +src_install() { + base_src_install + + # Save the glsl-compiler for later use + if ! tc-is-cross-compiler; then + dobin "${S}"/src/glsl/glsl_compiler || die + fi + # Remove redundant headers + # GLU and GLUT + rm -f "${D}"/usr/include/GL/glu*.h || die "Removing GLU and GLUT headers failed." + # Glew includes + rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \ + || die "Removing glew includes failed." + + # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib + # because user can eselect desired GL provider. + ebegin "Moving libGL and friends for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} + local x + for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ + || die "Failed to move ${x}" + fi + done + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \ + || die "Failed to move ${x}" + fi + done + eend $? + + dodir /usr/$(get_libdir)/dri + insinto "/usr/$(get_libdir)/dri/" + insopts -m0755 + # install the gallium drivers we use + local gallium_drivers_files=( i915_dri.so nouveau_dri.so r300_dri.so r600_dri.so swrast_dri.so ) + for x in ${gallium_drivers_files[@]}; do + if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then + doins "${S}/$(get_libdir)/gallium/${x}" + fi + done + + # install classic drivers we use + local classic_drivers_files=( i810_dri.so i965_dri.so nouveau_vieux_dri.so radeon_dri.so r200_dri.so ) + for x in ${classic_drivers_files[@]}; do + if [ -f "${S}/$(get_libdir)/${x}" ]; then + doins "${S}/$(get_libdir)/${x}" + fi + done + + # Set driconf option to enable S3TC hardware decompression + insinto "/etc/" + doins "${FILESDIR}"/drirc +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +driver_enable() { + case $# in + # for enabling unconditionally + 1) + DRI_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + DRI_DRIVERS+=",${i}" + done + fi + ;; + esac +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +gallium_driver_enable() { + case $# in + # for enabling unconditionally + 1) + GALLIUM_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + GALLIUM_DRIVERS+=",${i}" + done + fi + ;; + esac +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch new file mode 100644 index 0000000000..7a794cd28a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch @@ -0,0 +1,341 @@ +--- OpenCV-2.3.0-0-vanilla/CMakeLists.txt ++++ OpenCV-2.3.0/CMakeLists.txt +@@ -14,7 +14,7 @@ + # Add these standard paths to the search paths for FIND_LIBRARY + # to find libraries from these locations first + if(UNIX) +- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib) ++ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX}) + endif() + + +@@ -77,13 +77,13 @@ + # Build static or dynamic libs? + # Default: dynamic libraries + # ---------------------------------------------------------------------------- +-set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)") ++OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON) + + # ---------------------------------------------------------------------------- + # Include debug info into debug libs? + # Default: yes + # ---------------------------------------------------------------------------- +-set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs") ++OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON) + + # ---------------------------------------------------------------------------- + # Current version number: +@@ -285,20 +285,20 @@ + + # Build/install (or not) some apps: + # =================================================== +-set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples") +-set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples") +-set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples") ++option(BUILD_EXAMPLES "Build all examples" OFF) ++option(INSTALL_C_EXAMPLES "Install C examples" OFF) ++option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF) + + # Build tests: + # =================================================== +-set(BUILD_TESTS ON CACHE BOOL "Build tests") ++option(BUILD_TESTS "Build tests" ON) + + # Build 3rdparty libraries under unix + # =================================================== + if(WIN32) +- set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries") ++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE) + else() +- set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries") ++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE) + endif() + + include(OpenCVPCHSupport.cmake REQUIRED) +@@ -324,8 +324,8 @@ + #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "") + + if(CMAKE_COMPILER_IS_GNUCXX) +- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)") +- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC") ++ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF) ++ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON) + + if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*) + set(X86_64 1) +@@ -341,58 +341,58 @@ + + if(X86 OR X86_64) + # enable everything, since the available set of instructions is checked at runtime +- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math") +- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions") +- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions") +- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions") +- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions") +- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions") +- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions") ++ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON) ++ option(ENABLE_SSE "Enable SSE instructions" ON) ++ option(ENABLE_SSE2 "Enable SSE2 instructions" ON) ++ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF) ++ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF) ++ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF) ++ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF) + endif() + endif() + + if(MSVC) +- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC") +- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC") ++ option(ENABLE_SSE "Enable SSE instructions for MSVC" ON) ++ option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON) + if(CMAKE_C_COMPILER MATCHES "icc") +- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC") +- set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC") ++ option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF) ++ option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF) + endif() + endif() + + # allow fine grained control over which libraries not to link, even if + # they are available on the system + # ==================================================================== +-set(WITH_PNG ON CACHE BOOL "Include PNG support") +-set(WITH_JPEG ON CACHE BOOL "Include JPEG support") +-set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support") +-set(WITH_TIFF ON CACHE BOOL "Include TIFF support") +-set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR") ++option(WITH_PNG "Include PNG support" ON) ++option(WITH_JPEG "Include JPEG support" ON) ++option(WITH_JASPER "Include JPEG2K support" ON) ++option(WITH_TIFF "Include TIFF support" ON) ++option(WITH_OPENEXR "Include ILM support via OpenEXR" ON) + + if(UNIX) +- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support") ++ option(WITH_FFMPEG "Include FFMPEG support" ON) + if(NOT APPLE) +- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)") +- set(WITH_GTK ON CACHE BOOL "Include GTK support") +- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support") +- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support") +- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)") ++ option(WITH_UNICAP "Include Unicap support (GPL)" OFF) ++ option(WITH_GTK "Include GTK support" ON) ++ option(WITH_GSTREAMER "Include Gstreamer support" ON) ++ option(WITH_V4L "Include Video 4 Linux support" ON) ++ option(WITH_XINE "Include Xine support (GPL)" OFF) + endif() +- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support") +- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support") ++ option(WITH_PVAPI "Include Prosilica GigE support" ON) ++ option(WITH_1394 "Include IEEE1394 support" ON) + endif() + + if(APPLE) +- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa") +- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit") ++ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF) ++ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF) + endif() + +-set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support") +-set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support") +-set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support") +-set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support") ++option(WITH_TBB "Include TBB support" OFF) ++option(WITH_IPP "Include Intel IPP support" OFF) ++option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON) ++option(WITH_CUDA "Include NVidia Cuda Runtime support" ON) + +-set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support") ++option(WITH_OPENNI "Include OpenNI support" OFF) + + # =================================================== + # Macros that checks if module have been installed. +@@ -586,13 +586,13 @@ + include(OpenCVFindOpenEXR.cmake) + endif() + +-set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation") ++option(BUILD_DOCS "Build OpenCV Documentation" ON) + + if(BUILD_DOCS) + include(OpenCVFindLATEX.cmake REQUIRED) + endif() + +-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support") ++option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON) + + if (WIN32) + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") +@@ -619,11 +619,11 @@ + + string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") + if(UNIX) +- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) ++ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) + if(APPLE) + set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") + else() #debian based assumed, install to the dist-packages. +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") ++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) + endif() + endif() + if(WIN32) +@@ -665,8 +665,8 @@ + #YV + ############################### QT ################################ + +-set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support") +-set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt") ++option(WITH_QT "Build with Qt Backend support" OFF) ++option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF) + + set(HAVE_QT 0) + set(HAVE_QT_OPENGL 0) +@@ -876,8 +876,8 @@ + ################## Extra HighGUI libs on Windows ################### + + if(WIN32) +- set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support") +- ++ option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON) ++ + set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32) + + if(WITH_VIDEOINPUT) +@@ -956,7 +956,7 @@ + # Set the maximum level of warnings: + # ---------------------------------------------------------------------------- + # Should be set to true for development +-set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors") ++option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF) + + set(EXTRA_C_FLAGS "") + set(EXTRA_C_FLAGS_RELEASE "") +@@ -1073,14 +1073,6 @@ + endif() + endif() + +- if(X86 OR X86_64) +- if(NOT APPLE) +- if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mfpmath=387") +- endif() +- endif() +- endif() +- + # Profiling? + if(ENABLE_PROFILING) + set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g") +@@ -1197,7 +1197,7 @@ + if(WIN32) + set(OPENCV_DOC_INSTALL_PATH doc) + else() +-set(OPENCV_DOC_INSTALL_PATH share/opencv/doc) ++set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)") + endif() + + +@@ -1232,7 +1232,7 @@ + set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../include/opencv" "\${THIS_OPENCV_CONFIG_PATH}/../../include\"") + set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"") + +-set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib\"") ++set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib${LIB_SUFFIX}\"") + + exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY) +@@ -1327,14 +1327,14 @@ + # ------------------------------------------------------------------------------------------- + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") +-set(libdir "\${exec_prefix}/lib") ++set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") + set(includedir "\${prefix}/include") + set(VERSION ${OPENCV_VERSION}) + + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE) + + if(UNIX) +- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig) ++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + endif() + + +@@ -1354,7 +1354,7 @@ + # CPack target + # ---------------------------------------------------------------------------- + +-set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command") ++option(BUILD_PACKAGE "Build a installer with the SDK" ON) + + if(BUILD_PACKAGE) + +--- OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake ++++ OpenCV-2.3.0/OpenCVModule.cmake +@@ -63,7 +63,7 @@ + DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" + ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} + RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} +- INSTALL_NAME_DIR lib ++ INSTALL_NAME_DIR lib${LIB_SUFFIX} + ) + + if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS) +@@ -97,8 +97,8 @@ + + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) + + install(FILES ${lib_hdrs} + DESTINATION include/opencv2/${name} +--- OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt ++++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt +@@ -121,7 +121,7 @@ + DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" + ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} + RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} +- INSTALL_NAME_DIR lib ++ INSTALL_NAME_DIR lib${LIB_SUFFIX} + ) + + # Add the required libraries for linking: +@@ -149,8 +149,8 @@ + + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) + + install(FILES ${lib_hdrs} + DESTINATION include/opencv2/${name} +--- OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt ++++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt +@@ -295,7 +295,7 @@ + DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" + ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} + RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} +- INSTALL_NAME_DIR lib ++ INSTALL_NAME_DIR lib${LIB_SUFFIX} + LINK_INTERFACE_LIBRARIES "" + ) + +@@ -362,8 +362,8 @@ + + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) + + install(FILES ${highgui_ext_hdrs} + DESTINATION include/opencv2/highgui diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch new file mode 100644 index 0000000000..4f93d4eed4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch @@ -0,0 +1,156 @@ +diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp +--- OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-07-04 06:21:58.000000000 +0200 ++++ OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-09-18 20:27:05.000000000 +0200 +@@ -489,7 +489,7 @@ + AVCodecContext *enc = &ic->streams[i]->codec; + #endif + +- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) { ++ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) { + AVCodec *codec = avcodec_find_decoder(enc->codec_id); + if (!codec || + avcodec_open(enc, codec) < 0) +@@ -576,15 +576,27 @@ + continue; + } + +-#if LIBAVFORMAT_BUILD > 4628 +- avcodec_decode_video(video_st->codec, +- picture, &got_picture, +- packet.data, packet.size); +-#else +- avcodec_decode_video(&video_st->codec, +- picture, &got_picture, +- packet.data, packet.size); +-#endif ++ ++ AVPacket avpkt; ++ av_init_packet(&avpkt); ++ avpkt.data = packet.data; ++ avpkt.size = packet.size; ++ // ++ // HACK for CorePNG to decode as normal PNG by default ++ // same method used by ffmpeg ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ avcodec_decode_video2(video_st->codec, ++ picture, &got_picture, &avpkt); ++//Functions Removed from ffmpeg on 4/19/11 ++//#if LIBAVFORMAT_BUILD > 4628 ++// avcodec_decode_video(video_st->codec, ++// picture, &got_picture, ++// packet.data, packet.size); ++//#else ++// avcodec_decode_video(&video_st->codec, ++// picture, &got_picture, ++// packet.data, packet.size); ++//#endif + + if (got_picture) { + // we have a new picture, so memorize it +@@ -822,24 +834,25 @@ + #endif + }; + +-static const char * icvFFMPEGErrStr(int err) +-{ +- switch(err) { +- case AVERROR_NUMEXPECTED: +- return "Incorrect filename syntax"; +- case AVERROR_INVALIDDATA: +- return "Invalid data in header"; +- case AVERROR_NOFMT: +- return "Unknown format"; +- case AVERROR_IO: +- return "I/O error occurred"; +- case AVERROR_NOMEM: +- return "Memory allocation error"; +- default: +- break; +- } +- return "Unspecified error"; +-} ++//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings ++//static const char * icvFFMPEGErrStr(int err) ++//{ ++// switch(err) { ++// case AVERROR_NUMEXPECTED: ++// return "Incorrect filename syntax"; ++// case AVERROR_INVALIDDATA: ++// return "Invalid data in header"; ++// case AVERROR_NOFMT: ++// return "Unknown format"; ++// case AVERROR_IO: ++// return "I/O error occurred"; ++// case AVERROR_NOMEM: ++// return "Memory allocation error"; ++// default: ++// break; ++// } ++// return "Unspecified error"; ++//} + + /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/ + extern "C" { +@@ -918,7 +931,7 @@ + #endif + + #if LIBAVFORMAT_BUILD > 4621 +- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO); ++ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO); + #else + c->codec_id = oc->oformat->video_codec; + #endif +@@ -930,7 +943,7 @@ + //if(codec_tag) c->codec_tag=codec_tag; + codec = avcodec_find_encoder(c->codec_id); + +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + + /* put sample parameters */ + c->bit_rate = bitrate; +@@ -1015,7 +1028,7 @@ + AVPacket pkt; + av_init_packet(&pkt); + +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index= video_st->index; + pkt.data= (uint8_t *)picture; + pkt.size= sizeof(AVPicture); +@@ -1035,7 +1048,7 @@ + pkt.pts = c->coded_frame->pts; + #endif + if(c->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index= video_st->index; + pkt.data= outbuf; + pkt.size= out_size; +@@ -1237,7 +1250,7 @@ + av_register_all (); + + /* auto detect the output format from the name and fourcc code. */ +- fmt = guess_format(NULL, filename, NULL); ++ fmt = av_guess_format(NULL, filename, NULL); + if (!fmt) + return false; + +@@ -1260,7 +1273,7 @@ + #endif + + // alloc memory for context +- oc = av_alloc_format_context(); ++ oc = avformat_alloc_context(); + assert (oc); + + /* set file name */ +@@ -1336,7 +1349,7 @@ + /* open the codec */ + if ( (err=avcodec_open(c, codec)) < 0) { + char errtext[256]; +- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err)); ++ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL)); + return false; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-libpng15.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-libpng15.patch new file mode 100644 index 0000000000..c811766bf8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-libpng15.patch @@ -0,0 +1,8 @@ +--- opencv/modules/highgui/src/grfmt_png.cpp (revision 4945) ++++ opencv/modules/highgui/src/grfmt_png.cpp (revision 6143) +@@ -57,4 +57,5 @@ + #include + #endif ++#include + #include "grfmt_png.hpp" + diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-numpy.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-numpy.patch new file mode 100644 index 0000000000..e0706d2167 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-numpy.patch @@ -0,0 +1,12 @@ +diff -ruN OpenCV-2.3.0-1-ol1/CMakeLists.txt OpenCV-2.3.0-2-numpy/CMakeLists.txt +--- OpenCV-2.3.0-1-ol1/CMakeLists.txt 2011-08-28 14:53:46.000000000 +0200 ++++ OpenCV-2.3.0-2-numpy/CMakeLists.txt 2011-08-28 15:26:37.000000000 +0200 +@@ -640,7 +640,7 @@ + + if(PYTHON_NUMPY_PROCESS EQUAL 0) + set(PYTHON_USE_NUMPY 1) +- add_definitions(-D PYTHON_USE_NUMPY=1) ++ add_definitions(-DPYTHON_USE_NUMPY=1) + include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS}) + message(STATUS " Use NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}") + else() diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-symlink.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-symlink.patch new file mode 100644 index 0000000000..d6f5efb249 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/files/opencv-2.3.0-symlink.patch @@ -0,0 +1,12 @@ +diff -ruN OpenCV-2.3.0-1-s2o/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt +--- OpenCV-2.3.0-1-s2o/CMakeLists.txt 2011-09-18 18:40:04.000000000 +0200 ++++ OpenCV-2.3.0/CMakeLists.txt 2011-09-18 18:55:47.000000000 +0200 +@@ -1240,7 +1240,7 @@ + if(UNIX) + # For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/cmake/FOO/FOOConfig.cmake, so: + install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv/) +- install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"${CMAKE_INSTALL_PREFIX}/share/OpenCV\")") ++ install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"$ENV{D}/${CMAKE_INSTALL_PREFIX}/share/OpenCV\")") + endif() + + # -------------------------------------------------------------------------------------------- diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/opencv-2.3.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/opencv-2.3.0-r2.ebuild new file mode 100644 index 0000000000..2cc6478146 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-libs/opencv/opencv-2.3.0-r2.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.11 2011/11/22 22:38:59 dilfridge Exp $ + +EAPI=3 + +PYTHON_DEPEND="python? 2:2.6" + +inherit base toolchain-funcs cmake-utils python + +MY_P=OpenCV-${PV} + +DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" +HOMEPAGE="http://opencv.willowgarage.com" +SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine" + +RDEPEND=" + app-arch/bzip2 + sys-libs/zlib + cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) + eigen? ( dev-cpp/eigen:2 ) + ffmpeg? ( virtual/ffmpeg ) + gstreamer? ( + media-libs/gstreamer + media-libs/gst-plugins-base + ) + gtk? ( + dev-libs/glib:2 + x11-libs/gtk+:2 + ) + jpeg? ( virtual/jpeg ) + jpeg2k? ( media-libs/jasper ) + ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) + openexr? ( media-libs/openexr ) + png? ( media-libs/libpng ) + python? ( dev-python/numpy ) + qt4? ( + x11-libs/qt-gui:4 + x11-libs/qt-test:4 + opengl? ( x11-libs/qt-opengl:4 ) + ) + tiff? ( media-libs/tiff ) + v4l? ( >=media-libs/libv4l-0.8.3 ) + xine? ( media-libs/xine-lib ) +" +DEPEND="${RDEPEND} + doc? ( virtual/latex-base ) + dev-util/pkgconfig +" + +# REQUIRED_USE="opengl? ( qt )" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch" + "${FILESDIR}/${PN}-2.3.0-ffmpeg.patch" + "${FILESDIR}/${PN}-2.3.0-numpy.patch" + "${FILESDIR}/${PN}-2.3.0-symlink.patch" + "${FILESDIR}/${PN}-2.3.0-libpng15.patch" +) + +CMAKE_BUILD_TYPE="Release" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + +src_prepare() { + base_src_prepare + + # remove bundled stuff + rm -rf 3rdparty + sed -i \ + -e '/add_subdirectory(3rdparty)/ d' \ + CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_build doc DOCS) + $(cmake-utils_use_build examples) + $(cmake-utils_use examples INSTALL_C_EXAMPLES) + $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) + $(cmake-utils_use_enable sse SSE) + $(cmake-utils_use_enable sse2 SSE2) + $(cmake-utils_use_enable sse3 SSE3) + $(cmake-utils_use_enable ssse3 SSSE3) + -DWITH_IPP=OFF + $(cmake-utils_use_with ieee1394 1394) + $(cmake-utils_use_with eigen) + $(cmake-utils_use_with ffmpeg) + $(cmake-utils_use_with gstreamer) + $(cmake-utils_use_with gtk) + $(cmake-utils_use_with jpeg) + $(cmake-utils_use_with jpeg2k JASPER) + $(cmake-utils_use_with openexr) + $(cmake-utils_use_with png) + $(cmake-utils_use_with qt4 QT) + $(cmake-utils_use_with opengl QT_OPENGL) + $(cmake-utils_use_with tiff) + $(cmake-utils_use_with v4l V4L) + $(cmake-utils_use_with xine) + ) + + if use cuda; then + if [ "$(gcc-version)" > "4.4" ]; then + ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." + mycmakeargs+=( "-DWITH_CUDA=OFF" ) + else + mycmakeargs+=( "-DWITH_CUDA=ON" ) + fi + else + mycmakeargs+=( "-DWITH_CUDA=OFF" ) + fi + + if use python && use examples; then + mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) + else + mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" ) + fi + + # Chrome OS cross-compilation fix: + # + # Setting root folder and search paths for cross-compilation + # We force the cmake to use binaries (e.g. compilers, interpreters) + # in the host but use include/library files in the target. + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH=${ROOT}" ) + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER" ) + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY" ) + mycmakeargs+=( "-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY" ) + tc-export PKG_CONFIG + sed -i '/^find_program/s:NAMES:& $ENV{PKG_CONFIG}:' OpenCVFindPkgConfig.cmake || die + # Workaround cmake testing the compiler too soon. + tc-export CC CXX + + # things we want to be hard off or not yet figured out + # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881 + # openni: ??? + mycmakeargs+=( + "-DUSE_OMIT_FRAME_POINTER=OFF" + "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" + "-DOPENCV_WARNINGS_ARE_ERRORS=OFF" + "-DBUILD_LATEX_DOCS=OFF" + "-DENABLE_POWERPC=OFF" + "-DBUILD_PACKAGE=OFF" + "-DENABLE_PROFILING=OFF" + "-DUSE_O2=OFF" + "-DUSE_O3=OFF" + "-DUSE_FAST_MATH=OFF" + "-DENABLE_SSE41=OFF" + "-DENABLE_SSE42=OFF" + "-DWITH_PVAPI=OFF" + "-DWITH_UNICAP=OFF" + "-DWITH_TBB=OFF" + "-DWITH_OPENNI=OFF" + ) + + # things we want to be hard enabled not worth useflag + mycmakeargs+=( + "-DCMAKE_SKIP_RPATH=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}" + ) + + # hardcode cuda paths + mycmakeargs+=( + "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda" + ) + + cmake-utils_src_configure +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/envvars.arm b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/envvars.arm new file mode 100644 index 0000000000..24e3ce44e9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/envvars.arm @@ -0,0 +1 @@ +O3D_OVERRIDE_RENDER_MODE=2D diff --git a/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/gcc-4_7.patch b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/gcc-4_7.patch new file mode 100644 index 0000000000..153c41bbf1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/gcc-4_7.patch @@ -0,0 +1,41 @@ +--- base/time_posix.cc.orig 2012-05-30 10:06:00.571692591 -0700 ++++ base/time_posix.cc 2012-05-30 10:06:25.911766484 -0700 +@@ -24,7 +24,7 @@ struct timespec TimeDelta::ToTimeSpec() + } + struct timespec result = + {seconds, +- microseconds * Time::kNanosecondsPerMicrosecond}; ++ static_cast(microseconds * Time::kNanosecondsPerMicrosecond)}; + return result; + } + +--- base/message_pump_libevent.cc.orig 2012-05-30 10:04:00.331341859 -0700 ++++ base/message_pump_libevent.cc 2012-05-30 10:04:25.781416110 -0700 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "base/auto_reset.h" + #include "base/compiler_specific.h" +--- o3d/core/cross/param.h.orig 2012-05-30 10:02:52.981145332 -0700 ++++ o3d/core/cross/param.h 2012-05-30 10:03:31.441257564 -0700 +@@ -444,7 +444,7 @@ class TypedParam : public TypedParamBase + + // Copies the data from another Param. + virtual void CopyDataFromParam(Param* source_param) { +- set_value_private((down_cast(source_param))->value_); ++ this->set_value_private((down_cast(source_param))->value_); + } + + private: +@@ -552,7 +552,7 @@ class TypedRefParam : public TypedRefPar + // Copies the data from another Param. + virtual void CopyDataFromParam(Param* source_param) { + T* value = down_cast(source_param)->value_.Get(); +- set_value_private(value ? value->GetWeakPointer() : WeakPointerType()); ++ this->set_value_private(value ? value->GetWeakPointer() : WeakPointerType()); + } + + private: diff --git a/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/make-tarball b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/make-tarball new file mode 100755 index 0000000000..59308a8b76 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/make-tarball @@ -0,0 +1,57 @@ +#!/bin/bash + +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +usage() { + echo "Usage: $0 [gclient-file]" +} + +die() { + echo "dying: $*" + exit 1 +} + +if [[ $# -lt 1 ]]; then + usage + exit 0 +fi + +function update_mirror() { + [ -z "${LOCALMIRROR}" ] && return 0 + + echo -n "Update local mirror? [yn] " + read n + if [[ "$n" == "y" ]]; then + cp "o3d-svn-${SVNREV}.tar.gz" ${LOCALMIRROR} + chmod a+r "${LOCALMIRROR}/o3d-svn-${SVNREV}.tar.gz" + fi +} + +function download_stuff() { + FILESDIR=`dirname $0` + SVNREV=$1 + GCLIENT=${2-"${FILESDIR}/plugin-only.gclient"} + + if [[ ! -f "${GCLIENT}" ]]; then + echo "Can't read ${GCLIENT}" + exit 1 + fi + + # Grab the fully-qualified path to the .gclient file, since we are going to + # change directories. + GCLIENT=$(readlink -e "${GCLIENT}") + + mkdir o3d-${SVNREV} || die "Can't create work directory" + cd o3d-${SVNREV} + cp "${GCLIENT}" .gclient + gclient sync --revision o3d@${SVNREV} --force --nohooks + find . -name .svn -type d | xargs rm -rf + cd .. + tar -cvzf o3d-svn-${SVNREV}.tar.gz o3d-${SVNREV} +} + +download_stuff "$@" +update_mirror + diff --git a/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/plugin-only.gclient b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/plugin-only.gclient new file mode 100644 index 0000000000..23a733fea1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/files/plugin-only.gclient @@ -0,0 +1,32 @@ +# An element of this array (a "solution") describes a repository directory +# that will be checked out into your working copy. Each solution may +# optionally define additional dependencies (via its DEPS file) to be +# checked out alongside the solution's directory. A solution may also +# specify custom dependencies (via the "custom_deps" property) that +# override or augment the dependencies specified by the DEPS file. +# If a "safesync_url" is specified, it is assumed to reference the location of +# a text file which contains nothing but the last known good SCM revision to +# sync against. It is fetched if specified and used unless --head is passed + +solutions = [ + { "name" : "o3d", + "url" : "http://src.chromium.org/svn/trunk/o3d", + "custom_deps" : { + # To use the trunk of a component instead of what's in DEPS: + #"component": "https://svnserver/component/trunk/", + # To exclude a component from your working copy: + #"data/really_large_component": None, + + # Don't need the following for npo3dautoplugin + "chrome/third_party/wtl": None, + "ipc": None, + "third_party/jsdoctoolkit": None, + "third_party/pdiff": None, + "third_party/selenium_rc": None, + "third_party/sqlite": None, + "tools/data_pack": None, + "tools/grit": None, + }, + "safesync_url": "" + }, +] diff --git a/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/o3d-179976.ebuild b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/o3d-179976.ebuild new file mode 100644 index 0000000000..94c3980392 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-plugins/o3d/o3d-179976.ebuild @@ -0,0 +1,76 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +# added eutils to patch +inherit toolchain-funcs eutils flag-o-matic + +DESCRIPTION="O3D Plugin" +HOMEPAGE="http://code.google.com/p/o3d/" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-svn-${PV}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="opengl opengles" +DEPEND="dev-libs/nss + media-libs/fontconfig + opengl? ( media-libs/glew ) + net-misc/curl + opengles? ( virtual/opengles x11-drivers/opengles-headers ) + x11-libs/cairo + x11-libs/gtk+" +RDEPEND="${DEPEND}" + +set_build_defines() { + # Prevents gclient from updating self. + export DEPOT_TOOLS_UPDATE=0 + export EGCLIENT="${EGCLIENT:-/home/$(whoami)/depot_tools/gclient}" +} + +src_prepare() { + set_build_defines + + if use x86; then + # TODO(piman): switch to GLES backend + GYP_DEFINES="target_arch=ia32"; + elif use arm; then + GYP_DEFINES="target_arch=arm" + elif use amd64; then + GYP_DEFINES="target_arch=x64" + else + die "unsupported arch: ${ARCH}" + fi + if [[ -n "${ROOT}" && "${ROOT}" != "/" ]]; then + GYP_DEFINES="$GYP_DEFINES sysroot=$ROOT" + fi + export GYP_DEFINES="$GYP_DEFINES chromeos=1 plugin_interface=ppapi p2p_apis=0 os_posix=1 plugin_branding=gtpo3d $BUILD_DEFINES" + # ebuild uses emake, ensure GYP creates Makefiles (and not .ninja) + # and we don't have external environment variables leak in + export GYP_GENERATORS=make + unset GYP_GENERATOR_FLAGS + unset BUILD_OUT + unset builddir_name + epatch "${FILESDIR}"/gcc-4_7.patch + + ${EGCLIENT} runhooks || die +} + +src_compile() { + use arm && append-flags -Wa,-mimplicit-it=always + append-cxxflags $(test-flags-CC -Wno-error=unused-but-set-variable) + tc-export AR AS LD NM RANLIB CC CXX STRIP + + emake BUILDTYPE=Release ppo3dautoplugin || die +} + +src_install() { + local destdir=/opt/google/o3d + local chromepepperdir=/opt/google/chrome/pepper + + dodir ${destdir} + exeinto ${destdir} + doexe out/Release/libppo3dautoplugin.so || die + dodir ${chromepepperdir} + dosym ${destdir}/libppo3dautoplugin.so ${chromepepperdir}/ || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/adhd/adhd-0.0.1-r450.ebuild b/sdk_container/src/third_party/coreos-overlay/media-sound/adhd/adhd-0.0.1-r450.ebuild new file mode 100644 index 0000000000..f889736d14 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/adhd/adhd-0.0.1-r450.ebuild @@ -0,0 +1,61 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +EAPI=4 +CROS_WORKON_COMMIT="894a93374c5404028aa873b904b22d5fa7daf2c3" +CROS_WORKON_TREE="c086a20edabf4e7b0cd2b2cbfdef76e4f12c88b3" +CROS_WORKON_PROJECT="chromiumos/third_party/adhd" +CROS_WORKON_LOCALNAME="adhd" + +inherit toolchain-funcs autotools cros-workon cros-board + +DESCRIPTION="Google A/V Daemon" +HOMEPAGE="http://www.chromium.org" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND=">=media-libs/alsa-lib-1.0.24.1 + media-libs/speex + dev-libs/iniparser + >=sys-apps/dbus-1.4.12 + dev-libs/libpthread-stubs + sys-fs/udev" +DEPEND="${RDEPEND} + media-libs/ladspa-sdk" + +src_prepare() { + cd cras + eautoreconf +} + +src_configure() { + cd cras + econf +} + +src_compile() { + local board=$(get_current_board_with_variant) + emake BOARD=${board} CC="$(tc-getCC)" || die "Unable to build ADHD" +} + +src_test() { + if ! use x86 && ! use amd64 ; then + elog "Skipping unit tests on non-x86 platform" + else + cd cras + emake check + fi +} + +src_install() { + local board=$(get_current_board_with_variant) + emake BOARD=${board} DESTDIR="${D}" install + + insinto /usr/share/alsa/ucm + nonfatal doins -r ucm-config/${board}/* +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/adhd/adhd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/media-sound/adhd/adhd-9999.ebuild new file mode 100644 index 0000000000..baef9506d0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/adhd/adhd-9999.ebuild @@ -0,0 +1,59 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/adhd" +CROS_WORKON_LOCALNAME="adhd" + +inherit toolchain-funcs autotools cros-workon cros-board + +DESCRIPTION="Google A/V Daemon" +HOMEPAGE="http://www.chromium.org" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=">=media-libs/alsa-lib-1.0.24.1 + media-libs/speex + dev-libs/iniparser + >=sys-apps/dbus-1.4.12 + dev-libs/libpthread-stubs + sys-fs/udev" +DEPEND="${RDEPEND} + media-libs/ladspa-sdk" + +src_prepare() { + cd cras + eautoreconf +} + +src_configure() { + cd cras + econf +} + +src_compile() { + local board=$(get_current_board_with_variant) + emake BOARD=${board} CC="$(tc-getCC)" || die "Unable to build ADHD" +} + +src_test() { + if ! use x86 && ! use amd64 ; then + elog "Skipping unit tests on non-x86 platform" + else + cd cras + emake check + fi +} + +src_install() { + local board=$(get_current_board_with_variant) + emake BOARD=${board} DESTDIR="${D}" install + + insinto /usr/share/alsa/ucm + nonfatal doins -r ucm-config/${board}/* +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/Manifest b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/Manifest new file mode 100644 index 0000000000..bc346a1291 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/Manifest @@ -0,0 +1,2 @@ +DIST alsa-driver-1.0.25.tar.bz2 3861484 RMD160 ad8b8093bf1de78cb0dcbb1b6a82ebb18d7aad6d SHA1 ebda37d18379466ca9d843e7a80d10bb706a6b04 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3 +DIST alsa-utils-1.0.25.tar.bz2 1132780 RMD160 8b1dc5c28d1fa6d9e0a79e029b6d69530f493e1d SHA1 c02eb4a3b9649950b803628371a840fb96ed6370 SHA256 2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/alsa-utils-1.0.25-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/alsa-utils-1.0.25-r3.ebuild new file mode 100644 index 0000000000..ae688df0f8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/alsa-utils-1.0.25-r3.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild,v 1.7 2012/04/01 15:13:17 armin76 Exp $ + +EAPI=4 +inherit base systemd + +MY_P=${P/_rc/rc} + +DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" +HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2 + !minimal? ( mirror://alsaproject/driver/alsa-driver-${PV}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0.9" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86" +IUSE="doc +libsamplerate minimal +ncurses nls" + +COMMON_DEPEND=">=media-libs/alsa-lib-1.0.25 + libsamplerate? ( media-libs/libsamplerate ) + ncurses? ( >=sys-libs/ncurses-5.1 )" +RDEPEND="${COMMON_DEPEND} + !minimal? ( + dev-util/dialog + sys-apps/pciutils + )" +DEPEND="${COMMON_DEPEND} + doc? ( app-text/xmlto )" + +S="${WORKDIR}/${MY_P}" +PATCHES=( +"${FILESDIR}/${PN}-1.0.23-modprobe.d.patch" +"${FILESDIR}/${P}-separate-usr-var-fs.patch" +"${FILESDIR}/${P}-Do-not-access-other-cards-than-specified-for.patch" +) + +src_configure() { + local myconf="" + use doc || myconf="--disable-xmlto" + + econf ${myconf} \ + $(use_enable libsamplerate alsaloop) \ + $(use_enable nls) \ + $(use_enable ncurses alsamixer) \ + $(use_enable !minimal alsaconf) \ + "$(systemd_with_unitdir)" +} + +src_install() { + local ALSA_UTILS_DOCS="ChangeLog README TODO + seq/aconnect/README.aconnect + seq/aseqnet/README.aseqnet" + + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc ${ALSA_UTILS_DOCS} || die + + use minimal || newbin "${WORKDIR}/alsa-driver-${PV}/utils/alsa-info.sh" \ + alsa-info + + newinitd "${FILESDIR}/alsasound.initd-r5" alsasound + newconfd "${FILESDIR}/alsasound.confd-r4" alsasound + insinto /etc/modprobe.d + newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf + + keepdir /var/lib/alsa +} + +pkg_postinst() { + echo + elog "To take advantage of the init script, and automate the process of" + elog "saving and restoring sound-card mixer levels you should" + elog "add alsasound to the boot runlevel. You can do this as" + elog "root like so:" + elog " # rc-update add alsasound boot" + echo + ewarn "The ALSA core should be built into the kernel or loaded through other" + ewarn "means. There is no longer any modular auto(un)loading in alsa-utils." + echo + if use minimal; then + ewarn "The minimal use flag disables the dependency on pciutils that" + ewarn "is needed by alsaconf at runtime." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-modules.conf-rc b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-modules.conf-rc new file mode 100644 index 0000000000..40e99df8d3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-modules.conf-rc @@ -0,0 +1,38 @@ +# Alsa kernel modules' configuration file. + +# ALSA portion +alias char-major-116 snd +# OSS/Free portion +alias char-major-14 soundcore + +## +## IMPORTANT: +## You need to customise this section for your specific sound card(s) +## and then run `update-modules' command. +## Read alsa-driver's INSTALL file in /usr/share/doc for more info. +## +## ALSA portion +## alias snd-card-0 snd-interwave +## alias snd-card-1 snd-ens1371 +## OSS/Free portion +## alias sound-slot-0 snd-card-0 +## alias sound-slot-1 snd-card-1 +## + +# OSS/Free portion - card #1 +alias sound-service-0-0 snd-mixer-oss +alias sound-service-0-1 snd-seq-oss +alias sound-service-0-3 snd-pcm-oss +alias sound-service-0-8 snd-seq-oss +alias sound-service-0-12 snd-pcm-oss +## OSS/Free portion - card #2 +## alias sound-service-1-0 snd-mixer-oss +## alias sound-service-1-3 snd-pcm-oss +## alias sound-service-1-12 snd-pcm-oss + +alias /dev/mixer snd-mixer-oss +alias /dev/dsp snd-pcm-oss +alias /dev/midi snd-seq-oss + +# Set this to the correct number of cards. +options snd cards_limit=1 diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.23-modprobe.d.patch b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.23-modprobe.d.patch new file mode 100644 index 0000000000..efe75923c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.23-modprobe.d.patch @@ -0,0 +1,12 @@ +diff -uNr alsa-utils-1.0.23.ORIG//alsaconf/alsaconf.in alsa-utils-1.0.23/alsaconf/alsaconf.in +--- alsa-utils-1.0.23.ORIG//alsaconf/alsaconf.in 2010-04-16 23:16:24.972269218 +0100 ++++ alsa-utils-1.0.23/alsaconf/alsaconf.in 2010-04-16 23:16:47.781310369 +0100 +@@ -301,7 +301,7 @@ + fi + else + if [ "$distribution" = "gentoo" ]; then +- cfgfile="/etc/modules.d/alsa" ++ cfgfile="/etc/modprobe.d/alsa.conf" + elif [ "$kernel" = "new" ]; then + cfgfile="/etc/modprobe.conf" + if [ -d /etc/modprobe.d ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.25-Do-not-access-other-cards-than-specified-for.patch b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.25-Do-not-access-other-cards-than-specified-for.patch new file mode 100644 index 0000000000..abad116aaf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.25-Do-not-access-other-cards-than-specified-for.patch @@ -0,0 +1,48 @@ +From f7eb87ddc7787e981e6055c9e6f770fc0cd2359a Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 9 May 2012 08:45:47 +0200 +Subject: [PATCH] alsactl: Do not access other cards than specified for init + +When the global state does not exist, alsactl tries to +initialize all soundcards. It is not good when alsactl +is called multiple times from udev. Also, selinux can deny +access to non-existent devices. + +Signed-off-by: Jaroslav Kysela +--- + alsactl/state.c | 14 ++++++++++++-- + 1 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/alsactl/state.c b/alsactl/state.c +index a8b5bd3..fec000d 100644 +--- a/alsactl/state.c ++++ b/alsactl/state.c +@@ -1646,13 +1646,23 @@ int load_state(const char *file, const char *initfile, const char *cardname, + + error("Cannot open %s for reading: %s", file, snd_strerror(err)); + finalerr = err; +- card = -1; ++ if (cardname) { ++ card = snd_card_get_index(cardname); ++ if (card < 0) { ++ error("Cannot find soundcard '%s'...", cardname); ++ return -ENODEV; ++ } ++ goto single; ++ } else { ++ card = -1; ++ } + /* find each installed soundcards */ +- while (1) { ++ while (!cardname) { + if (snd_card_next(&card) < 0) + break; + if (card < 0) + break; ++single: + first = 0; + if (!do_init) + break; +-- +1.7.9.rc0 + diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.25-separate-usr-var-fs.patch b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.25-separate-usr-var-fs.patch new file mode 100644 index 0000000000..bf9afee042 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsa-utils-1.0.25-separate-usr-var-fs.patch @@ -0,0 +1,7 @@ +diff -uNr alsa-utils-1.0.25.ORIG/alsactl/90-alsa-restore.rules alsa-utils-1.0.25/alsactl/90-alsa-restore.rules +--- alsa-utils-1.0.25.ORIG/alsactl/90-alsa-restore.rules 2012-02-03 12:14:50.139393938 +0000 ++++ alsa-utils-1.0.25/alsactl/90-alsa-restore.rules 2012-02-03 12:16:02.660395020 +0000 +@@ -1,2 +1,3 @@ + ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS=="card*", \ ++ ENV{STARTUP}!="1", \ + RUN+="/usr/sbin/alsactl restore $attr{number}" diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsasound.confd-r4 b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsasound.confd-r4 new file mode 100644 index 0000000000..6fec8f5938 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsasound.confd-r4 @@ -0,0 +1,15 @@ +# RESTORE_ON_START: +# Do you want to restore your mixer settings? If not, your cards will be +# muted. +# no - Do not restore state +# yes - Restore state + +RESTORE_ON_START="yes" + +# SAVE_ON_STOP: +# Do you want to save changes made to your mixer volumes when alsasound +# stops? +# no - Do not save state +# yes - Save state + +SAVE_ON_STOP="yes" diff --git a/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsasound.initd-r5 b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsasound.initd-r5 new file mode 100644 index 0000000000..e3c8dd9009 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/media-sound/alsa-utils/files/alsasound.initd-r5 @@ -0,0 +1,83 @@ +#!/sbin/runscript +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r5,v 1.1 2012/02/20 09:03:53 chainsaw Exp $ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d + +extra_commands="save restore" + +depend() { + need localmount + after bootmisc modules isapnp coldplug hotplug +} + +restore() { + ebegin "Restoring Mixer Levels" + + if [ ! -r "${alsastatedir}/asound.state" ] ; then + ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" + eend 0 + return 0 + fi + + local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" + local CARDNUM + for cardnum in ${cards}; do + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + alsactl -I -f "${alsastatedir}/asound.state" restore ${cardnum} \ + || ewarn "Errors while restoring defaults, ignoring" + done + + for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do + [ -e "${ossfile}" ] || continue + # We use cat because I'm not sure if cp works properly on /proc + local procfile=${ossfile##${alsastatedir}/oss} + procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" + if [ -e /proc/asound/"${procfile}"/oss ] ; then + cat "${ossfile}" > /proc/asound/"${procfile}"/oss + fi + done + + eend 0 +} + +save() { + ebegin "Storing ALSA Mixer Levels" + + mkdir -p "${alsastatedir}" + if ! alsactl -f "${alsastatedir}/asound.state" store; then + eerror "Error saving levels." + eend 1 + return 1 + fi + + for ossfile in /proc/asound/card*/pcm*/oss; do + [ -e "${ossfile}" ] || continue + local device=${ossfile##/proc/asound/} ; device=${device%%/oss} + device="$(echo "${device}" | sed -e 's,/,_,g')" + mkdir -p "${alsastatedir}/oss/" + cp "${ossfile}" "${alsastatedir}/oss/${device}" + done + + eend 0 +} + +start() { + if [ "${RESTORE_ON_START}" = "yes" ]; then + restore + fi + + return 0 +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ]; then + save + fi + return 0 +} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/layout.conf b/sdk_container/src/third_party/coreos-overlay/metadata/layout.conf new file mode 100644 index 0000000000..aa927d1474 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/layout.conf @@ -0,0 +1,4 @@ +masters = portage-stable +thin-manifests = true +use-manifests = true +cache-format = md5-dict diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/eselect-mesa-0.0.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/eselect-mesa-0.0.8 new file mode 100644 index 0000000000..d4590e5f02 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/eselect-mesa-0.0.8 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install postinst +DESCRIPTION=Utility to change the Mesa OpenGL driver being used +EAPI=3 +HOMEPAGE=http://www.gentoo.org/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=>=app-admin/eselect-1.2.4 +SLOT=0 +SRC_URI=mirror://gentoo/eselect-mesa-0.0.8.tar.gz +_md5_=8c7054de8afb93652e8eb588525f3b7d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/bootchart-0.9.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/bootchart-0.9.2-r1 new file mode 100644 index 0000000000..18111a77f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/bootchart-0.9.2-r1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=compile install unpack +DESCRIPTION=Performance analysis and visualization of the system boot process +HOMEPAGE=http://packages.ubuntu.com/lucid/bootchart +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=0c0c1735a3914c8bb073841e9453ed9a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/punybench-0.0.1-r40 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/punybench-0.0.1-r40 new file mode 100644 index 0000000000..02aeb28a87 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/punybench-0.0.1-r40 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=A set of file system microbenchmarks +EAPI=2 +HOMEPAGE=http://git.chromium.org/gitweb/?s=punybench +IUSE=cros_workon_tree_82e2c58d5dd033f61d396db341daca182448c8ad +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=abfa544e95b6ef0ba1107f03bba7583d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/punybench-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/punybench-9999 new file mode 100644 index 0000000000..4703771a71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-benchmarks/punybench-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=A set of file system microbenchmarks +EAPI=2 +HOMEPAGE=http://git.chromium.org/gitweb/?s=punybench +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9b9cba2b9477992d76244bec32745f54 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.12.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.12.8 new file mode 100644 index 0000000000..b2609d1579 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.12.8 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install prepare +DEPEND=dev-util/pkgconfig +DESCRIPTION=Mozilla's Network Security Services library that implements PKI support +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +RDEPEND=>=dev-libs/nspr-4.8.6 >=dev-libs/nss-3.12.8 >=dev-db/sqlite-3.5 sys-libs/zlib +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_8_RTM/src/nss-3.12.8.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8e30ec7349fb3734abe3d47e6780c93b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.12.8-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.12.8-r4 new file mode 100644 index 0000000000..b2609d1579 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.12.8-r4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install prepare +DEPEND=dev-util/pkgconfig +DESCRIPTION=Mozilla's Network Security Services library that implements PKI support +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +RDEPEND=>=dev-libs/nspr-4.8.6 >=dev-libs/nss-3.12.8 >=dev-db/sqlite-3.5 sys-libs/zlib +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_8_RTM/src/nss-3.12.8.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8e30ec7349fb3734abe3d47e6780c93b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.14 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.14 new file mode 100644 index 0000000000..c2c2272b64 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/nss-3.14 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install prepare +DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.2 +DESCRIPTION=Mozilla's Network Security Services library that implements PKI support +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +RDEPEND=>=dev-libs/nspr-4.9.2 >=dev-libs/nss-3.14 >=dev-db/sqlite-3.5 sys-libs/zlib +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_RTM/src/nss-3.14.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=95c264bee60f51523cebe66c2b75afb0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/tpm-emulator-0.0.1-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/tpm-emulator-0.0.1-r6 new file mode 100644 index 0000000000..21eb4a6faa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/tpm-emulator-0.0.1-r6 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-crypt/trousers dev-libs/gmp >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git +DESCRIPTION=TPM Emulator with small google-local changes +EAPI=2 +HOMEPAGE=//https://developer.berlios.de/projects/tpm-emulator +IUSE=doc cros_workon_tree_33cbcef6b44783d7ece0dcb7f5bdaa49b9e29123 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-crypt/trousers dev-libs/gmp +SLOT=0 +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cmake-utils 00f9fd5a80cf3605f6d9a2e808c48a92 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5d72817c40d1c6aa1e9643df5d068040 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/tpm-emulator-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/tpm-emulator-9999 new file mode 100644 index 0000000000..c1ae744b41 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/tpm-emulator-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-crypt/trousers dev-libs/gmp >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git +DESCRIPTION=TPM Emulator with small google-local changes +EAPI=2 +HOMEPAGE=//https://developer.berlios.de/projects/tpm-emulator +IUSE=doc cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=app-crypt/trousers dev-libs/gmp +SLOT=0 +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cmake-utils 00f9fd5a80cf3605f6d9a2e808c48a92 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2580f88d3a331c1a8e817aa71640cb5c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-0.3.3-r31 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-0.3.3-r31 new file mode 100644 index 0000000000..6b896d0510 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-0.3.3-r31 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=>=dev-libs/openssl-0.9.7 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation +EAPI=2 +HOMEPAGE=http://trousers.sf.net +IUSE=doc tss_trace cros_workon_tree_c6b3d8822b63163c977a8d4e0bc9ef3c9cd7b011 +KEYWORDS=amd64 arm x86 +LICENSE=CPL-1.0 +RDEPEND=>=dev-libs/openssl-0.9.7 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=a173e7ae698114446a53890850a1be2c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-9999 new file mode 100644 index 0000000000..b8ebec6913 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=>=dev-libs/openssl-0.9.7 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation +EAPI=2 +HOMEPAGE=http://trousers.sf.net +IUSE=doc tss_trace cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=CPL-1.0 +RDEPEND=>=dev-libs/openssl-0.9.7 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=6c08cb35bcc7359707c844a810205ca2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-tests-0.0.1-r30 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-tests-0.0.1-r30 new file mode 100644 index 0000000000..5aae178dd2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-tests-0.0.1-r30 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=app-crypt/trousers !=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4cb38af6eb4ec4443e146acecc369a21 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-tests-9999 new file mode 100644 index 0000000000..0856c8a220 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/trousers-tests-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=app-crypt/trousers !=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d5d0b0433db2fcd3126bd998d73e0030 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-editors/qemacs-0.4.0_pre20090420 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-editors/qemacs-0.4.0_pre20090420 new file mode 100644 index 0000000000..a6b7c18fe8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-editors/qemacs-0.4.0_pre20090420 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=!app-editors/qe X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( media-libs/libpng:1.2 ) app-text/texi2html +DESCRIPTION=QEmacs is a very small but powerful UNIX editor +EAPI=2 +HOMEPAGE=http://savannah.nongnu.org/projects/qemacs +IUSE=X png unicode xv +KEYWORDS=amd64 ppc x86 +LICENSE=LGPL-2.1 +RDEPEND=!app-editors/qe X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( media-libs/libpng:1.2 ) +RESTRICT=strip test +SLOT=0 +SRC_URI=mirror://gentoo/qemacs-0.4.0_pre20090420.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=345dc1a099797a074bd7d43afd04a60f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-editors/vim-7.3.266-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-editors/vim-7.3.266-r1 new file mode 100644 index 0000000000..eb671c4cf7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-editors/vim-7.3.266-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-proto/xproto ) !minimal? ( dev-util/ctags ) +DESCRIPTION=Vim, an improved vi-style text editor +EAPI=3 +HOMEPAGE=http://www.vim.org/ +IUSE=bash-completion nls acl cscope debug gpm perl python ruby X minimal vim-pager +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +PDEPEND=bash-completion? ( app-shells/bash-completion ) +RDEPEND=bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio ) ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( static? ( >=media-libs/libsdl-1.2.11[X,static-libs] ) !static? ( >=media-libs/libsdl-1.2.11[X] ) ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html >=sys-kernel/linux-headers-2.6.35 ssl? ( dev-util/pkgconfig ) >=app-admin/eselect-python-20091230 +DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools +EAPI=3 +HOMEPAGE=http://www.linux-kvm.org +IUSE=+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg nss png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio ) ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( static? ( >=media-libs/libsdl-1.2.11[X,static-libs] ) !static? ( >=media-libs/libsdl-1.2.11[X] ) ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) >=app-admin/eselect-python-20091230 +RESTRICT=test +SLOT=0 +SRC_URI=mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-0.15.1.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=5aff872c0cb92b2463c912db38858fd0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-1.4.99.20120314-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-1.4.99.20120314-r5 new file mode 100644 index 0000000000..6a7302312a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-1.4.99.20120314-r5 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=>=dev-libs/glib-2.26 x11-libs/libX11 dev-util/pkgconfig >=app-admin/eselect-python-20091230 +DESCRIPTION=Intelligent Input Bus for Linux / Unix OS +EAPI=2 +HOMEPAGE=http://code.google.com/p/ibus/ +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.26 x11-libs/libX11 >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=mirror://gentoo/ibus-1.4.99.20120314.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cceb116577db8305e13ab66f271681b7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-english-m-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-english-m-0.0.1-r3 new file mode 100644 index 0000000000..ebab02a617 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-english-m-0.0.1-r3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install prepare +DEPEND=>=app-i18n/ibus-1.3.99 dev-util/pkgconfig >=sys-devel/gettext-0.16.1 +DESCRIPTION=English IME for testing +EAPI=2 +HOMEPAGE=http://github.com/yusukes/ibus-zinnia +KEYWORDS=amd64 arm x86 +LICENSE=Apache-2.0 +RDEPEND=>=app-i18n/ibus-1.3.99 +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/ibus-zinnia-0.0.3.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9f506f76142c0046a5a2fff001fcde07 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-m17n-1.3.3-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-m17n-1.3.3-r5 new file mode 100644 index 0000000000..57f4923cce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-m17n-1.3.3-r5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=>=app-i18n/ibus-1.3.99 >=dev-libs/m17n-lib-1.6.1 >=dev-db/m17n-db-1.6.1 >=dev-db/m17n-contrib-1.1.10 nls? ( virtual/libintl ) >=chromeos-base/chromeos-chrome-16 chromeos-base/chromeos-assets dev-libs/libxml2 dev-util/pkgconfig >=sys-devel/gettext-0.16.1 +DESCRIPTION=The M17N engine IMEngine for IBus Framework +EAPI=2 +HOMEPAGE=http://code.google.com/p/ibus/ +IUSE=nls +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=>=app-i18n/ibus-1.3.99 >=dev-libs/m17n-lib-1.6.1 >=dev-db/m17n-db-1.6.1 >=dev-db/m17n-contrib-1.1.10 nls? ( virtual/libintl ) +SLOT=0 +SRC_URI=http://ibus.googlecode.com/files/ibus-m17n-1.3.3.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fe5f2edc739c3b25d1c02ae59fcce513 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-1.5.1090.102-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-1.5.1090.102-r3 new file mode 100644 index 0000000000..ce2fd88819 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-1.5.1090.102-r3 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=>=app-i18n/ibus-1.4.1 dev-libs/openssl dev-libs/protobuf internal? ( net-misc/curl ) >=app-admin/eselect-python-20091230 +DESCRIPTION=The Mozc engine for IBus Framework +EAPI=2 +HOMEPAGE=http://code.google.com/p/mozc +IUSE=internal +KEYWORDS=amd64 x86 arm +LICENSE=BSD +RDEPEND=>=app-i18n/ibus-1.4.1 dev-libs/openssl dev-libs/protobuf internal? ( net-misc/curl ) >=app-admin/eselect-python-20091230 +RESTRICT=mirror +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-1.5.1090.102.tar.bz2 internal? ( gs://chromeos-localmirror-private/distfiles/GoogleJapaneseInputFilesForChromeOS-1.5.1090.102.tar.bz2 ) +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=23e3cd7f036786369e222625f45ed269 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-chewing-1.4.1033.102-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-chewing-1.4.1033.102-r2 new file mode 100644 index 0000000000..ae3293cd3e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-chewing-1.4.1033.102-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=>=app-i18n/ibus-1.3.99.20110817 >=dev-libs/libchewing-0.3.2 dev-libs/protobuf >=app-admin/eselect-python-20091230 +DESCRIPTION=The Mozc Chewing engine for IBus Framework +EAPI=2 +HOMEPAGE=http://code.google.com/p/mozc +KEYWORDS=amd64 x86 arm +LICENSE=BSD +RDEPEND=>=app-i18n/ibus-1.3.99.20110817 >=dev-libs/libchewing-0.3.2 dev-libs/protobuf >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-1.4.1033.102.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4792a8142b787ee3cdc9a200e35f71a3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-hangul-1.4.1033.102-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-hangul-1.4.1033.102-r4 new file mode 100644 index 0000000000..cbc0c777c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-hangul-1.4.1033.102-r4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=>=app-i18n/ibus-1.3.99 >=app-i18n/libhangul-0.0.10 dev-libs/protobuf >=app-admin/eselect-python-20091230 +DESCRIPTION=The Mozc Hangul engine for IBus Framework +EAPI=2 +HOMEPAGE=http://code.google.com/p/mozc +KEYWORDS=amd64 x86 arm +LICENSE=BSD +RDEPEND=>=app-i18n/ibus-1.3.99 >=app-i18n/libhangul-0.0.10 dev-libs/protobuf >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-1.4.1033.102.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f501371205a385ffb80fc3b1989ae70a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-pinyin-1.6.1187.102-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-pinyin-1.6.1187.102-r2 new file mode 100644 index 0000000000..ecc727f725 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-mozc-pinyin-1.6.1187.102-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=>=app-i18n/ibus-1.3.99 >=dev-libs/glib-2.26 dev-libs/protobuf >=dev-libs/pyzy-0.1.0 >=app-admin/eselect-python-20091230 +DESCRIPTION=The Mozc Pinyin engine for IBus Framework +EAPI=2 +HOMEPAGE=http://code.google.com/p/mozc +KEYWORDS=amd64 x86 arm +LICENSE=BSD +RDEPEND=>=app-i18n/ibus-1.3.99 >=dev-libs/glib-2.26 dev-libs/protobuf >=dev-libs/pyzy-0.1.0 >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/mozc-1.6.1187.102.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f45da2ca5194bcaa18877d2643c6c159 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-zinnia-0.0.3-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-zinnia-0.0.3-r2 new file mode 100644 index 0000000000..3ed2a9e19f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/ibus-zinnia-0.0.3-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install +DEPEND=>=app-i18n/ibus-1.3.99 app-i18n/zinnia app-i18n/tegaki-zinnia-japanese-light app-i18n/tegaki-zinnia-simplified-chinese-light app-i18n/tegaki-zinnia-traditional-chinese-light dev-util/pkgconfig >=sys-devel/gettext-0.16.1 +DESCRIPTION=Zinnia hand-writing engine +EAPI=2 +HOMEPAGE=http://github.com/yusukes/ibus-zinnia +KEYWORDS=amd64 arm x86 +LICENSE=Apache-2.0 +RDEPEND=>=app-i18n/ibus-1.3.99 app-i18n/zinnia app-i18n/tegaki-zinnia-japanese-light app-i18n/tegaki-zinnia-simplified-chinese-light app-i18n/tegaki-zinnia-traditional-chinese-light +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/ibus-zinnia-0.0.3.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cf9e73eac06e07ffd2d256f79e944c43 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/libhangul-0.0.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/libhangul-0.0.10 new file mode 100644 index 0000000000..96f92155dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/libhangul-0.0.10 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DESCRIPTION=libhangul is a generalized and portable library for processing hangul. +HOMEPAGE=http://kldp.net/projects/hangul/ +KEYWORDS=~alpha ~amd64 ~ppc ~x86 +LICENSE=LGPL-2.1 +SLOT=0 +SRC_URI=mirror://gentoo/libhangul-0.0.10.tar.gz +_md5_=7b8c4bb69a029c2d6d060cae869bacd4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-light-0.3-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-light-0.3-r1 new file mode 100644 index 0000000000..c45c091840 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-light-0.3-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DESCRIPTION=Zinnia learning data for Japanese +EAPI=3 +HOMEPAGE=http://tegaki.org/ +KEYWORDS=amd64 x86 arm +LICENSE=LGPL +RDEPEND=app-i18n/zinnia +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/tegaki-zinnia-japanese-light-0.3.zip +_md5_=8c92163c58dd1f2f96ba4bb1362bf095 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-simplified-chinese-light-0.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-simplified-chinese-light-0.3 new file mode 100644 index 0000000000..66d076114f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-simplified-chinese-light-0.3 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DESCRIPTION=Zinnia learning data for simplified Chinese +EAPI=3 +HOMEPAGE=http://tegaki.org/ +KEYWORDS=amd64 x86 arm +LICENSE=LGPL +RDEPEND=app-i18n/zinnia +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/tegaki-zinnia-simplified-chinese-light-0.3.zip +_md5_=9b7586d1cc85de43b80e76bbb7306c18 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-traditional-chinese-light-0.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-traditional-chinese-light-0.3 new file mode 100644 index 0000000000..d1d471c2b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-i18n/tegaki-zinnia-traditional-chinese-light-0.3 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DESCRIPTION=Zinnia learning data for traditional Chinese +EAPI=3 +HOMEPAGE=http://tegaki.org/ +KEYWORDS=amd64 x86 arm +LICENSE=LGPL +RDEPEND=app-i18n/zinnia +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/tegaki-zinnia-traditional-chinese-light-0.3.zip +_md5_=8f947a7b1ecaa14e2cd118195a7ffe6b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-laptop/laptop-mode-tools-1.59 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-laptop/laptop-mode-tools-1.59 new file mode 100644 index 0000000000..f50a76778e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-laptop/laptop-mode-tools-1.59 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst unpack +DESCRIPTION=Linux kernel laptop_mode user-space utilities +EAPI=2 +HOMEPAGE=http://www.samwel.tk/laptop_mode/ +IUSE=-acpi -apm bluetooth -hal -scsi +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=sys-apps/ethtool acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-utils ) ) hal? ( sys-apps/hal ) net-wireless/iw scsi? ( sys-apps/sdparm ) sys-apps/hdparm +SLOT=0 +SRC_URI=http://samwel.tk/laptop_mode/tools/downloads/laptop-mode-tools_1.59.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c4705578a4fa6fbc814d687dca2eb5a9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-laptop/laptop-mode-tools-1.59-r15 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-laptop/laptop-mode-tools-1.59-r15 new file mode 100644 index 0000000000..f50a76778e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-laptop/laptop-mode-tools-1.59-r15 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst unpack +DESCRIPTION=Linux kernel laptop_mode user-space utilities +EAPI=2 +HOMEPAGE=http://www.samwel.tk/laptop_mode/ +IUSE=-acpi -apm bluetooth -hal -scsi +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=sys-apps/ethtool acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-utils ) ) hal? ( sys-apps/hal ) net-wireless/iw scsi? ( sys-apps/sdparm ) sys-apps/hdparm +SLOT=0 +SRC_URI=http://samwel.tk/laptop_mode/tools/downloads/laptop-mode-tools_1.59.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c4705578a4fa6fbc814d687dca2eb5a9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-20090709 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-20090709 new file mode 100644 index 0000000000..8084e20d4c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-20090709 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install postinst setup unpack +DEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) +DESCRIPTION=Common CA Certificates PEM files +HOMEPAGE=http://packages.debian.org/sid/ca-certificates +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=MPL-1.1 +RDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) dev-libs/openssl sys-apps/debianutils +SLOT=0 +SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20090709_all.deb +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9fd1d82becd02e9f6c67afe562150523 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-20090709-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-20090709-r6 new file mode 100644 index 0000000000..8084e20d4c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-20090709-r6 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install postinst setup unpack +DEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) +DESCRIPTION=Common CA Certificates PEM files +HOMEPAGE=http://packages.debian.org/sid/ca-certificates +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=MPL-1.1 +RDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) dev-libs/openssl sys-apps/debianutils +SLOT=0 +SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20090709_all.deb +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9fd1d82becd02e9f6c67afe562150523 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ddccontrol-0.4.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ddccontrol-0.4.2 new file mode 100644 index 0000000000..6dc5cedd9a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ddccontrol-0.4.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-2.4 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 dev-perl/XML-Parser dev-util/intltool doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=DDCControl allows control of monitor parameters via DDC +HOMEPAGE=http://ddccontrol.sourceforge.net/ +IUSE=gtk gnome doc nls ddcpci +KEYWORDS=amd64 ppc x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-2.4 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 +SLOT=0 +SRC_URI=mirror://sourceforge/ddccontrol/ddccontrol-0.4.2.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e774220a6b07c4bee32d658c1ef04abb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ddccontrol-0.4.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ddccontrol-0.4.2-r1 new file mode 100644 index 0000000000..6dc5cedd9a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ddccontrol-0.4.2-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-2.4 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 dev-perl/XML-Parser dev-util/intltool doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=DDCControl allows control of monitor parameters via DDC +HOMEPAGE=http://ddccontrol.sourceforge.net/ +IUSE=gtk gnome doc nls ddcpci +KEYWORDS=amd64 ppc x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-2.4 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 +SLOT=0 +SRC_URI=mirror://sourceforge/ddccontrol/ddccontrol-0.4.2.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e774220a6b07c4bee32d658c1ef04abb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/utouch-evemu-1.0.5-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/utouch-evemu-1.0.5-r9 new file mode 100644 index 0000000000..2a6618a77c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/utouch-evemu-1.0.5-r9 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare unpack +DEPEND=X? ( >=x11-base/xorg-server-1.8 ) +DESCRIPTION=To record and replay data from kernel evdev devices +EAPI=2 +HOMEPAGE=http://bitmath.org/code/evemu/ +IUSE=X +KEYWORDS=amd64 x86 arm +LICENSE=GPL-3 +RDEPEND=X? ( >=x11-base/xorg-server-1.8 ) +SLOT=0 +SRC_URI=http://launchpad.net/utouch-evemu/trunk/v1.0.5/+download/utouch-evemu-1.0.5.tar.gz +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=0d700f0683c73b148b656f6b73aca24a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/eclass-manpages-20130110 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/eclass-manpages-20130110 new file mode 100644 index 0000000000..0a47915179 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/eclass-manpages-20130110 @@ -0,0 +1,8 @@ +DEFINED_PHASES=compile install +DESCRIPTION=collection of Gentoo eclass manpages +EAPI=4 +HOMEPAGE=http://www.gentoo.org/ +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris +LICENSE=GPL-2 +SLOT=0 +_md5_=1769702052dba8eab80d12edb5b01398 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/audioconfig-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/audioconfig-0.0.1 new file mode 100644 index 0000000000..11431ee4fe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/audioconfig-0.0.1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DESCRIPTION=Audio configuration files. +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=1bc361079b090b04d67a279a0db769f5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/audioconfig-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/audioconfig-0.0.1-r1 new file mode 100644 index 0000000000..11431ee4fe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/audioconfig-0.0.1-r1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DESCRIPTION=Audio configuration files. +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=1bc361079b090b04d67a279a0db769f5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-0.0.1-r3539 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-0.0.1-r3539 new file mode 100644 index 0000000000..ce9420e3eb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-0.0.1-r3539 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install postinst prepare setup unpack +DEPEND=!=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=47a8973262da7f2684759754ff0312bc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-chrome-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-chrome-9999 new file mode 100644 index 0000000000..9ea2b9e695 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-chrome-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/autotest-tests chromeos-base/chromeos-chrome chromeos-base/flimflam-test tests_audiovideo_PlaybackRecordSemiAuto? ( media-sound/alsa-utils ) dev-vcs/git +DESCRIPTION=Autotest tests that require chrome_test or pyauto deps +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +tests_desktopui_EnterprisePolicy +tests_audiovideo_FFMPEG +tests_audiovideo_VDA +tests_desktopui_BrowserTest +tests_desktopui_DocViewing +tests_desktopui_PyAutoEnduranceTests +tests_desktopui_PyAutoFunctionalTests +tests_desktopui_PyAutoInstall +tests_desktopui_PyAutoPerfTests +tests_desktopui_SyncIntegrationTests +tests_audiovideo_PlaybackRecordSemiAuto +tests_desktopui_AudioFeedback +tests_desktopui_ChromeSemiAuto +tests_desktopui_FlashSanityCheck +tests_desktopui_IBusTest +tests_desktopui_ImeTest +tests_desktopui_LoadBigFile +tests_desktopui_MediaAudioFeedback +tests_desktopui_NaClSanity +tests_desktopui_ScreenLocker +tests_desktopui_SimpleLogin tests_desktopui_TouchScreen +tests_desktopui_UrlFetch +tests_desktopui_WebRTC +tests_desktopui_VideoSanity +tests_desktopui_YouTubeHTML5 +tests_enterprise_DevicePolicy +tests_graphics_GLAPICheck +tests_graphics_GpuReset +tests_graphics_Piglit +tests_graphics_SanAngeles +tests_graphics_TearTest +tests_graphics_VTSwitch +tests_graphics_WebGLConformance +tests_graphics_WebGLPerformance +tests_graphics_WindowManagerGraphicsCapture +tests_hardware_BluetoothSemiAuto +tests_hardware_ExternalDrives +tests_hardware_USB20 +tests_hardware_UsbPlugIn tests_logging_AsanCrash +tests_logging_UncleanShutdown +tests_login_BadAuthentication +tests_login_ChromeProfileSanitary +tests_login_CryptohomeIncognitoMounted +tests_login_CryptohomeIncognitoUnmounted +tests_login_CryptohomeMounted +tests_login_CryptohomeUnmounted +tests_login_LoginSuccess +tests_login_LogoutProcessCleanup +tests_login_RemoteLogin +tests_network_3GSuspendResume +tests_network_NavigateToUrl +tests_network_ONC +tests_platform_Pkcs11InitOnLogin +tests_platform_Pkcs11Persistence +tests_platform_ProcessPrivileges +tests_power_AudioDetector +tests_power_Consumption +tests_power_Idle +tests_power_LoadTest +tests_power_SuspendStress +tests_power_UiResume +tests_power_VideoDetector +tests_power_VideoSuspend +tests_realtimecomm_GTalkAudioPlayground +tests_realtimecomm_GTalkPlayground +tests_security_BluetoothUIXSS +tests_security_BundledExtensions +tests_security_NetworkListeners +tests_security_ProfilePermissions +tests_security_RendererSandbox cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +RDEPEND=chromeos-base/autotest-tests chromeos-base/chromeos-chrome chromeos-base/flimflam-test tests_audiovideo_PlaybackRecordSemiAuto? ( media-sound/alsa-utils ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=eff72f8618dc2d1f4ad1b034abc746c6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-0.0.1-r3549 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-0.0.1-r3549 new file mode 100644 index 0000000000..63d2633773 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-0.0.1-r3549 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-cpp/gtest chromeos-base/autotest-deps-libaio app-i18n/ibus dev-libs/glib sys-apps/dbus dev-libs/libnl:0 sys-fs/udev[gudev] chromeos-base/autotest-fakemodem-conf sys-devel/binutils dev-vcs/git +DESCRIPTION=Autotest common deps +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +RDEPEND=dev-cpp/gtest chromeos-base/autotest-deps-libaio app-i18n/ibus dev-libs/glib sys-apps/dbus dev-libs/libnl:0 sys-fs/udev[gudev] chromeos-base/autotest-fakemodem-conf sys-devel/binutils ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=70863d79d457863b8e0b79eff203b8ea diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-9999 new file mode 100644 index 0000000000..dcdac5e18c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-cpp/gtest chromeos-base/autotest-deps-libaio app-i18n/ibus dev-libs/glib sys-apps/dbus dev-libs/libnl:0 sys-fs/udev[gudev] chromeos-base/autotest-fakemodem-conf sys-devel/binutils dev-vcs/git +DESCRIPTION=Autotest common deps +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +RDEPEND=dev-cpp/gtest chromeos-base/autotest-deps-libaio app-i18n/ibus dev-libs/glib sys-apps/dbus dev-libs/libnl:0 sys-fs/udev[gudev] chromeos-base/autotest-fakemodem-conf sys-devel/binutils ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=660b5f83788c7d01337930456500e740 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-audioloop-0.0.1-r2663 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-audioloop-0.0.1-r2663 new file mode 100644 index 0000000000..05e1cbe3f2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-audioloop-0.0.1-r2663 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=media-libs/alsa-lib media-sound/adhd dev-vcs/git +DESCRIPTION=Autotest audioloop dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=media-libs/alsa-lib media-sound/adhd ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9dd2a815f71332c49325d5f558ec0787 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-audioloop-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-audioloop-9999 new file mode 100644 index 0000000000..e5cc11e4da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-audioloop-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=media-libs/alsa-lib media-sound/adhd dev-vcs/git +DESCRIPTION=Autotest audioloop dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=media-libs/alsa-lib media-sound/adhd ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a0cd49889d873db3d2019c23f6bc913a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-ffmpeg-0.0.1-r1511 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-ffmpeg-0.0.1-r1511 new file mode 100644 index 0000000000..7ba8535d0c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-ffmpeg-0.0.1-r1511 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/chromeos-chrome dev-vcs/git +DESCRIPTION=Autotest chromium ffmpeg dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/chromeos-chrome ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=588080a0a840aa6b4fd0da7466625bb6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-ffmpeg-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-ffmpeg-9999 new file mode 100644 index 0000000000..fc4c607f09 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-ffmpeg-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/chromeos-chrome dev-vcs/git +DESCRIPTION=Autotest chromium ffmpeg dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/chromeos-chrome ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f28eb647c6326db8c786494fe5fee43d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glbench-0.0.1-r3223 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glbench-0.0.1-r3223 new file mode 100644 index 0000000000..e71142d8a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glbench-0.0.1-r3223 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-cpp/gflags chromeos-base/libchrome:125070[cros-debug=] virtual/opengl opengles? ( virtual/opengles ) x11-apps/xwd opengles? ( x11-drivers/opengles-headers ) dev-vcs/git !!<=chromeos-base/autotest-deps-0.0.1-r321 +DESCRIPTION=Autotest glbench dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles cros-debug +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-deps-0.0.1-r321 !!<=chromeos-base/autotest-deps-0.0.1-r321 ) +RDEPEND=dev-cpp/gflags chromeos-base/libchrome:125070[cros-debug=] virtual/opengl opengles? ( virtual/opengles ) x11-apps/xwd ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-deps-0.0.1-r321 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8cb18f9cc317fbca6e1c108fc493c6d7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glbench-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glbench-9999 new file mode 100644 index 0000000000..15792a07bb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glbench-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-cpp/gflags chromeos-base/libchrome:125070[cros-debug=] virtual/opengl opengles? ( virtual/opengles ) x11-apps/xwd opengles? ( x11-drivers/opengles-headers ) dev-vcs/git !!<=chromeos-base/autotest-deps-0.0.1-r321 +DESCRIPTION=Autotest glbench dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles cros-debug +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-deps-0.0.1-r321 !!<=chromeos-base/autotest-deps-0.0.1-r321 ) +RDEPEND=dev-cpp/gflags chromeos-base/libchrome:125070[cros-debug=] virtual/opengl opengles? ( virtual/opengles ) x11-apps/xwd ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-deps-0.0.1-r321 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=eb94ca9245b9b64df04d76ee227a711f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r1798 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r1798 new file mode 100644 index 0000000000..c0805474db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r1798 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=virtual/opengl media-libs/libpng sys-libs/zlib x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext dev-vcs/git +DESCRIPTION=Autotest glmark2 dependency +EAPI=2 +HOMEPAGE=https://launchpad.net/glmark2 +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=amd64 arm x86 +LICENSE=GPL-3 +RDEPEND=virtual/opengl media-libs/libpng sys-libs/zlib x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4c7390e92659fa1138dcfda8978e3fac diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r364 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r364 new file mode 100644 index 0000000000..79848325ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r364 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=virtual/opengl media-libs/libpng sys-libs/zlib x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext dev-vcs/git +DESCRIPTION=Autotest glmark2 dependency +EAPI=2 +HOMEPAGE=https://launchpad.net/glmark2 +IUSE=+autotest cros_workon_tree_3fac66aefc84fb25e5359292e9153c676ccbbf6f +buildcheck autotest opengles +KEYWORDS=amd64 arm x86 +LICENSE=GPL-3 +RDEPEND=virtual/opengl media-libs/libpng sys-libs/zlib x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a0412917e85158debf9c67ad4a641d6e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-9999 new file mode 100644 index 0000000000..80e443ea32 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=virtual/opengl media-libs/libpng sys-libs/zlib x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext dev-vcs/git +DESCRIPTION=Autotest glmark2 dependency +EAPI=2 +HOMEPAGE=https://launchpad.net/glmark2 +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-3 +RDEPEND=virtual/opengl media-libs/libpng sys-libs/zlib x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ffe880df758677ccf1c0215b719286f5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-iotools-0.0.1-r3219 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-iotools-0.0.1-r3219 new file mode 100644 index 0000000000..0df15836ce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-iotools-0.0.1-r3219 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git !!<=chromeos-base/autotest-deps-0.0.1-r321 +DESCRIPTION=Autotest iotools dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-deps-0.0.1-r321 !!<=chromeos-base/autotest-deps-0.0.1-r321 ) +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-deps-0.0.1-r321 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e6e42ba623b1788a5d15c0630269dc5b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-iotools-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-iotools-9999 new file mode 100644 index 0000000000..c4f96a2eab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-iotools-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git !!<=chromeos-base/autotest-deps-0.0.1-r321 +DESCRIPTION=Autotest iotools dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-deps-0.0.1-r321 !!<=chromeos-base/autotest-deps-0.0.1-r321 ) +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-deps-0.0.1-r321 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fe662fe9c1d0c273795bfe2f5f652f9e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-libaio-0.0.1-r3221 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-libaio-0.0.1-r3221 new file mode 100644 index 0000000000..24d7fcff1b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-libaio-0.0.1-r3221 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git !!<=chromeos-base/autotest-deps-0.0.1-r321 +DESCRIPTION=Autotest libaio dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-deps-0.0.1-r321 !!<=chromeos-base/autotest-deps-0.0.1-r321 ) +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-deps-0.0.1-r321 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=35605a680fb9d6d20fadd41221bc7c97 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-libaio-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-libaio-9999 new file mode 100644 index 0000000000..d79b8288cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-libaio-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git !!<=chromeos-base/autotest-deps-0.0.1-r321 +DESCRIPTION=Autotest libaio dep +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-deps-0.0.1-r321 !!<=chromeos-base/autotest-deps-0.0.1-r321 ) +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-deps-0.0.1-r321 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=06ba296f4c67d32bec03f339b19ad6ce diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r2978 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r2978 new file mode 100644 index 0000000000..6df41ca7cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r2978 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=virtual/glut virtual/opengl dev-python/mako dev-python/numpy media-libs/tiff media-libs/libpng sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXpm dev-vcs/git +DESCRIPTION=dependencies for Piglit (collection of automated tests for OpenGl based on glean and mesa) +EAPI=2 +HOMEPAGE=http://cgit.freedesktop.org/piglit +IUSE=+autotest cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=amd64 arm x86 +LICENSE=GPL +RDEPEND=virtual/glut virtual/opengl dev-python/mako dev-python/numpy media-libs/tiff media-libs/libpng sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXpm ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4ade46d1e8a104a230823009b31743d4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-piglit-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-piglit-9999 new file mode 100644 index 0000000000..d22ecc430c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-deps-piglit-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=virtual/glut virtual/opengl dev-python/mako dev-python/numpy media-libs/tiff media-libs/libpng sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXpm dev-vcs/git +DESCRIPTION=dependencies for Piglit (collection of automated tests for OpenGl based on glean and mesa) +EAPI=2 +HOMEPAGE=http://cgit.freedesktop.org/piglit +IUSE=+autotest cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL +RDEPEND=virtual/glut virtual/opengl dev-python/mako dev-python/numpy media-libs/tiff media-libs/libpng sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXpm ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fa12685fb717ad89d1b4d991929e2357 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-factory-0.0.1-r3236 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-factory-0.0.1-r3236 new file mode 100644 index 0000000000..f9586f9d90 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-factory-0.0.1-r3236 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-audioloop chromeos-base/autotest-deps-glbench chromeos-base/autotest-private-board chromeos-base/chromeos-factory chromeos-base/flimflam-test >=chromeos-base/vpd-0.0.1-r11 dev-python/jsonrpclib dev-python/pygobject dev-python/pygtk dev-python/ws4py xset? ( x11-apps/xset ) dev-vcs/git !!<=chromeos-base/autotest-tests-0.0.1-r335 +DESCRIPTION=Autotest Factory tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+xset hardened +autotest +tests_dummy_Fail +tests_dummy_Pass +tests_factory_Antenna +tests_factory_Audio +tests_factory_AudioInternalLoopback +tests_factory_AudioLoop +tests_factory_AudioQuality +tests_factory_BasicCellular +tests_factory_BasicGPS +tests_factory_BasicWifi +tests_factory_Camera +tests_factory_CameraPerformanceAls +tests_factory_Cellular +tests_factory_Connector +tests_factory_DeveloperRecovery +tests_factory_Display +tests_factory_Dummy +tests_factory_ExtDisplay +tests_factory_ExternalStorage +tests_factory_Fail +tests_factory_Finalize +tests_factory_HWID +tests_factory_Keyboard +tests_factory_KeyboardBacklight +tests_factory_Leds +tests_factory_LidSwitch +tests_factory_LightSensor +tests_factory_ProbeWifi +tests_factory_Prompt +tests_factory_RemovableStorage +tests_factory_RunScript +tests_factory_ScanSN +tests_factory_ScriptWrapper +tests_factory_Start +tests_factory_StressTest +tests_factory_SyncEventLogs +tests_factory_Touchpad +tests_factory_Touchscreen +tests_factory_TPM +tests_factory_USB +tests_factory_VerifyComponents +tests_factory_VPD +tests_factory_Wifi +tests_suite_Factory cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-tests-0.0.1-r335 !!<=chromeos-base/autotest-tests-0.0.1-r335 ) +RDEPEND=chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-audioloop chromeos-base/autotest-deps-glbench chromeos-base/autotest-private-board chromeos-base/chromeos-factory chromeos-base/flimflam-test >=chromeos-base/vpd-0.0.1-r11 dev-python/jsonrpclib dev-python/pygobject dev-python/pygtk dev-python/ws4py xset? ( x11-apps/xset ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-tests-0.0.1-r335 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c52d12bd578763b5143d35461fd1c5f3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-factory-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-factory-9999 new file mode 100644 index 0000000000..cc141035ca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-factory-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-audioloop chromeos-base/autotest-deps-glbench chromeos-base/autotest-private-board chromeos-base/chromeos-factory chromeos-base/flimflam-test >=chromeos-base/vpd-0.0.1-r11 dev-python/jsonrpclib dev-python/pygobject dev-python/pygtk dev-python/ws4py xset? ( x11-apps/xset ) dev-vcs/git !!<=chromeos-base/autotest-tests-0.0.1-r335 +DESCRIPTION=Autotest Factory tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+xset hardened +autotest +tests_dummy_Fail +tests_dummy_Pass +tests_factory_Antenna +tests_factory_Audio +tests_factory_AudioInternalLoopback +tests_factory_AudioLoop +tests_factory_AudioQuality +tests_factory_BasicCellular +tests_factory_BasicGPS +tests_factory_BasicWifi +tests_factory_Camera +tests_factory_CameraPerformanceAls +tests_factory_Cellular +tests_factory_Connector +tests_factory_DeveloperRecovery +tests_factory_Display +tests_factory_Dummy +tests_factory_ExtDisplay +tests_factory_ExternalStorage +tests_factory_Fail +tests_factory_Finalize +tests_factory_HWID +tests_factory_Keyboard +tests_factory_KeyboardBacklight +tests_factory_Leds +tests_factory_LidSwitch +tests_factory_LightSensor +tests_factory_ProbeWifi +tests_factory_Prompt +tests_factory_RemovableStorage +tests_factory_RunScript +tests_factory_ScanSN +tests_factory_ScriptWrapper +tests_factory_Start +tests_factory_StressTest +tests_factory_SyncEventLogs +tests_factory_Touchpad +tests_factory_Touchscreen +tests_factory_TPM +tests_factory_USB +tests_factory_VerifyComponents +tests_factory_VPD +tests_factory_Wifi +tests_suite_Factory cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-tests-0.0.1-r335 !!<=chromeos-base/autotest-tests-0.0.1-r335 ) +RDEPEND=chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-audioloop chromeos-base/autotest-deps-glbench chromeos-base/autotest-private-board chromeos-base/chromeos-factory chromeos-base/flimflam-test >=chromeos-base/vpd-0.0.1-r11 dev-python/jsonrpclib dev-python/pygobject dev-python/pygtk dev-python/ws4py xset? ( x11-apps/xset ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-tests-0.0.1-r335 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=81257fd6246ec6d1b98ea815c32f15fd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-fakemodem-conf-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-fakemodem-conf-0.0.1 new file mode 100644 index 0000000000..d6f1120b5d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-fakemodem-conf-0.0.1 @@ -0,0 +1,7 @@ +DEFINED_PHASES=install +DESCRIPTION=Runtime configuration file for fakemodem (autotest dep) +EAPI=2 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=f2ced545f77d8fb7ef95cfd945006079 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-0.1.0 new file mode 100644 index 0000000000..79386fd441 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-0.1.0 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=Private autotest tests +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_md5_=08212cff8840561719518195efac6772 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-0.1.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-0.1.0-r1 new file mode 100644 index 0000000000..79386fd441 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-0.1.0-r1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=Private autotest tests +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_md5_=08212cff8840561719518195efac6772 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-board-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-board-0.0.1-r1 new file mode 100644 index 0000000000..743dc2a98d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-private-board-0.0.1-r1 @@ -0,0 +1,7 @@ +DEFINED_PHASES=- +DESCRIPTION=Board specific autotests +EAPI=2 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=b96d309286be052334a5d408d7ecaade diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-0.0.1-r3634 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-0.0.1-r3634 new file mode 100644 index 0000000000..601543081a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-0.0.1-r3634 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/autotest-deps chromeos-base/autotest-deps-glbench chromeos-base/autotest-deps-glmark2 chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-piglit chromeos-base/flimflam-test autox? ( chromeos-base/autox ) dev-python/numpy dev-python/pygobject dev-python/pygtk xset? ( x11-apps/xset ) tpmtools? ( app-crypt/tpm-tools ) tests_platform_RootPartitionsNotMounted? ( sys-apps/rootdev ) tests_platform_RootPartitionsNotMounted? ( sys-fs/udev ) tests_hardware_TPMFirmware? ( chromeos-base/tpm_lite ) dev-vcs/git +DESCRIPTION=Autotest tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autox +xset +tpmtools hardened +autotest +tests_compilebench +tests_crashme +tests_dbench +tests_ddtest +tests_disktest +tests_fsx +tests_hackbench +tests_iperf +tests_bonnie +tests_iozone +tests_netperf2 +tests_netpipe +tests_scrashme +tests_sound_infrastructure +tests_sleeptest +tests_unixbench +tests_audiovideo_CRASFormatConversion +tests_audiovideo_LineOutToMicInLoopback +tests_audiovideo_LoopbackLatency +tests_audiovideo_Microphone +tests_audiovideo_V4L2 +tests_cellular_Smoke +tests_cellular_ThroughputController +tests_cellular_Throughput +tests_build_RootFilesystemSize +tests_desktopui_FontCache +tests_desktopui_GTK2Config +tests_desktopui_HangDetector +tests_desktopui_ImeLogin +tests_desktopui_KillRestart +tests_desktopui_SpeechSynthesisSemiAuto tests_example_UnitTest +tests_example_CrosTest +tests_graphics_GLBench +tests_graphics_GLMark2 +tests_graphics_KernelMemory +tests_graphics_LibDRM +tests_graphics_SyncControlTest +tests_firmware_RomSize tests_firmware_VbootCrypto +tests_hardware_Ath3k +tests_hardware_Backlight +tests_hardware_ch7036 +tests_hardware_Components +tests_hardware_DeveloperRecovery +tests_hardware_DiskSize +tests_hardware_EC +tests_hardware_EepromWriteProtect +tests_hardware_GobiGPS +tests_hardware_GPIOSwitches +tests_hardware_GPS +tests_hardware_I2CProbe +tests_hardware_Interrupt +tests_hardware_Keyboard +tests_hardware_LightSensor +tests_hardware_MemoryThroughput +tests_hardware_MemoryTotalSize +tests_hardware_MultiReader +tests_hardware_RealtekCardReader +tests_hardware_Resolution +tests_hardware_SAT +tests_hardware_SsdDetection +tests_hardware_StorageFio tests_hardware_TouchScreenPresent +tests_hardware_TPMCheck tests_hardware_TPMFirmware +tests_hardware_Trackpad +tests_hardware_VideoOutSemiAuto +tests_hardware_Xrandr +tests_hardware_bma150 +tests_kernel_Bootcache +tests_kernel_ConfigVerify +tests_kernel_CpufreqMinMax +tests_kernel_fs_Inplace +tests_kernel_fs_Punybench +tests_kernel_Lmbench +tests_kernel_LowMemNotify +tests_kernel_PerfEventRename +tests_kernel_SchedBandwith +tests_kernel_TPMPing +tests_kernel_HdParm +tests_kernel_ProtocolCheck +tests_logging_CrashSender +tests_logging_CrashServices +tests_logging_KernelCrash +tests_logging_UserCrash +tests_login_DBusCalls +tests_login_SecondFactor +tests_network_3GActivate +tests_network_3GAssociation +tests_network_3GDisableWhileConnecting +tests_network_3GDisableGobiWhileConnecting +tests_network_3GDormancyDance +tests_network_3GGobiPorts +tests_network_3GFailedConnect +tests_network_3GModemControl +tests_network_3GModemPresent +tests_network_3GNoGobi +tests_network_3GRecoverFromGobiDesync +tests_network_3GSafetyDance +tests_network_3GSmokeTest +tests_network_3GStressEnable +tests_network_SwitchCarrier +tests_network_ConnmanCromoCrash +tests_network_ConnmanIncludeExcludeMultiple +tests_network_ConnmanPowerStateTracking +tests_network_DhcpNegotiationSuccess +tests_network_DhcpRenew +tests_network_DisableInterface +tests_network_EthCaps +tests_network_EthernetStressPlug +tests_network_GobiUncleanDisconnect +tests_network_LockedSIM +tests_network_ModemManagerSMS +tests_network_ModemManagerSMSSignal +tests_network_NegotiatedLANSpeed +tests_network_Ping +tests_network_Portal +tests_network_UdevRename +tests_network_WiFiCaps +tests_network_WiFiSmokeTest +tests_network_WifiAuthenticationTests +tests_network_WlanHasIP +tests_network_netperf2 +tests_platform_AccurateTime +tests_platform_AesThroughput +tests_platform_Attestation +tests_platform_BootPerf +tests_platform_CheckErrorsInLog +tests_platform_CleanShutdown +tests_platform_CompressedSwap +tests_platform_CrosDisksArchive +tests_platform_CrosDisksDBus +tests_platform_CrosDisksFilesystem +tests_platform_CrosDisksFormat +tests_platform_CryptohomeBadPerms +tests_platform_CryptohomeChangePassword +tests_platform_CryptohomeFio +tests_platform_CryptohomeMount +tests_platform_CryptohomeMultiple +tests_platform_CryptohomeNonDirs +tests_platform_CryptohomeStress +tests_platform_CryptohomeTestAuth +tests_platform_DaemonsRespawn +tests_platform_DebugDaemonGetModemStatus +tests_platform_DebugDaemonGetNetworkStatus +tests_platform_DebugDaemonGetRoutes +tests_platform_DebugDaemonPing +tests_platform_DebugDaemonTracePath +tests_platform_DMVerityBitCorruption +tests_platform_DMVerityCorruption +tests_platform_EncryptedStateful +tests_platform_EvdevSynDropTest +tests_platform_ExternalUSBBootStress +tests_platform_ExternalUSBStress +tests_platform_FileNum +tests_platform_FilePerms +tests_platform_FileSize +tests_platform_HighResTimers +tests_platform_KernelVersion +tests_platform_LibCBench +tests_platform_MemCheck +tests_platform_NetParms +tests_platform_OSLimits +tests_platform_PartitionCheck +tests_platform_Pkcs11InitUnderErrors +tests_platform_Pkcs11ChangeAuthData +tests_platform_Pkcs11Events +tests_platform_Pkcs11LoadPerf +tests_platform_Rootdev +tests_platform_RootPartitionsNotMounted +tests_platform_SessionManagerTerm +tests_platform_Shutdown +tests_platform_SuspendStress +tests_platform_TempFS +tests_platform_TLSDate +tests_platform_ToolchainOptions +tests_platform_TouchpadSynDrop +tests_platform_TPMEvict +tests_power_ARMSettings +tests_power_Backlight +tests_power_BacklightControl +tests_power_BacklightSuspend +tests_power_BatteryCharge +tests_power_CameraSuspend +tests_power_CPUFreq +tests_power_CPUIdle +tests_power_Draw +tests_power_HotCPUSuspend +tests_power_KernelSuspend +tests_power_MemorySuspend +tests_power_NoConsoleSuspend +tests_power_ProbeDriver +tests_power_Resume +tests_power_Standby +tests_power_StatsCPUFreq +tests_power_StatsCPUIdle +tests_power_StatsUSB +tests_power_Status +tests_power_SuspendResume +tests_power_SuspendShutdown +tests_power_WakeupRTC +tests_power_x86Settings +tests_realtimecomm_GTalkAudioBench +tests_realtimecomm_GTalkLmiCamera +tests_realtimecomm_GTalkunittest +tests_security_AccountsBaseline +tests_security_ASLR +tests_security_ChromiumOSLSM +tests_security_DbusMap +tests_security_DbusOwners +tests_security_Firewall +tests_security_HardlinkRestrictions +tests_security_HciconfigDefaultSettings +tests_security_HtpdateHTTP +tests_security_Minijail_seccomp +tests_security_Minijail0 +tests_security_ModuleLocking +tests_security_OpenFDs +tests_security_OpenSSLBlacklist +tests_security_OpenSSLRegressions +tests_security_ProtocolFamilies +tests_security_ptraceRestrictions +tests_security_ReservedPrivileges +tests_security_RestartJob +tests_security_RootCA +tests_security_RootfsOwners +tests_security_RootfsStatefulSymlinks +tests_security_RuntimeExecStack +tests_security_SandboxedServices +tests_security_SeccompSyscallFilters +tests_security_SMMLocked +tests_security_StatefulPermissions +tests_security_SuidBinaries +tests_security_SymlinkRestrictions +tests_security_SysVIPC +tests_suite_HWConfig +tests_suite_HWQual +test_Recall cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +RDEPEND=chromeos-base/autotest-deps chromeos-base/autotest-deps-glbench chromeos-base/autotest-deps-glmark2 chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-piglit chromeos-base/flimflam-test autox? ( chromeos-base/autox ) dev-python/numpy dev-python/pygobject dev-python/pygtk xset? ( x11-apps/xset ) tpmtools? ( app-crypt/tpm-tools ) tests_platform_RootPartitionsNotMounted? ( sys-apps/rootdev ) tests_platform_RootPartitionsNotMounted? ( sys-fs/udev ) tests_hardware_TPMFirmware? ( chromeos-base/tpm_lite ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c7b7141d44077b462f61b7e49ae1b95a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-9999 new file mode 100644 index 0000000000..900f2f2254 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/autotest-deps chromeos-base/autotest-deps-glbench chromeos-base/autotest-deps-glmark2 chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-piglit chromeos-base/flimflam-test autox? ( chromeos-base/autox ) dev-python/numpy dev-python/pygobject dev-python/pygtk xset? ( x11-apps/xset ) tpmtools? ( app-crypt/tpm-tools ) tests_platform_RootPartitionsNotMounted? ( sys-apps/rootdev ) tests_platform_RootPartitionsNotMounted? ( sys-fs/udev ) tests_hardware_TPMFirmware? ( chromeos-base/tpm_lite ) dev-vcs/git +DESCRIPTION=Autotest tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autox +xset +tpmtools hardened +autotest +tests_compilebench +tests_crashme +tests_dbench +tests_ddtest +tests_disktest +tests_fsx +tests_hackbench +tests_iperf +tests_bonnie +tests_iozone +tests_netperf2 +tests_netpipe +tests_scrashme +tests_sound_infrastructure +tests_sleeptest +tests_unixbench +tests_audiovideo_CRASFormatConversion +tests_audiovideo_LineOutToMicInLoopback +tests_audiovideo_LoopbackLatency +tests_audiovideo_Microphone +tests_audiovideo_V4L2 +tests_cellular_Smoke +tests_cellular_ThroughputController +tests_cellular_Throughput +tests_build_RootFilesystemSize +tests_desktopui_FontCache +tests_desktopui_GTK2Config +tests_desktopui_HangDetector +tests_desktopui_ImeLogin +tests_desktopui_KillRestart +tests_desktopui_SpeechSynthesisSemiAuto tests_example_UnitTest +tests_example_CrosTest +tests_graphics_GLBench +tests_graphics_GLMark2 +tests_graphics_KernelMemory +tests_graphics_LibDRM +tests_graphics_SyncControlTest +tests_firmware_RomSize tests_firmware_VbootCrypto +tests_hardware_Ath3k +tests_hardware_Backlight +tests_hardware_ch7036 +tests_hardware_Components +tests_hardware_DeveloperRecovery +tests_hardware_DiskSize +tests_hardware_EC +tests_hardware_EepromWriteProtect +tests_hardware_GobiGPS +tests_hardware_GPIOSwitches +tests_hardware_GPS +tests_hardware_I2CProbe +tests_hardware_Interrupt +tests_hardware_Keyboard +tests_hardware_LightSensor +tests_hardware_MemoryThroughput +tests_hardware_MemoryTotalSize +tests_hardware_MultiReader +tests_hardware_RealtekCardReader +tests_hardware_Resolution +tests_hardware_SAT +tests_hardware_SsdDetection +tests_hardware_StorageFio tests_hardware_TouchScreenPresent +tests_hardware_TPMCheck tests_hardware_TPMFirmware +tests_hardware_Trackpad +tests_hardware_VideoOutSemiAuto +tests_hardware_Xrandr +tests_hardware_bma150 +tests_kernel_Bootcache +tests_kernel_ConfigVerify +tests_kernel_CpufreqMinMax +tests_kernel_fs_Inplace +tests_kernel_fs_Punybench +tests_kernel_Lmbench +tests_kernel_LowMemNotify +tests_kernel_PerfEventRename +tests_kernel_SchedBandwith +tests_kernel_TPMPing +tests_kernel_HdParm +tests_kernel_ProtocolCheck +tests_logging_CrashSender +tests_logging_CrashServices +tests_logging_KernelCrash +tests_logging_UserCrash +tests_login_DBusCalls +tests_login_SecondFactor +tests_network_3GActivate +tests_network_3GAssociation +tests_network_3GDisableWhileConnecting +tests_network_3GDisableGobiWhileConnecting +tests_network_3GDormancyDance +tests_network_3GGobiPorts +tests_network_3GFailedConnect +tests_network_3GModemControl +tests_network_3GModemPresent +tests_network_3GNoGobi +tests_network_3GRecoverFromGobiDesync +tests_network_3GSafetyDance +tests_network_3GSmokeTest +tests_network_3GStressEnable +tests_network_SwitchCarrier +tests_network_ConnmanCromoCrash +tests_network_ConnmanIncludeExcludeMultiple +tests_network_ConnmanPowerStateTracking +tests_network_DhcpNegotiationSuccess +tests_network_DhcpRenew +tests_network_DisableInterface +tests_network_EthCaps +tests_network_EthernetStressPlug +tests_network_GobiUncleanDisconnect +tests_network_LockedSIM +tests_network_ModemManagerSMS +tests_network_ModemManagerSMSSignal +tests_network_NegotiatedLANSpeed +tests_network_Ping +tests_network_Portal +tests_network_UdevRename +tests_network_WiFiCaps +tests_network_WiFiSmokeTest +tests_network_WifiAuthenticationTests +tests_network_WlanHasIP +tests_network_netperf2 +tests_platform_AccurateTime +tests_platform_AesThroughput +tests_platform_Attestation +tests_platform_BootPerf +tests_platform_CheckErrorsInLog +tests_platform_CleanShutdown +tests_platform_CompressedSwap +tests_platform_CrosDisksArchive +tests_platform_CrosDisksDBus +tests_platform_CrosDisksFilesystem +tests_platform_CrosDisksFormat +tests_platform_CryptohomeBadPerms +tests_platform_CryptohomeChangePassword +tests_platform_CryptohomeFio +tests_platform_CryptohomeMount +tests_platform_CryptohomeMultiple +tests_platform_CryptohomeNonDirs +tests_platform_CryptohomeStress +tests_platform_CryptohomeTestAuth +tests_platform_DaemonsRespawn +tests_platform_DebugDaemonGetModemStatus +tests_platform_DebugDaemonGetNetworkStatus +tests_platform_DebugDaemonGetRoutes +tests_platform_DebugDaemonPing +tests_platform_DebugDaemonTracePath +tests_platform_DMVerityBitCorruption +tests_platform_DMVerityCorruption +tests_platform_EncryptedStateful +tests_platform_EvdevSynDropTest +tests_platform_ExternalUSBBootStress +tests_platform_ExternalUSBStress +tests_platform_FileNum +tests_platform_FilePerms +tests_platform_FileSize +tests_platform_HighResTimers +tests_platform_KernelVersion +tests_platform_LibCBench +tests_platform_MemCheck +tests_platform_NetParms +tests_platform_OSLimits +tests_platform_PartitionCheck +tests_platform_Pkcs11InitUnderErrors +tests_platform_Pkcs11ChangeAuthData +tests_platform_Pkcs11Events +tests_platform_Pkcs11LoadPerf +tests_platform_Rootdev +tests_platform_RootPartitionsNotMounted +tests_platform_SessionManagerTerm +tests_platform_Shutdown +tests_platform_SuspendStress +tests_platform_TempFS +tests_platform_TLSDate +tests_platform_ToolchainOptions +tests_platform_TouchpadSynDrop +tests_platform_TPMEvict +tests_power_ARMSettings +tests_power_Backlight +tests_power_BacklightControl +tests_power_BacklightSuspend +tests_power_BatteryCharge +tests_power_CameraSuspend +tests_power_CPUFreq +tests_power_CPUIdle +tests_power_Draw +tests_power_HotCPUSuspend +tests_power_KernelSuspend +tests_power_MemorySuspend +tests_power_NoConsoleSuspend +tests_power_ProbeDriver +tests_power_Resume +tests_power_Standby +tests_power_StatsCPUFreq +tests_power_StatsCPUIdle +tests_power_StatsUSB +tests_power_Status +tests_power_SuspendResume +tests_power_SuspendShutdown +tests_power_WakeupRTC +tests_power_x86Settings +tests_realtimecomm_GTalkAudioBench +tests_realtimecomm_GTalkLmiCamera +tests_realtimecomm_GTalkunittest +tests_security_AccountsBaseline +tests_security_ASLR +tests_security_ChromiumOSLSM +tests_security_DbusMap +tests_security_DbusOwners +tests_security_Firewall +tests_security_HardlinkRestrictions +tests_security_HciconfigDefaultSettings +tests_security_HtpdateHTTP +tests_security_Minijail_seccomp +tests_security_Minijail0 +tests_security_ModuleLocking +tests_security_OpenFDs +tests_security_OpenSSLBlacklist +tests_security_OpenSSLRegressions +tests_security_ProtocolFamilies +tests_security_ptraceRestrictions +tests_security_ReservedPrivileges +tests_security_RestartJob +tests_security_RootCA +tests_security_RootfsOwners +tests_security_RootfsStatefulSymlinks +tests_security_RuntimeExecStack +tests_security_SandboxedServices +tests_security_SeccompSyscallFilters +tests_security_SMMLocked +tests_security_StatefulPermissions +tests_security_SuidBinaries +tests_security_SymlinkRestrictions +tests_security_SysVIPC +tests_suite_HWConfig +tests_suite_HWQual +test_Recall cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +RDEPEND=chromeos-base/autotest-deps chromeos-base/autotest-deps-glbench chromeos-base/autotest-deps-glmark2 chromeos-base/autotest-deps-iotools chromeos-base/autotest-deps-libaio chromeos-base/autotest-deps-piglit chromeos-base/flimflam-test autox? ( chromeos-base/autox ) dev-python/numpy dev-python/pygobject dev-python/pygtk xset? ( x11-apps/xset ) tpmtools? ( app-crypt/tpm-tools ) tests_platform_RootPartitionsNotMounted? ( sys-apps/rootdev ) tests_platform_RootPartitionsNotMounted? ( sys-fs/udev ) tests_hardware_TPMFirmware? ( chromeos-base/tpm_lite ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=44ff4163a1000ec1b31033a8a18061fb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ltp-0.0.1-r1886 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ltp-0.0.1-r1886 new file mode 100644 index 0000000000..9b0a1c1429 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ltp-0.0.1-r1886 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject !chromeos-base/autotest-tests-0.0.1-r596 !!<=chromeos-base/autotest-tests-0.0.1-r596 ) +RDEPEND=chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject !=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-tests-0.0.1-r596 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4e2cfc7ff2390a245c1f14a3d192489f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ltp-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ltp-9999 new file mode 100644 index 0000000000..5b9d3ce4d6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ltp-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject !chromeos-base/autotest-tests-0.0.1-r596 !!<=chromeos-base/autotest-tests-0.0.1-r596 ) +RDEPEND=chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject !=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-tests-0.0.1-r596 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f050ce3c89b003af2f754e9fbd6b2496 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ownershipapi-0.0.1-r3039 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ownershipapi-0.0.1-r3039 new file mode 100644 index 0000000000..fa574ee616 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ownershipapi-0.0.1-r3039 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/flimflam-test chromeos-base/chromeos-chrome chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject autox? ( chromeos-base/autox ) dev-vcs/git !!<=chromeos-base/autotest-tests-0.0.1-r596 +DESCRIPTION=login_OwnershipApi autotest +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autox +xset +tpmtools hardened +autotest +tests_login_OwnershipApi +tests_login_OwnershipNotRetaken +tests_login_OwnershipRetaken +tests_login_OwnershipTaken +tests_login_RemoteOwnership cros_workon_tree_fb8c4062f8c8ed9467124d53053e7c108d1eab34 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-tests-0.0.1-r596 !!<=chromeos-base/autotest-tests-0.0.1-r596 ) +RDEPEND=chromeos-base/flimflam-test chromeos-base/chromeos-chrome chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject autox? ( chromeos-base/autox ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-tests-0.0.1-r596 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=817702dc1b61cba55b226f81a58d72c3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ownershipapi-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ownershipapi-9999 new file mode 100644 index 0000000000..ed5d5faa25 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autotest-tests-ownershipapi-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=chromeos-base/flimflam-test chromeos-base/chromeos-chrome chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject autox? ( chromeos-base/autox ) dev-vcs/git !!<=chromeos-base/autotest-tests-0.0.1-r596 +DESCRIPTION=login_OwnershipApi autotest +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autox +xset +tpmtools hardened +autotest +tests_login_OwnershipApi +tests_login_OwnershipNotRetaken +tests_login_OwnershipRetaken +tests_login_OwnershipTaken +tests_login_RemoteOwnership cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +PDEPEND=|| ( >chromeos-base/autotest-tests-0.0.1-r596 !!<=chromeos-base/autotest-tests-0.0.1-r596 ) +RDEPEND=chromeos-base/flimflam-test chromeos-base/chromeos-chrome chromeos-base/protofiles dev-libs/protobuf dev-python/pygobject autox? ( chromeos-base/autox ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) !!<=chromeos-base/autotest-tests-0.0.1-r596 +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 conflict 974274f61683fa68a5c5fae14d38e018 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2904cb50070b798a06639bb17f51a06b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autox-0.0.1-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autox-0.0.1-r11 new file mode 100644 index 0000000000..cd807ad5b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autox-0.0.1-r11 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=>=app-admin/eselect-python-20091230 dev-vcs/git +DESCRIPTION=AutoX library for interacting with X apps +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_611b421824a85dff20fd67f6cb25b6eab9f36730 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=dev-python/python-xlib >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d255cd32c05a52e7f6cd140682980d5d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autox-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autox-9999 new file mode 100644 index 0000000000..2960349d1a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/autox-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=>=app-admin/eselect-python-20091230 dev-vcs/git +DESCRIPTION=AutoX library for interacting with X apps +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=dev-python/python-xlib >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=49d999421134dd5fec27175fe41d3292 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/board-devices-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/board-devices-0.0.1 new file mode 100644 index 0000000000..d0ea827928 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/board-devices-0.0.1 @@ -0,0 +1,7 @@ +DEFINED_PHASES=- +DESCRIPTION=Generic board (meta package) +EAPI=2 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=e6d162d8f8ad7f4ab8d6f60932c8ff4c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/bootstat-0.0.1-r19 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/bootstat-0.0.1-r19 new file mode 100644 index 0000000000..d38059ee47 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/bootstat-0.0.1-r19 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=dev-cpp/gtest dev-vcs/git +DESCRIPTION=Chrome OS Boot Time Statistics Utilities +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_b5ef87a2635b6cbba9816bf32c256b3cdec80cef +KEYWORDS=amd64 x86 arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=158034a842295ebff499409ce1570632 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/bootstat-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/bootstat-9999 new file mode 100644 index 0000000000..7bdf833598 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/bootstat-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=dev-cpp/gtest dev-vcs/git +DESCRIPTION=Chrome OS Boot Time Statistics Utilities +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=76402238ab324292ca2d4be0adf433d3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/brcmfmac-nvram-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/brcmfmac-nvram-0.0.1-r1 new file mode 100644 index 0000000000..a6fc46a79b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/brcmfmac-nvram-0.0.1-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install setup +DESCRIPTION=NVRAM image for the brcmfmac driver +EAPI=2 +HOMEPAGE=http://src.chromium.org +IUSE=awnh610 awnh930 +KEYWORDS=arm +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 confutils a80706bb5b9ddcf6bbd14365656d4985 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=0c0e2799e53ab66679752bb9fa39e0b2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/busybox-config-1.21.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/busybox-config-1.21.0 new file mode 100644 index 0000000000..e8a8bdcb4d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/busybox-config-1.21.0 @@ -0,0 +1,7 @@ +DEFINED_PHASES=install +DESCRIPTION=CrOS specific busybox configuration file. +EAPI=4 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=20d73b73a67e1a5549681dec03ec47ed diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ca0132-dsp-firmware-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ca0132-dsp-firmware-0.0.1 new file mode 100644 index 0000000000..fdb16af18a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ca0132-dsp-firmware-0.0.1 @@ -0,0 +1,7 @@ +DEFINED_PHASES=install +DESCRIPTION=Ebuild that installs the firmware needed by the ca0132 codec. +EAPI=4 +KEYWORDS=x86 amd64 +LICENSE=BSD +SLOT=0 +_md5_=bbbe8d69d15afdeb0bed3c34ef6f7101 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/celltest-perf-endpoint-0.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/celltest-perf-endpoint-0.1-r2 new file mode 100644 index 0000000000..cd8ea97db9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/celltest-perf-endpoint-0.1-r2 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=Performance testing endpoint for cellular performance tests +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=net-misc/iperf +SLOT=0 +_md5_=319e6eafe425ac5e1b10c300e4c84184 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chaps-0.0.1-r115 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chaps-0.0.1-r115 new file mode 100644 index 0000000000..054f55e146 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chaps-0.0.1-r115 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/openssl dev-cpp/gflags dev-cpp/gmock test? ( dev-cpp/gtest ) dev-db/leveldb dev-vcs/git +DESCRIPTION=PKCS #11 layer over TrouSerS. +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_21c1942d9a04e83433ab0a7af6b6ce0346f647c1 +KEYWORDS=arm amd64 x86 +LICENSE=BSD +RDEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/openssl dev-cpp/gflags chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f338726bb505a497f21e2fdcb377f80c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chaps-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chaps-9999 new file mode 100644 index 0000000000..e7f0a3e6a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chaps-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/openssl dev-cpp/gflags dev-cpp/gmock test? ( dev-cpp/gtest ) dev-db/leveldb dev-vcs/git +DESCRIPTION=PKCS #11 layer over TrouSerS. +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~arm ~amd64 ~x86 +LICENSE=BSD +RDEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/openssl dev-cpp/gflags chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4e6d2d8b73b388b1a08375637b67f645 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-0.0.1 new file mode 100644 index 0000000000..f01a763dca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-0.0.1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=- +DEPEND=X? ( chromeos-base/chromeos-chrome chromeos-base/chromeos-fonts chromeos-base/xorg-conf x11-apps/xinit x11-apps/xrandr x11-apps/xset-mini >=x11-base/xorg-server-1.6.3 ) x86? ( sys-boot/syslinux ) amd64? ( sys-boot/syslinux ) arm? ( chromeos-base/u-boot-scripts ) virtual/chromeos-bsp virtual/chromeos-firmware virtual/linux-sources app-editors/vim app-admin/rsyslog app-arch/sharutils app-arch/tar bootchart? ( app-benchmarks/bootchart ) app-crypt/trousers app-i18n/ibus-english-m app-i18n/ibus-m17n app-i18n/ibus-mozc app-i18n/ibus-mozc-chewing app-i18n/ibus-mozc-hangul app-i18n/ibus-mozc-pinyin app-laptop/laptop-mode-tools app-shells/bash app-shells/dash chromeos-base/audioconfig chromeos-base/board-devices chromeos-base/bootstat chromeos-base/chromeos-assets chromeos-base/chromeos-assets-split chromeos-base/chromeos-auth-config chromeos-base/chromeos-base chromeos-base/chromeos-debugd chromeos-base/chromeos-imageburner chromeos-base/chromeos-init chromeos-base/chromeos-installer chromeos-base/chromeos-login chromeos-base/crash-reporter chromeos-base/cromo chromeos-base/cros-disks chromeos-base/cros_boot_mode chromeos-base/crosh chromeos-base/dev-install chromeos-base/inputcontrol chromeos-base/internal chromeos-base/metrics chromeos-base/mtpd chromeos-base/power_manager chromeos-base/root-certificates chromeos-base/shill chromeos-base/update_engine chromeos-base/userfeedback chromeos-base/vboot_reference chromeos-base/wimax_manager media-gfx/ply-image media-plugins/alsa-plugins !arm? ( media-plugins/o3d ) arm? ( opengles? ( media-plugins/o3d ) ) media-sound/alsa-utils media-sound/adhd net-firewall/iptables net-misc/tlsdate net-wireless/ath3k net-wireless/ath6k net-wireless/crda gdmwimax? ( net-wireless/gdmwimax ) net-wireless/marvell_sd8787 bluetooth? ( net-wireless/bluez ) >=sys-apps/baselayout-2.0.0 sys-apps/bootcache sys-apps/coreutils sys-apps/dbus sys-apps/eject sys-apps/flashrom sys-apps/grep sys-apps/mawk sys-apps/module-init-tools sys-apps/mosys sys-apps/net-tools sys-apps/pv sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/upstart sys-apps/ureadahead sys-apps/util-linux sys-auth/pam_pwdfile sys-fs/e2fsprogs sys-fs/udev sys-libs/timezone-data sys-process/lsof sys-process/procps virtual/modemmanager coreboot? ( virtual/chromeos-coreboot ) sys-apps/which bootimage? ( sys-boot/chromeos-bootimage ) cros_ec? ( chromeos-base/chromeos-ec ) +DESCRIPTION=Chrome OS (meta package) +EAPI=2 +HOMEPAGE=http://src.chromium.org +IUSE=bluetooth bootimage coreboot cros_ec gdmwimax X bootchart opengles +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=X? ( chromeos-base/chromeos-chrome chromeos-base/chromeos-fonts chromeos-base/xorg-conf x11-apps/xinit x11-apps/xrandr x11-apps/xset-mini >=x11-base/xorg-server-1.6.3 ) x86? ( sys-boot/syslinux ) amd64? ( sys-boot/syslinux ) arm? ( chromeos-base/u-boot-scripts ) virtual/chromeos-bsp virtual/chromeos-firmware virtual/linux-sources app-editors/vim app-admin/rsyslog app-arch/sharutils app-arch/tar bootchart? ( app-benchmarks/bootchart ) app-crypt/trousers app-i18n/ibus-english-m app-i18n/ibus-m17n app-i18n/ibus-mozc app-i18n/ibus-mozc-chewing app-i18n/ibus-mozc-hangul app-i18n/ibus-mozc-pinyin app-laptop/laptop-mode-tools app-shells/bash app-shells/dash chromeos-base/audioconfig chromeos-base/board-devices chromeos-base/bootstat chromeos-base/chromeos-assets chromeos-base/chromeos-assets-split chromeos-base/chromeos-auth-config chromeos-base/chromeos-base chromeos-base/chromeos-debugd chromeos-base/chromeos-imageburner chromeos-base/chromeos-init chromeos-base/chromeos-installer chromeos-base/chromeos-login chromeos-base/crash-reporter chromeos-base/cromo chromeos-base/cros-disks chromeos-base/cros_boot_mode chromeos-base/crosh chromeos-base/dev-install chromeos-base/inputcontrol chromeos-base/internal chromeos-base/metrics chromeos-base/mtpd chromeos-base/power_manager chromeos-base/root-certificates chromeos-base/shill chromeos-base/update_engine chromeos-base/userfeedback chromeos-base/vboot_reference chromeos-base/wimax_manager media-gfx/ply-image media-plugins/alsa-plugins !arm? ( media-plugins/o3d ) arm? ( opengles? ( media-plugins/o3d ) ) media-sound/alsa-utils media-sound/adhd net-firewall/iptables net-misc/tlsdate net-wireless/ath3k net-wireless/ath6k net-wireless/crda gdmwimax? ( net-wireless/gdmwimax ) net-wireless/marvell_sd8787 bluetooth? ( net-wireless/bluez ) >=sys-apps/baselayout-2.0.0 sys-apps/bootcache sys-apps/coreutils sys-apps/dbus sys-apps/eject sys-apps/flashrom sys-apps/grep sys-apps/mawk sys-apps/module-init-tools sys-apps/mosys sys-apps/net-tools sys-apps/pv sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/upstart sys-apps/ureadahead sys-apps/util-linux sys-auth/pam_pwdfile sys-fs/e2fsprogs sys-fs/udev sys-libs/timezone-data sys-process/lsof sys-process/procps virtual/modemmanager coreboot? ( virtual/chromeos-coreboot ) sys-apps/which dev-util/quipper net-wireless/realtek-rt2800-firmware +SLOT=0 +_md5_=57d5410250369297652a90d2e60aed6e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-0.0.1-r187 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-0.0.1-r187 new file mode 100644 index 0000000000..f01a763dca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-0.0.1-r187 @@ -0,0 +1,11 @@ +DEFINED_PHASES=- +DEPEND=X? ( chromeos-base/chromeos-chrome chromeos-base/chromeos-fonts chromeos-base/xorg-conf x11-apps/xinit x11-apps/xrandr x11-apps/xset-mini >=x11-base/xorg-server-1.6.3 ) x86? ( sys-boot/syslinux ) amd64? ( sys-boot/syslinux ) arm? ( chromeos-base/u-boot-scripts ) virtual/chromeos-bsp virtual/chromeos-firmware virtual/linux-sources app-editors/vim app-admin/rsyslog app-arch/sharutils app-arch/tar bootchart? ( app-benchmarks/bootchart ) app-crypt/trousers app-i18n/ibus-english-m app-i18n/ibus-m17n app-i18n/ibus-mozc app-i18n/ibus-mozc-chewing app-i18n/ibus-mozc-hangul app-i18n/ibus-mozc-pinyin app-laptop/laptop-mode-tools app-shells/bash app-shells/dash chromeos-base/audioconfig chromeos-base/board-devices chromeos-base/bootstat chromeos-base/chromeos-assets chromeos-base/chromeos-assets-split chromeos-base/chromeos-auth-config chromeos-base/chromeos-base chromeos-base/chromeos-debugd chromeos-base/chromeos-imageburner chromeos-base/chromeos-init chromeos-base/chromeos-installer chromeos-base/chromeos-login chromeos-base/crash-reporter chromeos-base/cromo chromeos-base/cros-disks chromeos-base/cros_boot_mode chromeos-base/crosh chromeos-base/dev-install chromeos-base/inputcontrol chromeos-base/internal chromeos-base/metrics chromeos-base/mtpd chromeos-base/power_manager chromeos-base/root-certificates chromeos-base/shill chromeos-base/update_engine chromeos-base/userfeedback chromeos-base/vboot_reference chromeos-base/wimax_manager media-gfx/ply-image media-plugins/alsa-plugins !arm? ( media-plugins/o3d ) arm? ( opengles? ( media-plugins/o3d ) ) media-sound/alsa-utils media-sound/adhd net-firewall/iptables net-misc/tlsdate net-wireless/ath3k net-wireless/ath6k net-wireless/crda gdmwimax? ( net-wireless/gdmwimax ) net-wireless/marvell_sd8787 bluetooth? ( net-wireless/bluez ) >=sys-apps/baselayout-2.0.0 sys-apps/bootcache sys-apps/coreutils sys-apps/dbus sys-apps/eject sys-apps/flashrom sys-apps/grep sys-apps/mawk sys-apps/module-init-tools sys-apps/mosys sys-apps/net-tools sys-apps/pv sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/upstart sys-apps/ureadahead sys-apps/util-linux sys-auth/pam_pwdfile sys-fs/e2fsprogs sys-fs/udev sys-libs/timezone-data sys-process/lsof sys-process/procps virtual/modemmanager coreboot? ( virtual/chromeos-coreboot ) sys-apps/which bootimage? ( sys-boot/chromeos-bootimage ) cros_ec? ( chromeos-base/chromeos-ec ) +DESCRIPTION=Chrome OS (meta package) +EAPI=2 +HOMEPAGE=http://src.chromium.org +IUSE=bluetooth bootimage coreboot cros_ec gdmwimax X bootchart opengles +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=X? ( chromeos-base/chromeos-chrome chromeos-base/chromeos-fonts chromeos-base/xorg-conf x11-apps/xinit x11-apps/xrandr x11-apps/xset-mini >=x11-base/xorg-server-1.6.3 ) x86? ( sys-boot/syslinux ) amd64? ( sys-boot/syslinux ) arm? ( chromeos-base/u-boot-scripts ) virtual/chromeos-bsp virtual/chromeos-firmware virtual/linux-sources app-editors/vim app-admin/rsyslog app-arch/sharutils app-arch/tar bootchart? ( app-benchmarks/bootchart ) app-crypt/trousers app-i18n/ibus-english-m app-i18n/ibus-m17n app-i18n/ibus-mozc app-i18n/ibus-mozc-chewing app-i18n/ibus-mozc-hangul app-i18n/ibus-mozc-pinyin app-laptop/laptop-mode-tools app-shells/bash app-shells/dash chromeos-base/audioconfig chromeos-base/board-devices chromeos-base/bootstat chromeos-base/chromeos-assets chromeos-base/chromeos-assets-split chromeos-base/chromeos-auth-config chromeos-base/chromeos-base chromeos-base/chromeos-debugd chromeos-base/chromeos-imageburner chromeos-base/chromeos-init chromeos-base/chromeos-installer chromeos-base/chromeos-login chromeos-base/crash-reporter chromeos-base/cromo chromeos-base/cros-disks chromeos-base/cros_boot_mode chromeos-base/crosh chromeos-base/dev-install chromeos-base/inputcontrol chromeos-base/internal chromeos-base/metrics chromeos-base/mtpd chromeos-base/power_manager chromeos-base/root-certificates chromeos-base/shill chromeos-base/update_engine chromeos-base/userfeedback chromeos-base/vboot_reference chromeos-base/wimax_manager media-gfx/ply-image media-plugins/alsa-plugins !arm? ( media-plugins/o3d ) arm? ( opengles? ( media-plugins/o3d ) ) media-sound/alsa-utils media-sound/adhd net-firewall/iptables net-misc/tlsdate net-wireless/ath3k net-wireless/ath6k net-wireless/crda gdmwimax? ( net-wireless/gdmwimax ) net-wireless/marvell_sd8787 bluetooth? ( net-wireless/bluez ) >=sys-apps/baselayout-2.0.0 sys-apps/bootcache sys-apps/coreutils sys-apps/dbus sys-apps/eject sys-apps/flashrom sys-apps/grep sys-apps/mawk sys-apps/module-init-tools sys-apps/mosys sys-apps/net-tools sys-apps/pv sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/upstart sys-apps/ureadahead sys-apps/util-linux sys-auth/pam_pwdfile sys-fs/e2fsprogs sys-fs/udev sys-libs/timezone-data sys-process/lsof sys-process/procps virtual/modemmanager coreboot? ( virtual/chromeos-coreboot ) sys-apps/which dev-util/quipper net-wireless/realtek-rt2800-firmware +SLOT=0 +_md5_=57d5410250369297652a90d2e60aed6e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-acpi-0.0.1-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-acpi-0.0.1-r13 new file mode 100644 index 0000000000..6f0bb7224c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-acpi-0.0.1-r13 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS ACPI Scripts +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_97011cdf8ff5934f680c71756dea9286dc73ec11 +KEYWORDS=amd64 x86 +LICENSE=BSD +RDEPEND=sys-power/acpid chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=95870de376f9abcafafefea0532df73a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-acpi-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-acpi-9999 new file mode 100644 index 0000000000..baef35a2d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-acpi-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS ACPI Scripts +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=sys-power/acpid chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=35157672fe947a03d0b162ee94cd1ccd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-0.0.1-r364 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-0.0.1-r364 new file mode 100644 index 0000000000..88ddb57076 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-0.0.1-r364 @@ -0,0 +1,11 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=media-fonts/croscorefonts media-fonts/droidfonts-cros x11-apps/xcursorgen dev-vcs/git +DESCRIPTION=Chrome OS assets (images, sounds, etc.) +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=alex lumpy lumpy64 mario tegra2-ldk cros_workon_tree_d003ce8d1ed1a8f362a169685fae11e7aedc0afe +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=686d4b34845c8ef96fab3a3f3a956257 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-9999 new file mode 100644 index 0000000000..9342e0db08 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=media-fonts/croscorefonts media-fonts/droidfonts-cros x11-apps/xcursorgen dev-vcs/git +DESCRIPTION=Chrome OS assets (images, sounds, etc.) +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=alex lumpy lumpy64 mario tegra2-ldk cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ad2f4bbb4f175f6d19998c0e3a388f55 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-split-0.0.1-r28 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-split-0.0.1-r28 new file mode 100644 index 0000000000..03610ba26d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-split-0.0.1-r28 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chromium OS-specific assets +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_e18118e277349f02968917bc3eddb4dc39722e05 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +PDEPEND=>chromeos-base/chromeos-assets-0.0.1-r47 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=96394237d1ad330db71bdfdee15dade0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-split-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-split-9999 new file mode 100644 index 0000000000..8fd5199876 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-assets-split-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chromium OS-specific assets +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +PDEPEND=>chromeos-base/chromeos-assets-0.0.1-r47 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ca2c70158b64ab417d05628cfd24148d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-auth-config-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-auth-config-0.0.1-r1 new file mode 100644 index 0000000000..aaa3b62cf6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-auth-config-0.0.1-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install postinst +DEPEND=>=sys-auth/pambase-20090620.1-r7 chromeos-base/vboot_reference +DESCRIPTION=ChromiumOS-specific configuration files for pambase +EAPI=2 +HOMEPAGE=http://www.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=>=sys-auth/pambase-20090620.1-r7 chromeos-base/vboot_reference +SLOT=0 +_md5_=e09263291619381d4fbad646e8fdcc31 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-base-0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-base-0 new file mode 100644 index 0000000000..8498748135 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-base-0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install postinst setup +DEPEND=>=sys-apps/baselayout-2 !=sys-apps/baselayout-2 !=sys-apps/baselayout-2 !=sys-apps/baselayout-2 !=app-i18n/ibus-1.4.99 arm? ( virtual/opengles ) dev-libs/atk dev-libs/glib dev-libs/nspr >=dev-libs/nss-3.12.2 dev-libs/libxml2 dev-libs/dbus-glib x11-libs/cairo drm? ( x11-libs/libxkbcommon ) x11-libs/libXScrnSaver x11-libs/pango >=media-libs/alsa-lib-1.0.19 media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/mesa >=media-sound/adhd-0.0.1-r310 net-misc/wget sys-fs/udev sys-libs/zlib x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXScrnSaver chrome_remoting? ( x11-libs/libXtst ) x11-apps/setxkbmap !arm? ( x11-libs/libva ) arm? ( x11-drivers/opengles-headers ) chromeos-base/protofiles >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 net-wireless/bluez dev-vcs/git +DESCRIPTION=Open-source version of Google Chrome web browser +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=-asan +build_tests +chrome_remoting chrome_internal chrome_pdf +chrome_debug -chrome_debug_tests -chrome_media -clang -component_build -content_shell -drm +gold hardfp +highdpi +nacl neon -ninja -oem_wallpaper -pgo_use -pgo_generate +reorder +runhooks +verbose widevine_cdm +autotest +buildcheck autotest opengles +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-arch/bzip2 >=app-i18n/ibus-1.4.99 arm? ( virtual/opengles ) dev-libs/atk dev-libs/glib dev-libs/nspr >=dev-libs/nss-3.12.2 dev-libs/libxml2 dev-libs/dbus-glib x11-libs/cairo drm? ( x11-libs/libxkbcommon ) x11-libs/libXScrnSaver x11-libs/pango >=media-libs/alsa-lib-1.0.19 media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/mesa >=media-sound/adhd-0.0.1-r310 net-misc/wget sys-fs/udev sys-libs/zlib x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXScrnSaver chrome_remoting? ( x11-libs/libXtst ) x11-apps/setxkbmap !arm? ( x11-libs/libva ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +RESTRICT=mirror +SLOT=0 +SRC_URI=pgo_use? ( x86? ( gs://chromeos-prebuilt/pgo-job/canonicals/chromeos-chrome-x86-26.0.1403.0_rc.pgo.tar.bz2 ) ) pgo_use? ( amd64? ( gs://chromeos-prebuilt/pgo-job/canonicals/chromeos-chrome-amd64-26.0.1403.0_rc.pgo.tar.bz2 ) ) pgo_use? ( arm? ( gs://chromeos-prebuilt/pgo-job/canonicals/chromeos-chrome-arm-26.0.1403.0_rc.pgo.tar.bz2 ) ) +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c67f740f17936ed74a51ae606460668b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-chrome-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-chrome-9999 new file mode 100644 index 0000000000..18df145ffd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-chrome-9999 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare unpack +DEPEND=app-arch/bzip2 >=app-i18n/ibus-1.4.99 arm? ( virtual/opengles ) dev-libs/atk dev-libs/glib dev-libs/nspr >=dev-libs/nss-3.12.2 dev-libs/libxml2 dev-libs/dbus-glib x11-libs/cairo drm? ( x11-libs/libxkbcommon ) x11-libs/libXScrnSaver x11-libs/pango >=media-libs/alsa-lib-1.0.19 media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/mesa >=media-sound/adhd-0.0.1-r310 net-misc/wget sys-fs/udev sys-libs/zlib x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXScrnSaver chrome_remoting? ( x11-libs/libXtst ) x11-apps/setxkbmap !arm? ( x11-libs/libva ) arm? ( x11-drivers/opengles-headers ) chromeos-base/protofiles >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 net-wireless/bluez dev-vcs/git +DESCRIPTION=Open-source version of Google Chrome web browser +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=-asan +build_tests +chrome_remoting chrome_internal chrome_pdf +chrome_debug -chrome_debug_tests -chrome_media -clang -component_build -content_shell -drm +gold hardfp +highdpi +nacl neon -ninja -oem_wallpaper -pgo_use -pgo_generate +reorder +runhooks +verbose widevine_cdm +autotest +buildcheck autotest opengles +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-arch/bzip2 >=app-i18n/ibus-1.4.99 arm? ( virtual/opengles ) dev-libs/atk dev-libs/glib dev-libs/nspr >=dev-libs/nss-3.12.2 dev-libs/libxml2 dev-libs/dbus-glib x11-libs/cairo drm? ( x11-libs/libxkbcommon ) x11-libs/libXScrnSaver x11-libs/pango >=media-libs/alsa-lib-1.0.19 media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/mesa >=media-sound/adhd-0.0.1-r310 net-misc/wget sys-fs/udev sys-libs/zlib x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXScrnSaver chrome_remoting? ( x11-libs/libXtst ) x11-apps/setxkbmap !arm? ( x11-libs/libva ) ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +RESTRICT=mirror +SLOT=0 +SRC_URI=pgo_use? ( x86? ( gs://chromeos-prebuilt/pgo-job/canonicals/chromeos-chrome-x86-9999.pgo.tar.bz2 ) ) pgo_use? ( amd64? ( gs://chromeos-prebuilt/pgo-job/canonicals/chromeos-chrome-amd64-9999.pgo.tar.bz2 ) ) pgo_use? ( arm? ( gs://chromeos-prebuilt/pgo-job/canonicals/chromeos-chrome-arm-9999.pgo.tar.bz2 ) ) +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 autotest-deponly c768cc6b3a334584419444354d68ba8e binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5d8fd20d46dfebaf5568998aa6e4daf1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-cryptohome-0.0.1-r329 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-cryptohome-0.0.1-r329 new file mode 100644 index 0000000000..7a2536bead --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-cryptohome-0.0.1-r329 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=test? ( dev-cpp/gtest ) chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api app-crypt/trousers chromeos-base/chaps chromeos-base/libchromeos chromeos-base/libscrypt chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/openssl dev-libs/protobuf sys-apps/keyutils sys-fs/ecryptfs-utils dev-vcs/git +DESCRIPTION=Encrypted home directories for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_6d63f920d37d52a9d907f9a0e7e17a2a8eac6137 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-crypt/trousers chromeos-base/chaps chromeos-base/libchromeos chromeos-base/libscrypt chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/openssl dev-libs/protobuf sys-apps/keyutils sys-fs/ecryptfs-utils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=133d72c86a967632e4c0595c96b59852 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-cryptohome-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-cryptohome-9999 new file mode 100644 index 0000000000..c9ca328cf7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-cryptohome-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=test? ( dev-cpp/gtest ) chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api app-crypt/trousers chromeos-base/chaps chromeos-base/libchromeos chromeos-base/libscrypt chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/openssl dev-libs/protobuf sys-apps/keyutils sys-fs/ecryptfs-utils dev-vcs/git +DESCRIPTION=Encrypted home directories for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-crypt/trousers chromeos-base/chaps chromeos-base/libchromeos chromeos-base/libscrypt chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/openssl dev-libs/protobuf sys-apps/keyutils sys-fs/ecryptfs-utils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d29c63b556bcc5a9da852513ff38f7cd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-debugd-0.0.0-r123 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-debugd-0.0.0-r123 new file mode 100644 index 0000000000..39e9f67d10 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-debugd-0.0.0-r123 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/glib:2 dev-libs/libpcre chromeos-base/shill sys-apps/dbus virtual/modemmanager dev-vcs/git +DESCRIPTION=Chrome OS debugging service +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_acf7bf198dadec0295a36c07a3f28615bd53af35 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/glib:2 dev-libs/libpcre +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8069ad6a1a424cab7c517dfd3690fa2a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-debugd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-debugd-9999 new file mode 100644 index 0000000000..b71e37464a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-debugd-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/glib:2 dev-libs/libpcre chromeos-base/shill sys-apps/dbus virtual/modemmanager dev-vcs/git +DESCRIPTION=Chrome OS debugging service +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-libs/dbus-c++ dev-libs/glib:2 dev-libs/libpcre +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d9af0a94f604f926dcbe7d03bbffce90 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-0.1.0 new file mode 100644 index 0000000000..e9f076c06b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-0.1.0 @@ -0,0 +1,10 @@ +DEFINED_PHASES=- +DESCRIPTION=Adds some developer niceties on top of Chrome OS for debugging +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=bluetooth opengl X +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-admin/sudo app-arch/gzip app-arch/tar app-benchmarks/punybench app-crypt/nss app-crypt/tpm-tools app-editors/vim app-misc/evtest app-shells/bash chromeos-base/chromeos-dev-init chromeos-base/flimflam-test chromeos-base/gmerge chromeos-base/protofiles chromeos-base/system_api dev-lang/python dev-python/dbus-python dev-util/hdctools dev-util/libc-bench dev-util/strace net-analyzer/netperf net-analyzer/tcpdump net-dialup/minicom net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync bluetooth? ( net-wireless/bluez-hcidump ) net-wireless/iw net-wireless/wireless-tools sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/findutils sys-apps/i2c-tools sys-apps/kbd sys-apps/less sys-apps/smartmontools sys-apps/usbutils sys-apps/which sys-devel/gdb sys-fs/fuse sys-fs/lvm2 sys-fs/sshfs-fuse sys-power/powertop sys-process/ktop sys-process/procps sys-process/psmisc sys-process/time virtual/perf virtual/chromeos-bsp-dev opengl? ( x11-apps/mesa-progs ) x11-apps/mtplot x11-apps/xauth x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xhost x11-apps/xinput x11-apps/xinput_calibrator x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xtrace x11-apps/xwd x11-apps/xwininfo x11-misc/xdotool x86? ( app-benchmarks/i7z app-editors/qemacs sys-apps/dmidecode sys-apps/iotools sys-apps/pciutils x11-apps/intel-gpu-tools ) amd64? ( app-benchmarks/i7z app-editors/qemacs sys-apps/dmidecode sys-apps/iotools sys-apps/pciutils x11-apps/intel-gpu-tools ) +SLOT=0 +_md5_=20f271450fdf513402e5bff1eb797702 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-0.1.0-r62 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-0.1.0-r62 new file mode 100644 index 0000000000..e9f076c06b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-0.1.0-r62 @@ -0,0 +1,10 @@ +DEFINED_PHASES=- +DESCRIPTION=Adds some developer niceties on top of Chrome OS for debugging +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=bluetooth opengl X +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-admin/sudo app-arch/gzip app-arch/tar app-benchmarks/punybench app-crypt/nss app-crypt/tpm-tools app-editors/vim app-misc/evtest app-shells/bash chromeos-base/chromeos-dev-init chromeos-base/flimflam-test chromeos-base/gmerge chromeos-base/protofiles chromeos-base/system_api dev-lang/python dev-python/dbus-python dev-util/hdctools dev-util/libc-bench dev-util/strace net-analyzer/netperf net-analyzer/tcpdump net-dialup/minicom net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync bluetooth? ( net-wireless/bluez-hcidump ) net-wireless/iw net-wireless/wireless-tools sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/findutils sys-apps/i2c-tools sys-apps/kbd sys-apps/less sys-apps/smartmontools sys-apps/usbutils sys-apps/which sys-devel/gdb sys-fs/fuse sys-fs/lvm2 sys-fs/sshfs-fuse sys-power/powertop sys-process/ktop sys-process/procps sys-process/psmisc sys-process/time virtual/perf virtual/chromeos-bsp-dev opengl? ( x11-apps/mesa-progs ) x11-apps/mtplot x11-apps/xauth x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xhost x11-apps/xinput x11-apps/xinput_calibrator x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xtrace x11-apps/xwd x11-apps/xwininfo x11-misc/xdotool x86? ( app-benchmarks/i7z app-editors/qemacs sys-apps/dmidecode sys-apps/iotools sys-apps/pciutils x11-apps/intel-gpu-tools ) amd64? ( app-benchmarks/i7z app-editors/qemacs sys-apps/dmidecode sys-apps/iotools sys-apps/pciutils x11-apps/intel-gpu-tools ) +SLOT=0 +_md5_=20f271450fdf513402e5bff1eb797702 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-init-0.0.1-r99 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-init-0.0.1-r99 new file mode 100644 index 0000000000..e6c8e8b27d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-init-0.0.1-r99 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=chromeos-base/chromeos-init dev-vcs/git +DESCRIPTION=Additional upstart jobs that will be installed on dev images +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_849f1bf8c2dd07edda676636f278674b93c49414 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=283bbec0bc41908c1ea7c2d5237ca719 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-init-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-init-9999 new file mode 100644 index 0000000000..ce658f638a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-dev-init-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=chromeos-base/chromeos-init dev-vcs/git +DESCRIPTION=Additional upstart jobs that will be installed on dev images +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=af74922be3fc0116fdb40f3abd68bfde diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-disableecho-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-disableecho-0.0.1 new file mode 100644 index 0000000000..daab52adc2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-disableecho-0.0.1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install unpack +DESCRIPTION=App that disables ECHO on tty1 for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=ba4458fcd3e234335ebafc8fe0cdb08f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-ec-0.0.1-r972 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-ec-0.0.1-r972 new file mode 100644 index 0000000000..a23209e2e7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-ec-0.0.1-r972 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Embedded Controller firmware code +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test bds snow spring board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host cros_workon_tree_7312bc4c61477f0041b02dbca07a3029707e9d46 +KEYWORDS=arm amd64 x86 +LICENSE=BSD +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +RESTRICT=binchecks +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6f0925f48c657083d45e6fe6cc4998c5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-ec-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-ec-9999 new file mode 100644 index 0000000000..a7a3457a44 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-ec-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Embedded Controller firmware code +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test bds snow spring board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host cros_workon_tree_ +KEYWORDS=~arm ~amd64 ~x86 +LICENSE=BSD +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +RESTRICT=binchecks +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4da17374b680e8bc33179d59eb0f311d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-0.0.1-r570 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-0.0.1-r570 new file mode 100644 index 0000000000..273a593be3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-0.0.1-r570 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst setup unpack +DEPEND=chromeos-base/chromeos-chrome dev-python/pyyaml dev-vcs/git >=app-admin/eselect-python-20091230 +DESCRIPTION=Chrome OS Factory Tools and Data +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +build_tests cros_workon_tree_bb14f8d6460944d9ae92b4f5c6692a17581efbe0_e5c05be79112b34348527a8b17d8b287d91a9140 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=!chromeos-base/chromeos-factorytools chromeos-base/chromeos-factory-board dev-lang/python dev-python/argparse dev-python/jsonrpclib dev-python/netifaces dev-python/pyyaml dev-python/setproctitle dev-util/stressapptest >=chromeos-base/vpd-0.0.1-r11 >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-binary cdd072fed15ee8b579bda4b38e5cec62 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=42f1dadb46f78fd692f69474bc3a1508 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-9999 new file mode 100644 index 0000000000..a2d26a0cc6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst setup unpack +DEPEND=chromeos-base/chromeos-chrome dev-python/pyyaml dev-vcs/git >=app-admin/eselect-python-20091230 +DESCRIPTION=Chrome OS Factory Tools and Data +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +build_tests cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=!chromeos-base/chromeos-factorytools chromeos-base/chromeos-factory-board dev-lang/python dev-python/argparse dev-python/jsonrpclib dev-python/netifaces dev-python/pyyaml dev-python/setproctitle dev-util/stressapptest >=chromeos-base/vpd-0.0.1-r11 >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-binary cdd072fed15ee8b579bda4b38e5cec62 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7f2658d8693dca3ca1e37dab7a7d763b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-board-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-board-0.0.1-r1 new file mode 100644 index 0000000000..cc1ff32a6c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factory-board-0.0.1-r1 @@ -0,0 +1,7 @@ +DEFINED_PHASES=- +DESCRIPTION=Board specific factory test image resources +EAPI=2 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=e7fab82da6007655756e7b41ce003962 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factoryinstall-0.0.1-r90 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factoryinstall-0.0.1-r90 new file mode 100644 index 0000000000..d857ac25d0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factoryinstall-0.0.1-r90 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install postinst setup unpack +DEPEND=chromeos-base/chromeos-init x86? ( sys-boot/syslinux ) dev-vcs/git +DESCRIPTION=Chrome OS Factory Installer +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_b50aef5db982b43af5e4b1c53bc67b9c78087917 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init app-arch/gzip app-arch/sharutils app-arch/tar chromeos-base/vboot_reference sys-apps/mosys sys-apps/util-linux x86? ( chromeos-base/chromeos-initramfs ) chromeos-base/chromeos-installer chromeos-base/memento_softwareupdate net-misc/htpdate net-wireless/iw sys-apps/flashrom sys-apps/net-tools sys-apps/upstart sys-block/parted sys-fs/e2fsprogs +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bc00d22d8ceac616221e775ec0968a4e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factoryinstall-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factoryinstall-9999 new file mode 100644 index 0000000000..2d69e6852b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-factoryinstall-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install postinst setup unpack +DEPEND=chromeos-base/chromeos-init x86? ( sys-boot/syslinux ) dev-vcs/git +DESCRIPTION=Chrome OS Factory Installer +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init app-arch/gzip app-arch/sharutils app-arch/tar chromeos-base/vboot_reference sys-apps/mosys sys-apps/util-linux x86? ( chromeos-base/chromeos-initramfs ) chromeos-base/chromeos-installer chromeos-base/memento_softwareupdate net-misc/htpdate net-wireless/iw sys-apps/flashrom sys-apps/net-tools sys-apps/upstart sys-block/parted sys-fs/e2fsprogs +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=49a90bf9e723152aafd8579d43daeba5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-firmware-null-0.0.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-firmware-null-0.0.2-r1 new file mode 100644 index 0000000000..60dcb12d77 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-firmware-null-0.0.2-r1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS Firmware (null template) +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_md5_=00b23e54d67fade353a0c1978b022c5e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-firmware-null-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-firmware-null-9999 new file mode 100644 index 0000000000..6be205091a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-firmware-null-9999 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS Firmware (null template) +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_md5_=85ac30f82108f946cd8c4c08a86d7376 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-fonts-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-fonts-0.0.1 new file mode 100644 index 0000000000..74d6073347 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-fonts-0.0.1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=preinst +DESCRIPTION=Chrome OS Fonts (meta package) +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=cros_host internal +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=internal? ( chromeos-base/ja-motoyafonts !media-fonts/ja-ipafonts ) !internal? ( !chromeos-base/ja-motoyafonts media-fonts/ja-ipafonts ) !cros_host? ( chromeos-base/chromeos-assets ) media-fonts/croscorefonts media-fonts/notofonts media-fonts/dejavu media-fonts/droidfonts-cros media-fonts/ko-nanumfonts media-fonts/lohitfonts-cros media-fonts/ml-anjalioldlipi media-fonts/sil-abyssinica media-libs/fontconfig cros_host? ( sys-libs/glibc ) +SLOT=0 +_md5_=fa2a4492b0a84e9e72606300355ba2bc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-fonts-0.0.1-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-fonts-0.0.1-r9 new file mode 100644 index 0000000000..74d6073347 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-fonts-0.0.1-r9 @@ -0,0 +1,10 @@ +DEFINED_PHASES=preinst +DESCRIPTION=Chrome OS Fonts (meta package) +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=cros_host internal +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=internal? ( chromeos-base/ja-motoyafonts !media-fonts/ja-ipafonts ) !internal? ( !chromeos-base/ja-motoyafonts media-fonts/ja-ipafonts ) !cros_host? ( chromeos-base/chromeos-assets ) media-fonts/croscorefonts media-fonts/notofonts media-fonts/dejavu media-fonts/droidfonts-cros media-fonts/ko-nanumfonts media-fonts/lohitfonts-cros media-fonts/ml-anjalioldlipi media-fonts/sil-abyssinica media-libs/fontconfig cros_host? ( sys-libs/glibc ) +SLOT=0 +_md5_=fa2a4492b0a84e9e72606300355ba2bc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-hwid-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-hwid-0.0.1 new file mode 100644 index 0000000000..3034ca69d0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-hwid-0.0.1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=Empty (null) ebuild which satisifies chromeos-hwid. This is overridden with board specific approved HWIDs in chromeos-overlay. +EAPI=2 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=3812fdd7410faae1855ad6e18be64c95 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-imageburner-0.0.1-r25 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-imageburner-0.0.1-r25 new file mode 100644 index 0000000000..67933a7489 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-imageburner-0.0.1-r25 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/libchromeos dev-libs/dbus-glib dev-libs/glib sys-apps/rootdev chromeos-base/system_api test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Image-burning service for Chromium OS. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_58a20ef629b90e2ccfc1fb6b11ba38228e1d4e11 +KEYWORDS=arm amd64 x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchromeos dev-libs/dbus-glib dev-libs/glib sys-apps/rootdev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bda6637fc97913706bd803059c5213e6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-imageburner-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-imageburner-9999 new file mode 100644 index 0000000000..af15efa2ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-imageburner-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/libchromeos dev-libs/dbus-glib dev-libs/glib sys-apps/rootdev chromeos-base/system_api test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Image-burning service for Chromium OS. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~arm ~amd64 ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchromeos dev-libs/dbus-glib dev-libs/glib sys-apps/rootdev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d8cc7c117997e9437a7826a6620acd46 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-init-0.0.1-r623 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-init-0.0.1-r623 new file mode 100644 index 0000000000..ac46cf5e8c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-init-0.0.1-r623 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Upstart init scripts for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=nfs cros_workon_tree_849f1bf8c2dd07edda676636f278674b93c49414 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-disableecho !=sys-apps/baselayout-2.0.0 sys-apps/coreutils sys-apps/dbus sys-apps/flashrom sys-apps/grep sys-apps/mawk sys-apps/module-init-tools sys-apps/mosys sys-apps/net-tools sys-apps/pv sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/upstart sys-apps/util-linux sys-apps/which sys-auth/pam_pwdfile sys-fs/e2fsprogs sys-fs/udev sys-process/lsof sys-process/procps virtual/chromeos-bsp +SLOT=0 +_md5_=f988928d6aa558c1faaaf003830d7d21 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-installshim-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-installshim-0.0.1-r1 new file mode 100644 index 0000000000..88696c2748 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-installshim-0.0.1-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS Install Shim (meta package) +EAPI=4 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=x86? ( sys-boot/syslinux ) amd64? ( sys-boot/syslinux ) arm? ( chromeos-base/u-boot-scripts ) app-arch/sharutils app-crypt/trousers app-shells/bash app-shells/dash chromeos-base/board-devices chromeos-base/chromeos-auth-config chromeos-base/chromeos-base chromeos-base/chromeos-factoryinstall chromeos-base/chromeos-init chromeos-base/dev-install chromeos-base/shill chromeos-base/vboot_reference net-firewall/iptables net-misc/tlsdate >=sys-apps/baselayout-2.0.0 sys-apps/coreutils sys-apps/dbus sys-apps/flashrom sys-apps/grep sys-apps/mawk sys-apps/module-init-tools sys-apps/mosys sys-apps/net-tools sys-apps/pv sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/upstart sys-apps/util-linux sys-apps/which sys-auth/pam_pwdfile sys-fs/e2fsprogs sys-fs/udev sys-process/lsof sys-process/procps virtual/chromeos-bsp +SLOT=0 +_md5_=f988928d6aa558c1faaaf003830d7d21 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-login-0.0.5-r535 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-login-0.0.5-r535 new file mode 100644 index 0000000000..55dc075ff6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-login-0.0.5-r535 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install prepare setup test unpack +DEPEND=chromeos-base/chromeos-cryptohome chromeos-base/chromeos-minijail chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/protobuf sys-apps/util-linux chromeos-base/bootstat chromeos-base/libchrome:125070[cros-debug=] >=chromeos-base/libchrome_crypto-125070 chromeos-base/protofiles chromeos-base/system_api dev-cpp/gmock sys-libs/glibc test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Login manager for Chromium OS. +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=-asan -chromeos_keyboard -disable_login_animations -disable_webaudio -has_diamond_key -has_hdd -highdpi -is_desktop -natural_scroll_default -new_power_button test -touchui +X cros-debug cros_workon_tree_10a8101baed1f255a6854bc0629b29a3c9e7ad80 board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=arm amd64 x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-cryptohome chromeos-base/chromeos-minijail chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/protobuf sys-apps/util-linux +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e157bc711ca762710ab29e7dee33b0c3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-login-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-login-9999 new file mode 100644 index 0000000000..85d84ffe71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-login-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install prepare setup test unpack +DEPEND=chromeos-base/chromeos-cryptohome chromeos-base/chromeos-minijail chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/protobuf sys-apps/util-linux chromeos-base/bootstat chromeos-base/libchrome:125070[cros-debug=] >=chromeos-base/libchrome_crypto-125070 chromeos-base/protofiles chromeos-base/system_api dev-cpp/gmock sys-libs/glibc test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Login manager for Chromium OS. +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=-asan -chromeos_keyboard -disable_login_animations -disable_webaudio -has_diamond_key -has_hdd -highdpi -is_desktop -natural_scroll_default -new_power_button test -touchui +X cros-debug cros_workon_tree_ board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=~arm ~amd64 ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-cryptohome chromeos-base/chromeos-minijail chromeos-base/metrics dev-libs/dbus-glib dev-libs/glib dev-libs/nss dev-libs/protobuf sys-apps/util-linux +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bfa21e5a6f964a4337cf0c02f8fa9c7d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-minijail-0.0.1-r91 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-minijail-0.0.1-r91 new file mode 100644 index 0000000000..bae3f82477 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-minijail-0.0.1-r91 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=test? ( dev-cpp/gtest ) test? ( dev-cpp/gmock ) sys-libs/libcap dev-vcs/git +DESCRIPTION=Chrome OS helper binary for restricting privs of services. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_25555f545dc61daa3c1892b328da5a34682e08c8 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=sys-libs/libcap +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3ad7910a63da6cf7722ee3bd18ce6b03 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-minijail-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-minijail-9999 new file mode 100644 index 0000000000..29f78a13b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-minijail-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=test? ( dev-cpp/gtest ) test? ( dev-cpp/gmock ) sys-libs/libcap dev-vcs/git +DESCRIPTION=Chrome OS helper binary for restricting privs of services. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=sys-libs/libcap +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fcff312258e584609cc281dd87273138 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-nfs-init-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-nfs-init-0.0.1 new file mode 100644 index 0000000000..f1652b1d14 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-nfs-init-0.0.1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install +DESCRIPTION=Upstart init scripts for NFS on Chromium OS +EAPI=2 +HOMEPAGE=http://src.chromium.org +IUSE=nfs +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=net-fs/nfs-utils sys-apps/upstart +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=9e93b767038b8938a25f53cd913b643e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-0.1.0 new file mode 100644 index 0000000000..90859b0b73 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-0.1.0 @@ -0,0 +1,10 @@ +DEFINED_PHASES=- +DESCRIPTION=Adds packages that are required for testing. +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=bluetooth cros_ec +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-admin/sudo app-arch/gzip app-arch/tar app-crypt/tpm-tools app-misc/tmux chromeos-base/autox chromeos-base/chromeos-test-init chromeos-base/flimflam-test chromeos-base/minifakedns chromeos-base/modem-diagnostics chromeos-base/protofiles chromeos-base/recover-duts chromeos-base/saft chromeos-base/system_api chromeos-base/touchbot dev-lang/python dev-python/dbus-python dev-python/pygobject dev-python/pygtk dev-python/pyserial dev-python/pyudev dev-python/pyyaml dev-util/dbus-spy games-util/joystick media-gfx/imagemagick[png] media-gfx/perceptualdiff media-libs/opencv media-libs/tiff net-analyzer/netperf net-dialup/minicom net-dns/dnsmasq net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync bluetooth? ( net-wireless/bluez-test ) net-wireless/hostapd sci-geosciences/gpsd sys-apps/coreutils sys-apps/file sys-apps/findutils sys-apps/kbd sys-apps/memtester !arm? ( sys-apps/pciutils ) x86? ( sys-apps/superiotool ) sys-apps/shadow sys-devel/binutils sys-process/procps sys-process/psmisc sys-process/time virtual/glut x11-apps/setxkbmap x11-apps/xauth x11-apps/xinput x11-apps/xset x11-libs/libdrm-tests !arm? ( x11-misc/read-edid ) x11-misc/x11vnc x11-misc/xdotool x11-terms/rxvt-unicode app-misc/utouch-evemu cros_ec? ( chromeos-base/ec-utils ) chromeos-base/ixchariot +SLOT=0 +_md5_=ad198531bc27613ae0745f3b5e3ec932 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-0.1.0-r59 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-0.1.0-r59 new file mode 100644 index 0000000000..90859b0b73 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-0.1.0-r59 @@ -0,0 +1,10 @@ +DEFINED_PHASES=- +DESCRIPTION=Adds packages that are required for testing. +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=bluetooth cros_ec +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-admin/sudo app-arch/gzip app-arch/tar app-crypt/tpm-tools app-misc/tmux chromeos-base/autox chromeos-base/chromeos-test-init chromeos-base/flimflam-test chromeos-base/minifakedns chromeos-base/modem-diagnostics chromeos-base/protofiles chromeos-base/recover-duts chromeos-base/saft chromeos-base/system_api chromeos-base/touchbot dev-lang/python dev-python/dbus-python dev-python/pygobject dev-python/pygtk dev-python/pyserial dev-python/pyudev dev-python/pyyaml dev-util/dbus-spy games-util/joystick media-gfx/imagemagick[png] media-gfx/perceptualdiff media-libs/opencv media-libs/tiff net-analyzer/netperf net-dialup/minicom net-dns/dnsmasq net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync bluetooth? ( net-wireless/bluez-test ) net-wireless/hostapd sci-geosciences/gpsd sys-apps/coreutils sys-apps/file sys-apps/findutils sys-apps/kbd sys-apps/memtester !arm? ( sys-apps/pciutils ) x86? ( sys-apps/superiotool ) sys-apps/shadow sys-devel/binutils sys-process/procps sys-process/psmisc sys-process/time virtual/glut x11-apps/setxkbmap x11-apps/xauth x11-apps/xinput x11-apps/xset x11-libs/libdrm-tests !arm? ( x11-misc/read-edid ) x11-misc/x11vnc x11-misc/xdotool x11-terms/rxvt-unicode app-misc/utouch-evemu cros_ec? ( chromeos-base/ec-utils ) chromeos-base/ixchariot +SLOT=0 +_md5_=ad198531bc27613ae0745f3b5e3ec932 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-init-0.0.1-r99 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-init-0.0.1-r99 new file mode 100644 index 0000000000..4f31c147f0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-init-0.0.1-r99 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=chromeos-base/chromeos-init dev-vcs/git +DESCRIPTION=Additional upstart jobs that will be installed on test images +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_849f1bf8c2dd07edda676636f278674b93c49414 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e13f796672b446fce70192db04937dd9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-init-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-init-9999 new file mode 100644 index 0000000000..caff74411a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chromeos-test-init-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=chromeos-base/chromeos-init dev-vcs/git +DESCRIPTION=Additional upstart jobs that will be installed on test images +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5c00cffa6b7cd5108c681dfd8fecb017 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chrontel-0.0.1-r43 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chrontel-0.0.1-r43 new file mode 100644 index 0000000000..5afc51fbf3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chrontel-0.0.1-r43 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXrandr media-libs/alsa-lib media-sound/adhd dev-vcs/git +DESCRIPTION=Chrontel CH7036 User Space Driver +EAPI=2 +HOMEPAGE=http://www.chrontel.com +IUSE=-bogus_screen_resizes -use_alsa_control cros_workon_tree_06c317dfeaa7f039eb8c2e5891dd36398266d12c +KEYWORDS=amd64 x86 arm +LICENSE=BSD +RDEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXrandr media-libs/alsa-lib media-sound/adhd +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=21fde2efce6d6792acfebf522a235ffd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chrontel-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chrontel-9999 new file mode 100644 index 0000000000..2339863a86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/chrontel-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXrandr media-libs/alsa-lib media-sound/adhd dev-vcs/git +DESCRIPTION=Chrontel CH7036 User Space Driver +EAPI=2 +HOMEPAGE=http://www.chrontel.com +IUSE=-bogus_screen_resizes -use_alsa_control cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=BSD +RDEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXrandr media-libs/alsa-lib media-sound/adhd +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6bb9a024df37e092b08d343f14c288e5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/courgette-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/courgette-1 new file mode 100644 index 0000000000..c322ad1e2b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/courgette-1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-vcs/git dev-util/scons +DESCRIPTION=Chrome courgette/ library extracted for use on Chrome OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ cros-debug +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=da945135e4339a2242aeb4dbbad916ad diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/courgette-1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/courgette-1-r1 new file mode 100644 index 0000000000..c322ad1e2b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/courgette-1-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-vcs/git dev-util/scons +DESCRIPTION=Chrome courgette/ library extracted for use on Chrome OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ cros-debug +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=da945135e4339a2242aeb4dbbad916ad diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crash-reporter-0.0.1-r129 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crash-reporter-0.0.1-r129 new file mode 100644 index 0000000000..602e327e7f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crash-reporter-0.0.1-r129 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/google-breakpad chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/chromeos-ca-certificates dev-cpp/gflags dev-libs/libpcre test? ( dev-cpp/gtest ) net-misc/curl sys-apps/findutils dev-vcs/git +DESCRIPTION=Build chromeos crash handler +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_7e911e28b8bcde9bbdf4cff52eec7ac57adc3980 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/google-breakpad chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/chromeos-ca-certificates dev-cpp/gflags dev-libs/libpcre test? ( dev-cpp/gtest ) net-misc/curl sys-apps/findutils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=051efb1ca3a1551b8214605a10c9ed16 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crash-reporter-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crash-reporter-9999 new file mode 100644 index 0000000000..97c5db88b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crash-reporter-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/google-breakpad chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/chromeos-ca-certificates dev-cpp/gflags dev-libs/libpcre test? ( dev-cpp/gtest ) net-misc/curl sys-apps/findutils dev-vcs/git +DESCRIPTION=Build chromeos crash handler +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/google-breakpad chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/chromeos-ca-certificates dev-cpp/gflags dev-libs/libpcre test? ( dev-cpp/gtest ) net-misc/curl sys-apps/findutils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8c8ebcc9db006c470e076c80a55dee71 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cromo-0.0.1-r163 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cromo-0.0.1-r163 new file mode 100644 index 0000000000..5a95a518bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cromo-0.0.1-r163 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] >=dev-libs/glib-2.0 dev-libs/dbus-glib dev-libs/dbus-c++ dev-cpp/gflags dev-cpp/glog install_tests? ( dev-cpp/gtest ) chromeos-base/libchromeos chromeos-base/metrics chromeos-base/system_api virtual/modemmanager dev-vcs/git +DESCRIPTION=Chromium OS modem manager +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=install_tests cros-debug cros_workon_tree_751811205b7d37b36bced5c2b4efaf6a7312795b +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] >=dev-libs/glib-2.0 dev-libs/dbus-glib dev-libs/dbus-c++ dev-cpp/gflags dev-cpp/glog install_tests? ( dev-cpp/gtest ) chromeos-base/libchromeos chromeos-base/metrics +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fea572f7729cd5cc7503a6484d4993a6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cromo-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cromo-9999 new file mode 100644 index 0000000000..dd544fef8e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cromo-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] >=dev-libs/glib-2.0 dev-libs/dbus-glib dev-libs/dbus-c++ dev-cpp/gflags dev-cpp/glog install_tests? ( dev-cpp/gtest ) chromeos-base/libchromeos chromeos-base/metrics chromeos-base/system_api virtual/modemmanager dev-vcs/git +DESCRIPTION=Chromium OS modem manager +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=install_tests cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-minijail chromeos-base/libchrome:125070[cros-debug=] >=dev-libs/glib-2.0 dev-libs/dbus-glib dev-libs/dbus-c++ dev-cpp/gflags dev-cpp/glog install_tests? ( dev-cpp/gtest ) chromeos-base/libchromeos chromeos-base/metrics +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=45b2505d09752adfb7ee908405a46635 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-devutils-0.0.1-r516 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-devutils-0.0.1-r516 new file mode 100644 index 0000000000..5c2f145dc3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-devutils-0.0.1-r516 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install preinst setup test unpack +DEPEND=dev-vcs/git >=app-admin/eselect-python-20091230 +DESCRIPTION=Development utilities for ChromiumOS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_host test cros_workon_tree_a0a8dc61fac2ae0179f836e42406c569c2e2ca84 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=cros_host? ( app-emulation/qemu-kvm ) app-portage/gentoolkit cros_host? ( app-shells/bash ) !cros_host? ( !chromeos-base/gmerge ) dev-lang/python dev-util/shflags cros_host? ( dev-util/crosutils ) >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=476ef4feddf43f36647dd6981a2f9981 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-devutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-devutils-9999 new file mode 100644 index 0000000000..cc3853523e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-devutils-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install preinst setup test unpack +DEPEND=dev-vcs/git >=app-admin/eselect-python-20091230 +DESCRIPTION=Development utilities for ChromiumOS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_host test cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=cros_host? ( app-emulation/qemu-kvm ) app-portage/gentoolkit cros_host? ( app-shells/bash ) !cros_host? ( !chromeos-base/gmerge ) dev-lang/python dev-util/shflags cros_host? ( dev-util/crosutils ) >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e8cc1d64d7c4cff3b5ca3cbf712c5c5b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-disks-0.0.1-r156 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-disks-0.0.1-r156 new file mode 100644 index 0000000000..737838d04d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-disks-0.0.1-r156 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-arch/unrar chromeos-base/chromeos-minijail chromeos-base/libchromeos chromeos-base/metrics dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 sys-apps/rootdev sys-apps/util-linux sys-block/parted sys-fs/avfs sys-fs/fuse-exfat sys-fs/ntfs3g sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api dev-cpp/gmock test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Disk mounting daemon for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_6c05b98c91993c6c4921e505f83372bf87cbc5bd +KEYWORDS=arm amd64 x86 +LICENSE=BSD +RDEPEND=app-arch/unrar chromeos-base/chromeos-minijail chromeos-base/libchromeos chromeos-base/metrics dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 sys-apps/rootdev sys-apps/util-linux sys-block/parted sys-fs/avfs sys-fs/fuse-exfat sys-fs/ntfs3g sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2f20686cd32da666ac5d1af8cf91f249 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-disks-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-disks-9999 new file mode 100644 index 0000000000..65bc3ce4f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-disks-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-arch/unrar chromeos-base/chromeos-minijail chromeos-base/libchromeos chromeos-base/metrics dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 sys-apps/rootdev sys-apps/util-linux sys-block/parted sys-fs/avfs sys-fs/fuse-exfat sys-fs/ntfs3g sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api dev-cpp/gmock test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Disk mounting daemon for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~arm ~amd64 ~x86 +LICENSE=BSD +RDEPEND=app-arch/unrar chromeos-base/chromeos-minijail chromeos-base/libchromeos chromeos-base/metrics dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 sys-apps/rootdev sys-apps/util-linux sys-block/parted sys-fs/avfs sys-fs/fuse-exfat sys-fs/ntfs3g sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3804cc901d48053b2401e6d711d0d816 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-factoryutils-0.0.1-r96 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-factoryutils-0.0.1-r96 new file mode 100644 index 0000000000..e4a35effe8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-factoryutils-0.0.1-r96 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=chromeos-base/chromeos-installer[cros_host] chromeos-base/vboot_reference dev-vcs/git +DESCRIPTION=Factory development utilities for ChromiumOS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_factory_bundle cros_workon_tree_46e050754b5a2f5392223d734036b7b51dde5b5b +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=18ce3847e77668e82ca454e4a4b67d3b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-factoryutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-factoryutils-9999 new file mode 100644 index 0000000000..7cce140019 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-factoryutils-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=chromeos-base/chromeos-installer[cros_host] chromeos-base/vboot_reference dev-vcs/git +DESCRIPTION=Factory development utilities for ChromiumOS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_factory_bundle cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=016d6187e335a22484aa3136a40a4c26 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-testutils-0.0.1-r210 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-testutils-0.0.1-r210 new file mode 100644 index 0000000000..426df15b32 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-testutils-0.0.1-r210 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Host test utilities for ChromiumOS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_7b1191682d8df182503e2c2ee948c0ecb48c5461 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-emulation/qemu-kvm app-portage/gentoolkit app-shells/bash chromeos-base/cros-devutils dev-util/crosutils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2606f52e6bdb3111c37d3a18008a02c2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-testutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-testutils-9999 new file mode 100644 index 0000000000..1e3659bdd9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros-testutils-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Host test utilities for ChromiumOS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=app-emulation/qemu-kvm app-portage/gentoolkit app-shells/bash chromeos-base/cros-devutils dev-util/crosutils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1249ab0fca7c829bf493aee27d5b0467 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros_boot_mode-0.0.1-r16 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros_boot_mode-0.0.1-r16 new file mode 100644 index 0000000000..8b393c1d3d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros_boot_mode-0.0.1-r16 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=test? ( chromeos-base/libchrome:125070[cros-debug=] ) test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) valgrind? ( dev-util/valgrind ) dev-vcs/git +DESCRIPTION=Chrome OS platform boot mode utility +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test valgrind cros-debug cros_workon_tree_b21faacf6a9940571ef122363c19a1ac02595b4b +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=test? ( chromeos-base/libchrome:125070[cros-debug=] ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=35d9d482c1bd368b61c73dbf7bea3946 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros_boot_mode-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros_boot_mode-9999 new file mode 100644 index 0000000000..05d873135b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cros_boot_mode-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=test? ( chromeos-base/libchrome:125070[cros-debug=] ) test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) valgrind? ( dev-util/valgrind ) dev-vcs/git +DESCRIPTION=Chrome OS platform boot mode utility +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test valgrind cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=test? ( chromeos-base/libchrome:125070[cros-debug=] ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4ae8483e8906f1effe6d206e1168c2e7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crosh-0.0.1-r106 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crosh-0.0.1-r106 new file mode 100644 index 0000000000..d6237290ce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crosh-0.0.1-r106 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS command-line shell +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_8d74f9d4855eb6e358a143174eb4a646c9367408 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-admin/sudo chromeos-base/vboot_reference chromeos-base/workarounds net-misc/iputils net-misc/openssh net-wireless/iw sys-apps/net-tools x11-terms/rxvt-unicode +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e2af9feec54beb65133ce85939ca4caa diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crosh-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crosh-9999 new file mode 100644 index 0000000000..905da0119e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/crosh-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS command-line shell +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-admin/sudo chromeos-base/vboot_reference chromeos-base/workarounds net-misc/iputils net-misc/openssh net-wireless/iw sys-apps/net-tools x11-terms/rxvt-unicode +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ac00cd1342044e42c7b56ec00cb5af62 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cypress-tools-0.0.1-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cypress-tools-0.0.1-r7 new file mode 100644 index 0000000000..a56247e127 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cypress-tools-0.0.1-r7 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Cypress APA Trackpad Firmware Update Utility +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_4614c03641dd88053b2bab281ab385ddfac73551 +KEYWORDS=amd64 x86 arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1605a3ddbb29bb944272e50380f09d95 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cypress-tools-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cypress-tools-9999 new file mode 100644 index 0000000000..ca1979258f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/cypress-tools-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Cypress APA Trackpad Firmware Update Utility +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2d4ac0c239f971fb37fb22d976484bd2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/dev-install-0.0.1-r418 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/dev-install-0.0.1-r418 new file mode 100644 index 0000000000..210fade2db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/dev-install-0.0.1-r418 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=app-arch/tar sys-apps/coreutils sys-apps/grep sys-apps/portage sys-apps/sed dev-vcs/git +DESCRIPTION=Chromium OS Developer Packages installer +EAPI=4 +HOMEPAGE=http://www.chromium.org/chromium-os +IUSE=cros_workon_tree_a0a8dc61fac2ae0179f836e42406c569c2e2ca84 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-arch/tar net-misc/curl sys-apps/coreutils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8552d6f3f65192c639edd342f7f56697 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/dev-install-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/dev-install-9999 new file mode 100644 index 0000000000..e608b15e07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/dev-install-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=app-arch/tar sys-apps/coreutils sys-apps/grep sys-apps/portage sys-apps/sed dev-vcs/git +DESCRIPTION=Chromium OS Developer Packages installer +EAPI=4 +HOMEPAGE=http://www.chromium.org/chromium-os +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-arch/tar net-misc/curl sys-apps/coreutils +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=da4f09cddf434ddbe6be6ed2c1954d2c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ec-utils-0.0.1-r959 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ec-utils-0.0.1-r959 new file mode 100644 index 0000000000..c435cb25a4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ec-utils-0.0.1-r959 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS EC Utility +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_7312bc4c61477f0041b02dbca07a3029707e9d46 board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=amd64 arm x86 +LICENSE=BSD +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e6ea3de7856289a1139d19a6410e6b36 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ec-utils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ec-utils-9999 new file mode 100644 index 0000000000..1372642593 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ec-utils-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS EC Utility +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5905a64ad77a8c9bbec63a09613ebe6c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/factorytest-init-0.0.1-r27 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/factorytest-init-0.0.1-r27 new file mode 100644 index 0000000000..f230873164 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/factorytest-init-0.0.1-r27 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install postinst setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Upstart jobs for the Chrome OS factory test image +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_1e8ef6aa3f78d3b5b4088235cf08bb6b66568e45 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init sys-apps/coreutils sys-apps/module-init-tools sys-apps/upstart sys-process/procps +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2f3129c2534f061989e675dad7137e77 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/factorytest-init-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/factorytest-init-9999 new file mode 100644 index 0000000000..4e63f37de3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/factorytest-init-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install postinst setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Upstart jobs for the Chrome OS factory test image +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-init sys-apps/coreutils sys-apps/module-init-tools sys-apps/upstart sys-process/procps +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f65ccb16507a4964567aa91528a3a953 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/flimflam-test-0.0.1-r405 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/flimflam-test-0.0.1-r405 new file mode 100644 index 0000000000..7ead93d1db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/flimflam-test-0.0.1-r405 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=chromeos-base/shill dev-lang/python dev-python/dbus-python dev-python/pygobject net-dns/dnsmasq sys-apps/iproute2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=flimflam's test scripts +EAPI=2 +HOMEPAGE=http://connman.net +IUSE=cros_workon_tree_93ba80236f878c56dd1c6b62ddc2944bae584962 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/shill dev-lang/python dev-python/dbus-python dev-python/pygobject net-dns/dnsmasq sys-apps/iproute2 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=23f4e257474eaff8e8c8534de433bf95 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/flimflam-test-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/flimflam-test-9999 new file mode 100644 index 0000000000..ed0a837de8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/flimflam-test-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=chromeos-base/shill dev-lang/python dev-python/dbus-python dev-python/pygobject net-dns/dnsmasq sys-apps/iproute2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=flimflam's test scripts +EAPI=2 +HOMEPAGE=http://connman.net +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/shill dev-lang/python dev-python/dbus-python dev-python/pygobject net-dns/dnsmasq sys-apps/iproute2 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7788e8225019b1576efd17e10b4f147a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gestures-0.0.1-r384 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gestures-0.0.1-r384 new file mode 100644 index 0000000000..c6d4415d07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gestures-0.0.1-r384 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=dev-cpp/gtest x11-libs/libXi chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libevdev dev-cpp/gflags sys-fs/udev x11-libs/pixman dev-vcs/git +DESCRIPTION=Gesture recognizer library +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_1b27f1efcb7c69fbcae6dfbed1b19fc052f275d6 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libevdev dev-cpp/gflags sys-fs/udev x11-libs/pixman +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=dd02ae2f6d39979066b1b1bbda94b918 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gestures-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gestures-9999 new file mode 100644 index 0000000000..dfbd4abdab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gestures-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=dev-cpp/gtest x11-libs/libXi chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libevdev dev-cpp/gflags sys-fs/udev x11-libs/pixman dev-vcs/git +DESCRIPTION=Gesture recognizer library +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libevdev dev-cpp/gflags sys-fs/udev x11-libs/pixman +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c5d539de64727f6c623c0f8a5615e75a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gmerge-0.0.1-r563 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gmerge-0.0.1-r563 new file mode 100644 index 0000000000..803156b0ed --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gmerge-0.0.1-r563 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=app-shells/bash dev-lang/python dev-util/shflags sys-apps/portage dev-vcs/git +DESCRIPTION=A util for installing packages using the CrOS dev server +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_a0a8dc61fac2ae0179f836e42406c569c2e2ca84 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-shells/bash dev-lang/python dev-util/shflags sys-apps/portage +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=def2f703b034ea721ef85890ea927e72 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gmerge-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gmerge-9999 new file mode 100644 index 0000000000..5ca8f28fc5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gmerge-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=app-shells/bash dev-lang/python dev-util/shflags sys-apps/portage dev-vcs/git +DESCRIPTION=A util for installing packages using the CrOS dev server +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=app-shells/bash dev-lang/python dev-util/shflags sys-apps/portage +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=12dbfc5b1832c38f7ab569c8e4f9697b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi-cromo-plugin-1.0.1-r52 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi-cromo-plugin-1.0.1-r52 new file mode 100644 index 0000000000..ad2aa51fab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi-cromo-plugin-1.0.1-r52 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=chromeos-base/cromo chromeos-base/libchrome:125070[cros-debug=] dev-cpp/glog dev-libs/dbus-c++ chromeos-base/metrics chromeos-base/gobi3k-sdk || ( !internal? ( chromeos-base/gobi3k-lib-bin ) chromeos-base/gobi3k-lib ) install_tests? ( dev-cpp/gmock dev-cpp/gtest ) dev-cpp/gmock dev-cpp/gtest virtual/modemmanager dev-vcs/git +DESCRIPTION=Cromo plugin to control Qualcomm Gobi modems +EAPI=2 +IUSE=install_tests internal cros-debug cros_workon_tree_e6b68499152fa7301c97b86b3d0b4112f2d42fb2 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/cromo chromeos-base/libchrome:125070[cros-debug=] dev-cpp/glog dev-libs/dbus-c++ chromeos-base/metrics chromeos-base/gobi3k-sdk || ( !internal? ( chromeos-base/gobi3k-lib-bin ) chromeos-base/gobi3k-lib ) install_tests? ( dev-cpp/gmock dev-cpp/gtest ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d1558f78a1082b02b24556b6b35f1299 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi-cromo-plugin-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi-cromo-plugin-9999 new file mode 100644 index 0000000000..c880f2a3a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi-cromo-plugin-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=chromeos-base/cromo chromeos-base/libchrome:125070[cros-debug=] dev-cpp/glog dev-libs/dbus-c++ chromeos-base/metrics chromeos-base/gobi3k-sdk || ( !internal? ( chromeos-base/gobi3k-lib-bin ) chromeos-base/gobi3k-lib ) install_tests? ( dev-cpp/gmock dev-cpp/gtest ) dev-cpp/gmock dev-cpp/gtest virtual/modemmanager dev-vcs/git +DESCRIPTION=Cromo plugin to control Qualcomm Gobi modems +EAPI=2 +IUSE=install_tests internal cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/cromo chromeos-base/libchrome:125070[cros-debug=] dev-cpp/glog dev-libs/dbus-c++ chromeos-base/metrics chromeos-base/gobi3k-sdk || ( !internal? ( chromeos-base/gobi3k-lib-bin ) chromeos-base/gobi3k-lib ) install_tests? ( dev-cpp/gmock dev-cpp/gtest ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cd63ececfbf5bcd216c904c627b10045 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi3k-sdk-1.0.1-r16 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi3k-sdk-1.0.1-r16 new file mode 100644 index 0000000000..4292781c1a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi3k-sdk-1.0.1-r16 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=SDK for Qualcomm Gobi 3000 modems +EAPI=4 +IUSE=cros_workon_tree_9ebc2b4fd3dfd75430562a5238a2df9218966fdc +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=|| ( >=sys-apps/coreutils-8.15 app-misc/realpath ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=aab0b611938c6b1e6d775a0138a5e7a8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi3k-sdk-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi3k-sdk-9999 new file mode 100644 index 0000000000..c13f1389db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/gobi3k-sdk-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=SDK for Qualcomm Gobi 3000 modems +EAPI=4 +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=|| ( >=sys-apps/coreutils-8.15 app-misc/realpath ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=06256e290fbc56d8cf93178df89c95fb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/google-breakpad-1084-r52 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/google-breakpad-1084-r52 new file mode 100644 index 0000000000..aa64961d31 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/google-breakpad-1084-r52 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=net-misc/curl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Google crash reporting +EAPI=4 +HOMEPAGE=http://code.google.com/p/google-breakpad +IUSE=cros-debug cros_workon_tree_cc72c3a2e2d1746bb31faf70937fc427ad6a57aa +KEYWORDS=amd64 x86 arm +LICENSE=BSD +RDEPEND=net-misc/curl +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=14a7e4b2f32694697e2bd1afc7193278 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/google-breakpad-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/google-breakpad-9999 new file mode 100644 index 0000000000..9a71993ebc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/google-breakpad-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=net-misc/curl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Google crash reporting +EAPI=4 +HOMEPAGE=http://code.google.com/p/google-breakpad +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=BSD +RDEPEND=net-misc/curl +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=194bd0b6a64bd751dedbc9a20c8722e8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/hard-host-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/hard-host-depends-0.0.1 new file mode 100644 index 0000000000..3764dab4f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/hard-host-depends-0.0.1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=List of packages that are needed on the buildhost (meta package) +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 x86 +LICENSE=GPL-2 +RDEPEND=virtual/hard-host-depends-bsp app-arch/lzop app-arch/pigz app-admin/sudo dev-embedded/cbootimage dev-embedded/tegrarcm dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils >=sys-apps/dtc-1.3.0-r5 sys-boot/bootstub sys-boot/grub sys-boot/syslinux sys-devel/crossdev sys-fs/dosfstools app-admin/eselect-opengl app-admin/eselect-mesa app-arch/cabextract >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-crypt/nss app-emulation/qemu-kvm !app-emulation/qemu-user app-i18n/ibus app-text/texi2html chromeos-base/google-breakpad chromeos-base/chromeos-base chromeos-base/chromeos-installer chromeos-base/cros-devutils[cros_host] chromeos-base/cros-factoryutils chromeos-base/cros-testutils dev-lang/python dev-db/m17n-contrib dev-db/m17n-db dev-lang/closure-compiler-bin dev-lang/nasm dev-lang/swig dev-lang/yasm dev-libs/dbus-c++ dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/m17n-lib dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen dev-python/dbus-python dev-python/imaging dev-python/m2crypto dev-python/mako dev-python/netifaces dev-python/pygobject dev-python/pygtk dev-python/pyinotify dev-python/pyopenssl dev-python/python-daemon dev-python/pyudev dev-python/pyusb dev-python/setproctitle dev-python/ws4py dev-util/cmake dev-util/gob dev-util/gdbus-codegen dev-util/gperf dev-util/gtk-doc dev-util/hdctools >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons >=dev-vcs/git-1.7.2 dev-vcs/subversion[-dso] >=media-libs/freetype-2.2.1 media-libs/mesa net-misc/gsutil sys-apps/module-init-tools sys-apps/usbutils !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-devel/clang sys-fs/sshfs-fuse sys-fs/udev sys-libs/libnih sys-power/iasl x11-apps/mkfontdir x11-apps/xcursorgen x11-apps/xkbcomp x11-libs/gtk+ >=x11-misc/util-macros-1.2 chromeos-base/chromeos-fonts dev-libs/atk dev-libs/glib media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/libX11 x11-libs/libXi x11-libs/libXtst x11-libs/pango sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/qemacs app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-devel/smatch x11-misc/xkeyboard-config dev-util/dejagnu media-video/ffmpeg >=chromeos-base/vboot_reference-1.0-r174 chromeos-base/verity sys-apps/mosys sys-fs/libfat >=app-misc/ca-certificates-20090709-r6 chromeos-base/update_engine dev-cpp/gflags dev-python/mock dev-python/mox dev-python/unittest2 dev-python/pylint chromeos-base/ssh-known-hosts chromeos-base/ssh-root-dot-dir net-misc/openssh net-misc/wget dev-python/gdata dev-embedded/smdk-dltool dev-python/pyyaml dev-util/lcov !net-misc/dhcpcd +SLOT=0 +_md5_=1d73fc395ef0701197b203be3770c681 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/hard-host-depends-0.0.1-r145 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/hard-host-depends-0.0.1-r145 new file mode 100644 index 0000000000..3764dab4f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/hard-host-depends-0.0.1-r145 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=List of packages that are needed on the buildhost (meta package) +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 x86 +LICENSE=GPL-2 +RDEPEND=virtual/hard-host-depends-bsp app-arch/lzop app-arch/pigz app-admin/sudo dev-embedded/cbootimage dev-embedded/tegrarcm dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils >=sys-apps/dtc-1.3.0-r5 sys-boot/bootstub sys-boot/grub sys-boot/syslinux sys-devel/crossdev sys-fs/dosfstools app-admin/eselect-opengl app-admin/eselect-mesa app-arch/cabextract >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-crypt/nss app-emulation/qemu-kvm !app-emulation/qemu-user app-i18n/ibus app-text/texi2html chromeos-base/google-breakpad chromeos-base/chromeos-base chromeos-base/chromeos-installer chromeos-base/cros-devutils[cros_host] chromeos-base/cros-factoryutils chromeos-base/cros-testutils dev-lang/python dev-db/m17n-contrib dev-db/m17n-db dev-lang/closure-compiler-bin dev-lang/nasm dev-lang/swig dev-lang/yasm dev-libs/dbus-c++ dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/m17n-lib dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen dev-python/dbus-python dev-python/imaging dev-python/m2crypto dev-python/mako dev-python/netifaces dev-python/pygobject dev-python/pygtk dev-python/pyinotify dev-python/pyopenssl dev-python/python-daemon dev-python/pyudev dev-python/pyusb dev-python/setproctitle dev-python/ws4py dev-util/cmake dev-util/gob dev-util/gdbus-codegen dev-util/gperf dev-util/gtk-doc dev-util/hdctools >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons >=dev-vcs/git-1.7.2 dev-vcs/subversion[-dso] >=media-libs/freetype-2.2.1 media-libs/mesa net-misc/gsutil sys-apps/module-init-tools sys-apps/usbutils !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-devel/clang sys-fs/sshfs-fuse sys-fs/udev sys-libs/libnih sys-power/iasl x11-apps/mkfontdir x11-apps/xcursorgen x11-apps/xkbcomp x11-libs/gtk+ >=x11-misc/util-macros-1.2 chromeos-base/chromeos-fonts dev-libs/atk dev-libs/glib media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/libX11 x11-libs/libXi x11-libs/libXtst x11-libs/pango sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/qemacs app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-devel/smatch x11-misc/xkeyboard-config dev-util/dejagnu media-video/ffmpeg >=chromeos-base/vboot_reference-1.0-r174 chromeos-base/verity sys-apps/mosys sys-fs/libfat >=app-misc/ca-certificates-20090709-r6 chromeos-base/update_engine dev-cpp/gflags dev-python/mock dev-python/mox dev-python/unittest2 dev-python/pylint chromeos-base/ssh-known-hosts chromeos-base/ssh-root-dot-dir net-misc/openssh net-misc/wget dev-python/gdata dev-embedded/smdk-dltool dev-python/pyyaml dev-util/lcov !net-misc/dhcpcd +SLOT=0 +_md5_=1d73fc395ef0701197b203be3770c681 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/inputcontrol-0.0.1-r56 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/inputcontrol-0.0.1-r56 new file mode 100644 index 0000000000..1ad2e2a9c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/inputcontrol-0.0.1-r56 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info prepare setup unpack +DEPEND=app-arch/gzip x11-apps/xinput dev-vcs/git +DESCRIPTION=A collection of utilities for configuring input devices +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=+X cros_workon_tree_3d9f2153a67e76765e864412e7a62fde8bf91fba +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-arch/gzip x11-apps/xinput +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4c4eaeae3db852df5ae19aa3984b75eb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/inputcontrol-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/inputcontrol-9999 new file mode 100644 index 0000000000..632491d1f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/inputcontrol-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info prepare setup unpack +DEPEND=app-arch/gzip x11-apps/xinput dev-vcs/git +DESCRIPTION=A collection of utilities for configuring input devices +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=+X cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-arch/gzip x11-apps/xinput +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d0d57e04bb8d07baa46c6ef60a5daa2c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/internal-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/internal-0.0.1 new file mode 100644 index 0000000000..4bad16621e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/internal-0.0.1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=This package is for hooking up your internal overlays +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=x86 amd64 arm +LICENSE=BSD +SLOT=0 +_md5_=7cdefc9b380ed04f7bdd08103cc1a1b7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ixchariot-7.10.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ixchariot-7.10.4 new file mode 100644 index 0000000000..c201600fd2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ixchariot-7.10.4 @@ -0,0 +1,7 @@ +DEFINED_PHASES=- +DESCRIPTION=Placeholder for Ixia IxChariot Endpoint for Chrome OS. +EAPI=2 +KEYWORDS=x86 amd64 arm +LICENSE=Proprietary +SLOT=0 +_md5_=5fcd666acbcaedb438139c1dcd80897e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchrome-125070-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchrome-125070-r6 new file mode 100644 index 0000000000..37f3742ca5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchrome-125070-r6 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=dev-libs/glib dev-libs/libevent dev-libs/nss dev-cpp/gtest cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons +DESCRIPTION=Chrome base/ library extracted for use on Chrome OS +EAPI=4 +HOMEPAGE=http://dev.chromium.org/chromium-os/packages/libchrome +IUSE=cros_host cros_workon_tree_ cros-debug +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=dev-libs/glib dev-libs/libevent dev-libs/nss +SLOT=125070 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4b704ff134960064ea2f9165142d1ea6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchrome_crypto-125070 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchrome_crypto-125070 new file mode 100644 index 0000000000..c99189d199 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchrome_crypto-125070 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/nss dev-cpp/gtest dev-vcs/git dev-util/scons +DESCRIPTION=Chrome crypto/ library extracted for use on Chrome OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ cros-debug +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/nss +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=71908f23f801e649e498904c394c9173 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchromeos-0.0.1-r152 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchromeos-0.0.1-r152 new file mode 100644 index 0000000000..5ce8efa8ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchromeos-0.0.1-r152 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf chromeos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons +DESCRIPTION=Chrome OS base library. +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_host test cros-debug cros_workon_tree_0e93b9386777f1606fb731bee338820c54d6b9b9 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c4b2868301458883d9808278ebfc8d20 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchromeos-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchromeos-9999 new file mode 100644 index 0000000000..48f24c6516 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libchromeos-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf chromeos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons +DESCRIPTION=Chrome OS base library. +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_host test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2af6ade335431f2ee80ff3b578dacec7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libevdev-0.0.1-r32 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libevdev-0.0.1-r32 new file mode 100644 index 0000000000..b247328128 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libevdev-0.0.1-r32 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=evdev userspace library +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_b597299516c97f3fa4787b1e31680cb87ec57c58 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=20d970cbe42709b88b2b066619327086 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libevdev-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libevdev-9999 new file mode 100644 index 0000000000..3ddb5095a4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libevdev-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=evdev userspace library +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4d19f871ab8bde99bdc76b258404ba11 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libscrypt-1.1.6-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libscrypt-1.1.6-r6 new file mode 100644 index 0000000000..5cc4ec00f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libscrypt-1.1.6-r6 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=dev-libs/openssl dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Scrypt key derivation library +EAPI=2 +HOMEPAGE=http://www.tarsnap.com/scrypt.html +IUSE=static-libs cros_workon_tree_2690e048f807a2fce12bcc3129c5f6e9209de11e +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=dev-libs/openssl +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=18d119dd1207e7927b49c2c5487f69c4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libscrypt-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libscrypt-9999 new file mode 100644 index 0000000000..b30911ef67 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/libscrypt-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=dev-libs/openssl dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Scrypt key derivation library +EAPI=2 +HOMEPAGE=http://www.tarsnap.com/scrypt.html +IUSE=static-libs cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=dev-libs/openssl +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=16eeb2796c1769a77a02c4e948e8b733 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/memento_softwareupdate-0.0.1-r39 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/memento_softwareupdate-0.0.1-r39 new file mode 100644 index 0000000000..8d13c19560 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/memento_softwareupdate-0.0.1-r39 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS Memento Updater +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_21159049de65a064cc6e0afdb528d955ee1112a8 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-arch/gzip app-shells/bash dev-libs/openssl dev-util/shflags dev-util/xxd net-misc/wget sys-apps/coreutils sys-apps/util-linux +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=083356fec0ac5130627e321a92a3fec6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/memento_softwareupdate-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/memento_softwareupdate-9999 new file mode 100644 index 0000000000..114bbbe3d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/memento_softwareupdate-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS Memento Updater +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-arch/gzip app-shells/bash dev-libs/openssl dev-util/shflags dev-util/xxd net-misc/wget sys-apps/coreutils sys-apps/util-linux +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=73c4a7f085c134d0f07316b228ccc74b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/metrics-0.0.1-r83 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/metrics-0.0.1-r83 new file mode 100644 index 0000000000..951e7e3efa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/metrics-0.0.1-r83 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib >=dev-libs/glib-2.0 sys-apps/dbus sys-apps/rootdev dev-cpp/gmock dev-cpp/gtest dev-vcs/git +DESCRIPTION=Chrome OS Metrics Collection Utilities +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_028567b168176acb7724c0a04da17674f53480f7 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib >=dev-libs/glib-2.0 sys-apps/dbus sys-apps/rootdev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c4da68fe9ad814278331b09f66022121 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/metrics-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/metrics-9999 new file mode 100644 index 0000000000..2eeac4b8ea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/metrics-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib >=dev-libs/glib-2.0 sys-apps/dbus sys-apps/rootdev dev-cpp/gmock dev-cpp/gtest dev-vcs/git +DESCRIPTION=Chrome OS Metrics Collection Utilities +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib >=dev-libs/glib-2.0 sys-apps/dbus sys-apps/rootdev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=24c7046ede31618bcce89dfa312e8448 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/minifakedns-0.0.1-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/minifakedns-0.0.1-r9 new file mode 100644 index 0000000000..c60760b65b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/minifakedns-0.0.1-r9 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-lang/python >=app-admin/eselect-python-20091230 dev-vcs/git +DESCRIPTION=Minimal python dns server +EAPI=2 +HOMEPAGE=http://code.activestate.com/recipes/491264-mini-fake-dns-server/ +IUSE=cros_workon_tree_efb76b27f1af4db93b7c8d48910de14400fbbd37 +KEYWORDS=amd64 arm x86 +LICENSE=PSF +RDEPEND=dev-lang/python >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=26db21d597821836f99ea621c66cdc7c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/minifakedns-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/minifakedns-9999 new file mode 100644 index 0000000000..60c8d00697 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/minifakedns-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-lang/python >=app-admin/eselect-python-20091230 dev-vcs/git +DESCRIPTION=Minimal python dns server +EAPI=2 +HOMEPAGE=http://code.activestate.com/recipes/491264-mini-fake-dns-server/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=PSF +RDEPEND=dev-lang/python >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=78b31ccf3e5cd3bee98053d009a3b51e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mobile-providers-0.0.1-r23 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mobile-providers-0.0.1-r23 new file mode 100644 index 0000000000..87bd175296 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mobile-providers-0.0.1-r23 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=!net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.0 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Database of mobile broadband service providers (with local modifications) +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +IUSE=tools cros_workon_tree_a49d61e48b2f7469de35b6adffdbfefdae842690 +KEYWORDS=amd64 arm x86 +LICENSE=CC-PD +RDEPEND=!net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.0 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c342eff05fcbc270a648acd4ae408b2e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mobile-providers-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mobile-providers-9999 new file mode 100644 index 0000000000..a412a4fc4f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mobile-providers-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=!net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.0 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Database of mobile broadband service providers (with local modifications) +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +IUSE=tools cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=CC-PD +RDEPEND=!net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.0 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3e32e5d20eb3292326b99323bda2d4eb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-diagnostics-0.1-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-diagnostics-0.1-r7 new file mode 100644 index 0000000000..d73a24126a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-diagnostics-0.1-r7 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DESCRIPTION=Convenience script for testing attached cell modems +EAPI=4 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=dev-util/shflags net-misc/socat +SLOT=0 +_md5_=5b43adce046edc858842b575925defa6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-utilities-0.0.1-r30 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-utilities-0.0.1-r30 new file mode 100644 index 0000000000..d6fe9b034d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-utilities-0.0.1-r30 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-apps/dbus dev-vcs/git +DESCRIPTION=Chromium OS modem utilities +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ca43c1f4b7bbe4516527e2a97306664ebdc89e8e +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=sys-apps/dbus +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7c965a5d870f9b725540dd2bab921da4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-utilities-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-utilities-9999 new file mode 100644 index 0000000000..52e3ee8452 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/modem-utilities-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-apps/dbus dev-vcs/git +DESCRIPTION=Chromium OS modem utilities +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=sys-apps/dbus +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5c0dc84267c0b522ed619b2b6bde18e7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mtpd-0.0.1-r65 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mtpd-0.0.1-r65 new file mode 100644 index 0000000000..cab088c906 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mtpd-0.0.1-r65 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf media-libs/libmtp sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=MTP daemon for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_1a482c50c1630fbafafba77541365711208b2c78 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf media-libs/libmtp sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ac6c1d659553b8d745b9a8ef3aafa5f7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mtpd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mtpd-9999 new file mode 100644 index 0000000000..ee422a6996 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/mtpd-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf media-libs/libmtp sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=MTP daemon for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchromeos dev-cpp/gflags dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf media-libs/libmtp sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3a4b1c545805bcac33b17dd85b3990ab diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/permission_broker-0.0.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/permission_broker-0.0.1-r2 new file mode 100644 index 0000000000..d8d4c82647 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/permission_broker-0.0.1-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/glib dev-libs/libusb sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/system_api test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Permission Broker for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_b9bc9b0b7a16498f6c3ed97218ad1c764bdca2bb +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/glib dev-libs/libusb sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=db3d4eac0a15414a5fa3e8a32744a08b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/permission_broker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/permission_broker-9999 new file mode 100644 index 0000000000..64e32c1913 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/permission_broker-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/glib dev-libs/libusb sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/system_api test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Permission Broker for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/glib dev-libs/libusb sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c6d18798171a573621f4b074981aca91 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/power_manager-0.0.1-r725 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/power_manager-0.0.1-r725 new file mode 100644 index 0000000000..33ab988e40 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/power_manager-0.0.1-r725 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-misc/ddccontrol chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/dbus-glib dev-libs/glib dev-libs/protobuf media-sound/adhd sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/system_api test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Power Manager for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=-new_power_button test -lockvt -nocrit -is_desktop -als -has_keyboard_backlight -stay_awake_with_headphones -touch_device cros-debug cros_workon_tree_8d385de24291e4e27eaa166f65bcbd7ebe5362f7 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-misc/ddccontrol chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/dbus-glib dev-libs/glib dev-libs/protobuf media-sound/adhd sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3d76354f966d6b6ae0b72413730e89e9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/power_manager-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/power_manager-9999 new file mode 100644 index 0000000000..8aaae6b835 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/power_manager-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=app-misc/ddccontrol chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/dbus-glib dev-libs/glib dev-libs/protobuf media-sound/adhd sys-fs/udev chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/system_api test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) dev-vcs/git +DESCRIPTION=Power Manager for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=-new_power_button test -lockvt -nocrit -is_desktop -als -has_keyboard_backlight -stay_awake_with_headphones -touch_device cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-misc/ddccontrol chromeos-base/metrics dev-cpp/gflags dev-cpp/glog dev-libs/dbus-glib dev-libs/glib dev-libs/protobuf media-sound/adhd sys-fs/udev +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=56b0acb83e4649f26774dff893466f59 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/protofiles-0.0.1-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/protofiles-0.0.1-r11 new file mode 100644 index 0000000000..a8ad18dd5f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/protofiles-0.0.1-r11 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install prepare unpack +DEPEND=!<=chromeos-base/chromeos-chrome-16.0.886.0_rc-r1 !=chromeos-base/chromeos-chrome-16.0.882.0_alpha-r1 >=dev-vcs/git-1.6 +DESCRIPTION=Protobuf installer for the device policy proto definitions. +EAPI=2 +HOMEPAGE=http://chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=!<=chromeos-base/chromeos-chrome-16.0.886.0_rc-r1 !=chromeos-base/chromeos-chrome-16.0.882.0_alpha-r1 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5c91929e22ca93e504217114ee3e4b56 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/recover-duts-0.0.1-r60 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/recover-duts-0.0.1-r60 new file mode 100644 index 0000000000..63a9ffe3f9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/recover-duts-0.0.1-r60 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Test tool that recovers bricked Chromium OS test devices +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_7b1191682d8df182503e2c2ee948c0ecb48c5461 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/chromeos-init dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2850ff4322a4693ebb28cfef00267630 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/recover-duts-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/recover-duts-9999 new file mode 100644 index 0000000000..fbd966a405 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/recover-duts-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Test tool that recovers bricked Chromium OS test devices +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/chromeos-init dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4ac25a0c70af470973713d97a5033b27 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/root-certificates-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/root-certificates-0.0.1-r1 new file mode 100644 index 0000000000..7595bf4007 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/root-certificates-0.0.1-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DEPEND=!app-misc/ca-certificates dev-libs/openssl +DESCRIPTION=Chromium OS CA Certificates PEM files +EAPI=4 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=!app-misc/ca-certificates +SLOT=0 +_md5_=a71e100b15f3cfabd58f66c88d58ca70 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/saft-0.0.1-r57 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/saft-0.0.1-r57 new file mode 100644 index 0000000000..6e0ad1e94c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/saft-0.0.1-r57 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=ChromeOS SAFT installer +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_9d192a93916cf24651a867191fa0c24fc6ee0e4a +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/vboot_reference virtual/chromeos-firmware +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e93df2d23cf920c96628fd9e6bbb1307 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/saft-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/saft-9999 new file mode 100644 index 0000000000..8b18b7c680 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/saft-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=ChromeOS SAFT installer +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/vboot_reference virtual/chromeos-firmware +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=67067d73621a745cbac1059d8ad52bb0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/serial-tty-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/serial-tty-0.0.1 new file mode 100644 index 0000000000..d18ce52404 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/serial-tty-0.0.1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install +DEPEND=!chromeos-base/tegra-debug !chromeos-base/serial-sac-tty +DESCRIPTION=Init script to run agetty on the serial port +EAPI=4 +IUSE=serial_use_ttyAMA0 serial_use_ttyAMA1 serial_use_ttyAMA2 serial_use_ttyAMA3 serial_use_ttyAMA4 serial_use_ttyAMA5 serial_use_ttyO0 serial_use_ttyO1 serial_use_ttyO2 serial_use_ttyO3 serial_use_ttyO4 serial_use_ttyO5 serial_use_ttyS0 serial_use_ttyS1 serial_use_ttyS2 serial_use_ttyS3 serial_use_ttyS4 serial_use_ttyS5 serial_use_ttySAC0 serial_use_ttySAC1 serial_use_ttySAC2 serial_use_ttySAC3 serial_use_ttySAC4 serial_use_ttySAC5 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=!chromeos-base/tegra-debug !chromeos-base/serial-sac-tty sys-apps/upstart +SLOT=0 +_eclasses_=cros-serialuser 3745147a01ccbc59e455c4cc65030203 +_md5_=b8562bf35aea322051f25dc9c9fb48d1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/serial-tty-0.0.1-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/serial-tty-0.0.1-r4 new file mode 100644 index 0000000000..d18ce52404 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/serial-tty-0.0.1-r4 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install +DEPEND=!chromeos-base/tegra-debug !chromeos-base/serial-sac-tty +DESCRIPTION=Init script to run agetty on the serial port +EAPI=4 +IUSE=serial_use_ttyAMA0 serial_use_ttyAMA1 serial_use_ttyAMA2 serial_use_ttyAMA3 serial_use_ttyAMA4 serial_use_ttyAMA5 serial_use_ttyO0 serial_use_ttyO1 serial_use_ttyO2 serial_use_ttyO3 serial_use_ttyO4 serial_use_ttyO5 serial_use_ttyS0 serial_use_ttyS1 serial_use_ttyS2 serial_use_ttyS3 serial_use_ttyS4 serial_use_ttyS5 serial_use_ttySAC0 serial_use_ttySAC1 serial_use_ttySAC2 serial_use_ttySAC3 serial_use_ttySAC4 serial_use_ttySAC5 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=!chromeos-base/tegra-debug !chromeos-base/serial-sac-tty sys-apps/upstart +SLOT=0 +_eclasses_=cros-serialuser 3745147a01ccbc59e455c4cc65030203 +_md5_=b8562bf35aea322051f25dc9c9fb48d1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/shill-0.0.1-r1052 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/shill-0.0.1-r1052 new file mode 100644 index 0000000000..c0575924e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/shill-0.0.1-r1052 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/bootstat chromeos-base/chromeos-minijail !=chromeos-base/mobile-providers-0.0.1-r12 chromeos-base/vpn-manager dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/libnl:3 dev-libs/nss dev-libs/protobuf net-dialup/ppp net-dns/c-ares net-misc/dhcpcd net-misc/openvpn net-wireless/wpa_supplicant[dbus] chromeos-base/system_api chromeos-base/wimax_manager test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) virtual/modemmanager dev-vcs/git +DESCRIPTION=Shill Connection Manager for Chromium OS +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=test cros-debug cros_workon_tree_e68fbfeee03d9d1e0e4a248b13d7081eaaacf317 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/bootstat chromeos-base/chromeos-minijail !=chromeos-base/mobile-providers-0.0.1-r12 chromeos-base/vpn-manager dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/libnl:3 dev-libs/nss dev-libs/protobuf net-dialup/ppp net-dns/c-ares net-misc/dhcpcd net-misc/openvpn net-wireless/wpa_supplicant[dbus] +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b828a077f39135534e4175805e0cd945 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/shill-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/shill-9999 new file mode 100644 index 0000000000..c29c424d9d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/shill-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/bootstat chromeos-base/chromeos-minijail !=chromeos-base/mobile-providers-0.0.1-r12 chromeos-base/vpn-manager dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/libnl:3 dev-libs/nss dev-libs/protobuf net-dialup/ppp net-dns/c-ares net-misc/dhcpcd net-misc/openvpn net-wireless/wpa_supplicant[dbus] chromeos-base/system_api chromeos-base/wimax_manager test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) virtual/modemmanager dev-vcs/git +DESCRIPTION=Shill Connection Manager for Chromium OS +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/bootstat chromeos-base/chromeos-minijail !=chromeos-base/mobile-providers-0.0.1-r12 chromeos-base/vpn-manager dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/libnl:3 dev-libs/nss dev-libs/protobuf net-dialup/ppp net-dns/c-ares net-misc/dhcpcd net-misc/openvpn net-wireless/wpa_supplicant[dbus] +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=256073be88c0944ee60294b10ffe5f9c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/smogcheck-0.0.1-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/smogcheck-0.0.1-r4 new file mode 100644 index 0000000000..5a3b7c4aff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/smogcheck-0.0.1-r4 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-kernel/linux-headers dev-vcs/git +DESCRIPTION=TPM SmogCheck library +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_bfb5a8712813658b24525efbc94c8dc46380afff +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=364161128cbb59cf4d198b0e21804699 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/smogcheck-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/smogcheck-9999 new file mode 100644 index 0000000000..999385bfe6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/smogcheck-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-kernel/linux-headers dev-vcs/git +DESCRIPTION=TPM SmogCheck library +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=468e48b612818a9ccc238ab28b85d4b2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-known-hosts-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-known-hosts-0.0.1 new file mode 100644 index 0000000000..4d9de4addf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-known-hosts-0.0.1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=SSH known_hosts file +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 x86 +LICENSE=BSD +RDEPEND=net-misc/openssh +SLOT=0 +_md5_=76418e0fd7302838e83cf6eb39780f82 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-known-hosts-0.0.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-known-hosts-0.0.1-r2 new file mode 100644 index 0000000000..4d9de4addf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-known-hosts-0.0.1-r2 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=SSH known_hosts file +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 x86 +LICENSE=BSD +RDEPEND=net-misc/openssh +SLOT=0 +_md5_=76418e0fd7302838e83cf6eb39780f82 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-root-dot-dir-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-root-dot-dir-0.0.1 new file mode 100644 index 0000000000..820fed4f6d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/ssh-root-dot-dir-0.0.1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DESCRIPTION=SSH /root/.ssh directory +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 x86 +LICENSE=BSD +SLOT=0 +_md5_=f0a81e47b78ba2486bc446af4e03f2d8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/system_api-0.0.1-r199 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/system_api-0.0.1-r199 new file mode 100644 index 0000000000..60a20da7c5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/system_api-0.0.1-r199 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=!<=chromeos-base/libchromeos-0.0.1-r78 dev-vcs/git +DESCRIPTION=Chrome OS system API (D-Bus service names, etc.) +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_f4692489193b90154b01d3bf5de0603ef15cac4e +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=!<=chromeos-base/libchromeos-0.0.1-r78 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b46c7f8e8a6736bd9b696475aa9c8896 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/system_api-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/system_api-9999 new file mode 100644 index 0000000000..e29e88a4e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/system_api-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=!<=chromeos-base/libchromeos-0.0.1-r78 dev-vcs/git +DESCRIPTION=Chrome OS system API (D-Bus service names, etc.) +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=!<=chromeos-base/libchromeos-0.0.1-r78 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5d6af7986efe5eccc99429ae002311ef diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/touchbot-1.0-r18 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/touchbot-1.0-r18 new file mode 100644 index 0000000000..bf3cf861dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/touchbot-1.0-r18 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst postrm prepare setup unpack +DEPEND=dev-vcs/git >=app-admin/eselect-python-20091230 dev-lang/python +DESCRIPTION=Suite of control scripts for the Touchbot +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_40e371afcf914e281d4611a6fcbe40a972a2ee25 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=>=app-admin/eselect-python-20091230 dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a4dd0f7910986288826f365fff9cc018 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/touchbot-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/touchbot-9999 new file mode 100644 index 0000000000..e8a06cffcd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/touchbot-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst postrm prepare setup unpack +DEPEND=dev-vcs/git >=app-admin/eselect-python-20091230 dev-lang/python +DESCRIPTION=Suite of control scripts for the Touchbot +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=>=app-admin/eselect-python-20091230 dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=aa3457b9233d93cab155563004f298f9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-0.0.1-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-0.0.1-r7 new file mode 100644 index 0000000000..2cd666ffd4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-0.0.1-r7 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=app-crypt/trousers dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git dev-vcs/git dev-vcs/git +DESCRIPTION=Various TPM tools +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_c131259845e91d4cd0fd8001c0598d49f59c4b7d cros_workon_tree_c131259845e91d4cd0fd8001c0598d49f59c4b7d cros_workon_tree_c131259845e91d4cd0fd8001c0598d49f59c4b7d cros_workon_tree_c131259845e91d4cd0fd8001c0598d49f59c4b7d +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-crypt/trousers +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=23c3110c1af945dde372f890b4c4b028 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-9999 new file mode 100644 index 0000000000..085a8d9c1a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=app-crypt/trousers dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git dev-vcs/git dev-vcs/git +DESCRIPTION=Various TPM tools +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ cros_workon_tree_ cros_workon_tree_ cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-crypt/trousers +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=f5430b997a0e7e95169ac969bc04e9c5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-check-0.0.1-r700 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-check-0.0.1-r700 new file mode 100644 index 0000000000..ab14d08e75 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-check-0.0.1-r700 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=tpm check test +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +tests_hardware_TPMCheck cros_workon_tree_8b768b506c41afc82139df72f689917b51d7cbb2 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=31f656c95f7b09e61f73aeff58172867 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-check-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-check-9999 new file mode 100644 index 0000000000..a0f67814e0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-check-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=tpm check test +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +tests_hardware_TPMCheck cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9c03f5a8523c29426913ab2227416a56 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-firmware-tests-0.0.1-r718 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-firmware-tests-0.0.1-r718 new file mode 100644 index 0000000000..bdb8306660 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-firmware-tests-0.0.1-r718 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=app-crypt/trousers chromeos-base/tpm dev-vcs/git +DESCRIPTION=TPM firmware tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +tests_hardware_TPMFirmware +tests_hardware_TPMFirmwareServer cros_workon_tree_8b768b506c41afc82139df72f689917b51d7cbb2 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +RDEPEND=app-crypt/trousers chromeos-base/tpm ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=0fcdb22cec41e63f04d8d6cad6db6cda diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-firmware-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-firmware-tests-9999 new file mode 100644 index 0000000000..2a5cdce0f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm-firmware-tests-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=app-crypt/trousers chromeos-base/tpm dev-vcs/git +DESCRIPTION=TPM firmware tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +tests_hardware_TPMFirmware +tests_hardware_TPMFirmwareServer cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +RDEPEND=app-crypt/trousers chromeos-base/tpm ( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bae451617b4e1ccab31ec6d265707ebd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm_lite-0.0.1-r8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm_lite-0.0.1-r8 new file mode 100644 index 0000000000..b264d418e0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm_lite-0.0.1-r8 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=app-crypt/trousers dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git dev-vcs/git +DESCRIPTION=TPM Light Command Library testsuite +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_e1d7a6d5d9b3eb03d183c7ec73a33c77c53edd2b cros_workon_tree_e1d7a6d5d9b3eb03d183c7ec73a33c77c53edd2b cros_workon_tree_e1d7a6d5d9b3eb03d183c7ec73a33c77c53edd2b +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=app-crypt/trousers +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=282ca59be70915d849251b2e6d5edb3b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm_lite-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm_lite-9999 new file mode 100644 index 0000000000..a87db85474 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/tpm_lite-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=app-crypt/trousers dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git dev-vcs/git +DESCRIPTION=TPM Light Command Library testsuite +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ cros_workon_tree_ cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=app-crypt/trousers +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3bf84e61bdc3f6fbffe1da64d3a9ea9f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/u-boot-scripts-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/u-boot-scripts-0.0.1 new file mode 100644 index 0000000000..e467075d37 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/u-boot-scripts-0.0.1 @@ -0,0 +1,7 @@ +DEFINED_PHASES=compile install +DESCRIPTION=Tegra2 boot scripts +EAPI=2 +KEYWORDS=arm +LICENSE=BCD +SLOT=0 +_md5_=8b575e2d6a2b9ef13dc0ef81b2025662 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/u-boot-scripts-0.0.1-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/u-boot-scripts-0.0.1-r5 new file mode 100644 index 0000000000..e467075d37 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/u-boot-scripts-0.0.1-r5 @@ -0,0 +1,7 @@ +DEFINED_PHASES=compile install +DESCRIPTION=Tegra2 boot scripts +EAPI=2 +KEYWORDS=arm +LICENSE=BCD +SLOT=0 +_md5_=8b575e2d6a2b9ef13dc0ef81b2025662 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/uboot-env-0.0.1-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/uboot-env-0.0.1-r5 new file mode 100644 index 0000000000..1c43da6e03 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/uboot-env-0.0.1-r5 @@ -0,0 +1,10 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=>=dev-lang/python-2.5 dev-vcs/git +DESCRIPTION=Python script to read/write u-boot environment +EAPI=2 +IUSE=cros_workon_tree_5e354d36805a844694bf48c110c287067494722e +KEYWORDS=arm x86 +RDEPEND=>=dev-lang/python-2.5 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1d0e6cca8a32d57a6aeff8c5955efdb2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/uboot-env-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/uboot-env-9999 new file mode 100644 index 0000000000..d5ab2e4c39 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/uboot-env-9999 @@ -0,0 +1,10 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=>=dev-lang/python-2.5 dev-vcs/git +DESCRIPTION=Python script to read/write u-boot environment +EAPI=2 +IUSE=cros_workon_tree_ +KEYWORDS=~arm ~x86 +RDEPEND=>=dev-lang/python-2.5 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4a77a3812c799788523a6b02685e4272 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/update_engine-0.0.1-r361 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/update_engine-0.0.1-r361 new file mode 100644 index 0000000000..8c63466da0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/update_engine-0.0.1-r361 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/system_api dev-cpp/gmock dev-cpp/gtest dev-libs/dbus-glib cros_host? ( dev-util/scons ) sys-fs/udev app-arch/bzip2 chromeos-base/chromeos-ca-certificates chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/vboot_reference chromeos-base/verity dev-cpp/gflags dev-libs/glib dev-libs/libpcre dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-apps/rootdev sys-fs/e2fsprogs sys-libs/e2fsprogs-libs dev-vcs/git dev-util/scons +DESCRIPTION=Chrome OS Update Engine +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_host -delta_generator cros-debug cros_workon_tree_bb8510cb7d96ac37c6e2407ce9b4b3006a11b0f4 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=app-arch/bzip2 chromeos-base/chromeos-ca-certificates chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/vboot_reference chromeos-base/verity dev-cpp/gflags dev-libs/glib dev-libs/libpcre dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-apps/rootdev sys-fs/e2fsprogs sys-libs/e2fsprogs-libs +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=df355f17e8dff93cb1fb219d526f7763 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/update_engine-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/update_engine-9999 new file mode 100644 index 0000000000..eb68aa4786 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/update_engine-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=chromeos-base/system_api dev-cpp/gmock dev-cpp/gtest dev-libs/dbus-glib cros_host? ( dev-util/scons ) sys-fs/udev app-arch/bzip2 chromeos-base/chromeos-ca-certificates chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/vboot_reference chromeos-base/verity dev-cpp/gflags dev-libs/glib dev-libs/libpcre dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-apps/rootdev sys-fs/e2fsprogs sys-libs/e2fsprogs-libs dev-vcs/git dev-util/scons +DESCRIPTION=Chrome OS Update Engine +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_host -delta_generator cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=app-arch/bzip2 chromeos-base/chromeos-ca-certificates chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos chromeos-base/metrics chromeos-base/vboot_reference chromeos-base/verity dev-cpp/gflags dev-libs/glib dev-libs/libpcre dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-apps/rootdev sys-fs/e2fsprogs sys-libs/e2fsprogs-libs +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c scons-utils bfa350a15756117faaecd9056bbb79c2 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6f4221abb766fe41f3b2f8979b88d9b9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/userfeedback-0.0.1-r81 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/userfeedback-0.0.1-r81 new file mode 100644 index 0000000000..949b02ac09 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/userfeedback-0.0.1-r81 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Log scripts used by userfeedback to report cros system information +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_f209555c63c55fe03d652edfb83c61d912c54f16 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/chromeos-init chromeos-base/modem-utilities chromeos-base/vboot_reference media-libs/fontconfig sys-apps/mosys sys-apps/net-tools sys-apps/pciutils sys-apps/usbutils x11-apps/setxkbmap +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b882964368b74610ce964344c5e6c70d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/userfeedback-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/userfeedback-9999 new file mode 100644 index 0000000000..4811206bf8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/userfeedback-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Log scripts used by userfeedback to report cros system information +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=chromeos-base/chromeos-init chromeos-base/modem-utilities chromeos-base/vboot_reference media-libs/fontconfig sys-apps/mosys sys-apps/net-tools sys-apps/pciutils sys-apps/usbutils x11-apps/setxkbmap +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a43c1778154cad67294369a794ec1113 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-1.0-r825 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-1.0-r825 new file mode 100644 index 0000000000..1172f9645d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-1.0-r825 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] !minimal? ( dev-libs/libyaml ) dev-libs/glib dev-libs/openssl sys-apps/util-linux dev-cpp/gflags dev-cpp/gtest dev-vcs/git +DESCRIPTION=Chrome OS verified boot tools +EAPI=4 +IUSE=32bit_au minimal rbtest tpmtests cros_host cros-debug cros_workon_tree_8b768b506c41afc82139df72f689917b51d7cbb2 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-3 +RDEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] !minimal? ( dev-libs/libyaml ) dev-libs/glib dev-libs/openssl sys-apps/util-linux !cros_host? ( chromeos-base/vboot_reference-config ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4463ef2f82b39dd26580ddc579660a06 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-9999 new file mode 100644 index 0000000000..84dea707d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] !minimal? ( dev-libs/libyaml ) dev-libs/glib dev-libs/openssl sys-apps/util-linux dev-cpp/gflags dev-cpp/gtest dev-vcs/git +DESCRIPTION=Chrome OS verified boot tools +EAPI=4 +IUSE=32bit_au minimal rbtest tpmtests cros_host cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-3 +RDEPEND=app-crypt/trousers chromeos-base/libchrome:125070[cros-debug=] !minimal? ( dev-libs/libyaml ) dev-libs/glib dev-libs/openssl sys-apps/util-linux !cros_host? ( chromeos-base/vboot_reference-config ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=26305f8602aec5bcfe5788df75e48fa6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-config-0.0.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-config-0.0.1-r2 new file mode 100644 index 0000000000..2d09a54c0d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-config-0.0.1-r2 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install +DESCRIPTION=Chrome OS verified boot tools config +EAPI=4 +IUSE=board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=cros-board cb702a5d2e48ec0b63029973efa4d744 +_md5_=a546cd1b3476692b6d7392161a2ef542 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-tests-0.0.1-r718 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-tests-0.0.1-r718 new file mode 100644 index 0000000000..dcc90c514b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-tests-0.0.1-r718 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=vboot tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +tests_firmware_VbootCrypto cros_workon_tree_8b768b506c41afc82139df72f689917b51d7cbb2 +buildcheck autotest opengles +KEYWORDS=x86 arm amd64 +LICENSE=GPL-2 +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=45357e96da69a085a07119d11e1e8d94 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-tests-9999 new file mode 100644 index 0000000000..7089758b01 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vboot_reference-tests-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=vboot tests +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=+autotest +tests_firmware_VbootCrypto cros_workon_tree_ +buildcheck autotest opengles +KEYWORDS=~x86 ~arm ~amd64 +LICENSE=GPL-2 +RDEPEND=( autotest? ( >=chromeos-base/autotest-0.0.1-r3 ) ) +SLOT=0 +_eclasses_=autotest 534125295770b6401a8180bb518da0e9 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fa3323c6b6ecbab0505e3af798f38129 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/verity-0.0.1-r71 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/verity-0.0.1-r71 new file mode 100644 index 0000000000..51f5150f6e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/verity-0.0.1-r71 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=dev-cpp/gtest dev-cpp/gmock 32bit_au? ( dev-cpp/gtest32 dev-cpp/gmock32 ) valgrind? ( dev-util/valgrind ) dev-vcs/git +DESCRIPTION=File system integrity image generator for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=32bit_au test valgrind splitdebug cros_workon_tree_8f459ef16b87c47cb26400078c2ae353cb41455b +KEYWORDS=amd64 x86 arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8a79462be5228715d215610f6812e9db diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/verity-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/verity-9999 new file mode 100644 index 0000000000..a2d9132fb6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/verity-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=dev-cpp/gtest dev-cpp/gmock 32bit_au? ( dev-cpp/gtest32 dev-cpp/gmock32 ) valgrind? ( dev-util/valgrind ) dev-vcs/git +DESCRIPTION=File system integrity image generator for Chromium OS +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=32bit_au test valgrind splitdebug cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=54a382c4314e9c1a2737f40942b5ee1e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpd-0.0.1-r56 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpd-0.0.1-r56 new file mode 100644 index 0000000000..dee606d2a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpd-0.0.1-r56 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-apps/util-linux dev-vcs/git +DESCRIPTION=ChromeOS vital product data utilities +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_06f71f0505ed3bc1a5cec68639fab3a4d16dd167 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=sys-apps/flashrom dev-util/shflags +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=070f74131518b6ed07fb077a504e62f0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpd-9999 new file mode 100644 index 0000000000..351eb0a5c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpd-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-apps/util-linux dev-vcs/git +DESCRIPTION=ChromeOS vital product data utilities +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=sys-apps/flashrom dev-util/shflags +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3f628cf7dc13fcb923c8cd05474346d4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpn-manager-0.0.1-r50 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpn-manager-0.0.1-r50 new file mode 100644 index 0000000000..13bdedf17b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpn-manager-0.0.1-r50 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/openssl net-dialup/xl2tpd net-misc/strongswan[cisco,nat-transport] dev-cpp/gtest dev-vcs/git +DESCRIPTION=VPN tools +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_482758b2628f6cce1913020b920b5ca0bd88c7fc +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/openssl net-dialup/xl2tpd net-misc/strongswan[cisco,nat-transport] +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3011a131002d5b461f94902f5f62705d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpn-manager-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpn-manager-9999 new file mode 100644 index 0000000000..3dad4063c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/vpn-manager-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/openssl net-dialup/xl2tpd net-misc/strongswan[cisco,nat-transport] dev-cpp/gtest dev-vcs/git +DESCRIPTION=VPN tools +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/libchrome:125070[cros-debug=] chromeos-base/libchromeos dev-cpp/gflags dev-libs/openssl net-dialup/xl2tpd net-misc/strongswan[cisco,nat-transport] +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=04b8d96d1ed9440795f0deb6d708a660 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/wimax_manager-0.0.1-r59 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/wimax_manager-0.0.1-r59 new file mode 100644 index 0000000000..f5f306ac9c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/wimax_manager-0.0.1-r59 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=gdmwimax? ( gdmwimax? ( chromeos-base/libchromeos chromeos-base/metrics dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf ) chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api net-wireless/gdmwimax test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) ) dev-vcs/git +DESCRIPTION=Chromium OS WiMAX Manager +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=gdmwimax test cros-debug cros_workon_tree_4ebbad4742c5c0ec59e6499688750fc6a15c2790 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=gdmwimax? ( chromeos-base/libchromeos chromeos-base/metrics dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=014d5f995eea17c8c19e18a9ecd64559 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/wimax_manager-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/wimax_manager-9999 new file mode 100644 index 0000000000..51722c00d6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/wimax_manager-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=gdmwimax? ( gdmwimax? ( chromeos-base/libchromeos chromeos-base/metrics dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf ) chromeos-base/libchrome:125070[cros-debug=] chromeos-base/system_api net-wireless/gdmwimax test? ( dev-cpp/gmock ) test? ( dev-cpp/gtest ) ) dev-vcs/git +DESCRIPTION=Chromium OS WiMAX Manager +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=gdmwimax test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=gdmwimax? ( chromeos-base/libchromeos chromeos-base/metrics dev-libs/dbus-c++ >=dev-libs/glib-2.30 dev-libs/protobuf ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=61d733f242768aeb0c248bc9fe9e1770 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/workarounds-0.0.1-r55 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/workarounds-0.0.1-r55 new file mode 100644 index 0000000000..f9172f4404 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/workarounds-0.0.1-r55 @@ -0,0 +1,11 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS workarounds utilities. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_e6347aff50d20225de76678985458117532d95ba +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6b2f7befed86302bf5fa857d28cf7d22 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/workarounds-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/workarounds-9999 new file mode 100644 index 0000000000..e780dec79f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/workarounds-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS workarounds utilities. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6789b58af652931ba93ec4610f777edf diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/xorg-conf-0.0.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/xorg-conf-0.0.5 new file mode 100644 index 0000000000..63373be11d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/xorg-conf-0.0.5 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DESCRIPTION=Board specific xorg configuration file. +EAPI=4 +IUSE=cmt elan -exynos synaptics -tegra board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=amd64 arm x86 +LICENSE=BSD +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=cros-board cb702a5d2e48ec0b63029973efa4d744 +_md5_=cadb9309a35cbd520b3a425fccc50c98 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/xorg-conf-0.0.5-r95 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/xorg-conf-0.0.5-r95 new file mode 100644 index 0000000000..63373be11d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/chromeos-base/xorg-conf-0.0.5-r95 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DESCRIPTION=Board specific xorg configuration file. +EAPI=4 +IUSE=cmt elan -exynos synaptics -tegra board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=amd64 arm x86 +LICENSE=BSD +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=cros-board cb702a5d2e48ec0b63029973efa4d744 +_md5_=cadb9309a35cbd520b3a425fccc50c98 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock-1.4.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock-1.4.0 new file mode 100644 index 0000000000..91b6e0195e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock-1.4.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare unpack +DEPEND=>=dev-cpp/gtest-1.4.0 +DESCRIPTION=Google's C++ mocking framework +EAPI=4 +HOMEPAGE=http://code.google.com/p/googlemock/ +IUSE=static-libs +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=>=dev-cpp/gtest-1.4.0 +SLOT=0 +SRC_URI=http://googlemock.googlecode.com/files/gmock-1.4.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7f7df4f805df05dfada867a6c573d3cf diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock-1.4.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock-1.4.0-r1 new file mode 100644 index 0000000000..91b6e0195e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock-1.4.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare unpack +DEPEND=>=dev-cpp/gtest-1.4.0 +DESCRIPTION=Google's C++ mocking framework +EAPI=4 +HOMEPAGE=http://code.google.com/p/googlemock/ +IUSE=static-libs +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=>=dev-cpp/gtest-1.4.0 +SLOT=0 +SRC_URI=http://googlemock.googlecode.com/files/gmock-1.4.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7f7df4f805df05dfada867a6c573d3cf diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock32-1.4.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock32-1.4.0 new file mode 100644 index 0000000000..bf7663912f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gmock32-1.4.0 @@ -0,0 +1,15 @@ +DEFINED_PHASES=configure install prepare unpack +DEPEND=>=dev-cpp/gtest32-1.4.0 +DESCRIPTION=Google's C++ mocking framework +EAPI=4 +HOMEPAGE=http://code.google.com/p/googlemock/ +IUSE=32bit_au +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=>=dev-cpp/gtest32-1.4.0 +REQUIRED_USE=32bit_au +RESTRICT=test +SLOT=0 +SRC_URI=http://googlemock.googlecode.com/files/gmock-1.4.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ad22a4ae6f507cfb86ceb1a68e0f15b0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gtest32-1.4.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gtest32-1.4.0 new file mode 100644 index 0000000000..fe881c136d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gtest32-1.4.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare +DEPEND=dev-lang/python || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Google C++ Testing Framework +EAPI=4 +HOMEPAGE=http://code.google.com/p/googletest/ +IUSE=32bit_au +KEYWORDS=amd64 arm x86 +LICENSE=BSD +REQUIRED_USE=32bit_au +RESTRICT=test +SLOT=0 +SRC_URI=http://googletest.googlecode.com/files/gtest-1.4.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3dfbdcd4a82dd0f46c3cecd35b9c7373 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gtest32-1.4.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gtest32-1.4.0-r1 new file mode 100644 index 0000000000..fe881c136d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-cpp/gtest32-1.4.0-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare +DEPEND=dev-lang/python || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Google C++ Testing Framework +EAPI=4 +HOMEPAGE=http://code.google.com/p/googletest/ +IUSE=32bit_au +KEYWORDS=amd64 arm x86 +LICENSE=BSD +REQUIRED_USE=32bit_au +RESTRICT=test +SLOT=0 +SRC_URI=http://googletest.googlecode.com/files/gtest-1.4.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3dfbdcd4a82dd0f46c3cecd35b9c7373 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/leveldb-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/leveldb-0.0.1-r3 new file mode 100644 index 0000000000..bf3a10933d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/leveldb-0.0.1-r3 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=A fast and lightweight key/value database library by Google. +EAPI=4 +HOMEPAGE=http://code.google.com/p/leveldb/ +IUSE=test cros-debug cros_workon_tree_cddf50f93e1fdd9ade5b86f46b4b7a7b79b4800e +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=974a06c4283d2634c1bbb9c5284cf768 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/leveldb-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/leveldb-9999 new file mode 100644 index 0000000000..ab58febe25 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/leveldb-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=A fast and lightweight key/value database library by Google. +EAPI=4 +HOMEPAGE=http://code.google.com/p/leveldb/ +IUSE=test cros-debug cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b01ec57074d583f24ed70876c2183ee8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/m17n-contrib-1.1.10-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/m17n-contrib-1.1.10-r1 new file mode 100644 index 0000000000..659a6b28f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/m17n-contrib-1.1.10-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure install +DEPEND=dev-db/m17n-db +DESCRIPTION=Contribution database for the m17n library +EAPI=2 +HOMEPAGE=http://www.m17n.org/m17n-lib/ +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2.1 +RDEPEND=dev-db/m17n-db +SLOT=0 +SRC_URI=mirror://gentoo/m17n-contrib-1.1.10.tar.gz +_md5_=c8b59d02869b6fe7ece28a250654334d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/m17n-db-1.6.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/m17n-db-1.6.1-r2 new file mode 100644 index 0000000000..22f90a4448 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/m17n-db-1.6.1-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=sys-devel/gettext +DESCRIPTION=Database for the m17n library +EAPI=2 +HOMEPAGE=http://www.m17n.org/m17n-lib/ +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 +LICENSE=LGPL-2.1 +RDEPEND=virtual/libintl +SLOT=0 +SRC_URI=mirror://gentoo/m17n-db-1.6.1.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=25778daec4b9b06150d85c9367f4520a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/sqlite-3.6.19 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/sqlite-3.6.19 new file mode 100644 index 0000000000..370e8da3c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/sqlite-3.6.19 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) +DESCRIPTION=an SQL Database Engine in a C Library +EAPI=2 +HOMEPAGE=http://www.sqlite.org/ +IUSE=debug doc icu +readline soundex tcl +threadsafe +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd +LICENSE=as-is +RDEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) +RESTRICT=!tcl? ( test ) +SLOT=3 +SRC_URI=http://www.sqlite.org/sqlite-3.6.19.tar.gz doc? ( http://www.sqlite.org/sqlite_docs_3_6_19.zip ) !tcl? ( mirror://gentoo/sqlite3.h-3.6.19.bz2 ) +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=d2d950ac8580158a64fb97c07e9eeb3e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.1-r26 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.1-r26 new file mode 100644 index 0000000000..c767d32221 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.1-r26 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for signing Tegra2 boot images +EAPI=2 +HOMEPAGE=http://git.chromium.org +IUSE=cros_workon_tree_3c1f68b1c84462e5e30c6f8f6f354ecff67f44bd +KEYWORDS=amd64 arm x86 +LICENSE=GPLv2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=acad41ae17e123a35451a5d1225c321b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2 new file mode 100644 index 0000000000..266c2eaf54 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for signing Tegra2 boot images +EAPI=4 +HOMEPAGE=http://nv-tegra.nvidia.com/gitweb/?p=tools/cbootimage.git +KEYWORDS=amd64 arm x86 +LICENSE=GPLv2 +SLOT=0 +_eclasses_=git-2 da60d6e85fa94cef4d510cab24e01e36 +_md5_=05892305a5a6dcaf3e0203bd9b4537eb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2-r1 new file mode 100644 index 0000000000..266c2eaf54 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for signing Tegra2 boot images +EAPI=4 +HOMEPAGE=http://nv-tegra.nvidia.com/gitweb/?p=tools/cbootimage.git +KEYWORDS=amd64 arm x86 +LICENSE=GPLv2 +SLOT=0 +_eclasses_=git-2 da60d6e85fa94cef4d510cab24e01e36 +_md5_=05892305a5a6dcaf3e0203bd9b4537eb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-9999 new file mode 100644 index 0000000000..901953ea7b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for signing Tegra2 boot images +EAPI=2 +HOMEPAGE=http://git.chromium.org +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPLv2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e82c175813fe805c599d763ad9b2576b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.4_rc1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.4_rc1 new file mode 100644 index 0000000000..ddc699bd12 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.4_rc1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=>=dev-embedded/libftdi-0.19 dev-libs/confuse || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Utility to program external EEPROM for FTDI USB chips +EAPI=2 +HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/ +KEYWORDS=x86 amd64 +LICENSE=LGPL-2 +RDEPEND=>=dev-embedded/libftdi-0.19 dev-libs/confuse +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/ftdi_eeprom-0.4_rc1.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5ae88b325ebe097da461933662574597 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-0.0.1-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-0.0.1-r4 new file mode 100644 index 0000000000..998bd94fee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-0.0.1-r4 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility monitoring power usage on Harmony and Seaboard +EAPI=2 +IUSE=cros_workon_tree_9e4e01d060cdaf9232236674d7e2a5bd14f1dfae +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1a35f5228e4d8ab67933f7aa2ff26ff3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-9999 new file mode 100644 index 0000000000..64e42c9396 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-9999 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility monitoring power usage on Harmony and Seaboard +EAPI=2 +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8ae9c5833be8c38a0a3a8e86da0d78ed diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.1 new file mode 100644 index 0000000000..ad89de3202 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install unpack +DEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 dev-vcs/git +DESCRIPTION=Utility for downloading code to tegra system in recovery mode +EAPI=4 +HOMEPAGE=http://sourceforge.net/projects/tegra-rcm/ +KEYWORDS=amd64 x86 +LICENSE=BSD +RDEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 +SLOT=0 +_eclasses_=git-2 da60d6e85fa94cef4d510cab24e01e36 +_md5_=cdb4af0606e6cad577fe408c9999e61b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2 new file mode 100644 index 0000000000..e475e7597d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install prepare unpack +DEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Utility for downloading code to tegra system in recovery mode +EAPI=4 +HOMEPAGE=http://sourceforge.net/projects/tegra-rcm/ +KEYWORDS=amd64 x86 +LICENSE=BSD +RDEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cbed7b0a86693248a0a4f828af36e209 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2-r1 new file mode 100644 index 0000000000..e475e7597d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install prepare unpack +DEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Utility for downloading code to tegra system in recovery mode +EAPI=4 +HOMEPAGE=http://sourceforge.net/projects/tegra-rcm/ +KEYWORDS=amd64 x86 +LICENSE=BSD +RDEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cbed7b0a86693248a0a4f828af36e209 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-0.0.1-r3 new file mode 100644 index 0000000000..fd556c01af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-0.0.1-r3 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Based on the eutils eclass +EAPI=2 +IUSE=cros_workon_tree_aeb5f4b3e2d7743026b2c267a4424203c924ffeb +KEYWORDS=amd64 arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7a73342dd75ffface546eae8e6203407 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-9999 new file mode 100644 index 0000000000..ce910bc0b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-9999 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Based on the eutils eclass +EAPI=2 +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=550bd591273d966e70daeb492221dc20 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-java/icedtea6-bin-1.6.2-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-java/icedtea6-bin-1.6.2-r3 new file mode 100644 index 0000000000..4237027a85 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-java/icedtea6-bin-1.6.2-r3 @@ -0,0 +1,14 @@ +DEFINED_PHASES=install postinst postrm prerm setup +DEPEND==dev-java/java-config-2* >=sys-apps/portage-2.1 +DESCRIPTION=A Gentoo-made binary build of the icedtea6 JDK +EAPI=1 +HOMEPAGE=http://icedtea.classpath.org +IUSE=X alsa doc examples nsplugin source +KEYWORDS=amd64 x86 +LICENSE=GPL-2-with-linking-exception +RDEPEND=>=sys-devel/gcc-4.3 >=sys-libs/glibc-2.9 >=media-libs/giflib-4.1.6-r1 virtual/jpeg >=media-libs/libpng-1.2.38 >=sys-libs/zlib-1.2.3-r1 alsa? ( >=media-libs/alsa-lib-1.0.20 ) X? ( >=media-libs/freetype-2.3.9:2 >=media-libs/fontconfig-2.6.0-r2:1.0 >=x11-libs/libXext-1.0.5 >=x11-libs/libXi-1.2.1 >=x11-libs/libXtst-1.0.3 >=x11-libs/libX11-1.2.2 x11-libs/libXt ) nsplugin? ( >=dev-libs/atk-1.26.0 >=dev-libs/glib-2.20.5:2 >=dev-libs/nspr-4.8 >=x11-libs/cairo-1.8.8 >=x11-libs/gtk+-2.16.6:2 >=x11-libs/pango-1.24.5 ) =dev-java/java-config-2* +RESTRICT=strip +SLOT=0 +SRC_URI=amd64? ( mirror://gentoo//icedtea6-bin-core-1.6.2-r2-amd64.tar.bz2 ) x86? ( mirror://gentoo//icedtea6-bin-core-1.6.2-r2-x86.tar.bz2 ) doc? ( mirror://gentoo//icedtea6-bin-doc-1.6.2-r2.tar.bz2 ) examples? ( amd64? ( mirror://gentoo//icedtea6-bin-examples-1.6.2-r2-amd64.tar.bz2 ) x86? ( mirror://gentoo//icedtea6-bin-examples-1.6.2-r2-x86.tar.bz2 ) ) nsplugin? ( amd64? ( mirror://gentoo//icedtea6-bin-nsplugin-1.6.2-r2-amd64.tar.bz2 ) x86? ( mirror://gentoo//icedtea6-bin-nsplugin-1.6.2-r2-x86.tar.bz2 ) ) source? ( mirror://gentoo//icedtea6-bin-src-1.6.2-r2.tar.bz2 ) +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 java-vm-2 1f212b8a508fe54444797b761bf17527 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fcd8d66f9b592dc238e6f190adca0507 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/python-2.6.8-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/python-2.6.8-r1 new file mode 100644 index 0000000000..89bd7548a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/python-2.6.8-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!=sys-devel/autoconf-2.61 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230 +DESCRIPTION=Python is an interpreted, interactive, object-oriented programming language. +EAPI=2 +HOMEPAGE=http://www.python.org/ +IUSE=-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=PSF-2 +RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!=app-admin/eselect-python-20091230 +SLOT=2.6 +SRC_URI=http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e multiprocessing 1512bdfe7004902b8cd2c466fc3df772 pax-utils 3551398d6ede2b572568832730cc2a45 portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=176d0839f5c3b59f4584885a4098ca27 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/v8-5208 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/v8-5208 new file mode 100644 index 0000000000..7dc583e01f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/v8-5208 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install +DESCRIPTION=V8 JavaScript engine. +EAPI=2 +HOMEPAGE=http://code.google.com/p/v8/ +KEYWORDS=amd64 x86 arm +LICENSE=BSD +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/v8-svn-5208.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fd6e6e4265ce1415d4c890fb449e19b3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-0.0.2-r36 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-0.0.2-r36 new file mode 100644 index 0000000000..eeb759b24e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-0.0.2-r36 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=doc? ( dev-libs/libxslt ) doc? ( app-doc/doxygen ) dev-util/pkgconfig dev-vcs/git +DESCRIPTION=C++ D-Bus bindings +EAPI=2 +HOMEPAGE=http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B +IUSE=debug doc +glib cros_workon_tree_6ce294bb88229f44567404a1a5a9cd1b89157724 +KEYWORDS=amd64 x86 arm +LICENSE=LGPL-2 +RDEPEND=glib? ( >=dev-libs/dbus-glib-0.76 ) glib? ( >=dev-libs/glib-2.19:2 ) >=sys-apps/dbus-1.0 >=dev-cpp/ctemplate-1.0 +SLOT=1 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=dfbe0d9d4fb9647cde37be3cb9db2d14 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-9999 new file mode 100644 index 0000000000..41b4b1a9b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=doc? ( dev-libs/libxslt ) doc? ( app-doc/doxygen ) dev-util/pkgconfig dev-vcs/git +DESCRIPTION=C++ D-Bus bindings +EAPI=2 +HOMEPAGE=http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B +IUSE=debug doc +glib cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=LGPL-2 +RDEPEND=glib? ( >=dev-libs/dbus-glib-0.76 ) glib? ( >=dev-libs/glib-2.19:2 ) >=sys-apps/dbus-1.0 >=dev-cpp/ctemplate-1.0 +SLOT=1 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a1d057e118dd29111edda92b9f5d616d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-glib-0.82 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-glib-0.82 new file mode 100644 index 0000000000..a51b999e6e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-glib-0.82 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=>=sys-apps/dbus-1.1 >=dev-libs/glib-2.10 >=dev-libs/expat-1.95.8 dev-util/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen app-text/xmlto >=dev-util/gtk-doc-1.4 ) +DESCRIPTION=D-Bus bindings for glib +EAPI=2 +HOMEPAGE=http://dbus.freedesktop.org/ +IUSE=bash-completion debug doc test bash-completion +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd +LICENSE=|| ( GPL-2 AFL-2.1 ) +PDEPEND=bash-completion? ( app-shells/bash-completion ) +RDEPEND=>=sys-apps/dbus-1.1 >=dev-libs/glib-2.10 >=dev-libs/expat-1.95.8 bash-completion? ( app-admin/eselect ) +SLOT=0 +SRC_URI=http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.82.tar.gz +_eclasses_=bash-completion f0fab76a98c0e4b3d72b6beb28d3f653 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=050e782d77918b4985c3a5fdf9dbdc4c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-glib-0.92 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-glib-0.92 new file mode 100644 index 0000000000..758db1af81 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-glib-0.92 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst setup test +DEPEND=>=sys-apps/dbus-1.1 >=dev-libs/glib-2.26 >=dev-libs/expat-1.95.8 dev-util/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen app-text/xmlto >=dev-util/gtk-doc-1.4 ) +DESCRIPTION=D-Bus bindings for glib +EAPI=2 +HOMEPAGE=http://dbus.freedesktop.org/ +IUSE=bash-completion debug doc static-libs test bash-completion +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd +LICENSE=|| ( GPL-2 AFL-2.1 ) +PDEPEND=bash-completion? ( app-shells/bash-completion ) +RDEPEND=>=sys-apps/dbus-1.1 >=dev-libs/glib-2.26 >=dev-libs/expat-1.95.8 bash-completion? ( app-admin/eselect ) +SLOT=0 +SRC_URI=http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.92.tar.gz +_eclasses_=bash-completion f0fab76a98c0e4b3d72b6beb28d3f653 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=ceea851a254cbd523cadfbcafbb7fb90 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-1.2.10-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-1.2.10-r5 new file mode 100644 index 0000000000..c0e1ad2015 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-1.2.10-r5 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=The GLib library of C routines +HOMEPAGE=http://www.gtk.org/ +IUSE=hardened +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2.1 +SLOT=1 +SRC_URI=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/glib-1.2.10.tar.gz mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f31941ec5f6a80c3afb225a703745269 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.20.5-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.20.5-r1 new file mode 100644 index 0000000000..337a12d1ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.20.5-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 dev-util/gtk-doc-am doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=The GLib library of C routines +EAPI=2 +HOMEPAGE=http://www.gtk.org/ +IUSE=debug doc fam hardened selinux xattr +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) +SLOT=2 +SRC_URI=mirror://gnome/sources/glib/2.20/glib-2.20.5.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=b38ba52105255458695d6d6a97b9f5f2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.2 new file mode 100644 index 0000000000..dbd4faa4b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) +DESCRIPTION=The GLib library of C routines +EAPI=2 +HOMEPAGE=http://www.gtk.org/ +IUSE=debug doc fam hardened selinux xattr +KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) +SLOT=2 +SRC_URI=mirror://gnome/sources/glib/2.22/glib-2.22.2.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=bd991871edc3c1020a5f3803d2467982 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.3 new file mode 100644 index 0000000000..fc82e766d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) +DESCRIPTION=The GLib library of C routines +EAPI=2 +HOMEPAGE=http://www.gtk.org/ +IUSE=debug doc fam hardened selinux xattr +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) +SLOT=2 +SRC_URI=mirror://gnome/sources/glib/2.22/glib-2.22.3.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=89b228e987b8143477a0313afd320f09 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.4-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.4-r1 new file mode 100644 index 0000000000..27940f21af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.22.4-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) +DESCRIPTION=The GLib library of C routines +EAPI=2 +HOMEPAGE=http://www.gtk.org/ +IUSE=debug doc fam hardened selinux xattr +KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) +SLOT=2 +SRC_URI=mirror://gnome/sources/glib/2.22/glib-2.22.4.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=2e997e6a07e491f5872cbc176310d3b6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.26.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.26.1-r3 new file mode 100644 index 0000000000..40659363cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.26.1-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=virtual/libiconv sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( >=sys-apps/dbus-1.2.14 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=The GLib library of C routines +EAPI=2 +HOMEPAGE=http://www.gtk.org/ +IUSE=debug doc fam selinux +static-libs test xattr +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=virtual/libiconv sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) +SLOT=2 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/glib-2.26.1.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e pax-utils 3551398d6ede2b572568832730cc2a45 portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=64f984f32a865043bc81e1713c2872e1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.30.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.30.0 new file mode 100644 index 0000000000..99523f660f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/glib-2.30.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst preinst prepare test +DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( >=dev-util/gdbus-codegen-2.30.0 >=sys-apps/dbus-1.2.14 ) !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=The GLib library of C routines +EAPI=4 +HOMEPAGE=http://www.gtk.org/ +IUSE=debug doc fam selinux +static-libs systemtap test xattr test +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux +LICENSE=LGPL-2 +PDEPEND=!=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( >=dev-util/gdbus-codegen-2.30.0 >=sys-apps/dbus-1.2.14 ) !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=The GLib library of C routines +EAPI=4 +HOMEPAGE=http://www.gtk.org/ +IUSE=debug doc fam selinux +static-libs systemtap test xattr test +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux +LICENSE=LGPL-2 +PDEPEND=!=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=library to construct the suffix array and the Burrows-Wheeler transformed string +EAPI=3 +HOMEPAGE=http://code.google.com/p/libdivsufsort/ +KEYWORDS=amd64 arm x86 +LICENSE=MIT +SLOT=0 +SRC_URI=http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.gz +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cmake-utils 00f9fd5a80cf3605f6d9a2e808c48a92 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1b8e90a7c2d21055bc0bbd989cd8475a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libelf-0.8.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libelf-0.8.12 new file mode 100644 index 0000000000..7f5100c70e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libelf-0.8.12 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare unpack +DEPEND=!dev-libs/elfutils nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=A ELF object file access library +EAPI=2 +HOMEPAGE=http://www.mr511.de/software/ +IUSE=debug nls elibc_FreeBSD +KEYWORDS=arm ~alpha amd64 ~hppa ~ppc ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=!dev-libs/elfutils nls? ( sys-devel/gettext ) +SLOT=0 +SRC_URI=http://www.mr511.de/software/libelf-0.8.12.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a09c2a4ed713bd742e1632f1a0878755 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libffi-3.0.9-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libffi-3.0.9-r2 new file mode 100644 index 0000000000..0b76835633 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libffi-3.0.9-r2 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install unpack +DEPEND=test? ( dev-util/dejagnu ) +DESCRIPTION=a portable, high level programming interface to various calling conventions. +HOMEPAGE=http://sourceware.org/libffi/ +IUSE=debug static-libs test +KEYWORDS=alpha amd64 arm hppa mips ppc ppc64 x86 ~sparc-fbsd ~x86-fbsd +LICENSE=MIT +SLOT=0 +SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.0.9.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=5f492ab242259570c61cba07375a8119 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libgcrypt-1.4.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libgcrypt-1.4.6 new file mode 100644 index 0000000000..5392c0291e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libgcrypt-1.4.6 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install prepare +DEPEND=>=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=General purpose crypto library based on the code used in GnuPG +EAPI=2 +HOMEPAGE=http://www.gnupg.org/ +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/libgpg-error-1.5 +SLOT=0 +SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.4.6.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1f4b3c392d7016d4b240953bc984c9f3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libusb-0.1.12-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libusb-0.1.12-r5 new file mode 100644 index 0000000000..0343199417 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libusb-0.1.12-r5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install unpack +DEPEND=!dev-libs/libusb-compat doc? ( app-text/openjade app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-utils ~app-text/docbook-sgml-dtd-4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Userspace access to USB devices +HOMEPAGE=http://libusb.sourceforge.net/ +IUSE=debug doc nocxx +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=!dev-libs/libusb-compat +RESTRICT=test +SLOT=0 +SRC_URI=mirror://sourceforge/libusb/libusb-0.1.12.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8258bd501f9ffd1c646f4774d379d094 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libusb-0.1.12-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libusb-0.1.12-r6 new file mode 100644 index 0000000000..0343199417 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libusb-0.1.12-r6 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install unpack +DEPEND=!dev-libs/libusb-compat doc? ( app-text/openjade app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-utils ~app-text/docbook-sgml-dtd-4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Userspace access to USB devices +HOMEPAGE=http://libusb.sourceforge.net/ +IUSE=debug doc nocxx +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=!dev-libs/libusb-compat +RESTRICT=test +SLOT=0 +SRC_URI=mirror://sourceforge/libusb/libusb-0.1.12.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8258bd501f9ffd1c646f4774d379d094 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libxml2-2.7.8-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libxml2-2.7.8-r4 new file mode 100644 index 0000000000..0d01eda3cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libxml2-2.7.8-r4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[-build,xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Version 2 of the library to manipulate XML files +EAPI=3 +HOMEPAGE=http://www.xmlsoft.org/ +IUSE=debug doc examples icu ipv6 python readline static-libs test +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +LICENSE=MIT +RDEPEND=sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[-build,xml] ) +SLOT=2 +SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz ) +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c prefix 21058c21ca48453d771df15500873ede python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ba1525a6e630a14882f73a19607753fe diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/m17n-lib-1.6.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/m17n-lib-1.6.1-r1 new file mode 100644 index 0000000000..2025d07574 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/m17n-lib-1.6.1-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=>=dev-db/m17n-db-1.6.1 dev-libs/libxml2 dev-util/pkgconfig +DESCRIPTION=Multilingual Library for Unix/Linux +EAPI=2 +HOMEPAGE=http://www.m17n.org/m17n-lib/ +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 +LICENSE=LGPL-2.1 +RDEPEND=>=dev-db/m17n-db-1.6.1 dev-libs/libxml2 +SLOT=0 +SRC_URI=mirror://gentoo/m17n-lib-1.6.1.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=54ea67e11d56fb7ae809c8d5064abd8a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.8.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.8.6-r1 new file mode 100644 index 0000000000..da8776c26b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.8.6-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install postinst prepare +DESCRIPTION=Netscape Portable Runtime +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/nspr/ +IUSE=debug +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.6/src/nspr-4.8.6.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=f6d024ce87855dfba096c883cb5e6f21 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.8.6-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.8.6-r5 new file mode 100644 index 0000000000..da8776c26b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.8.6-r5 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install postinst prepare +DESCRIPTION=Netscape Portable Runtime +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/nspr/ +IUSE=debug +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.6/src/nspr-4.8.6.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=f6d024ce87855dfba096c883cb5e6f21 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.9.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.9.2 new file mode 100644 index 0000000000..42e32fa88b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nspr-4.9.2 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install postinst prepare +DESCRIPTION=Netscape Portable Runtime +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/nspr/ +IUSE=debug +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.2/src/nspr-4.9.2.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e683680383a479ab4d58bbe602835646 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.12.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.12.8 new file mode 100644 index 0000000000..982f9735d3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.12.8 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm prepare +DEPEND=dev-util/pkgconfig +DESCRIPTION=Mozilla's Network Security Services library that implements PKI support +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +RDEPEND=>=dev-libs/nspr-4.8.6 >=dev-db/sqlite-3.5 sys-libs/zlib +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_8_RTM/src/nss-3.12.8.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=53744bd6290f65d30515b38bd6cbb628 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.12.8-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.12.8-r9 new file mode 100644 index 0000000000..982f9735d3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.12.8-r9 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm prepare +DEPEND=dev-util/pkgconfig +DESCRIPTION=Mozilla's Network Security Services library that implements PKI support +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +RDEPEND=>=dev-libs/nspr-4.8.6 >=dev-db/sqlite-3.5 sys-libs/zlib +SLOT=0 +SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_8_RTM/src/nss-3.12.8.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=53744bd6290f65d30515b38bd6cbb628 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.14 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.14 new file mode 100644 index 0000000000..9a46be98b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/nss-3.14 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm prepare +DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.2 +DESCRIPTION=Mozilla's Network Security Services library that implements PKI support +EAPI=3 +HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) +RDEPEND=>=dev-libs/nspr-4.9.2 >=dev-db/sqlite-3.5 sys-libs/zlib !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=PKCS#11 provider for IBM cryptographic hardware +EAPI=2 +HOMEPAGE=http://sourceforge.net/projects/opencryptoki +IUSE=tpmtok cros_workon_tree_8f71d13ce4e947d8a631fc03d8bfd4f63587d3a7 +KEYWORDS=amd64 arm x86 +LICENSE=CPL-0.5 +RDEPEND=tpmtok? ( app-crypt/trousers ) dev-libs/openssl +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=963260f66cd0048715ad57bc248f7dd6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/opencryptoki-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/opencryptoki-9999 new file mode 100644 index 0000000000..b3f8d981d1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/opencryptoki-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=tpmtok? ( app-crypt/trousers ) dev-libs/openssl dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=PKCS#11 provider for IBM cryptographic hardware +EAPI=2 +HOMEPAGE=http://sourceforge.net/projects/opencryptoki +IUSE=tpmtok cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=CPL-0.5 +RDEPEND=tpmtok? ( app-crypt/trousers ) dev-libs/openssl +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d64b29dc1686832e88ecd1546878ade2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/openssl-1.0.1c-r8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/openssl-1.0.1c-r8 new file mode 100644 index 0000000000..0fb7539c46 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/openssl-1.0.1c-r8 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install postinst preinst prepare setup unpack +DEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) sys-apps/diffutils >=dev-lang/perl-5 test? ( sys-devel/bc ) dev-vcs/git +DESCRIPTION=full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1) +EAPI=4 +HOMEPAGE=http://www.openssl.org/ +IUSE=bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib heartbeat cros_workon_tree_3c54d51cd31fbd357c6a08a37e4281836018d2a9 +KEYWORDS=alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 amd64-fbsd sparc-fbsd x86-fbsd +LICENSE=openssl +PDEPEND=app-misc/ca-certificates +RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8b3128a767668e3c3dddeeb3e3b5c848 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/openssl-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/openssl-9999 new file mode 100644 index 0000000000..ec48475c9c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/openssl-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install postinst preinst prepare setup unpack +DEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) sys-apps/diffutils >=dev-lang/perl-5 test? ( sys-devel/bc ) dev-vcs/git +DESCRIPTION=full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1) +EAPI=4 +HOMEPAGE=http://www.openssl.org/ +IUSE=bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib heartbeat cros_workon_tree_ +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd +LICENSE=openssl +PDEPEND=app-misc/ca-certificates +RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3da4645816ba3126c1aa28d72679dd71 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/protobuf-2.2.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/protobuf-2.2.0 new file mode 100644 index 0000000000..4a91257e8e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/protobuf-2.2.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) >=app-admin/eselect-python-20091230 java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) ) +DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data +EAPI=2 +HOMEPAGE=http://code.google.com/p/protobuf/ +IUSE=emacs examples java python vim-syntax elibc_FreeBSD source java +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=Apache-2.0 +RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) >=app-admin/eselect-python-20091230 java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) ) +SLOT=0 +SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.2.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 elisp-common 3322f14f031ddc95feccd9089c9adc59 eutils 33ef77a15337022e05342d2c772a7a5a java-pkg-opt-2 31a1663247652448431dcc8c194e2752 java-utils-2 6beafc7c3d1dbae83a4478182b158f66 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=590e10243fc72000dba115a62388f153 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/protobuf-2.3.0-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/protobuf-2.3.0-r4 new file mode 100644 index 0000000000..a898584fab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/protobuf-2.3.0-r4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=java? ( >=virtual/jdk-1.5 ) python? ( dev-lang/python dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 python-runtime? ( =dev-lang/python-2* ) >=app-admin/eselect-python-20091230 python-runtime? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) ) +DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data +EAPI=3 +HOMEPAGE=http://code.google.com/p/protobuf/ +IUSE=emacs examples java python python-runtime static-libs vim-syntax elibc_FreeBSD source java +KEYWORDS=amd64 arm ppc ppc64 x86 ~x64-macos +LICENSE=Apache-2.0 +RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) >=app-admin/eselect-python-20091230 python-runtime? ( =dev-lang/python-2* ) >=app-admin/eselect-python-20091230 python-runtime? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) ) +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/protobuf-2.3.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 distutils b4c334e216d998c4ce4b750cb091e42e elisp-common 3322f14f031ddc95feccd9089c9adc59 eutils 33ef77a15337022e05342d2c772a7a5a java-pkg-opt-2 31a1663247652448431dcc8c194e2752 java-utils-2 6beafc7c3d1dbae83a4478182b158f66 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 python-old-eapi3 bf34cae2aef2d28f4760534398db7517 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=1790e8f95815ab757c77e24c958758c6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/pyzy-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/pyzy-0.1.0 new file mode 100644 index 0000000000..d8f2de9d25 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/pyzy-0.1.0 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure prepare +DEPEND=>=dev-db/sqlite-3.6.18 >=dev-libs/glib-2.24 sys-apps/util-linux dev-util/pkgconfig >=sys-devel/gettext-0.16.1 +DESCRIPTION=the Chinese PinYin and Bopomofo conversion library +EAPI=4 +HOMEPAGE=http://code.google.com/p/pyzy/ +KEYWORDS=amd64 x86 arm +LICENSE=LGPL-2.1 +RDEPEND=>=dev-db/sqlite-3.6.18 >=dev-libs/glib-2.24 sys-apps/util-linux +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/pyzy-0.1.0.tar.gz http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/pyzy-database-1.0.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5055b12f765a3ef77ee903bb09db52ea diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/pyzy-0.1.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/pyzy-0.1.0-r1 new file mode 100644 index 0000000000..d8f2de9d25 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/pyzy-0.1.0-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure prepare +DEPEND=>=dev-db/sqlite-3.6.18 >=dev-libs/glib-2.24 sys-apps/util-linux dev-util/pkgconfig >=sys-devel/gettext-0.16.1 +DESCRIPTION=the Chinese PinYin and Bopomofo conversion library +EAPI=4 +HOMEPAGE=http://code.google.com/p/pyzy/ +KEYWORDS=amd64 x86 arm +LICENSE=LGPL-2.1 +RDEPEND=>=dev-db/sqlite-3.6.18 >=dev-libs/glib-2.24 sys-apps/util-linux +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/pyzy-0.1.0.tar.gz http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/pyzy-database-1.0.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5055b12f765a3ef77ee903bb09db52ea diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/vectormath-166 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/vectormath-166 new file mode 100644 index 0000000000..c7d243919a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/vectormath-166 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=Sony vector math library. +EAPI=2 +HOMEPAGE=http://www.bulletphysics.com/Bullet/phpBB2/viewforum.php?f=18 +KEYWORDS=amd64 x86 arm +LICENSE=BSD +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/vectormath-svn-166.tar.gz +_md5_=f10a44192a37b8607474101cd559d9d2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.14-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.14-r1 new file mode 100644 index 0000000000..431cab680e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.14-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst postrm prepare setup test +DEPEND=|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/elementtree ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ssl] +DESCRIPTION=Python client library for Google data APIs +EAPI=3 +HOMEPAGE=http://code.google.com/p/gdata-python-client/ http://pypi.python.org/pypi/gdata +IUSE=examples +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd +LICENSE=Apache-2.0 +RDEPEND=|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/elementtree ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ssl] +SLOT=0 +SRC_URI=http://gdata-python-client.googlecode.com/files/gdata-2.0.14.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d0355ac0473cb3e06e52cbbc160f6159 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygobject-2.18.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygobject-2.18.0-r1 new file mode 100644 index 0000000000..59e0192357 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygobject-2.18.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=GLib's GObject library bindings for Python +EAPI=3 +HOMEPAGE=http://www.pygtk.org/ +IUSE=doc examples libffi test test +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) !=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) +SLOT=2 +SRC_URI=mirror://gnome/sources/pygobject/2.18/pygobject-2.18.0.tar.bz2 +_eclasses_=alternatives eb864f6e50a20036e4cd47c8fd8f64d1 autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed virtualx e9162f65645513120b4e12863a5fa972 +_md5_=db8ea25e2b140affc702b41dcfd363cd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygobject-2.18.0-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygobject-2.18.0-r4 new file mode 100644 index 0000000000..59e0192357 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygobject-2.18.0-r4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=GLib's GObject library bindings for Python +EAPI=3 +HOMEPAGE=http://www.pygtk.org/ +IUSE=doc examples libffi test test +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) !=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) +SLOT=2 +SRC_URI=mirror://gnome/sources/pygobject/2.18/pygobject-2.18.0.tar.bz2 +_eclasses_=alternatives eb864f6e50a20036e4cd47c8fd8f64d1 autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed virtualx e9162f65645513120b4e12863a5fa972 +_md5_=db8ea25e2b140affc702b41dcfd363cd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygtk-2.14.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygtk-2.14.1-r2 new file mode 100644 index 0000000000..2ffc651727 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygtk-2.14.1-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test +DEPEND=>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.13.6 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.15.3 dev-python/numpy >=gnome-base/libglade-2.5:2.0 doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=GTK+2 bindings for Python +EAPI=3 +HOMEPAGE=http://www.pygtk.org/ +IUSE=doc examples test +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.13.6 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.15.3 dev-python/numpy >=gnome-base/libglade-2.5:2.0 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) +SLOT=2 +SRC_URI=mirror://gnome/sources/pygtk/2.14/pygtk-2.14.1.tar.bz2 +_eclasses_=alternatives eb864f6e50a20036e4cd47c8fd8f64d1 autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed virtualx e9162f65645513120b4e12863a5fa972 +_md5_=d9da942f9befd3bf1b58a783b733f904 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygtk-2.14.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygtk-2.14.1-r3 new file mode 100644 index 0000000000..2ffc651727 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/pygtk-2.14.1-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test +DEPEND=>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.13.6 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.15.3 dev-python/numpy >=gnome-base/libglade-2.5:2.0 doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=GTK+2 bindings for Python +EAPI=3 +HOMEPAGE=http://www.pygtk.org/ +IUSE=doc examples test +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.13.6 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.15.3 dev-python/numpy >=gnome-base/libglade-2.5:2.0 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) +SLOT=2 +SRC_URI=mirror://gnome/sources/pygtk/2.14/pygtk-2.14.1.tar.bz2 +_eclasses_=alternatives eb864f6e50a20036e4cd47c8fd8f64d1 autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed virtualx e9162f65645513120b4e12863a5fa972 +_md5_=d9da942f9befd3bf1b58a783b733f904 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/apitrace-3.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/apitrace-3.0-r1 new file mode 100644 index 0000000000..e427664480 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/apitrace-3.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=app-arch/snappy media-libs/libpng sys-libs/zlib media-libs/mesa[egl?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] =x11-libs/qt-core-4.7:4 >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-webkit-4.7:4 >=dev-libs/qjson-0.5 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) +DESCRIPTION=A tool for tracing, analyzing, and debugging graphics APIs +EAPI=2 +HOMEPAGE=https://github.com/apitrace/apitrace +IUSE=egl multilib qt4 +KEYWORDS=amd64 arm x86 +LICENSE=MIT +RDEPEND=app-arch/snappy media-libs/libpng sys-libs/zlib media-libs/mesa[egl?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] =x11-libs/qt-core-4.7:4 >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-webkit-4.7:4 >=dev-libs/qjson-0.5 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) +SLOT=0 +SRC_URI=https://github.com/apitrace/apitrace/tarball/3.0 -> apitrace-3.0.tar.gz +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cmake-utils 00f9fd5a80cf3605f6d9a2e808c48a92 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1cc5b71d72013b87bff5cd830ca2f4e4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/bsdiff-4.3-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/bsdiff-4.3-r5 new file mode 100644 index 0000000000..e6b917697a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/bsdiff-4.3-r5 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install prepare +DEPEND=app-arch/bzip2 dev-libs/libdivsufsort +DESCRIPTION=bsdiff: Binary Differencer using a suffix alg +EAPI=2 +HOMEPAGE=http://www.daemonology.net/bsdiff/ +KEYWORDS=alpha amd64 arm hppa ia64 mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos +LICENSE=BSD-2 +RDEPEND=app-arch/bzip2 dev-libs/libdivsufsort +SLOT=0 +SRC_URI=http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=518d75756c55c3fbf5a9bd3851385b60 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-0.0.1-r1289 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-0.0.1-r1289 new file mode 100644 index 0000000000..ef9abe0eb8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-0.0.1-r1289 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install setup unpack +DEPEND=>=app-admin/eselect-python-20091230 dev-vcs/git +DESCRIPTION=Chromium OS build utilities +EAPI=2 +HOMEPAGE=http://www.chromium.org/chromium-os +IUSE=cros_workon_tree_fac7e77188abf62a8c29d1aab875e6bc72d892b2 +KEYWORDS=amd64 +LICENSE=BSD +RDEPEND=>=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9e3cc6f5c225982927273794f0acd81d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-9999 new file mode 100644 index 0000000000..3e8f140b2a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install setup unpack +DEPEND=>=app-admin/eselect-python-20091230 dev-vcs/git +DESCRIPTION=Chromium OS build utilities +EAPI=2 +HOMEPAGE=http://www.chromium.org/chromium-os +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 +LICENSE=BSD +RDEPEND=>=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=85de96d2b95d71d0ee06ed3ec39548ac diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/dbus-spy-0.0.1-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/dbus-spy-0.0.1-r5 new file mode 100644 index 0000000000..c85f597b7c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/dbus-spy-0.0.1-r5 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=python dbus sniffer +EAPI=4 +HOMEPAGE=http://vidner.net/martin/software/dbus-spy/ +IUSE=cros_workon_tree_ecdfeb706a9f6612b8adc3fb528c1ae8e5d2e09e +KEYWORDS=amd64 arm x86 +LICENSE=CCPL-Attribution-3.0 +RDEPEND=dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e5235ce1743422581ce29083929f5114 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/dbus-spy-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/dbus-spy-9999 new file mode 100644 index 0000000000..9e166683a8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/dbus-spy-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=python dbus sniffer +EAPI=4 +HOMEPAGE=http://vidner.net/martin/software/dbus-spy/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=CCPL-Attribution-3.0 +RDEPEND=dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7efa89b9395444985337a94bcf1f22b6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/git-1.7.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/git-1.7.0 new file mode 100644 index 0000000000..bfe88fe1f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/git-1.7.0 @@ -0,0 +1,4 @@ +DEFINED_PHASES=- +KEYWORDS=amd64 arm x86 +SLOT=0 +_md5_=95085b963dd6b0f8adff7371f9800044 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/gob-2.0.17 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/gob-2.0.17 new file mode 100644 index 0000000000..8d1361a323 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/gob-2.0.17 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install postinst postrm preinst unpack +DEPEND=>=dev-libs/glib-2 dev-util/pkgconfig sys-devel/flex >=sys-apps/sed-4 +DESCRIPTION=Preprocessor for making GTK+ objects with inline C code +HOMEPAGE=http://www.5z.com/jirka/gob.html +KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos +LICENSE=GPL-2 +RDEPEND=>=dev-libs/glib-2 +SLOT=2 +SRC_URI=mirror://gnome/sources/gob2/2.0/gob2-2.0.17.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=fc59b68283510d047ba724cadc19e887 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/hdctools-0.0.1-r184 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/hdctools-0.0.1-r184 new file mode 100644 index 0000000000..e5f2dec212 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/hdctools-0.0.1-r184 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install postinst postrm prepare setup unpack +DEPEND=>=dev-embedded/libftdi-0.18 dev-libs/libusb dev-python/numpy dev-python/pexpect dev-python/pyserial dev-python/pyusb app-text/htmltidy dev-vcs/git >=app-admin/eselect-python-20091230 dev-lang/python +DESCRIPTION=Software to communicate with servo/miniservo debug boards +EAPI=2 +IUSE=cros_workon_tree_2cd6599248d6a4c113086df61d6767dc9c3bc8f7 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=>=dev-embedded/libftdi-0.18 dev-libs/libusb dev-python/numpy dev-python/pexpect dev-python/pyserial dev-python/pyusb >=app-admin/eselect-python-20091230 dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bf30dee3e0456bd3a33e023445b32579 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/hdctools-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/hdctools-9999 new file mode 100644 index 0000000000..732b22f54d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/hdctools-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install postinst postrm prepare setup unpack +DEPEND=>=dev-embedded/libftdi-0.18 dev-libs/libusb dev-python/numpy dev-python/pexpect dev-python/pyserial dev-python/pyusb app-text/htmltidy dev-vcs/git >=app-admin/eselect-python-20091230 dev-lang/python +DESCRIPTION=Software to communicate with servo/miniservo debug boards +EAPI=2 +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=>=dev-embedded/libftdi-0.18 dev-libs/libusb dev-python/numpy dev-python/pexpect dev-python/pyserial dev-python/pyusb >=app-admin/eselect-python-20091230 dev-lang/python +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=40db8b623330164984000cec502f48ef diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/lcov-1.9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/lcov-1.9 new file mode 100644 index 0000000000..c1d5b25f17 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/lcov-1.9 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install prepare +DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov +EAPI=2 +HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php +KEYWORDS=amd64 ~ppc x86 +LICENSE=GPL-2 +RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png] +SLOT=0 +SRC_URI=mirror://sourceforge/ltp/lcov-1.9.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=756c26f995eecc2fea5a0347bc119e2c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/libc-bench-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/libc-bench-0.0.1-r3 new file mode 100644 index 0000000000..e7eb7edd12 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/libc-bench-0.0.1-r3 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=libc benchmark originally from http://www.etalabs.net/src/libc-bench/ +EAPI=2 +HOMEPAGE=http://www.etalabs.net/src/libc-bench/ +IUSE=cros_workon_tree_fb0ecd51a4636d40f23ccfc7492087b17e28b1dd +KEYWORDS=amd64 arm x86 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2078a3a8b6cf8618dd9c81d6612688f4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/libc-bench-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/libc-bench-9999 new file mode 100644 index 0000000000..db2fd3b2a9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/libc-bench-9999 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=libc benchmark originally from http://www.etalabs.net/src/libc-bench/ +EAPI=2 +HOMEPAGE=http://www.etalabs.net/src/libc-bench/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e992dfc732c68ffe28752ecd4af1de0a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-3.4-r2115 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-3.4-r2115 new file mode 100644 index 0000000000..ee8b7ffb51 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-3.4-r2115 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf-next doc? ( app-text/asciidoc app-text/xmlto ) dev-vcs/git +DESCRIPTION=Userland tools for Linux Performance Counters +EAPI=4 +HOMEPAGE=http://perf.wiki.kernel.org/ +IUSE=+demangle +doc perl python ncurses cros_workon_tree_cf09dbf486aa2e7f53a7236d4d77165325586be8 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf-next +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=496cf1201cf0f4b3db3128a5f3300140 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-9999 new file mode 100644 index 0000000000..417b53b3c4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf-next doc? ( app-text/asciidoc app-text/xmlto ) dev-vcs/git +DESCRIPTION=Userland tools for Linux Performance Counters +EAPI=4 +HOMEPAGE=http://perf.wiki.kernel.org/ +IUSE=+demangle +doc perl python ncurses cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf-next +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=c473f126c5d5e01c31d5a9a41f833306 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-next-3.4_rc7-r254 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-next-3.4_rc7-r254 new file mode 100644 index 0000000000..25502065a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-next-3.4_rc7-r254 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf doc? ( app-text/asciidoc app-text/xmlto ) dev-vcs/git +DESCRIPTION=Userland tools for Linux Performance Counters +EAPI=4 +HOMEPAGE=http://perf.wiki.kernel.org/ +IUSE=+demangle +doc perl python ncurses cros_workon_tree_b80c11182613432cf1192946a2c95ea1cd742d9d +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=338a2961c37538bd098c63e73386bcbe diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-next-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-next-9999 new file mode 100644 index 0000000000..868f190dd4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/perf-next-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf doc? ( app-text/asciidoc app-text/xmlto ) dev-vcs/git +DESCRIPTION=Userland tools for Linux Performance Counters +EAPI=4 +HOMEPAGE=http://perf.wiki.kernel.org/ +IUSE=+demangle +doc perl python ncurses cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=demangle? ( sys-devel/binutils ) dev-libs/elfutils ncurses? ( dev-libs/newt ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) !dev-util/perf +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=77a046d55c4ddf65aa00f3da1bea7dcc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/quipper-0.0.1-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/quipper-0.0.1-r11 new file mode 100644 index 0000000000..05ad98b0b7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/quipper-0.0.1-r11 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install setup test unpack +DEPEND=test? ( dev-cpp/gtest ) dev-libs/openssl dev-libs/protobuf dev-vcs/git +DESCRIPTION=Program used to collect performance data on ChromeOS machines +EAPI=4 +IUSE=cros_workon_tree_1af8f7cfbc13d84dd2b17d8492123a49ea14544b +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=virtual/perf dev-libs/openssl dev-libs/protobuf +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b0722f4e6e6e87f815b0112a5ea2388e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/quipper-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/quipper-9999 new file mode 100644 index 0000000000..f6df6eca44 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/quipper-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install setup test unpack +DEPEND=test? ( dev-cpp/gtest ) dev-libs/openssl dev-libs/protobuf dev-vcs/git +DESCRIPTION=Program used to collect performance data on ChromeOS machines +EAPI=4 +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=virtual/perf dev-libs/openssl dev-libs/protobuf +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=775c9c7b637efb11527fe7386b393781 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/subversion-1.6.9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/subversion-1.6.9 new file mode 100644 index 0000000000..8010f222ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/subversion-1.6.9 @@ -0,0 +1,4 @@ +DEFINED_PHASES=- +KEYWORDS=amd64 arm x86 +SLOT=0 +_md5_=846ad08a92499dd71ec97a312c27051b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/systemtap-1.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/systemtap-1.5 new file mode 100644 index 0000000000..2b9716ba56 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/systemtap-1.5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare setup +DEPEND=>=dev-libs/elfutils-0.131 sys-libs/libcap sqlite? ( =dev-db/sqlite-3* ) +DESCRIPTION=A linux trace/probe tool +EAPI=2 +HOMEPAGE=http://sourceware.org/systemtap/ +IUSE=sqlite +KEYWORDS=~amd64 arm ~x86 +LICENSE=GPL-2 +RDEPEND=>=dev-libs/elfutils-0.131 sys-libs/libcap sqlite? ( =dev-db/sqlite-3* ) +SLOT=0 +SRC_URI=http://sources.redhat.com/systemtap/ftp/releases/systemtap-1.5.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=a01494ea641045d1db8e3b937e8f0106 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xnu_quick_test-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xnu_quick_test-0.0.1-r3 new file mode 100644 index 0000000000..58cab75308 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xnu_quick_test-0.0.1-r3 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Simple kernel regression test suite +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_275bcb3a81b419a073305e0ab91feca9c18ff48e +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=0498323cca58409871b7ae03aee512ef diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xnu_quick_test-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xnu_quick_test-9999 new file mode 100644 index 0000000000..52d6251a42 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xnu_quick_test-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Simple kernel regression test suite +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d38d0d75355eedcc4b782448044ce3e7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xxd-1.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xxd-1.10 new file mode 100644 index 0000000000..d0e20bc8c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xxd-1.10 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install prepare +DESCRIPTION=make a hexdump or do the reverse +EAPI=4 +HOMEPAGE=http://ftp.uni-erlangen.de/pub/utilities/etc/?order=s +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://ftp.uni-erlangen.de/pub/utilities/etc/xxd-1.10.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=74c48cb092b0a7dcfc76998cfe09efea diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xxd-1.10-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xxd-1.10-r2 new file mode 100644 index 0000000000..d0e20bc8c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/xxd-1.10-r2 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install prepare +DESCRIPTION=make a hexdump or do the reverse +EAPI=4 +HOMEPAGE=http://ftp.uni-erlangen.de/pub/utilities/etc/?order=s +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://ftp.uni-erlangen.de/pub/utilities/etc/xxd-1.10.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=74c48cb092b0a7dcfc76998cfe09efea diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/git-1.7.2.3-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/git-1.7.2.3-r1 new file mode 100644 index 0000000000..6bef46fa29 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/git-1.7.2.3-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-util/git !blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) +DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team +EAPI=3 +HOMEPAGE=http://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion +KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +PDEPEND=bash-completion? ( app-shells/bash-completion ) +RDEPEND=dev-util/git !blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) gtk? ( >=dev-python/pygtk-2.8 || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) ) bash-completion? ( app-admin/eselect ) +SLOT=0 +SRC_URI=mirror://kernel/software/scm/git/git-1.7.2.3.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.2.3.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.2.3.tar.bz2 ) +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b bash-completion f0fab76a98c0e4b3d72b6beb28d3f653 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 elisp-common 3322f14f031ddc95feccd9089c9adc59 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e perl-module 62eaf4b4e2dfe2d7766c20bfd93e7199 portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=884c0ff94f438b4e0ec3934109ade52b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/patman-0.0.1-r21 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/patman-0.0.1-r21 new file mode 100644 index 0000000000..e94b00ff1b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/patman-0.0.1-r21 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst postrm prepare setup unpack +DEPEND=dev-python/setuptools dev-vcs/git >=app-admin/eselect-python-20091230 =dev-lang/python-2* +DESCRIPTION=Patman tool (from U-Boot) for sending patches upstream +EAPI=4 +HOMEPAGE=http://www.denx.de/wiki/U-Boot +IUSE=cros_workon_tree_8595e217edc9baad42dd848f58b4cbd0c85c0200 +KEYWORDS=amd64 x86 +LICENSE=GPL-2 +RDEPEND=>=app-admin/eselect-python-20091230 =dev-lang/python-2* +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=24ef3c248fef65c39f5dd45568b8456c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/patman-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/patman-9999 new file mode 100644 index 0000000000..2521477456 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/patman-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst postrm prepare setup unpack +DEPEND=dev-python/setuptools dev-vcs/git >=app-admin/eselect-python-20091230 =dev-lang/python-2* +DESCRIPTION=Patman tool (from U-Boot) for sending patches upstream +EAPI=4 +HOMEPAGE=http://www.denx.de/wiki/U-Boot +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=app-admin/eselect-python-20091230 =dev-lang/python-2* +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=42a6829f9415d72a854e8e16543717a0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/subversion-1.6.9-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/subversion-1.6.9-r1 new file mode 100644 index 0000000000..0030f2256a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/subversion-1.6.9-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack +DEPEND=>=dev-db/sqlite-3.4[threadsafe] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( =sys-libs/db-4* ) emacs? ( virtual/emacs ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) ruby? ( >=dev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) dev-util/subversion net-misc/neon webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) >=sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( dev-util/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kde? ( dev-util/pkgconfig ) nls? ( sys-devel/gettext ) test? ( webdav-neon? ( || ( =www-servers/apache-2.4*[apache2_modules_auth_basic,apache2_modules_authn_core,apache2_modules_authn_file,apache2_modules_authz_core,apache2_modules_authz_user,apache2_modules_dav,apache2_modules_log_config,apache2_modules_unixd] =www-servers/apache-2.2*[apache2_modules_auth_basic,apache2_modules_authn_file,apache2_modules_dav,apache2_modules_log_config] ) ) webdav-serf? ( || ( =www-servers/apache-2.4*[apache2_modules_auth_basic,apache2_modules_authn_core,apache2_modules_authn_file,apache2_modules_authz_core,apache2_modules_authz_user,apache2_modules_dav,apache2_modules_log_config,apache2_modules_unixd] =www-servers/apache-2.2*[apache2_modules_auth_basic,apache2_modules_authn_file,apache2_modules_dav,apache2_modules_log_config] ) ) ) webdav-neon? ( dev-util/pkgconfig ) apache2? ( =www-servers/apache-2* ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 +DESCRIPTION=Advanced version control system +EAPI=2 +HOMEPAGE=http://subversion.tigris.org/ +IUSE=apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf apache2 bash-completion elibc_FreeBSD java +KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd +LICENSE=Subversion +PDEPEND=bash-completion? ( app-shells/bash-completion ) +RDEPEND=>=dev-db/sqlite-3.4[threadsafe] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( =sys-libs/db-4* ) emacs? ( virtual/emacs ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) ruby? ( >=dev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) dev-util/subversion net-misc/neon webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) bash-completion? ( app-admin/eselect ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://subversion.tigris.org/downloads/subversion-1.6.9.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b bash-completion f0fab76a98c0e4b3d72b6beb28d3f653 binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 db-use 8d7baa3efc7c38c7d5c5e7353c5460dc depend.apache a471783c63e68987a2b20eb46f9edf68 elisp-common 3322f14f031ddc95feccd9089c9adc59 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 java-pkg-opt-2 31a1663247652448431dcc8c194e2752 java-utils-2 6beafc7c3d1dbae83a4478182b158f66 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e perl-module 62eaf4b4e2dfe2d7766c20bfd93e7199 portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=688be9dbf47d1e1d92dfc588fc41dd7e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/croscorefonts-1.23.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/croscorefonts-1.23.0 new file mode 100644 index 0000000000..f0d77e024f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/croscorefonts-1.23.0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 +DESCRIPTION=Arimo, Tinos and Cousine in 4 weights and Symbol Neu developed by Monotype Imaging for Chrom*OS +IUSE=X +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd +LICENSE=Apache-2.0 +RESTRICT=strip binchecks +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.23.0.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a font bc3df4ed373e09f86a90e8fad39034d6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=208139e39535a1ded7ffa3d2e8131ba2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/droidfonts-cros-20121206 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/droidfonts-cros-20121206 new file mode 100644 index 0000000000..b2011ba45d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/droidfonts-cros-20121206 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 +DESCRIPTION=The latest fonts including Droid Thai, Hebrew and Arabic +IUSE=X +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd +LICENSE=Apache-2.0 +RESTRICT=strip binchecks +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/droidfonts-cros-20121206.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a font bc3df4ed373e09f86a90e8fad39034d6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5110263ff5b4cc5706419f23ece2e764 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ja-ipafonts-003.03-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ja-ipafonts-003.03-r1 new file mode 100644 index 0000000000..d5c427828c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ja-ipafonts-003.03-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 +DESCRIPTION=Japanese TrueType fonts developed by IPA (Information-technology Promotion Agency, Japan) +HOMEPAGE=http://ossipedia.ipa.go.jp/ipafont/ +IUSE=X +KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd +LICENSE=IPAfont +RESTRICT=strip binchecks +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/IPAMGTTC00303_r1.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a font bc3df4ed373e09f86a90e8fad39034d6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7e2f7fd9def6fe187be69c8393674c0d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ko-nanumfonts-3.10.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ko-nanumfonts-3.10.0 new file mode 100644 index 0000000000..fa98b72cb6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ko-nanumfonts-3.10.0 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 +DESCRIPTION=Korean fonts released by Naver Inc. under OFL : NanumGothic (regular, bold), NanumMyeongjo (regular, bold) +HOMEPAGE=http://hangeul.naver.com/index.nhn +IUSE=X +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd +LICENSE=OFL-1.1 +RESTRICT=strip binchecks +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/ko-nanumfonts-3.10.0.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a font bc3df4ed373e09f86a90e8fad39034d6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a490ed912115f6b80cc4abe4bcffebdc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/lohitfonts-cros-2.5.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/lohitfonts-cros-2.5.0-r1 new file mode 100644 index 0000000000..cd1bb40255 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/lohitfonts-cros-2.5.0-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 +DESCRIPTION=6 Lohit fonts for Indic scripts +HOMEPAGE=http://fedorahosted.org/lohit +IUSE=X +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd +LICENSE=OFL-1.1 +RESTRICT=strip binchecks +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/lohitfonts-cros-2.5.0.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a font bc3df4ed373e09f86a90e8fad39034d6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7233c558514443c84ea7d4dfbba59763 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ml-anjalioldlipi-0.740 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ml-anjalioldlipi-0.740 new file mode 100644 index 0000000000..b00c533f0b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/ml-anjalioldlipi-0.740 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 +DESCRIPTION=AnjaliOldLipi font for the correct Malayalam rendering +HOMEPAGE=https://sites.google.com/site/cibu/anjalioldlipi-font +IUSE=X +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd +LICENSE=OFL-1.1 +RESTRICT=strip binchecks +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/ml-anjalioldlipi-0.740.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a font bc3df4ed373e09f86a90e8fad39034d6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ca46f20d08851cd159e8e562576107e7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/notofonts-20121206 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/notofonts-20121206 new file mode 100644 index 0000000000..9772537895 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-fonts/notofonts-20121206 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 +DESCRIPTION=Noto fonts developed by Monotype +IUSE=X +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd +LICENSE=Apache-2.0 +RESTRICT=strip binchecks +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/notofonts-20121206.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a font bc3df4ed373e09f86a90e8fad39034d6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ed956601427f571ef2aa6fa28636b538 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/imagemagick-6.5.8.8-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/imagemagick-6.5.8.8-r6 new file mode 100644 index 0000000000..d3322f4737 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/imagemagick-6.5.8.8-r6 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack +DEPEND=autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw ) fontconfig? ( media-libs/fontconfig ) fpx? ( media-libs/libfpx ) graphviz? ( >=media-gfx/graphviz-2.6 ) gs? ( app-text/ghostscript-gpl ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( >=media-libs/lcms-1.06 ) lqr? ( >=media-libs/liblqr-0.1.0 ) openexr? ( media-libs/openexr ) perl? ( >=dev-lang/perl-5.8.6-r6 ) png? ( media-libs/libpng ) raw? ( media-gfx/ufraw ) tiff? ( >=media-libs/tiff-3.5.5 ) truetype? ( =media-libs/freetype-2* corefonts? ( media-fonts/corefonts ) ) wmf? ( >=media-libs/libwmf-0.2.8 ) xml? ( >=dev-libs/libxml2-2.4.10 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM svg? ( >=gnome-base/librsvg-2.9.0 ) ) !dev-perl/perlmagick !media-gfx/graphicsmagick[imagemagick] !sys-apps/compare >=sys-devel/libtool-1.5.2-r6 >=sys-apps/sed-4 X? ( x11-proto/xextproto ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=A collection of tools and libraries for many image formats +EAPI=2 +HOMEPAGE=http://www.imagemagick.org/ +IUSE=autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw svg tiff truetype X wmf xml zlib +KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 +LICENSE=imagemagick +RDEPEND=autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw ) fontconfig? ( media-libs/fontconfig ) fpx? ( media-libs/libfpx ) graphviz? ( >=media-gfx/graphviz-2.6 ) gs? ( app-text/ghostscript-gpl ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( >=media-libs/lcms-1.06 ) lqr? ( >=media-libs/liblqr-0.1.0 ) openexr? ( media-libs/openexr ) perl? ( >=dev-lang/perl-5.8.6-r6 ) png? ( media-libs/libpng ) raw? ( media-gfx/ufraw ) tiff? ( >=media-libs/tiff-3.5.5 ) truetype? ( =media-libs/freetype-2* corefonts? ( media-fonts/corefonts ) ) wmf? ( >=media-libs/libwmf-0.2.8 ) xml? ( >=dev-libs/libxml2-2.4.10 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM svg? ( >=gnome-base/librsvg-2.9.0 ) ) !dev-perl/perlmagick !media-gfx/graphicsmagick[imagemagick] !sys-apps/compare >=sys-devel/libtool-1.5.2-r6 dev-lang/perl[-build] +RESTRICT=perl? ( userpriv ) +SLOT=0 +SRC_URI=mirror://imagemagick/ImageMagick-6.5.8-8.tar.bz2 mirror://imagemagick/legacy/ImageMagick-6.5.8-8.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e perl-app 514b28d9656ef299fc6f266f2c9c11a4 perl-module 62eaf4b4e2dfe2d7766c20bfd93e7199 portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=9ab0b98371ae110e1d702a24021a6ab0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/perceptualdiff-1.1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/perceptualdiff-1.1.1 new file mode 100644 index 0000000000..77e1a3664f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/perceptualdiff-1.1.1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install prepare +DEPEND=media-libs/freeimage +DESCRIPTION=An image comparison utility +EAPI=3 +HOMEPAGE=http://pdiff.sourceforge.net/ +KEYWORDS=amd64 x86 +LICENSE=GPL-2 +RDEPEND=media-libs/freeimage +SLOT=0 +SRC_URI=mirror://sourceforge/pdiff/perceptualdiff-1.1.1-src.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bfce1948ac7320be449d9bc1964e094d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/perceptualdiff-1.1.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/perceptualdiff-1.1.1-r1 new file mode 100644 index 0000000000..77e1a3664f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/perceptualdiff-1.1.1-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install prepare +DEPEND=media-libs/freeimage +DESCRIPTION=An image comparison utility +EAPI=3 +HOMEPAGE=http://pdiff.sourceforge.net/ +KEYWORDS=amd64 x86 +LICENSE=GPL-2 +RDEPEND=media-libs/freeimage +SLOT=0 +SRC_URI=mirror://sourceforge/pdiff/perceptualdiff-1.1.1-src.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bfce1948ac7320be449d9bc1964e094d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/ply-image-0.0.1-r37 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/ply-image-0.0.1-r37 new file mode 100644 index 0000000000..aab2b7a2d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/ply-image-0.0.1-r37 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=media-libs/libpng x11-libs/libdrm dev-vcs/git +DESCRIPTION=Utility that dumps a png image to the frame buffer. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_b3354be712b630953df065a934a4063b12fa2843 +KEYWORDS=amd64 x86 arm +LICENSE=GPL-2 +RDEPEND=media-libs/libpng x11-libs/libdrm +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=68691071c4a3e785182da1948590516b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/ply-image-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/ply-image-9999 new file mode 100644 index 0000000000..ec084f7e53 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-gfx/ply-image-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=media-libs/libpng x11-libs/libdrm dev-vcs/git +DESCRIPTION=Utility that dumps a png image to the frame buffer. +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=GPL-2 +RDEPEND=media-libs/libpng x11-libs/libdrm +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e4fc280eb6e4100ffeb3ed8c38db1880 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/fontconfig-2.7.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/fontconfig-2.7.1 new file mode 100644 index 0000000000..9b5ba460bf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/fontconfig-2.7.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 dev-util/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) +DESCRIPTION=A library for configuring and customizing font access +EAPI=2 +HOMEPAGE=http://fontconfig.org/ +IUSE=cros_host doc -highdpi -is_desktop +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=fontconfig +PDEPEND=app-admin/eselect-fontconfig +RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 +SLOT=1.0 +SRC_URI=http://fontconfig.org/release/fontconfig-2.7.1.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=79c57922c9a05105971e34a4682d51e1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/fontconfig-2.7.1-r34 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/fontconfig-2.7.1-r34 new file mode 100644 index 0000000000..9b5ba460bf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/fontconfig-2.7.1-r34 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 dev-util/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) +DESCRIPTION=A library for configuring and customizing font access +EAPI=2 +HOMEPAGE=http://fontconfig.org/ +IUSE=cros_host doc -highdpi -is_desktop +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=fontconfig +PDEPEND=app-admin/eselect-fontconfig +RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 +SLOT=1.0 +SRC_URI=http://fontconfig.org/release/fontconfig-2.7.1.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=79c57922c9a05105971e34a4682d51e1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freeimage-3.15.3-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freeimage-3.15.3-r2 new file mode 100644 index 0000000000..0497e958b8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freeimage-3.15.3-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=sys-libs/zlib jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) mng? ( media-libs/libmng ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( media-libs/libraw ) tiff? ( media-libs/ilmbase media-libs/tiff ) virtual/pkgconfig app-arch/unzip +DESCRIPTION=Image library supporting many formats +EAPI=4 +HOMEPAGE=http://freeimage.sourceforge.net/ +IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff +KEYWORDS=amd64 arm x86 +LICENSE=|| ( GPL-2 FIPL-1.0 ) +RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) mng? ( media-libs/libmng ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( media-libs/libraw ) tiff? ( media-libs/ilmbase media-libs/tiff ) +SLOT=0 +SRC_URI=mirror://sourceforge/freeimage/FreeImage3153.zip mirror://sourceforge/freeimage/FreeImage3153.pdf +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5ac4cbcdf6100c37b1bfddccfacca928 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freetype-2.4.11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freetype-2.4.11 new file mode 100644 index 0000000000..d5d48176ef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freetype-2.4.11 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare test unpack +DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=A high-quality and portable font engine +EAPI=4 +HOMEPAGE=http://www.freetype.org/ +IUSE=X auto-hinter bindist bzip2 debug doc fontforge static-libs utils +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +LICENSE=FTL GPL-2 +RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) +SLOT=2 +SRC_URI=mirror://sourceforge/freetype/freetype-2.4.11.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.11.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.11.tar.bz2 ) +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7bfc11a059ecad55b13f45e94e881cf7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glmark2-0.0.1-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glmark2-0.0.1-r7 new file mode 100644 index 0000000000..d6aa6a236d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glmark2-0.0.1-r7 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=media-libs/libpng media-libs/mesa[gles2?] x11-libs/libX11 dev-util/pkgconfig dev-vcs/git +DESCRIPTION=Opengl test suite +EAPI=4 +HOMEPAGE=https://launchpad.net/glmark2 +IUSE=gles2 drm cros_workon_tree_bdda989e471e778cc25f09f0334c2d4ee8d40ae7 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-3 +RDEPEND=media-libs/libpng media-libs/mesa[gles2?] x11-libs/libX11 +SLOT=0 +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 waf-utils 6a06d354382c90eecb783e2536b5316f +_md5_=78e988d6d02437236dbcc27ba6b26d59 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glmark2-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glmark2-9999 new file mode 100644 index 0000000000..bd7a24ad2c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glmark2-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=media-libs/libpng media-libs/mesa[gles2?] x11-libs/libX11 dev-util/pkgconfig dev-vcs/git +DESCRIPTION=Opengl test suite +EAPI=4 +HOMEPAGE=https://launchpad.net/glmark2 +IUSE=gles2 drm cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-3 +RDEPEND=media-libs/libpng media-libs/mesa[gles2?] x11-libs/libX11 +SLOT=0 +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 waf-utils 6a06d354382c90eecb783e2536b5316f +_md5_=135689a5729480b537d539d68d06c363 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glu-9.0.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glu-9.0.0 new file mode 100644 index 0000000000..ce427fe047 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/glu-9.0.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test unpack +DEPEND=virtual/opengl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=The OpenGL Utility Library +EAPI=4 +HOMEPAGE=http://cgit.freedesktop.org/mesa/glu/ +IUSE=multilib static-libs +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=SGI-B-2.0 +RDEPEND=virtual/opengl multilib? ( !app-emulation/emul-linux-x86-opengl ) +SLOT=0 +SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=09ba86aec543f9a9327f2e300b14d99f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/jpeg-6b-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/jpeg-6b-r11 new file mode 100644 index 0000000000..dd7f842422 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/jpeg-6b-r11 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install prepare +DESCRIPTION=library to load, handle and manipulate images in the JPEG format (transition package) +EAPI=2 +HOMEPAGE=http://www.ijg.org/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd +LICENSE=as-is +RDEPEND=!~media-libs/jpeg-6b:0 !media-libs/jpeg-compat +SLOT=0 +SRC_URI=mirror://gentoo/jpegsrc.v6b.tar.gz mirror://gentoo/jpeg-6b-patches-2.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=90fd16fee56a300aa810180aeb66b6c5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libmtp-0.0.1-r12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libmtp-0.0.1-r12 new file mode 100644 index 0000000000..14d53479b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libmtp-0.0.1-r12 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP). +EAPI=4 +HOMEPAGE=http://libmtp.sourceforge.net/ +IUSE=+crypt doc examples static-libs cros_workon_tree_62ba988dca03df08f1aac5d601d47b64ffb869ea +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2.1 +RDEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a969b4c2552714ead0f8e174183503cb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libmtp-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libmtp-9999 new file mode 100644 index 0000000000..0b377e9f7a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libmtp-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP). +EAPI=4 +HOMEPAGE=http://libmtp.sourceforge.net/ +IUSE=+crypt doc examples static-libs cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=LGPL-2.1 +RDEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=13d8470257482a6799ea4d0512cc0b99 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libpng-1.2.49 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libpng-1.2.49 new file mode 100644 index 0000000000..3d78183907 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libpng-1.2.49 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure prepare +DEPEND=sys-libs/zlib !=media-libs/libpng-1.2*:0 app-arch/xz-utils +DESCRIPTION=Portable Network Graphics library +EAPI=4 +HOMEPAGE=http://www.libpng.org/ +KEYWORDS=alpha amd64 arm hppa ia64 m68k mips s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=as-is +RDEPEND=sys-libs/zlib !=media-libs/libpng-1.2*:0 +SLOT=0 +SRC_URI=mirror://sourceforge/libpng/libpng-1.2.49.tar.xz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=ad84b53b911de3d9c3290fae89a81b23 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libresample-0.0.1-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libresample-0.0.1-r7 new file mode 100644 index 0000000000..641487ad63 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libresample-0.0.1-r7 @@ -0,0 +1,11 @@ +DEFINED_PHASES=info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=resampling library (see README.chromiumos) +EAPI=4 +HOMEPAGE=http://www-ccrma.stanford.edu/~jos/resample/ +IUSE=cros_workon_tree_172744c4f8686f99baa15072d6e47716ff67e6e9 +KEYWORDS=amd64 arm x86 +LICENSE=LGPL +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=99c5e576268781b153600622bffbfe21 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libresample-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libresample-9999 new file mode 100644 index 0000000000..8f49536b89 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/libresample-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=resampling library (see README.chromiumos) +EAPI=4 +HOMEPAGE=http://www-ccrma.stanford.edu/~jos/resample/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=LGPL +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=94d748b9abf1e27ca37963a93d96cea8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/mesa-9.0-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/mesa-9.0-r5 new file mode 100644 index 0000000000..cb5928742e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/mesa-9.0-r5 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=!=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) >=x11-libs/libdrm-2.4.31 =dev-lang/python-2* dev-libs/libxml2 dev-util/pkgconfig x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto !arm? ( sys-devel/llvm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 dev-vcs/git +DESCRIPTION=OpenGL-like graphic library for Linux +EAPI=4 +HOMEPAGE=http://mesa3d.sourceforge.net/ +IUSE=video_cards_intel video_cards_radeon video_cards_mach64 video_cards_mga video_cards_nouveau video_cards_r128 video_cards_savage video_cards_sis video_cards_vmware video_cards_tdfx video_cards_via +classic debug egl +gallium -gbm gles1 gles2 +llvm motif +nptl pic selinux shared-glapi kernel_FreeBSD cros_workon_tree_9fac2f50764a0dd604f1d1c3458343cedc871d1d +KEYWORDS=alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 x86-fbsd +LICENSE=MIT LGPL-3 SGI-B-2.0 +RDEPEND=!=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) >=x11-libs/libdrm-2.4.31 >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5ee38b172af81c572bd7db8eded841cd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/mesa-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/mesa-9999 new file mode 100644 index 0000000000..6b2565d861 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/mesa-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=!=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) >=x11-libs/libdrm-2.4.31 =dev-lang/python-2* dev-libs/libxml2 dev-util/pkgconfig x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto !arm? ( sys-devel/llvm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 dev-vcs/git dev-vcs/git +DESCRIPTION=OpenGL-like graphic library for Linux +EAPI=4 +HOMEPAGE=http://mesa3d.sourceforge.net/ +IUSE=video_cards_intel video_cards_radeon video_cards_mach64 video_cards_mga video_cards_nouveau video_cards_r128 video_cards_savage video_cards_sis video_cards_vmware video_cards_tdfx video_cards_via +classic debug egl +gallium -gbm gles1 gles2 +llvm motif +nptl pic selinux shared-glapi kernel_FreeBSD cros_workon_tree_ +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd +LICENSE=MIT LGPL-3 SGI-B-2.0 +RDEPEND=!=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) >=x11-libs/libdrm-2.4.31 >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2de287d9e4c2e059625b9c9566a5d546 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/opencv-2.3.0-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/opencv-2.3.0-r2 new file mode 100644 index 0000000000..0649ce19cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/opencv-2.3.0-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) doc? ( virtual/latex-base ) dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) +DESCRIPTION=A collection of algorithms and sample code for various computer vision problems +EAPI=3 +HOMEPAGE=http://opencv.willowgarage.com +IUSE=cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine +KEYWORDS=amd64 arm ppc x86 +LICENSE=BSD +RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) +SLOT=0 +SRC_URI=mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2 +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cmake-utils 00f9fd5a80cf3605f6d9a2e808c48a92 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9eb7ac7f85e368089117c702d8ca7147 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-plugins/o3d-179976 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-plugins/o3d-179976 new file mode 100644 index 0000000000..ba5ebd1e07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-plugins/o3d-179976 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=dev-libs/nss media-libs/fontconfig opengl? ( media-libs/glew ) net-misc/curl opengles? ( virtual/opengles x11-drivers/opengles-headers ) x11-libs/cairo x11-libs/gtk+ +DESCRIPTION=O3D Plugin +EAPI=2 +HOMEPAGE=http://code.google.com/p/o3d/ +IUSE=opengl opengles +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=dev-libs/nss media-libs/fontconfig opengl? ( media-libs/glew ) net-misc/curl opengles? ( virtual/opengles x11-drivers/opengles-headers ) x11-libs/cairo x11-libs/gtk+ +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/o3d-svn-179976.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7026f5215c9545de5ffa1ea4ad2d30e0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/adhd-0.0.1-r450 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/adhd-0.0.1-r450 new file mode 100644 index 0000000000..8d9f90e9d3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/adhd-0.0.1-r450 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=>=media-libs/alsa-lib-1.0.24.1 media-libs/speex dev-libs/iniparser >=sys-apps/dbus-1.4.12 dev-libs/libpthread-stubs sys-fs/udev media-libs/ladspa-sdk || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Google A/V Daemon +EAPI=4 +HOMEPAGE=http://www.chromium.org +IUSE=cros_workon_tree_c086a20edabf4e7b0cd2b2cbfdef76e4f12c88b3 board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=>=media-libs/alsa-lib-1.0.24.1 media-libs/speex dev-libs/iniparser >=sys-apps/dbus-1.4.12 dev-libs/libpthread-stubs sys-fs/udev +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7b35bd6828f570bafee65b7b7d9d85ea diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/adhd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/adhd-9999 new file mode 100644 index 0000000000..b61582954e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/adhd-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=>=media-libs/alsa-lib-1.0.24.1 media-libs/speex dev-libs/iniparser >=sys-apps/dbus-1.4.12 dev-libs/libpthread-stubs sys-fs/udev media-libs/ladspa-sdk || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Google A/V Daemon +EAPI=4 +HOMEPAGE=http://www.chromium.org +IUSE=cros_workon_tree_ board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=>=media-libs/alsa-lib-1.0.24.1 media-libs/speex dev-libs/iniparser >=sys-apps/dbus-1.4.12 dev-libs/libpthread-stubs sys-fs/udev +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cbd2521d73c3fb2e17d6b1934f578bd4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/alsa-utils-1.0.25-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/alsa-utils-1.0.25-r3 new file mode 100644 index 0000000000..48be413b9f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-sound/alsa-utils-1.0.25-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare unpack +DEPEND=>=media-libs/alsa-lib-1.0.25 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.1 ) doc? ( app-text/xmlto ) +DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.) +EAPI=4 +HOMEPAGE=http://www.alsa-project.org/ +IUSE=doc +libsamplerate minimal +ncurses nls +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 +LICENSE=GPL-2 +RDEPEND=>=media-libs/alsa-lib-1.0.25 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.1 ) !minimal? ( dev-util/dialog sys-apps/pciutils ) +SLOT=0.9 +SRC_URI=mirror://alsaproject/utils/alsa-utils-1.0.25.tar.bz2 !minimal? ( mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2 ) +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5485f60cfb186391150f40011893c899 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-analyzer/wireshark-1.2.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-analyzer/wireshark-1.2.8 new file mode 100644 index 0000000000..3baa0dbfd8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-analyzer/wireshark-1.2.8 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=>=dev-libs/glib-2.4.0:2 zlib? ( sys-libs/zlib ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango dev-libs/atk ) gnutls? ( net-libs/gnutls ) gcrypt? ( dev-libs/libgcrypt ) pcap? ( net-libs/libpcap ) pcre? ( dev-libs/libpcre ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) portaudio? ( media-libs/portaudio ) ares? ( >=net-dns/c-ares-1.5 ) !ares? ( adns? ( net-libs/adns ) ) geoip? ( dev-libs/geoip ) lua? ( >=dev-lang/lua-5.1 ) selinux? ( sec-policy/selinux-wireshark ) >=dev-util/pkgconfig-0.15.0 dev-lang/perl sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=A network protocol analyzer formerly known as ethereal +EAPI=2 +HOMEPAGE=http://www.wireshark.org/ +IUSE=adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux +KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=>=dev-libs/glib-2.4.0:2 zlib? ( sys-libs/zlib ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango dev-libs/atk ) gnutls? ( net-libs/gnutls ) gcrypt? ( dev-libs/libgcrypt ) pcap? ( net-libs/libpcap ) pcre? ( dev-libs/libpcre ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) portaudio? ( media-libs/portaudio ) ares? ( >=net-dns/c-ares-1.5 ) !ares? ( adns? ( net-libs/adns ) ) geoip? ( dev-libs/geoip ) lua? ( >=dev-lang/lua-5.1 ) selinux? ( sec-policy/selinux-wireshark ) +SLOT=0 +SRC_URI=http://www.wireshark.org/download/src/wireshark-1.2.8.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6dccf85e6ddbb19473aa57825e6c654b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/ppp-2.4.5-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/ppp-2.4.5-r3 new file mode 100644 index 0000000000..1630023a2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/ppp-2.4.5-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare setup +DEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl ) +DESCRIPTION=Point-to-Point Protocol (PPP) +EAPI=2 +HOMEPAGE=http://www.samba.org/ppp +IUSE=activefilter atm dhcp eap-tls gtk ipv6 pam radius +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +LICENSE=BSD GPL-2 +RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl ) +SLOT=0 +SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.5.tar.gz http://dev.gentoo.org/~flameeyes/qa-copies/ppp-2.4.5-gentoo-20111111.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz ) +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=6b3514bee6c42a3bf0cb166a2447d522 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/xl2tpd-1.3.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/xl2tpd-1.3.0 new file mode 100644 index 0000000000..41b3c53e70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/xl2tpd-1.3.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=net-libs/libpcap +DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon +EAPI=4 +HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/ +IUSE=dnsretry +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=net-libs/libpcap net-dialup/ppp +SLOT=0 +SRC_URI=ftp://ftp.xelerance.com/xl2tpd/xl2tpd-1.3.0.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e8d389b2cd81f8fc8aaa8bb6ff0faae5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/xl2tpd-1.3.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/xl2tpd-1.3.0-r1 new file mode 100644 index 0000000000..41b3c53e70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-dialup/xl2tpd-1.3.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=net-libs/libpcap +DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon +EAPI=4 +HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/ +IUSE=dnsretry +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=net-libs/libpcap net-dialup/ppp +SLOT=0 +SRC_URI=ftp://ftp.xelerance.com/xl2tpd/xl2tpd-1.3.0.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e8d389b2cd81f8fc8aaa8bb6ff0faae5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-firewall/iptables-1.4.8-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-firewall/iptables-1.4.8-r2 new file mode 100644 index 0000000000..a659f84f0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-firewall/iptables-1.4.8-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools +EAPI=2 +HOMEPAGE=http://www.iptables.org/ +IUSE=ipv6 +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.8.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=240db803685d4630ec2c6bbed4b018f2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.2.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.2.3 new file mode 100644 index 0000000000..4dd69ec263 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.2.3 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) ) >=sys-apps/util-linux-2.12r-r7 +DESCRIPTION=NFS client and server daemons +EAPI=2 +HOMEPAGE=http://linux-nfs.org/ +IUSE=caps ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=GPL-2 +RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) ) !net-nds/portmap +RESTRICT=test +SLOT=0 +SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.3.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bf6b21814381320c7205055f6714c917 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libqmi-0.0.1-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libqmi-0.0.1-r7 new file mode 100644 index 0000000000..6bf81be5d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libqmi-0.0.1-r7 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=QMI modem protocol helper library +EAPI=4 +HOMEPAGE=http://cgit.freedesktop.org/libqmi/ +IUSE=doc static-libs test cros_workon_tree_860a508ab8dba4e63abecc47b2d67b3b906f6301 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=>=dev-libs/glib-2.32 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=605d1ad5ddcbb03d16be7867c2d8e29b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libqmi-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libqmi-9999 new file mode 100644 index 0000000000..fe96a6f802 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libqmi-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=QMI modem protocol helper library +EAPI=4 +HOMEPAGE=http://cgit.freedesktop.org/libqmi/ +IUSE=doc static-libs test cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=>=dev-libs/glib-2.32 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2d27a2c22d2835866f041cbdf2ede4e2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/neon-0.29.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/neon-0.29.0-r1 new file mode 100644 index 0000000000..f2bf50a3ee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/neon-0.29.0-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-2.0 pkcs11? ( dev-libs/pakchois ) ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6f pkcs11? ( dev-libs/pakchois ) ) ) kerberos? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=HTTP and WebDAV client library +EAPI=2 +HOMEPAGE=http://www.webdav.org/neon/ +IUSE=doc expat gnutls kerberos libproxy nls pkcs11 ssl zlib linguas_cs linguas_de linguas_fr linguas_ja linguas_nn linguas_pl linguas_ru linguas_tr linguas_zh_CN +KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-2.0 pkcs11? ( dev-libs/pakchois ) ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6f pkcs11? ( dev-libs/pakchois ) ) ) kerberos? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) zlib? ( sys-libs/zlib ) +RESTRICT=test +SLOT=0 +SRC_URI=http://www.webdav.org/neon/neon-0.29.0.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=679e11dc28cd8d2034c2bdceb1805419 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/curl-7.23.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/curl-7.23.1-r1 new file mode 100644 index 0000000000..901c187d6c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/curl-7.23.1-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare +DEPEND=ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) libssh2? ( >=net-libs/libssh2-0.16 ) test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=A Client that groks URLs +EAPI=4 +HOMEPAGE=http://curl.haxx.se/ +IUSE=ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) libssh2? ( >=net-libs/libssh2-0.16 ) +REQUIRED_USE=threads? ( !ares ) nss? ( !gnutls ) +SLOT=0 +SRC_URI=http://curl.haxx.se/download/curl-7.23.1.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c prefix 21058c21ca48453d771df15500873ede toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=825c5d2c51061277811a26538b6eab12 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/dhcpcd-5.1.4-r31 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/dhcpcd-5.1.4-r31 new file mode 100644 index 0000000000..73be5cf437 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/dhcpcd-5.1.4-r31 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install setup unpack +DEPEND=>=sys-apps/dbus-1.2 dev-vcs/git +DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client +EAPI=2 +HOMEPAGE=http://roy.marples.name/projects/dhcpcd/ +IUSE=cros_workon_tree_9124b6c37d47408449c8c99dad31680c020e0173 +KEYWORDS=amd64 arm x86 +LICENSE=BSD-2 +RDEPEND=>=sys-apps/dbus-1.2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d5f79b91a4f24b52c834db149c6cdcc1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/dhcpcd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/dhcpcd-9999 new file mode 100644 index 0000000000..dc73c47604 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/dhcpcd-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install setup unpack +DEPEND=>=sys-apps/dbus-1.2 dev-vcs/git +DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client +EAPI=2 +HOMEPAGE=http://roy.marples.name/projects/dhcpcd/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD-2 +RDEPEND=>=sys-apps/dbus-1.2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=dc6d7f57a72745df3237bdd3014ecdb3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.0 new file mode 100644 index 0000000000..40ae3844ed --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.0 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install postinst unpack +DESCRIPTION=Synchronize local workstation with time offered by remote webservers +HOMEPAGE=http://www.clevervest.com/htp/ +KEYWORDS=amd64 arm hppa ~mips ppc s390 sh x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://www.clevervest.com/htp/archive/c/htpdate-1.0.0.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=06d10d75c5f9a7562899898fd2056cdc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.4 new file mode 100644 index 0000000000..d3eb00eae8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.4 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install postinst unpack +DESCRIPTION=Synchronize local workstation with time offered by remote webservers +HOMEPAGE=http://www.clevervest.com/htp/ +KEYWORDS=~alpha amd64 arm hppa ~mips ppc ~ppc64 s390 sh x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://www.clevervest.com/htp/archive/c/htpdate-1.0.4.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ab55bd7a107971025f429d2f98b499ca diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.4-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.4-r6 new file mode 100644 index 0000000000..d3eb00eae8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/htpdate-1.0.4-r6 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install postinst unpack +DESCRIPTION=Synchronize local workstation with time offered by remote webservers +HOMEPAGE=http://www.clevervest.com/htp/ +KEYWORDS=~alpha amd64 arm hppa ~mips ppc ~ppc64 s390 sh x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://www.clevervest.com/htp/archive/c/htpdate-1.0.4.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ab55bd7a107971025f429d2f98b499ca diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iperf-2.0.4-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iperf-2.0.4-r1 new file mode 100644 index 0000000000..2531aa34af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iperf-2.0.4-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install postinst unpack +DESCRIPTION=tool to measure IP bandwidth using UDP or TCP +HOMEPAGE=http://iperf.sourceforge.net/ +IUSE=ipv6 threads debug +KEYWORDS=amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint +LICENSE=as-is +SLOT=0 +SRC_URI=mirror://sourceforge/iperf/iperf-2.0.4.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=61c951b23b2f549a3d864c68cd637e39 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iputils-20100418-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iputils-20100418-r3 new file mode 100644 index 0000000000..d26ab7a263 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iputils-20100418-r3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=extras? ( !net-misc/rarpd ) ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn ) virtual/os-headers +DESCRIPTION=Network monitoring tools including ping and ping6 +HOMEPAGE=http://www.linux-foundation.org/en/Net:Iputils +IUSE=doc extras idn ipv6 SECURITY_HAZARD ssl static +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=extras? ( !net-misc/rarpd ) ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn ) +SLOT=0 +SRC_URI=http://www.skbuff.net/iputils/iputils-s20100418.tar.bz2 mirror://gentoo/iputils-s20100418-manpages.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ac99c101ebf29eb5e0e26b4d3d6df570 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20090602 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20090602 new file mode 100644 index 0000000000..98e3610e20 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20090602 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DESCRIPTION=Database of mobile broadband service providers +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=~arm ~amd64 ~x86 +LICENSE=CC-PD +SLOT=0 +SRC_URI=http://dev.gentoo.org/~dagger/files/mobile-broadband-provider-info-20090602.tar.bz2 +_md5_=1bf03635dd575bf31942dea3bf172a48 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20100122 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20100122 new file mode 100644 index 0000000000..595c2d67f6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20100122 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=Database of mobile broadband service providers +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=~amd64 ~arm ~ppc ~x86 +LICENSE=CC-PD +SLOT=0 +SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20100122/mobile-broadband-provider-info-20100122tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a gnome.org 8fef8f967214f56e08fa92d61163d891 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=2c498e141cdb3500bb8da8a6969610e0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20100510 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20100510 new file mode 100644 index 0000000000..4bba6edff2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20100510 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=Database of mobile broadband service providers +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 ~arm ppc x86 +LICENSE=CC-PD +SLOT=0 +SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20100510/mobile-broadband-provider-info-20100510tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a gnome.org 8fef8f967214f56e08fa92d61163d891 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=fe7cd6b044c423528121e8b87138d31b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218 new file mode 100644 index 0000000000..03199f08f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=Database of mobile broadband service providers +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 ~arm ppc x86 +LICENSE=CC-PD +SLOT=0 +SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20110218/mobile-broadband-provider-info-20110218tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a gnome.org 8fef8f967214f56e08fa92d61163d891 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=fe7cd6b044c423528121e8b87138d31b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218-r1 new file mode 100644 index 0000000000..cc29bf982d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install prepare +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 ~arm ppc x86 +LICENSE=CC-PD +SLOT=0 +SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20110218/mobile-broadband-provider-info-20110218tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a gnome.org 8fef8f967214f56e08fa92d61163d891 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=b32a8ce1a5e08056c4e64eb8bf6d4623 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218-r2 new file mode 100644 index 0000000000..4dafdd260b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110218-r2 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install prepare +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 ~arm ppc x86 +LICENSE=CC-PD +SLOT=0 +SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20110218/mobile-broadband-provider-info-20110218tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a gnome.org 8fef8f967214f56e08fa92d61163d891 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=b417c305eaa72d3af68d75032a60b1f0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110503 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110503 new file mode 100644 index 0000000000..bed5721cf6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110503 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.6 +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 arm ppc x86 +LICENSE=CC-PD +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=437cacf45ac1abedf7ac28bf5a1d4c81 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110503-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110503-r1 new file mode 100644 index 0000000000..ac5f785a3a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110503-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.6 +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 arm ppc x86 +LICENSE=CC-PD +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=24f00eee49227b5815d5852a0ca5a87d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511 new file mode 100644 index 0000000000..bb4152ba75 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.6 +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 arm ppc x86 +LICENSE=CC-PD +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9703dafdcfea293d1547b58e8eb03106 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r1 new file mode 100644 index 0000000000..aa5b7f5c53 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.6 +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 arm ppc x86 +LICENSE=CC-PD +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ae0000e81feb94dbff47ed51a2d7dadc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r2 new file mode 100644 index 0000000000..37642d77ed --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r2 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.6 +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 arm ppc x86 +LICENSE=CC-PD +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ed7e2c003866e229b064055c86d303df diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r3 new file mode 100644 index 0000000000..2496181f4b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r3 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.6 +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 arm ppc x86 +LICENSE=CC-PD +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e8715fc579c3b3dc7e3e5c1218ef248d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r5 new file mode 100644 index 0000000000..a243d15aff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20110511-r5 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.6 +DESCRIPTION=Database of mobile broadband service providers +EAPI=2 +HOMEPAGE=http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders +KEYWORDS=amd64 arm ppc x86 +LICENSE=CC-PD +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git a673225a1558ef94456dbd8ce271d16a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3ad5df18a2e07f622f2ca4e1ccb13eac diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-0.3.997_p2-r70 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-0.3.997_p2-r70 new file mode 100644 index 0000000000..8ad3c0bb34 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-0.3.997_p2-r70 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=>=sys-fs/udev-145[gudev] dev-util/pkgconfig dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Modem and mobile broadband management libraries +EAPI=4 +HOMEPAGE=http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html +IUSE=doc cros_workon_tree_47ae986e8cc526edcdeb4601955d940e07098a60 +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2 dev-libs/dbus-glib net-dialup/ppp +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=35b5aed957d8ceb8fd8243c7f83214e5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-9999 new file mode 100644 index 0000000000..2ad1aefd75 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=>=sys-fs/udev-145[gudev] dev-util/pkgconfig dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Modem and mobile broadband management libraries +EAPI=4 +HOMEPAGE=http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html +IUSE=doc cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2 dev-libs/dbus-glib net-dialup/ppp +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=01608566f5152ac5073c2cacc5c2157b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-classic-interfaces-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-classic-interfaces-0.0.1 new file mode 100644 index 0000000000..bc9372ae22 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-classic-interfaces-0.0.1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DEPEND=!=dev-libs/glib-2.32 >=sys-apps/dbus-1.2 dev-libs/dbus-glib net-dialup/ppp qmi? ( net-libs/libqmi ) !net-misc/modemmanager >=sys-fs/udev-145[gudev] dev-util/pkgconfig dev-util/intltool >=dev-util/gtk-doc-1.13 !net-misc/modemmanager-next-interfaces !net-misc/modemmanager || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Modem and mobile broadband management libraries +EAPI=4 +HOMEPAGE=http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html +IUSE=doc qmi cros_workon_tree_8d36420a379eddc26d8e562dea0b00081807fdae +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.32 >=sys-apps/dbus-1.2 dev-libs/dbus-glib net-dialup/ppp qmi? ( net-libs/libqmi ) !net-misc/modemmanager +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=46a5ab47ca251324e54221df3bf1f4ab diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-9999 new file mode 100644 index 0000000000..6950f2c820 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure info install prepare setup unpack +DEPEND=>=dev-libs/glib-2.32 >=sys-apps/dbus-1.2 dev-libs/dbus-glib net-dialup/ppp qmi? ( net-libs/libqmi ) !net-misc/modemmanager >=sys-fs/udev-145[gudev] dev-util/pkgconfig dev-util/intltool >=dev-util/gtk-doc-1.13 !net-misc/modemmanager-next-interfaces !net-misc/modemmanager || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Modem and mobile broadband management libraries +EAPI=4 +HOMEPAGE=http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html +IUSE=doc qmi cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.32 >=sys-apps/dbus-1.2 dev-libs/dbus-glib net-dialup/ppp qmi? ( net-libs/libqmi ) !net-misc/modemmanager +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=65061dfbcb516aba7b2e6fb8e9281c30 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-interfaces-0.0.1-r89 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-interfaces-0.0.1-r89 new file mode 100644 index 0000000000..b53ef4e6bc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-interfaces-0.0.1-r89 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=>=dev-libs/glib-2.30.2 >=dev-util/gtk-doc-1.13 >=sys-fs/udev-145[gudev] !net-misc/modemmanager-next || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=DBus interface descriptions and headers for ModemManager v0.6 +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_8d36420a379eddc26d8e562dea0b00081807fdae +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2.1 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=585b1d45163dbe09294212716e0f53f8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-interfaces-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-interfaces-9999 new file mode 100644 index 0000000000..cd333876d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/modemmanager-next-interfaces-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=>=dev-libs/glib-2.30.2 >=dev-util/gtk-doc-1.13 >=sys-fs/udev-145[gudev] !net-misc/modemmanager-next || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=DBus interface descriptions and headers for ModemManager v0.6 +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=LGPL-2.1 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ee14b346bf4b6dfd85c6557cb442223c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/neon-0.29.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/neon-0.29.0 new file mode 100644 index 0000000000..6f44c3a11b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/neon-0.29.0 @@ -0,0 +1,4 @@ +DEFINED_PHASES=- +KEYWORDS=amd64 arm x86 +SLOT=0 +_md5_=8caaa32427574aea945e27d53a6d6b99 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openssh-5.2_p1-r10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openssh-5.2_p1-r10 new file mode 100644 index 0000000000..06a51c17d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openssh-5.2_p1-r10 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst setup test unpack +DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 smartcard? ( dev-libs/opensc ) pkcs11? ( dev-libs/pkcs11-helper ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( sys-apps/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-apps/baselayout +DESCRIPTION=Port of OpenBSD's free SSH release +HOMEPAGE=http://www.openssh.org/ +IUSE=hpn kerberos ldap libedit pam pkcs11 selinux skey smartcard static tcpd X X509 +KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=as-is +PROVIDE=virtual/ssh +RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 smartcard? ( dev-libs/opensc ) pkcs11? ( dev-libs/pkcs11-helper ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( sys-apps/shadow ) pam? ( >=sys-auth/pambase-20081028 ) sys-apps/baselayout +SLOT=0 +SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.2p1.tar.gz http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.2p1-0.3.11.patch.gz ) pkcs11? ( http://alon.barlev.googlepages.com/openssh-5.2pkcs11-0.26.tar.bz2 ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.1/openssh-5.2p1+x509-6.2.1.diff.gz ) +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 useradd fc85780d70dd069e45dbdfb10311d5d2 +_md5_=35c4c3849790ef7e8f37e23d1d2354d9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openssh-5.2_p1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openssh-5.2_p1-r3 new file mode 100644 index 0000000000..06a51c17d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openssh-5.2_p1-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst setup test unpack +DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 smartcard? ( dev-libs/opensc ) pkcs11? ( dev-libs/pkcs11-helper ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( sys-apps/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-apps/baselayout +DESCRIPTION=Port of OpenBSD's free SSH release +HOMEPAGE=http://www.openssh.org/ +IUSE=hpn kerberos ldap libedit pam pkcs11 selinux skey smartcard static tcpd X X509 +KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=as-is +PROVIDE=virtual/ssh +RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 smartcard? ( dev-libs/opensc ) pkcs11? ( dev-libs/pkcs11-helper ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( sys-apps/shadow ) pam? ( >=sys-auth/pambase-20081028 ) sys-apps/baselayout +SLOT=0 +SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.2p1.tar.gz http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.2p1-0.3.11.patch.gz ) pkcs11? ( http://alon.barlev.googlepages.com/openssh-5.2pkcs11-0.26.tar.bz2 ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.1/openssh-5.2p1+x509-6.2.1.diff.gz ) +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 useradd fc85780d70dd069e45dbdfb10311d5d2 +_md5_=35c4c3849790ef7e8f37e23d1d2354d9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openvpn-2.1.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openvpn-2.1.12 new file mode 100644 index 0000000000..3e16a8634e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openvpn-2.1.12 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=OpenVPN is a robust and highly flexible tunneling application compatible with many OSes. +EAPI=2 +HOMEPAGE=http://openvpn.net/ +IUSE=eurephia examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 userland_BSD +KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) +SLOT=0 +SRC_URI=http://swupdate.openvpn.org/as/as-openvpn-core/build/openvpn-2.1.12.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c38355e854d3a48ab9a7c40ff524ac94 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openvpn-2.1.12-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openvpn-2.1.12-r2 new file mode 100644 index 0000000000..3e16a8634e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/openvpn-2.1.12-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=OpenVPN is a robust and highly flexible tunneling application compatible with many OSes. +EAPI=2 +HOMEPAGE=http://openvpn.net/ +IUSE=eurephia examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 userland_BSD +KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) +SLOT=0 +SRC_URI=http://swupdate.openvpn.org/as/as-openvpn-core/build/openvpn-2.1.12.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c38355e854d3a48ab9a7c40ff524ac94 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/strongswan-4.6.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/strongswan-4.6.4 new file mode 100644 index 0000000000..633e2a89e6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/strongswan-4.6.4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst preinst setup +DEPEND=!net-misc/openswan >=dev-libs/gmp-4.1.5 gcrypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) smartcard? ( dev-libs/opensc ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) virtual/linux-sources sys-kernel/linux-headers +DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE +EAPI=2 +HOMEPAGE=http://www.strongswan.org/ +IUSE=+caps cisco curl debug dhcp eap farp gcrypt ldap +ikev1 +ikev2 mysql nat-transport +non-root +openssl smartcard sqlite +KEYWORDS=~arm ~amd64 ~ppc ~sparc ~x86 +LICENSE=GPL-2 RSA-MD5 RSA-PKCS11 DES +RDEPEND=!net-misc/openswan >=dev-libs/gmp-4.1.5 gcrypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) smartcard? ( dev-libs/opensc ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) virtual/logger sys-apps/iproute2 +SLOT=0 +SRC_URI=http://download.strongswan.org/strongswan-4.6.4.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=1bcab9fd366329840f1da988c1d9cf62 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/strongswan-4.6.4-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/strongswan-4.6.4-r2 new file mode 100644 index 0000000000..ff5c60d5e9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/strongswan-4.6.4-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst preinst prepare setup +DEPEND=!net-misc/openswan >=dev-libs/gmp-4.1.5 gcrypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) smartcard? ( dev-libs/opensc ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) virtual/linux-sources sys-kernel/linux-headers +DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE +EAPI=2 +HOMEPAGE=http://www.strongswan.org/ +IUSE=+caps cisco curl debug dhcp eap farp gcrypt ldap +ikev1 +ikev2 mysql nat-transport +non-root openssl +smartcard sqlite +KEYWORDS=arm amd64 ~ppc ~sparc x86 +LICENSE=GPL-2 RSA-MD5 RSA-PKCS11 DES +RDEPEND=!net-misc/openswan >=dev-libs/gmp-4.1.5 gcrypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) smartcard? ( dev-libs/opensc ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) virtual/logger +SLOT=0 +SRC_URI=http://download.strongswan.org/strongswan-4.6.4.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=82862895b665eebe523c6f6282f49a6c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tlsdate-0.0.5-r16 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tlsdate-0.0.5-r16 new file mode 100644 index 0000000000..6dc13c3240 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tlsdate-0.0.5-r16 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Update local time over HTTPS +EAPI=4 +HOMEPAGE=https://github.com/ioerror/tlsdate +IUSE=dbus cros_workon_tree_3f95510f2675f728abd95e43dfb7cbecf56d2e77 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f528f4d3913d3e1b176fedd0c6796bfe diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tlsdate-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tlsdate-9999 new file mode 100644 index 0000000000..051a3b0596 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tlsdate-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Update local time over HTTPS +EAPI=4 +HOMEPAGE=https://github.com/ioerror/tlsdate +IUSE=dbus cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RDEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=590a6cf2c7191c93e23154df906e765d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.19-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.19-r2 new file mode 100644 index 0000000000..65792654ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.19-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 +DESCRIPTION=Anonymizing overlay network for TCP +EAPI=2 +HOMEPAGE=http://www.torproject.org/ +IUSE=debug +KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-fbsd +LICENSE=BSD +RDEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 net-proxy/tsocks +SLOT=0 +SRC_URI=http://www.torproject.org/dist/tor-0.2.1.19.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=dfaa45c7d0908761513af098ef072c81 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.20-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.20-r1 new file mode 100644 index 0000000000..510fb63892 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.20-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 +DESCRIPTION=Anonymizing overlay network for TCP +EAPI=2 +HOMEPAGE=http://www.torproject.org/ +IUSE=debug +KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +LICENSE=BSD +RDEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 net-proxy/tsocks +SLOT=0 +SRC_URI=http://www.torproject.org/dist/tor-0.2.1.20.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8e1eb5a810d246d6c8bf16c31f9ff53d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.21 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.21 new file mode 100644 index 0000000000..7183889c4a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.21 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 +DESCRIPTION=Anonymizing overlay network for TCP +EAPI=2 +HOMEPAGE=http://www.torproject.org/ +IUSE=debug +KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +LICENSE=BSD +RDEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 net-proxy/tsocks +SLOT=0 +SRC_URI=http://www.torproject.org/dist/tor-0.2.1.21.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c231fcf722f4be9897964ae432ecb8c9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.22 new file mode 100644 index 0000000000..cb1369dac9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.22 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 +DESCRIPTION=Anonymizing overlay network for TCP +EAPI=2 +HOMEPAGE=http://www.torproject.org/ +IUSE=debug +KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-fbsd +LICENSE=BSD +RDEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 net-proxy/tsocks +SLOT=0 +SRC_URI=http://www.torproject.org/dist/tor-0.2.1.22.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=dd9e103fd961a9da11556ccdcc484b32 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.30 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.30 new file mode 100644 index 0000000000..1eb4899539 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/tor-0.2.1.30 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 +DESCRIPTION=Anonymizing overlay network for TCP +EAPI=2 +HOMEPAGE=http://www.torproject.org/ +IUSE=debug +KEYWORDS=amd64 arm ppc ppc64 sparc x86 ~x86-fbsd +LICENSE=BSD +RDEPEND=dev-libs/openssl >=dev-libs/libevent-1.2 net-proxy/tsocks[tordns] +SLOT=0 +SRC_URI=http://www.torproject.org/dist/tor-0.2.1.30.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=88c5866f9cdcc651c4877db31eb3a826 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-0.0.1-r120 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-0.0.1-r120 new file mode 100644 index 0000000000..e3709c1cf8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-0.0.1-r120 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Atheros AR300x firmware +EAPI=2 +HOMEPAGE=http://www.atheros.com/ +IUSE=cros_workon_tree_a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc +KEYWORDS=amd64 arm x86 +LICENSE=Atheros +RESTRICT=binchecks strip test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a3a37e110138b1fcd95df0e84c7f0057 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-9999 new file mode 100644 index 0000000000..89fce70283 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Atheros AR300x firmware +EAPI=2 +HOMEPAGE=http://www.atheros.com/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=Atheros +RESTRICT=binchecks strip test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5b5af88ceed54dc45fbfc34b10b1af18 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-34-r21 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-34-r21 new file mode 100644 index 0000000000..e187d1bc58 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-34-r21 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Atheros AR600x firmware +EAPI=2 +HOMEPAGE=http://www.atheros.com/ +IUSE=cros_workon_tree_a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc +KEYWORDS=amd64 arm x86 +LICENSE=Atheros +RESTRICT=binchecks strip test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d345e8d2a69d715eac64c2b9abddec61 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-9999 new file mode 100644 index 0000000000..77e3b63504 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Atheros AR600x firmware +EAPI=2 +HOMEPAGE=http://www.atheros.com/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=Atheros +RESTRICT=binchecks strip test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5ab3772defa767362c8df9cd80f5f1bf diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62 new file mode 100644 index 0000000000..a2a54aa025 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=sys-devel/flex >=dev-util/pkgconfig-0.20 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Bluetooth Tools and System Daemons for Linux +EAPI=2 +HOMEPAGE=http://bluez.sourceforge.net/ +IUSE=alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( sys-auth/pambase[consolekit] ) test-programs? ( dev-python/dbus-python dev-python/pygobject ) +SLOT=0 +SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.62.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fbe76b1f95a29c416cd2ba8b36211e87 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62-r103 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62-r103 new file mode 100644 index 0000000000..a2a54aa025 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62-r103 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=sys-devel/flex >=dev-util/pkgconfig-0.20 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Bluetooth Tools and System Daemons for Linux +EAPI=2 +HOMEPAGE=http://bluez.sourceforge.net/ +IUSE=alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( sys-auth/pambase[consolekit] ) test-programs? ( dev-python/dbus-python dev-python/pygobject ) +SLOT=0 +SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.62.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fbe76b1f95a29c416cd2ba8b36211e87 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.97-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.97-r11 new file mode 100644 index 0000000000..d31b66e4fb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.97-r11 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( dev-libs/libusb:1 ) >=dev-util/pkgconfig-0.20 >=dev-libs/check-0.9.8 sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) +DESCRIPTION=Bluetooth Tools and System Daemons for Linux +EAPI=4 +HOMEPAGE=http://www.bluez.org/ +IUSE=alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb +KEYWORDS=amd64 arm ~hppa ~ppc ~ppc64 x86 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( dev-libs/libusb:1 ) !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-37 ) ) test-programs? ( dev-python/dbus-python dev-python/pygobject:2 ) >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) +SLOT=0 +SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.97.tar.xz http://dev.gentoo.org/~pacho/bluez/oui-20111231.txt.xz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=76d206097cc342c22ff9c9cf742c01d9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.99-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.99-r6 new file mode 100644 index 0000000000..20917a7616 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.99-r6 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) >=dev-util/pkgconfig-0.20 sys-devel/flex test-programs? ( >=dev-libs/check-0.9.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) +DESCRIPTION=Bluetooth Tools and System Daemons for Linux +EAPI=4 +HOMEPAGE=http://www.bluez.org/ +IUSE=alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline +KEYWORDS=amd64 arm hppa ~ppc ~ppc64 x86 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-37 ) ) test-programs? ( dev-python/dbus-python dev-python/pygobject:2 ) >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) +SLOT=0 +SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.99.tar.xz http://dev.gentoo.org/~pacho/bluez/oui-20120308.txt.xz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c562317850a05d586686e6d2921ca2a6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-test-4.99 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-test-4.99 new file mode 100644 index 0000000000..d0a1e8237a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-test-4.99 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare setup +DEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) >=dev-util/pkgconfig-0.20 sys-devel/flex test-programs? ( >=dev-libs/check-0.9.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) +DESCRIPTION=Bluetooth Tools and System Daemons for Linux +EAPI=4 +HOMEPAGE=http://www.bluez.org/ +IUSE=alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline +KEYWORDS=amd64 arm hppa ~ppc ~ppc64 x86 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-37 ) ) test-programs? ( dev-python/dbus-python dev-python/pygobject:2 ) >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) +SLOT=0 +SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.99.tar.xz http://dev.gentoo.org/~pacho/bluez/oui-20120308.txt.xz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=91598d2fbb104318e06beffe96196ce6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/crda-1.1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/crda-1.1.1 new file mode 100644 index 0000000000..b0155ca5eb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/crda-1.1.1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install prepare +DEPEND=dev-libs/libgcrypt dev-libs/libnl:0 net-wireless/wireless-regdb dev-python/m2crypto +DESCRIPTION=Central Regulatory Domain Agent for wireless networks. +EAPI=2 +HOMEPAGE=http://wireless.kernel.org/en/developers/Regulatory +KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +RDEPEND=dev-libs/libgcrypt dev-libs/libnl:0 net-wireless/wireless-regdb +SLOT=0 +SRC_URI=http://wireless.kernel.org/download/crda/crda-1.1.1.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=921c24d7b09fc5013de407a426097604 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-0.0.1-r25 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-0.0.1-r25 new file mode 100644 index 0000000000..fe2f698b98 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-0.0.1-r25 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=GCT GDM7205 WiMAX SDK +EAPI=4 +HOMEPAGE=http://www.gctsemi.com/ +IUSE=cros_workon_tree_3dc85a711e8560caa66ff457623c985d8256abe2 +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=66eeda10c80441104df126346ff2cec7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-9999 new file mode 100644 index 0000000000..571925ac4e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=GCT GDM7205 WiMAX SDK +EAPI=4 +HOMEPAGE=http://www.gctsemi.com/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=fd30ce250542cfe65f62e37a5086b503 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-0.7.2-r51 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-0.7.2-r51 new file mode 100644 index 0000000000..05e1487259 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-0.7.2-r51 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-vcs/git +DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon +EAPI=2 +HOMEPAGE=http://hostap.epitest.fi +IUSE=ipv6 logwatch madwifi +ssl +wps cros_workon_tree_6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5 +KEYWORDS=amd64 arm x86 +LICENSE=|| ( GPL-2 BSD ) +RDEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=59dfe3483da54fa0518a9440223d2bb9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-9999 new file mode 100644 index 0000000000..41979cf081 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-vcs/git +DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon +EAPI=2 +HOMEPAGE=http://hostap.epitest.fi +IUSE=ipv6 logwatch madwifi +ssl +wps cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=|| ( GPL-2 BSD ) +RDEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=86b8f0be48951a5d4adf7ca08d18aa56 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-0.9.22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-0.9.22 new file mode 100644 index 0000000000..bfc6b08454 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-0.9.22 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install +DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig +DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack +HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw +KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +RDEPEND=>=dev-libs/libnl-1.1 +SLOT=0 +SRC_URI=http://wireless.kernel.org/download/iw/iw-0.9.22.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=fcd477bbda16843500d4d84b2bbc0a6b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.0 new file mode 100644 index 0000000000..5e935e2821 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install +DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig +DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack +HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw +KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +RDEPEND=>=dev-libs/libnl-1.1 +SLOT=0 +SRC_URI=http://wireless.kernel.org/download/iw/iw-3.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=fcd477bbda16843500d4d84b2bbc0a6b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1 new file mode 100644 index 0000000000..a85563cc4a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig +DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack +EAPI=2 +HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw +KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +RDEPEND=>=dev-libs/libnl-1.1 +SLOT=0 +SRC_URI=http://linuxwireless.org/download/iw/iw-3.1.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d053798fd4fa8bc5001c0256b5d3209b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1-r1 new file mode 100644 index 0000000000..a85563cc4a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig +DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack +EAPI=2 +HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw +KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +RDEPEND=>=dev-libs/libnl-1.1 +SLOT=0 +SRC_URI=http://linuxwireless.org/download/iw/iw-3.1.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d053798fd4fa8bc5001c0256b5d3209b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6 new file mode 100644 index 0000000000..d5a5990bd0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig +DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack +EAPI=2 +HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw +KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +RDEPEND=>=dev-libs/libnl-1.1 +SLOT=0 +SRC_URI=http://linuxwireless.org/download/iw/iw-3.6.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=79426318c8c8a335c358b84cb0d65481 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6-r1 new file mode 100644 index 0000000000..d5a5990bd0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig +DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack +EAPI=2 +HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw +KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +RDEPEND=>=dev-libs/libnl-1.1 +SLOT=0 +SRC_URI=http://linuxwireless.org/download/iw/iw-3.6.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=79426318c8c8a335c358b84cb0d65481 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl2000-ucode-18.168.6.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl2000-ucode-18.168.6.1 new file mode 100644 index 0000000000..b8f62afa3e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl2000-ucode-18.168.6.1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) +DESCRIPTION=Intel (R) Centrino Wireless-N 2200 ucode +HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi +KEYWORDS=amd64 x86 +LICENSE=ipw3945 +SLOT=0 +SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-2000-ucode-18.168.6.1.tgz +_md5_=c2571b8bea43fa79175916fdc4a35ba4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl3945-ucode-15.32.2.9-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl3945-ucode-15.32.2.9-r1 new file mode 100644 index 0000000000..fe5349a672 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl3945-ucode-15.32.2.9-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) +DESCRIPTION=Intel (R) PRO/Wireless 3945ABG/BG Network Connection +HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi +KEYWORDS=amd64 x86 +LICENSE=ipw3945 +SLOT=0 +SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-3945-ucode-15.32.2.9.tgz +_md5_=fe623ff8b21dc78c96c5823960bbe6d4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl4965-ucode-228.61.2.24-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl4965-ucode-228.61.2.24-r1 new file mode 100644 index 0000000000..22081b25f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl4965-ucode-228.61.2.24-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) +DESCRIPTION=Intel (R) Wireless WiFi 4965AGN ucode +HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi +KEYWORDS=amd64 x86 +LICENSE=ipw3945 +SLOT=0 +SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-228.61.2.24.tgz +_md5_=3f69a332a1d5b1d6ae170cb235e8931d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6000-ucode-9.221.4.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6000-ucode-9.221.4.1-r1 new file mode 100644 index 0000000000..4e7aea1c1c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6000-ucode-9.221.4.1-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) +DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode +HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi +KEYWORDS=amd64 x86 +LICENSE=ipw3945 +SLOT=0 +SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000-ucode-9.221.4.1.tgz +_md5_=a8f6bbecc5cd2eecf6c8e2d487533b26 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6005-ucode-17.168.5.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6005-ucode-17.168.5.2-r1 new file mode 100644 index 0000000000..a3b75c90ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6005-ucode-17.168.5.2-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) +DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode +HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi +KEYWORDS=amd64 x86 +LICENSE=ipw3945 +SLOT=0 +SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-17.168.5.2.tgz +_md5_=3bd9e9f81c495ccb9544cd064fe1f61b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6030-ucode-18.168.6.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6030-ucode-18.168.6.1-r1 new file mode 100644 index 0000000000..45bb48bbdd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6030-ucode-18.168.6.1-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) +DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode +HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi +KEYWORDS=amd64 x86 +LICENSE=ipw3945 +SLOT=0 +SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-18.168.6.1.tgz +_md5_=6600761dac378f14fc8007a8217b84f1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6050-ucode-41.28.5.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6050-ucode-41.28.5.1-r1 new file mode 100644 index 0000000000..25dd5a98be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6050-ucode-41.28.5.1-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) +DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode +HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi +KEYWORDS=amd64 x86 +LICENSE=ipw3945 +SLOT=0 +SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6050-ucode-41.28.5.1.tgz +_md5_=fcc3c261c789028a951a984d2a0be433 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-14.64.2.47-r15 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-14.64.2.47-r15 new file mode 100644 index 0000000000..8869dfea78 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-14.64.2.47-r15 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Marvell SD8787 firmware image +EAPI=2 +HOMEPAGE=http://www.marvell.com/ +IUSE=cros_workon_tree_e678d0d27c25cba5abe0581e078ede22b87ba6ab +KEYWORDS=amd64 arm x86 +LICENSE=Marvell International Ltd. +RESTRICT=binchecks strip test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e70e379a7b45a9cbb807c3aa00bc4beb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-9999 new file mode 100644 index 0000000000..db7ec553a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Marvell SD8787 firmware image +EAPI=2 +HOMEPAGE=http://www.marvell.com/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=Marvell International Ltd. +RESTRICT=binchecks strip test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=0db79cbcf6f71483db023375b3484466 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/realtek-rt2800-firmware-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/realtek-rt2800-firmware-0.0.1 new file mode 100644 index 0000000000..daf4fb91fb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/realtek-rt2800-firmware-0.0.1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DESCRIPTION=Ebuild that installs Realtek 2800 USB firmware. +EAPI=4 +HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git +KEYWORDS=x86 arm amd64 +LICENSE=ralink-firmware +SLOT=0 +_md5_=c58aae91758bbf956e8fcb7307c0fa54 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wireless-regdb-20101124 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wireless-regdb-20101124 new file mode 100644 index 0000000000..1d41b7e953 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wireless-regdb-20101124 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install +DESCRIPTION=Binary regulatory database for CRDA +HOMEPAGE=http://wireless.kernel.org/en/developers/Regulatory +KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux +LICENSE=as-is +SLOT=0 +SRC_URI=http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-2010.11.24.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=67ed208f197385a2f392006d4e39cfb8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.2-r116 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.2-r116 new file mode 100644 index 0000000000..1e0c673c6d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.2-r116 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) dev-vcs/git +DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers +EAPI=2 +HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/ +IUSE=dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD cros_workon_tree_6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5 +KEYWORDS=amd64 arm x86 +LICENSE=|| ( GPL-2 BSD ) +RDEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) +SLOT=0 +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c qt3 823f11abd98cfc43cf92b8622e420f1f qt4 83eabd1192f3f2c5a649ba2422a14d00 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=a57426a6ed0a168b7009db585a6a5548 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-9999 new file mode 100644 index 0000000000..60e8ab8f33 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst prepare setup unpack +DEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) dev-vcs/git +DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers +EAPI=2 +HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/ +IUSE=dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=|| ( GPL-2 BSD ) +RDEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) +SLOT=0 +_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c qt3 823f11abd98cfc43cf92b8622e420f1f qt4 83eabd1192f3f2c5a649ba2422a14d00 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=34dc590d42c1fb333c869cc69f5fe7de diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-2.0.1-r228 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-2.0.1-r228 new file mode 100644 index 0000000000..4130b75d88 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-2.0.1-r228 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install postinst +DESCRIPTION=Filesystem baselayout and init scripts (Modified for Chromium OS) +HOMEPAGE=http://src.chromium.org/ +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=mirror://gentoo/baselayout-2.0.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/baselayout-2.0.1.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=c7944db11790246d29b3412e52832484 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/bootcache-0.0.1-r10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/bootcache-0.0.1-r10 new file mode 100644 index 0000000000..208d2dca74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/bootcache-0.0.1-r10 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for creating store for boot cache +EAPI=4 +HOMEPAGE=http://git.chromium.org/gitweb/?s=bootcache +IUSE=cros_workon_tree_41f576bc111ad5a24b71216c652c3e09c5cf2a87 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=923913dd9879530fa7388f1317c936ce diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/bootcache-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/bootcache-9999 new file mode 100644 index 0000000000..814a3ebe32 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/bootcache-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for creating store for boot cache +EAPI=4 +HOMEPAGE=http://git.chromium.org/gitweb/?s=bootcache +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9761684ce39f80c8922661d5d42010f6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/busybox-1.21.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/busybox-1.21.0 new file mode 100644 index 0000000000..ad1947fd82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/busybox-1.21.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst preinst prepare +DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) savedconfig? ( chromeos-base/busybox-config ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39 +DESCRIPTION=Utilities for rescue and embedded systems +EAPI=4 +HOMEPAGE=http://www.busybox.net/ +IUSE=ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd savedconfig +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) +RESTRICT=test +SLOT=0 +SRC_URI=http://www.busybox.net/downloads/busybox-1.21.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c savedconfig 973a6df1a0949eba28a185eac79de815 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b7466e930753156bbfddd7552f138eb0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/chvt-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/chvt-0.0.1-r1 new file mode 100644 index 0000000000..ae6a34baaa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/chvt-0.0.1-r1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=install +DEPEND=sys-apps/kbd +DESCRIPTION=chvt: Change virtual terminal console +EAPI=4 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_md5_=aa8758a45e081c12ccbefddf1e9c7838 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/daisydog-0.0.1-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/daisydog-0.0.1-r4 new file mode 100644 index 0000000000..a96d391bfc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/daisydog-0.0.1-r4 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Simple HW watchdog daemon +EAPI=4 +HOMEPAGE=http://git.chromium.org/gitweb/?p=chromiumos/third_party/daisydog.git +IUSE=cros_workon_tree_70399b45e7d690039110a3cd25d04b3648d79fe5 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=324684bfcb2d9d52e8586989bd55df93 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/daisydog-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/daisydog-9999 new file mode 100644 index 0000000000..e8056c105f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/daisydog-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure info setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Simple HW watchdog daemon +EAPI=4 +HOMEPAGE=http://git.chromium.org/gitweb/?p=chromiumos/third_party/daisydog.git +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=98cc9582d9ee10c143e5039048900938 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.2.20-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.2.20-r4 new file mode 100644 index 0000000000..f853a3abc2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.2.20-r4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst preinst test unpack +DEPEND=X? ( x11-libs/libXt x11-libs/libX11 ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 !=dev-libs/expat-1.95.8 !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=A message bus system, a simple way for applications to talk to each other +EAPI=2 +HOMEPAGE=http://dbus.freedesktop.org/ +IUSE=debug doc selinux static-libs test X test +KEYWORDS=amd64 x86 +LICENSE=|| ( GPL-2 AFL-2.1 ) +RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) !=dev-libs/expat-1.95.8 >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.4.1.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 virtualx e9162f65645513120b4e12863a5fa972 +_md5_=e341b9ec235791cf3606236b4fb815e1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.1-r1 new file mode 100644 index 0000000000..8d49fc39ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.1-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=A message bus system, a simple way for applications to talk to each other +EAPI=2 +HOMEPAGE=http://dbus.freedesktop.org/ +IUSE=debug doc selinux static-libs test X test +KEYWORDS=amd64 x86 +LICENSE=|| ( GPL-2 AFL-2.1 ) +RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) !=dev-libs/expat-1.95.8 >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.4.1.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 virtualx e9162f65645513120b4e12863a5fa972 +_md5_=e341b9ec235791cf3606236b4fb815e1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.12-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.12-r2 new file mode 100644 index 0000000000..3530c5d58e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.12-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( =dev-lang/python-2* >=dev-libs/glib-2.22:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=A message bus system, a simple way for applications to talk to each other +EAPI=2 +HOMEPAGE=http://dbus.freedesktop.org/ +IUSE=debug doc selinux static-libs test X test +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=|| ( GPL-2 AFL-2.1 ) +RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.4.12.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 virtualx e9162f65645513120b4e12863a5fa972 +_md5_=9b23625ecc2c0075142b16be8bc6b4ca diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.12-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.12-r5 new file mode 100644 index 0000000000..5499bf3138 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.4.12-r5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( =dev-lang/python-2* >=dev-libs/glib-2.22:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=A message bus system, a simple way for applications to talk to each other +EAPI=2 +HOMEPAGE=http://dbus.freedesktop.org/ +IUSE=debug doc selinux static-libs test X test +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=|| ( GPL-2 AFL-2.1 ) +RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 >=app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.4.12.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 virtualx e9162f65645513120b4e12863a5fa972 +_md5_=fd61327b610fb578540974747942d4bc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/debianutils-3.1.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/debianutils-3.1.3 new file mode 100644 index 0000000000..52587e35ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/debianutils-3.1.3 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install unpack +DESCRIPTION=A selection of tools from Debian +HOMEPAGE=http://packages.qa.debian.org/d/debianutils.html +IUSE=kernel_linux static +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd +LICENSE=BSD GPL-2 SMAIL +PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) +SLOT=0 +SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_3.1.3.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=013ecaf1e93de8dd3d1069b16eda4005 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/debianutils-3.1.3-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/debianutils-3.1.3-r1 new file mode 100644 index 0000000000..52587e35ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/debianutils-3.1.3-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install unpack +DESCRIPTION=A selection of tools from Debian +HOMEPAGE=http://packages.qa.debian.org/d/debianutils.html +IUSE=kernel_linux static +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd +LICENSE=BSD GPL-2 SMAIL +PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) +SLOT=0 +SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_3.1.3.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=013ecaf1e93de8dd3d1069b16eda4005 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dmidecode-2.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dmidecode-2.10 new file mode 100644 index 0000000000..5a8e903d2d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dmidecode-2.10 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install unpack +DESCRIPTION=DMI (Desktop Management Interface) table related utilities +HOMEPAGE=http://www.nongnu.org/dmidecode/ +KEYWORDS=-* amd64 arm ia64 ppc sparc x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://savannah.nongnu.org/download/dmidecode/dmidecode-2.10.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ccdadaad8bc41e70aaf9ed709be0b111 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dtc-1.3.0-r19 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dtc-1.3.0-r19 new file mode 100644 index 0000000000..000c4a8b27 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dtc-1.3.0-r19 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=sys-devel/flex sys-devel/bison dev-vcs/git +DESCRIPTION=Open Firmware device-tree compiler +EAPI=4 +HOMEPAGE=http://www.t2-project.org/packages/dtc.html +IUSE=cros_workon_tree_2fbdec828197e222838833d257710db96695654b +KEYWORDS=amd64 ppc ppc64 x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d516172dfd6864319c82edbfc6b1f37b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dtc-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dtc-9999 new file mode 100644 index 0000000000..3d81327064 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dtc-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=sys-devel/flex sys-devel/bison dev-vcs/git +DESCRIPTION=Open Firmware device-tree compiler +EAPI=4 +HOMEPAGE=http://www.t2-project.org/packages/dtc.html +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1680a1c263ae9d70b8eab14ac1592256 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashbench-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashbench-9999 new file mode 100644 index 0000000000..2bc7218b86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashbench-9999 @@ -0,0 +1,10 @@ +DEFINED_PHASES=configure prepare unpack +DEPEND=dev-vcs/git +DESCRIPTION=Flash Storage Benchmark +EAPI=4 +HOMEPAGE=https://github.com/bradfa/flashbench +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ca5e53456fcb436394489a8ef82853e8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashmap-0.3-r10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashmap-0.3-r10 new file mode 100644 index 0000000000..8903c88e58 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashmap-0.3-r10 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for manipulating firmware ROM mapping data structure +EAPI=4 +HOMEPAGE=http://flashmap.googlecode.com +IUSE=cros_workon_tree_e581823802f8d3adafbbe03ff0f17cc1476697fa +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RESTRICT=test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=29f7242606c1acb6e2af713bd5254c96 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashmap-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashmap-9999 new file mode 100644 index 0000000000..86811cdf84 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashmap-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup test unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for manipulating firmware ROM mapping data structure +EAPI=4 +HOMEPAGE=http://flashmap.googlecode.com +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +RESTRICT=test +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9287f78bdfcb6b309c6e21d916b50ab6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashrom-0.9.4-r234 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashrom-0.9.4-r234 new file mode 100644 index 0000000000..6598d29385 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashrom-0.9.4-r234 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=atahpt? ( sys-apps/pciutils ) dediprog? ( virtual/libusb:0 ) drkaiser? ( sys-apps/pciutils ) ft2232_spi? ( dev-embedded/libftdi ) gfxnvidia? ( sys-apps/pciutils ) internal? ( sys-apps/pciutils ) nic3com? ( sys-apps/pciutils ) nicintel? ( sys-apps/pciutils ) nicintel_spi? ( sys-apps/pciutils ) nicnatsemi? ( sys-apps/pciutils ) nicrealtek? ( sys-apps/pciutils ) rayer_spi? ( sys-apps/pciutils ) satasii? ( sys-apps/pciutils ) satamv? ( sys-apps/pciutils ) ogp_spi? ( sys-apps/pciutils ) sys-apps/pciutils[static-libs] sys-apps/diffutils dev-vcs/git +DESCRIPTION=Utility for reading, writing, erasing and verifying flash ROM chips +EAPI=4 +HOMEPAGE=http://flashrom.org/ +IUSE=+atahpt +bitbang_spi +buspirate_spi dediprog +drkaiser +dummy ft2232_spi +gfxnvidia +internal +linux_i2c +linux_spi +nic3com +nicintel +nicintel_spi +nicnatsemi +nicrealtek +ogp_spi +rayer_spi +satasii +satamv +serprog +wiki static -use_os_timer cros_workon_tree_846bf83a0323d8d44bc25c0c93f82b1121eb2766 +KEYWORDS=amd64 x86 arm +LICENSE=GPL-2 +RDEPEND=atahpt? ( sys-apps/pciutils ) dediprog? ( virtual/libusb:0 ) drkaiser? ( sys-apps/pciutils ) ft2232_spi? ( dev-embedded/libftdi ) gfxnvidia? ( sys-apps/pciutils ) internal? ( sys-apps/pciutils ) nic3com? ( sys-apps/pciutils ) nicintel? ( sys-apps/pciutils ) nicintel_spi? ( sys-apps/pciutils ) nicnatsemi? ( sys-apps/pciutils ) nicrealtek? ( sys-apps/pciutils ) rayer_spi? ( sys-apps/pciutils ) satasii? ( sys-apps/pciutils ) satamv? ( sys-apps/pciutils ) ogp_spi? ( sys-apps/pciutils ) sys-apps/pciutils[static-libs] internal? ( sys-apps/dmidecode ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3174b1a6aa7ae32370349d26cb5eb9f2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashrom-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashrom-9999 new file mode 100644 index 0000000000..9495a9785a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/flashrom-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=atahpt? ( sys-apps/pciutils ) dediprog? ( virtual/libusb:0 ) drkaiser? ( sys-apps/pciutils ) ft2232_spi? ( dev-embedded/libftdi ) gfxnvidia? ( sys-apps/pciutils ) internal? ( sys-apps/pciutils ) nic3com? ( sys-apps/pciutils ) nicintel? ( sys-apps/pciutils ) nicintel_spi? ( sys-apps/pciutils ) nicnatsemi? ( sys-apps/pciutils ) nicrealtek? ( sys-apps/pciutils ) rayer_spi? ( sys-apps/pciutils ) satasii? ( sys-apps/pciutils ) satamv? ( sys-apps/pciutils ) ogp_spi? ( sys-apps/pciutils ) sys-apps/pciutils[static-libs] sys-apps/diffutils dev-vcs/git +DESCRIPTION=Utility for reading, writing, erasing and verifying flash ROM chips +EAPI=4 +HOMEPAGE=http://flashrom.org/ +IUSE=+atahpt +bitbang_spi +buspirate_spi dediprog +drkaiser +dummy ft2232_spi +gfxnvidia +internal +linux_i2c +linux_spi +nic3com +nicintel +nicintel_spi +nicnatsemi +nicrealtek +ogp_spi +rayer_spi +satasii +satamv +serprog +wiki static -use_os_timer cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=GPL-2 +RDEPEND=atahpt? ( sys-apps/pciutils ) dediprog? ( virtual/libusb:0 ) drkaiser? ( sys-apps/pciutils ) ft2232_spi? ( dev-embedded/libftdi ) gfxnvidia? ( sys-apps/pciutils ) internal? ( sys-apps/pciutils ) nic3com? ( sys-apps/pciutils ) nicintel? ( sys-apps/pciutils ) nicintel_spi? ( sys-apps/pciutils ) nicnatsemi? ( sys-apps/pciutils ) nicrealtek? ( sys-apps/pciutils ) rayer_spi? ( sys-apps/pciutils ) satasii? ( sys-apps/pciutils ) satamv? ( sys-apps/pciutils ) ogp_spi? ( sys-apps/pciutils ) sys-apps/pciutils[static-libs] internal? ( sys-apps/dmidecode ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ae42868d02db8f58912a135e26117ad7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 new file mode 100644 index 0000000000..fdd165cfdb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install +DESCRIPTION=Simple commands to access hardware device registers +HOMEPAGE=http://code.google.com/p/iotools/ +IUSE=hardened +KEYWORDS=x86 amd64 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/iotools-1.2.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=622bd785753b621d7210cf24cf074237 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/keyutils-1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/keyutils-1.1 new file mode 100644 index 0000000000..a8e83c48e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/keyutils-1.1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install unpack +DEPEND=>=sys-kernel/linux-headers-2.6.11 +DESCRIPTION=Linux Key Management Utilities +HOMEPAGE=http://www.kernel.org/ +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=>=sys-kernel/linux-headers-2.6.11 +SLOT=0 +SRC_URI=http://people.redhat.com/~dhowells/keyutils/keyutils-1.1.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cf2d7aee93b3437bf27ad860aa7378b2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/module-init-tools-3.16-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/module-init-tools-3.16-r4 new file mode 100644 index 0000000000..df085d495f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/module-init-tools-3.16-r4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst test unpack +DEPEND=sys-libs/zlib +DESCRIPTION=tools for managing linux kernel modules +HOMEPAGE=http://modules.wiki.kernel.org/ +IUSE=static +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 +LICENSE=GPL-2 +RDEPEND=sys-libs/zlib !=sys-apps/flashmap-0.3-r4 dev-vcs/git +DESCRIPTION=Utility for obtaining various bits of low-level system info +EAPI=4 +HOMEPAGE=http://mosys.googlecode.com/ +IUSE=static cros_workon_tree_3988fb67f7ea025b9fd98e32e81faf93ffb5fca3 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=sys-apps/util-linux >=sys-apps/flashmap-0.3-r4 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7c67bad833b8caea668bceed1aa6aaa1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/mosys-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/mosys-9999 new file mode 100644 index 0000000000..97146d9386 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/mosys-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-apps/util-linux >=sys-apps/flashmap-0.3-r4 dev-vcs/git +DESCRIPTION=Utility for obtaining various bits of low-level system info +EAPI=4 +HOMEPAGE=http://mosys.googlecode.com/ +IUSE=static cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=sys-apps/util-linux >=sys-apps/flashmap-0.3-r4 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6f4eb7ca53ccdcbd49960595ade09745 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.1.10.11-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.1.10.11-r9 new file mode 100644 index 0000000000..bb7746e393 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.1.10.11-r9 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile install postinst postrm preinst prepare setup test +DEPEND=python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) >=app-admin/eselect-python-20091230 +DESCRIPTION=Portage is the package management and distribution system for Gentoo +EAPI=2 +HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml +IUSE=build doc epydoc +ipc +less linguas_pl python2 python3 selinux +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-2 +PDEPEND=!build? ( less? ( sys-apps/less ) >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) ) +PROVIDE=virtual/portage +RDEPEND=python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-1.6 ) elibc_uclibc? ( >=sys-apps/sandbox-1.6 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =app-admin/eselect-python-20091230 +SLOT=0 +SRC_URI=mirror://gentoo/portage-2.1.10.11.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.10.11.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=934feaa1757226778ad45319155602d2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-9999 new file mode 100644 index 0000000000..211b6124fe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-9999 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack +DEPEND=python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) >=app-admin/eselect-python-20091230 +DESCRIPTION=Portage is the package management and distribution system for Gentoo +EAPI=2 +HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml +IUSE=build doc epydoc +ipc linguas_pl python2 python3 selinux +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-2 +PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) ) +PROVIDE=virtual/portage +RDEPEND=python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-1.6 ) elibc_uclibc? ( >=sys-apps/sandbox-1.6 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8d0433279139ba88ccef0fd72020c1bc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/pv-1.1.4-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/pv-1.1.4-r1 new file mode 100644 index 0000000000..b111dec794 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/pv-1.1.4-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install +DESCRIPTION=Pipe Viewer: a tool for monitoring the progress of data through a pipe +EAPI=2 +HOMEPAGE=http://www.ivarch.com/programs/pv.shtml +IUSE=nls +KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris +LICENSE=Artistic-2 +SLOT=0 +SRC_URI=mirror://sourceforge/pipeviewer/pv-1.1.4.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=94cdf76f892b3b570e8db9431640c58c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rollog-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rollog-0.0.1-r3 new file mode 100644 index 0000000000..cf92eba40a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rollog-0.0.1-r3 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for implementing rolling logs for bug regression +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_f8747f25994455c144df5a4e24cedbbe09a16d7c +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a85861e17a561a38bd21c9880bea2645 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rollog-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rollog-9999 new file mode 100644 index 0000000000..11e1717a1d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rollog-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Utility for implementing rolling logs for bug regression +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4b833cf04dc73c0db42b8e890c3e412e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-0.0.1-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-0.0.1-r11 new file mode 100644 index 0000000000..5196891e7b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-0.0.1-r11 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS root block device tool/library +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_8ec533cfbe40ad80859408561a3623f8b24b909b +KEYWORDS=amd64 x86 arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c338e58bcde48e83acb6be9d13234536 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-9999 new file mode 100644 index 0000000000..a8b48c05ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Chrome OS root block device tool/library +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 ~arm +LICENSE=BSD +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=20e26014b1db74e44a8fa79b37ead093 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.2.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.2.2 new file mode 100644 index 0000000000..e8c6075477 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.2.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst preinst unpack +DEPEND=audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) !sys-apps/pam-login !app-admin/nologin skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Utilities to deal with user accounts +HOMEPAGE=http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/ +IUSE=audit cracklib nls pam selinux skey +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 +LICENSE=BSD GPL-2 +RDEPEND=audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) !sys-apps/pam-login !app-admin/nologin skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) pam? ( >=sys-auth/pambase-20080219.1 ) +SLOT=0 +SRC_URI=ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-4.1.2.2.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1753e1d13ef97d006b23d537fd6e4113 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.2.2-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.2.2-r3 new file mode 100644 index 0000000000..e8c6075477 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.2.2-r3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst preinst unpack +DEPEND=audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) !sys-apps/pam-login !app-admin/nologin skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Utilities to deal with user accounts +HOMEPAGE=http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/ +IUSE=audit cracklib nls pam selinux skey +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 +LICENSE=BSD GPL-2 +RDEPEND=audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) !sys-apps/pam-login !app-admin/nologin skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) pam? ( >=sys-auth/pambase-20080219.1 ) +SLOT=0 +SRC_URI=ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-4.1.2.2.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1753e1d13ef97d006b23d537fd6e4113 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/superiotool-5690-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/superiotool-5690-r1 new file mode 100644 index 0000000000..113e043cc1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/superiotool-5690-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install +DEPEND=sys-apps/pciutils +DESCRIPTION=Superiotool allows you to detect which Super I/O you have on your mainboard, and it can provide detailed information about the register contents of the Super I/O. +HOMEPAGE=http://www.coreboot.org/Superiotool +KEYWORDS=x86 +LICENSE=GPL-2 +RDEPEND=sys-apps/pciutils +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/superiotool-svn-5690.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5890085b7626bd5248c81d6b0aca7b9a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/superiotool-5690-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/superiotool-5690-r2 new file mode 100644 index 0000000000..4f15fa750e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/superiotool-5690-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install prepare +DEPEND=sys-apps/pciutils +DESCRIPTION=Superiotool allows you to detect which Super I/O you have on your mainboard, and it can provide detailed information about the register contents of the Super I/O. +EAPI=3 +HOMEPAGE=http://www.coreboot.org/Superiotool +KEYWORDS=x86 +LICENSE=GPL-2 +RDEPEND=sys-apps/pciutils +SLOT=0 +SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/superiotool-svn-5690.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c717fe687603c621d4f2af7ba30cb0c9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.3 new file mode 100644 index 0000000000..0afa18dbcb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=>=dev-libs/expat-2.0.0 >=sys-apps/dbus-1.2.16 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Upstart is an event-based replacement for the init daemon +HOMEPAGE=http://upstart.ubuntu.com/ +IUSE=examples nls +KEYWORDS=amd64 x86 arm +LICENSE=GPL-2 +RDEPEND=>=sys-apps/dbus-1.2.16 +SLOT=0 +SRC_URI=http://upstart.ubuntu.com/download/0.6/upstart-0.6.3.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7e94722cc8a62b1a0592944ca23b909d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.6 new file mode 100644 index 0000000000..560bddf6cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.6 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=>=dev-libs/expat-2.0.0 >=sys-apps/dbus-1.2.16 nls? ( sys-devel/gettext ) >=sys-libs/libnih-1.0.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Upstart is an event-based replacement for the init daemon +HOMEPAGE=http://upstart.ubuntu.com/ +IUSE=examples nls upstartdebug +KEYWORDS=amd64 x86 arm +LICENSE=GPL-2 +RDEPEND=>=sys-apps/dbus-1.2.16 >=sys-libs/libnih-1.0.2 +SLOT=0 +SRC_URI=http://upstart.ubuntu.com/download/0.6/upstart-0.6.6.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6b23c2650d15f13dc5fe46f4ebbac735 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.6-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.6-r3 new file mode 100644 index 0000000000..560bddf6cd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-0.6.6-r3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=>=dev-libs/expat-2.0.0 >=sys-apps/dbus-1.2.16 nls? ( sys-devel/gettext ) >=sys-libs/libnih-1.0.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Upstart is an event-based replacement for the init daemon +HOMEPAGE=http://upstart.ubuntu.com/ +IUSE=examples nls upstartdebug +KEYWORDS=amd64 x86 arm +LICENSE=GPL-2 +RDEPEND=>=sys-apps/dbus-1.2.16 >=sys-libs/libnih-1.0.2 +SLOT=0 +SRC_URI=http://upstart.ubuntu.com/download/0.6/upstart-0.6.6.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6b23c2650d15f13dc5fe46f4ebbac735 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-1.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-1.2 new file mode 100644 index 0000000000..94b096917b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-1.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=>=dev-libs/expat-2.0.0 >=sys-apps/dbus-1.2.16 nls? ( sys-devel/gettext ) >=sys-libs/libnih-1.0.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Upstart is an event-based replacement for the init daemon +HOMEPAGE=http://upstart.ubuntu.com/ +IUSE=examples nls upstartdebug +KEYWORDS=amd64 x86 arm +LICENSE=GPL-2 +RDEPEND=>=sys-apps/dbus-1.2.16 >=sys-libs/libnih-1.0.2 +SLOT=0 +SRC_URI=http://upstart.at/download/1.x/upstart-1.2.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8361db9a53999064a54c805a4a12cc89 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-1.2-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-1.2-r4 new file mode 100644 index 0000000000..94b096917b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/upstart-1.2-r4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=>=dev-libs/expat-2.0.0 >=sys-apps/dbus-1.2.16 nls? ( sys-devel/gettext ) >=sys-libs/libnih-1.0.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Upstart is an event-based replacement for the init daemon +HOMEPAGE=http://upstart.ubuntu.com/ +IUSE=examples nls upstartdebug +KEYWORDS=amd64 x86 arm +LICENSE=GPL-2 +RDEPEND=>=sys-apps/dbus-1.2.16 >=sys-libs/libnih-1.0.2 +SLOT=0 +SRC_URI=http://upstart.at/download/1.x/upstart-1.2.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8361db9a53999064a54c805a4a12cc89 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ureadahead-0.100.0-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ureadahead-0.100.0-r2 new file mode 100644 index 0000000000..f27c0f0bd1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ureadahead-0.100.0-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install prepare +DEPEND=sys-apps/util-linux >=sys-fs/e2fsprogs-1.41 sys-libs/libnih dev-util/pkgconfig sys-devel/gettext +DESCRIPTION=Ureadahead - Read files in advance during boot +EAPI=2 +HOMEPAGE=https://launchpad.net/ureadahead +KEYWORDS=x86 amd64 arm +LICENSE=GPL-2 +RDEPEND=sys-apps/util-linux >=sys-fs/e2fsprogs-1.41 sys-libs/libnih +SLOT=0 +SRC_URI=http://launchpad.net/ureadahead/trunk/0.100.0/+download/ureadahead-0.100.0.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=166dfcdd4e20d0616b9dd9ac551f0657 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/pam_pwdfile-0.99-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/pam_pwdfile-0.99-r1 new file mode 100644 index 0000000000..1ba4926a32 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/pam_pwdfile-0.99-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install +DEPEND=sys-libs/pam +DESCRIPTION=PAM module for authenticating against passwd-like files. +HOMEPAGE=http://cpbotha.net/pam_pwdfile.html +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=sys-libs/pam +SLOT=0 +SRC_URI=http://cpbotha.net/files/pam_pwdfile/pam_pwdfile-0.99.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f80f7edd510191fce5d6b706caa13c7c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/pambase-20101024-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/pambase-20101024-r2 new file mode 100644 index 0000000000..46d5446e35 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/pambase-20101024-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install postinst prepare test +DEPEND=app-portage/portage-utils +DESCRIPTION=PAM base configuration files +EAPI=4 +HOMEPAGE=http://www.gentoo.org/proj/en/base/pam/ +IUSE=debug cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=|| ( >=sys-libs/pam-0.99.9.0-r1 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) cracklib? ( >=sys-libs/pam-0.99[cracklib] ) consolekit? ( >=sys-auth/consolekit-0.3[pam] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.20[pam] ) selinux? ( >=sys-libs/pam-0.99[selinux] ) passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) mktemp? ( sys-auth/pam_mktemp ) pam_ssh? ( sys-auth/pam_ssh ) sha512? ( >=sys-libs/pam-1.0.1 ) pam_krb5? ( >=sys-libs/pam-1.1.0 >=sys-auth/pam_krb5-4.3 ) !=dev-libs/glib-2.25.12 dev-libs/expat introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam ) !!>=sys-auth/policykit-0.92 !=dev-util/intltool-0.36 doc? ( >=dev-util/gtk-doc-1.13 ) +DESCRIPTION=Policy framework for controlling privileges for system-wide services +EAPI=3 +HOMEPAGE=http://hal.freedesktop.org/docs/polkit/ +IUSE=debug doc examples gtk +introspection kde nls pam +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd +LICENSE=GPL-2 +PDEPEND=>=sys-auth/consolekit-0.4[policykit] gtk? ( || ( >=gnome-extra/polkit-gnome-0.96-r1 lxde-base/lxpolkit ) ) kde? ( || ( sys-auth/polkit-kde-agent sys-auth/polkit-kde ) ) +RDEPEND=>=dev-libs/glib-2.25.12 dev-libs/expat introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam ) +SLOT=0 +SRC_URI=http://hal.freedesktop.org/releases/polkit-0.100.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f4a09b0d64e4026c77a64d7a29baa48f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-block/parted-3.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-block/parted-3.1-r1 new file mode 100644 index 0000000000..ec7704ca18 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-block/parted-3.1-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) ) dev-util/pkgconfig test? ( >=dev-libs/check-0.9.3 ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems +EAPI=3 +HOMEPAGE=http://www.gnu.org/software/parted +IUSE=+debug device-mapper nls readline selinux static-libs test +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=GPL-3 +RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) ) +SLOT=0 +SRC_URI=mirror://gnu/parted/parted-3.1.tar.xz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4c817d8d8ae0f2499df93946cc59a981 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/bootstub-1.0-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/bootstub-1.0-r7 new file mode 100644 index 0000000000..89248904ea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/bootstub-1.0-r7 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-boot/gnu-efi dev-vcs/git +DESCRIPTION=Chrome OS embedded bootstub +EAPI=2 +IUSE=cros_workon_tree_a04ce1e804accdabc6afee4a4ca5ecd9e64d6c72 +KEYWORDS=amd64 +LICENSE=GPL-3 +RDEPEND=sys-boot/gnu-efi +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=bf52c6e0aaecf2b2de535428717c2b93 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/bootstub-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/bootstub-9999 new file mode 100644 index 0000000000..981d75edb8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/bootstub-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-boot/gnu-efi dev-vcs/git +DESCRIPTION=Chrome OS embedded bootstub +EAPI=2 +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 +LICENSE=GPL-3 +RDEPEND=sys-boot/gnu-efi +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a0b7d09af04a1e7ab5cffdd01e8615d2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bmpblk-0.0.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bmpblk-0.0.2 new file mode 100644 index 0000000000..19f9c7b37e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bmpblk-0.0.2 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install unpack +DESCRIPTION=Chrome OS Firmware Bitmap Block +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=cros-binary cdd072fed15ee8b579bda4b38e5cec62 +_md5_=27923dada2eda1e80799a95afa77b95d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bmpblk-0.0.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bmpblk-0.0.2-r1 new file mode 100644 index 0000000000..19f9c7b37e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bmpblk-0.0.2-r1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install unpack +DESCRIPTION=Chrome OS Firmware Bitmap Block +EAPI=2 +HOMEPAGE=http://www.chromium.org/ +KEYWORDS=amd64 arm x86 +LICENSE=BSD +SLOT=0 +_eclasses_=cros-binary cdd072fed15ee8b579bda4b38e5cec62 +_md5_=27923dada2eda1e80799a95afa77b95d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bootimage-0.0.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bootimage-0.0.2 new file mode 100644 index 0000000000..9a6e602be4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bootimage-0.0.2 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install +DEPEND=exynos? ( sys-boot/exynos-pre-boot ) tegra? ( virtual/tegra-bct ) x86? ( virtual/chromeos-coreboot sys-apps/coreboot-utils sys-boot/chromeos-seabios ) amd64? ( virtual/chromeos-coreboot sys-apps/coreboot-utils sys-boot/chromeos-seabios ) virtual/u-boot cros_ec? ( chromeos-base/chromeos-ec ) chromeos-base/vboot_reference sys-boot/chromeos-bmpblk memtest? ( sys-boot/chromeos-memtest ) depthcharge? ( sys-boot/depthcharge ) +DESCRIPTION=ChromeOS firmware image builder +EAPI=4 +HOMEPAGE=http://www.chromium.org +IUSE=alex butterfly emeraldlake2 haswell link lumpy lumpy64 mario parrot stout stumpy exynos factory-mode memtest tegra cros_ec depthcharge spring cros-debug +KEYWORDS=amd64 arm x86 +REQUIRED_USE=^^ ( alex butterfly emeraldlake2 haswell link lumpy lumpy64 mario parrot stout stumpy arm ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=44e0602048fe98998143955d99330b8a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bootimage-0.0.2-r57 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bootimage-0.0.2-r57 new file mode 100644 index 0000000000..9a6e602be4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-bootimage-0.0.2-r57 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install +DEPEND=exynos? ( sys-boot/exynos-pre-boot ) tegra? ( virtual/tegra-bct ) x86? ( virtual/chromeos-coreboot sys-apps/coreboot-utils sys-boot/chromeos-seabios ) amd64? ( virtual/chromeos-coreboot sys-apps/coreboot-utils sys-boot/chromeos-seabios ) virtual/u-boot cros_ec? ( chromeos-base/chromeos-ec ) chromeos-base/vboot_reference sys-boot/chromeos-bmpblk memtest? ( sys-boot/chromeos-memtest ) depthcharge? ( sys-boot/depthcharge ) +DESCRIPTION=ChromeOS firmware image builder +EAPI=4 +HOMEPAGE=http://www.chromium.org +IUSE=alex butterfly emeraldlake2 haswell link lumpy lumpy64 mario parrot stout stumpy exynos factory-mode memtest tegra cros_ec depthcharge spring cros-debug +KEYWORDS=amd64 arm x86 +REQUIRED_USE=^^ ( alex butterfly emeraldlake2 haswell link lumpy lumpy64 mario parrot stout stumpy arm ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-debug deb4c0b1259db4d092692c4c46fe072b eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=44e0602048fe98998143955d99330b8a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-memtest-0.0.1-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-memtest-0.0.1-r5 new file mode 100644 index 0000000000..3f145da4a7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-memtest-0.0.1-r5 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Based on the eutils eclass +EAPI=4 +HOMEPAGE=http://www.memtest86.com +IUSE=cros_workon_tree_b8064d188f425c4b2ced6c44a442b631d63568a3 +KEYWORDS=amd64 x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=de8f1e0ce892ced2fe58afe3b899193e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-memtest-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-memtest-9999 new file mode 100644 index 0000000000..cec795305f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-memtest-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=dev-vcs/git +DESCRIPTION=Based on the eutils eclass +EAPI=4 +HOMEPAGE=http://www.memtest86.com +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=79ae5c37312695038e09ff0df19a8500 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-seabios-0.0.1-r45 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-seabios-0.0.1-r45 new file mode 100644 index 0000000000..1a535f92bc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-seabios-0.0.1-r45 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=virtual/chromeos-coreboot sys-apps/coreboot-utils dev-vcs/git +DESCRIPTION=Based on the eutils eclass +EAPI=2 +HOMEPAGE=http://www.coreboot.org/SeaBIOS +IUSE=cros_workon_tree_aac8fef67a3b7b56c9b6cb32af538d32e9e70b15 +KEYWORDS=amd64 x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=edcb24bbb23e60f9df9f941762663016 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-seabios-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-seabios-9999 new file mode 100644 index 0000000000..770c29b2ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-seabios-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=virtual/chromeos-coreboot sys-apps/coreboot-utils dev-vcs/git +DESCRIPTION=Based on the eutils eclass +EAPI=2 +HOMEPAGE=http://www.coreboot.org/SeaBIOS +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6934b609e6a4dab02ef6821f400262d4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-u-boot-2011.12-r1312 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-u-boot-2011.12-r1312 new file mode 100644 index 0000000000..4581eef4d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-u-boot-2011.12-r1312 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install setup unpack +DEPEND=!sys-boot/x86-firmware-fdts !sys-boot/exynos-u-boot !sys-boot/tegra2-public-firmware-fdts dev-vcs/git +DESCRIPTION=Das U-Boot boot loader +EAPI=4 +HOMEPAGE=http://www.denx.de/wiki/U-Boot +IUSE=dev profiling factory-mode u_boot_config_use_beaglebone u_boot_config_use_coreboot u_boot_config_use_daisy u_boot_config_use_seaboard u_boot_config_use_waluigi cros-debug board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host cros_workon_tree_8595e217edc9baad42dd848f58b4cbd0c85c0200_8b768b506c41afc82139df72f689917b51d7cbb2 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=!sys-boot/x86-firmware-fdts !sys-boot/exynos-u-boot !sys-boot/tegra2-public-firmware-fdts +REQUIRED_USE=^^ ( u_boot_config_use_beaglebone u_boot_config_use_coreboot u_boot_config_use_daisy u_boot_config_use_seaboard u_boot_config_use_waluigi ) ^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a805d1294a60c2aaeb50d07c945279a9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-u-boot-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-u-boot-9999 new file mode 100644 index 0000000000..8823bea88d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/chromeos-u-boot-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install setup unpack +DEPEND=!sys-boot/x86-firmware-fdts !sys-boot/exynos-u-boot !sys-boot/tegra2-public-firmware-fdts dev-vcs/git +DESCRIPTION=Das U-Boot boot loader +EAPI=4 +HOMEPAGE=http://www.denx.de/wiki/U-Boot +IUSE=dev profiling factory-mode u_boot_config_use_beaglebone u_boot_config_use_coreboot u_boot_config_use_daisy u_boot_config_use_seaboard u_boot_config_use_waluigi cros-debug board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=!sys-boot/x86-firmware-fdts !sys-boot/exynos-u-boot !sys-boot/tegra2-public-firmware-fdts +REQUIRED_USE=^^ ( u_boot_config_use_beaglebone u_boot_config_use_coreboot u_boot_config_use_daisy u_boot_config_use_seaboard u_boot_config_use_waluigi ) ^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=dc25e4663c3ec9b7c5a6d8713d036ed5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-1.97-r12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-1.97-r12 new file mode 100644 index 0000000000..aea33ccbca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-1.97-r12 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install setup unpack +DEPEND=>=sys-libs/ncurses-5.2-r5 dev-libs/lzo truetype? ( media-libs/freetype ) dev-lang/ruby dev-vcs/git +DESCRIPTION=GNU GRUB 2 boot loader +EAPI=2 +HOMEPAGE=http://www.gnu.org/software/grub/ +IUSE=truetype cros_workon_tree_a626b63d9eb83c6985625569fa10d3b820ae9dd4 +KEYWORDS=amd64 +LICENSE=GPL-3 +PROVIDE=virtual/bootloader +RDEPEND=>=sys-libs/ncurses-5.2-r5 dev-libs/lzo truetype? ( media-libs/freetype ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6d7ea081fd18b56e2c51e8d5419a90cb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-9999 new file mode 100644 index 0000000000..c4f1356f04 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install setup unpack +DEPEND=>=sys-libs/ncurses-5.2-r5 dev-libs/lzo truetype? ( media-libs/freetype ) dev-lang/ruby dev-vcs/git +DESCRIPTION=GNU GRUB 2 boot loader +EAPI=2 +HOMEPAGE=http://www.gnu.org/software/grub/ +IUSE=truetype cros_workon_tree_ +KEYWORDS=~amd64 +LICENSE=GPL-3 +PROVIDE=virtual/bootloader +RDEPEND=>=sys-libs/ncurses-5.2-r5 dev-libs/lzo truetype? ( media-libs/freetype ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ee7be2f9e14c41cfd9e8de0f2dca5559 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-3.83-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-3.83-r5 new file mode 100644 index 0000000000..c5b464ce35 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-3.83-r5 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install unpack +DEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/nasm +DESCRIPTION=SysLinux, IsoLinux and PXELinux bootloader +HOMEPAGE=http://syslinux.zytor.com/ +KEYWORDS=-* amd64 x86 +LICENSE=GPL-2 +RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/boot/syslinux/syslinux-3.83.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=ee7b7a4b5d2167e2b8bd4c148d6a8df9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.03 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.03 new file mode 100644 index 0000000000..eb676d8563 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.03 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install unpack +DEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/nasm +DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders +HOMEPAGE=http://syslinux.zytor.com/ +IUSE=custom-cflags +KEYWORDS=-* amd64 x86 +LICENSE=GPL-2 +RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/boot/syslinux/4.xx/syslinux-4.03.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=996faf15d633de34ef17584f23b45b1f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-2.22-r16 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-2.22-r16 new file mode 100644 index 0000000000..8a945ac36b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-2.22-r16 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst postrm setup test unpack +DEPEND=>=sys-devel/binutils-config-1.9 test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex sys-devel/gnuconfig dev-vcs/git +DESCRIPTION=Tools necessary to build programs +HOMEPAGE=http://sources.redhat.com/binutils/ +IUSE=hardened mounted_binutils multislot multitarget nls test vanilla cros_workon_tree_2a7750a0cddd72df341d61250ade80d6270afbd7 +KEYWORDS=amd64 arm x86 +LICENSE=|| ( GPL-3 LGPL-3 ) +RDEPEND=>=sys-devel/binutils-config-1.9 +RESTRICT=fetch strip +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 gnuconfig 9200bfc8e0184357abfb86a08edd4fc3 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=3e8d237fc8a48c0e69e1c1b7da04360e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-2.23.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-2.23.1 new file mode 100644 index 0000000000..26025b62e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-2.23.1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install postinst postrm test unpack +DEPEND=sys-devel/gnuconfig >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc +DESCRIPTION=Tools necessary to build programs +HOMEPAGE=http://sources.redhat.com/binutils/ +IUSE=cxx nls multitarget multislot static-libs test vanilla zlib +LICENSE=|| ( GPL-3 LGPL-3 ) +RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib ) +SLOT=0 +SRC_URI=mirror://gnu/binutils/binutils-2.23.1.tar.bz2 mirror://gentoo/binutils-2.23.1-patches-1.0.tar.xz http://dev.gentoo.org/~vapier/dist/binutils-2.23.1-patches-1.0.tar.xz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnuconfig 9200bfc8e0184357abfb86a08edd4fc3 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-binutils c4e3cb8fc23e732e248b6cecc82f9800 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 unpacker 3bad9303b54075673d368b65e22dfdc8 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e58ac0ffa258cff1e79b7e2dc0d14bfb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-9999 new file mode 100644 index 0000000000..9499da2467 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/binutils-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install postinst postrm setup test unpack +DEPEND=>=sys-devel/binutils-config-1.9 test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex sys-devel/gnuconfig dev-vcs/git +DESCRIPTION=Tools necessary to build programs +HOMEPAGE=http://sources.redhat.com/binutils/ +IUSE=hardened mounted_binutils multislot multitarget nls test vanilla cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=|| ( GPL-3 LGPL-3 ) +RDEPEND=>=sys-devel/binutils-config-1.9 +RESTRICT=fetch strip +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 gnuconfig 9200bfc8e0184357abfb86a08edd4fc3 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=4f5550f7654023726b327c510160361d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/clang-3.2_pre170392 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/clang-3.2_pre170392 new file mode 100644 index 0000000000..200790fba9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/clang-3.2_pre170392 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=static-analyzer? ( dev-lang/perl ) dev-vcs/subversion[webdav-neon,webdav-serf] net-misc/rsync >=app-admin/eselect-python-20091230 +DESCRIPTION=C language family frontend for LLVM +EAPI=4 +HOMEPAGE=http://clang.llvm.org/ +IUSE=debug multitarget +static-analyzer test +KEYWORDS=amd64 +LICENSE=UoI-NCSA +RDEPEND=~sys-devel/llvm-3.2_pre170392[multitarget=] >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 subversion 9c7c21460890d4af8d8ec4446112d0d6 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b598c62a006e8d65bff7acdb9b4d08c5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/clang-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/clang-9999 new file mode 100644 index 0000000000..103df41481 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/clang-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=static-analyzer? ( dev-lang/perl ) dev-vcs/subversion[webdav-neon,webdav-serf] net-misc/rsync >=app-admin/eselect-python-20091230 +DESCRIPTION=C language family frontend for LLVM +EAPI=4 +HOMEPAGE=http://clang.llvm.org/ +IUSE=debug multitarget +static-analyzer test +KEYWORDS=~amd64 +LICENSE=UoI-NCSA +RDEPEND=~sys-devel/llvm-9999[multitarget=] >=app-admin/eselect-python-20091230 +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 subversion 9c7c21460890d4af8d8ec4446112d0d6 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=4c4d04acc7fffdebae5241c2c5c6890b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gcc-4.7.1-r41 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gcc-4.7.1-r41 new file mode 100644 index 0000000000..c567135417 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gcc-4.7.1-r41 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst postrm preinst setup unpack +DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto >=x11-libs/gtk+-2.2 x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 dev-vcs/git +DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14. +EAPI=1 +IUSE=gcj git_gcc graphite gtk hardened hardfp mounted_gcc multilib multislot nls cxx openmp tests +thumb upstream_gcc vanilla +wrapper_ccache cros_workon_tree_896542d4852cae24c8117b2a0706e0e8c2a51fdd +KEYWORDS=amd64 arm x86 +LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2 +PDEPEND=>=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) +RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto >=x11-libs/gtk+-2.2 x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) +RESTRICT=mirror strip +SLOT=x86_64-pc-linux-gnu +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a9568c69445227fe392b9700dc14c266 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gcc-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gcc-9999 new file mode 100644 index 0000000000..68394a057c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gcc-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile info install postinst postrm preinst setup unpack +DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto >=x11-libs/gtk+-2.2 x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 dev-vcs/git +DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14. +EAPI=1 +IUSE=gcj git_gcc graphite gtk hardened hardfp mounted_gcc multilib multislot nls cxx openmp tests +thumb upstream_gcc vanilla +wrapper_ccache cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2 +PDEPEND=>=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) +RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto >=x11-libs/gtk+-2.2 x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) +RESTRICT=mirror strip +SLOT=x86_64-pc-linux-gnu +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=66822f5f9e63335b5bc7bae0660cb1d9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gdb-7.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gdb-7.2-r2 new file mode 100644 index 0000000000..df87a1635e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gdb-7.2-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install postinst prepare test unpack +DEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.6 +DESCRIPTION=GNU debugger +EAPI=3 +HOMEPAGE=http://sourceware.org/gdb/ +IUSE=expat multitarget nls python test vanilla mounted_sources +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd +LICENSE=GPL-2 LGPL-2 +RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git a673225a1558ef94456dbd8ce271d16a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=13d368484c7955c2d2d1d4ceb0479d16 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gdb-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gdb-9999 new file mode 100644 index 0000000000..68166769fb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/gdb-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure install postinst prepare test unpack +DEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.6 +DESCRIPTION=GNU debugger +EAPI=3 +HOMEPAGE=http://sourceware.org/gdb/ +IUSE=expat multitarget nls python test vanilla mounted_sources +LICENSE=GPL-2 LGPL-2 +RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git a673225a1558ef94456dbd8ce271d16a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=e9d41ca2ece1d753015589dccddee3a6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-3.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-3.2-r1 new file mode 100644 index 0000000000..2974862abe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-3.2-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup +DEPEND=dev-lang/perl >=sys-devel/make-3.79 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) gold? ( >=sys-devel/binutils-2.22[cxx] ) libffi? ( virtual/pkgconfig virtual/libffi ) ocaml? ( dev-lang/ocaml ) udis86? ( amd64? ( dev-libs/udis86[pic] ) !amd64? ( dev-libs/udis86 ) ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* +DESCRIPTION=Low Level Virtual Machine +EAPI=4 +HOMEPAGE=http://llvm.org/ +IUSE=debug gold +libffi multitarget ocaml test udis86 vim-syntax +KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos +LICENSE=UoI-NCSA +RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* +SLOT=0 +SRC_URI=http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e pax-utils 3551398d6ede2b572568832730cc2a45 portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=035b48a917319f5c8e906ca19365aaf5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-3.2_pre170392 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-3.2_pre170392 new file mode 100644 index 0000000000..055567b998 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-3.2_pre170392 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install preinst prepare setup unpack +DEPEND=dev-lang/perl >=sys-devel/make-3.79 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) gold? ( >=sys-devel/binutils-2.22[cxx] ) libffi? ( dev-util/pkgconfig virtual/libffi ) ocaml? ( dev-lang/ocaml ) udis86? ( amd64? ( dev-libs/udis86[pic] ) !amd64? ( dev-libs/udis86 ) ) dev-vcs/subversion[webdav-neon,webdav-serf] net-misc/rsync >=app-admin/eselect-python-20091230 =dev-lang/python-2* +DESCRIPTION=Low Level Virtual Machine +EAPI=4 +HOMEPAGE=http://llvm.org/ +IUSE=debug doc gold +libffi multitarget ocaml test udis86 vim-syntax +KEYWORDS=amd64 +LICENSE=UoI-NCSA +RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e pax-utils 3551398d6ede2b572568832730cc2a45 portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 subversion 9c7c21460890d4af8d8ec4446112d0d6 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=91bcd2580c5c9c69bcc99a197ed4d710 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-9999 new file mode 100644 index 0000000000..f1badbd8a7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/llvm-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install preinst prepare setup unpack +DEPEND=dev-lang/perl >=sys-devel/make-3.79 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) gold? ( >=sys-devel/binutils-2.22[cxx] ) libffi? ( dev-util/pkgconfig virtual/libffi ) ocaml? ( dev-lang/ocaml ) udis86? ( amd64? ( dev-libs/udis86[pic] ) !amd64? ( dev-libs/udis86 ) ) dev-vcs/subversion[webdav-neon,webdav-serf] net-misc/rsync >=app-admin/eselect-python-20091230 =dev-lang/python-2* +DESCRIPTION=Low Level Virtual Machine +EAPI=4 +HOMEPAGE=http://llvm.org/ +IUSE=debug doc gold +libffi multitarget ocaml test udis86 vim-syntax +KEYWORDS=~amd64 +LICENSE=UoI-NCSA +RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e pax-utils 3551398d6ede2b572568832730cc2a45 portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 subversion 9c7c21460890d4af8d8ec4446112d0d6 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a134c9d9e32072fe4e2f2387d49c52df diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/fuse-2.8.6-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/fuse-2.8.6-r3 new file mode 100644 index 0000000000..be0abdccfc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/fuse-2.8.6-r3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install prepare setup +DESCRIPTION=An interface for filesystems implemented in userspace. +EAPI=3 +HOMEPAGE=http://fuse.sourceforge.net +IUSE=kernel_linux kernel_FreeBSD +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd +LICENSE=GPL-2 +PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd ) +SLOT=0 +SRC_URI=mirror://sourceforge/fuse/fuse-2.8.6.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=d183f42b5be02d89f014faa3c6a7c252 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/ntfs3g-2012.1.15-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/ntfs3g-2012.1.15-r1 new file mode 100644 index 0000000000..4b1380b0ef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/ntfs3g-2012.1.15-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install setup +DEPEND=!=dev-libs/libgcrypt-1.2.2 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 ) dev-util/pkgconfig sys-apps/attr +DESCRIPTION=Open source read-write NTFS driver that runs under FUSE +EAPI=4 +HOMEPAGE=http://www.tuxera.com/community/ntfs-3g-download/ +IUSE=acl crypt debug +external-fuse extras +ntfsprogs static-libs suid +udev xattr +KEYWORDS=amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=!=dev-libs/libgcrypt-1.2.2 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 ) +SLOT=0 +SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2012.1.15.tgz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=695d0efc861bdede3d635fb41174361e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/ntfs3g-2012.1.15-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/ntfs3g-2012.1.15-r2 new file mode 100644 index 0000000000..6c04280f02 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/ntfs3g-2012.1.15-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install setup +DEPEND=!=dev-libs/libgcrypt-1.2.2 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 ) dev-util/pkgconfig sys-apps/attr +DESCRIPTION=Open source read-write NTFS driver that runs under FUSE +EAPI=4 +HOMEPAGE=http://www.tuxera.com/community/ntfs-3g-download/ +IUSE=acl crypt debug +external-fuse extras +ntfsprogs static-libs suid +udev xattr +KEYWORDS=amd64 arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=!=dev-libs/libgcrypt-1.2.2 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 ) +SLOT=0 +SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2012.1.15.tgz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=dd8a8fa05c896a035c60e191ca4f52b6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-151-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-151-r6 new file mode 100644 index 0000000000..98a16a06ba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-151-r6 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install postinst preinst setup unpack +DEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl >=sys-apps/usbutils-0.82 virtual/libusb:0 sys-apps/pciutils dev-libs/glib:2 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.9 extras? ( dev-util/gperf dev-util/pkgconfig ) virtual/os-headers !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs) +EAPI=1 +HOMEPAGE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +IUSE=selinux devfs-compat old-hd-rules -extras test +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 +LICENSE=GPL-2 +PROVIDE=virtual/dev-manager +RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl >=sys-apps/usbutils-0.82 virtual/libusb:0 sys-apps/pciutils dev-libs/glib:2 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.9 !sys-apps/coldplug !=sys-apps/baselayout-1.12.5 +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-151.tar.bz2 test? ( mirror://gentoo/udev-151-testsys.tar.bz2 ) +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=ca1c21d01c4a3654ead4eb29c2441a10 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-170 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-170 new file mode 100644 index 0000000000..2b8fa082e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-170 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst preinst setup unpack +DEPEND=selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.9 keymap? ( dev-util/gperf ) virtual/os-headers !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs) +EAPI=1 +HOMEPAGE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +IUSE=selinux test rule_generator hwdb acl gudev introspection keymap floppy edd action_modeswitch +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=GPL-2 +RDEPEND=selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.9 hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) !sys-apps/coldplug !=sys-apps/baselayout-1.12.5 +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-170.tar.bz2 test? ( mirror://gentoo/udev-151-testsys.tar.bz2 ) mirror://gentoo/udev-gentoo-scripts-v3.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=125cab6f5c06fbdaa70b2ceb7ef98a22 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-170-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-170-r2 new file mode 100644 index 0000000000..2b8fa082e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-170-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst preinst setup unpack +DEPEND=selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.9 keymap? ( dev-util/gperf ) virtual/os-headers !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs) +EAPI=1 +HOMEPAGE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +IUSE=selinux test rule_generator hwdb acl gudev introspection keymap floppy edd action_modeswitch +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=GPL-2 +RDEPEND=selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.9 hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) !sys-apps/coldplug !=sys-apps/baselayout-1.12.5 +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-170.tar.bz2 test? ( mirror://gentoo/udev-151-testsys.tar.bz2 ) mirror://gentoo/udev-gentoo-scripts-v3.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=125cab6f5c06fbdaa70b2ceb7ef98a22 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-171 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-171 new file mode 100644 index 0000000000..25e762bb0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-171 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack +DEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl dev-libs/glib:2 dev-libs/gobject-introspection virtual/libusb:0 ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) extras? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) extras? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) !sys-apps/coldplug !=sys-apps/baselayout-1.12.5 +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-171.tar.bz2 test? ( mirror://gentoo/udev-171-testsys.tar.bz2 ) mirror://gentoo/udev-171-gentoo-patchset-v1.tar.bz2 mirror://gentoo/udev-gentoo-scripts-v4.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=3cc033d8b607f61edf8c3d5b8aaecdd3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-171-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-171-r3 new file mode 100644 index 0000000000..25e762bb0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/udev-171-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack +DEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl dev-libs/glib:2 dev-libs/gobject-introspection virtual/libusb:0 ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) extras? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) extras? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) !sys-apps/coldplug !=sys-apps/baselayout-1.12.5 +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-171.tar.bz2 test? ( mirror://gentoo/udev-171-testsys.tar.bz2 ) mirror://gentoo/udev-171-gentoo-patchset-v1.tar.bz2 mirror://gentoo/udev-gentoo-scripts-v4.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=3cc033d8b607f61edf8c3d5b8aaecdd3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-3.4-r2099 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-3.4-r2099 new file mode 100644 index 0000000000..15552d3472 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-3.4-r2099 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=!sys-kernel/chromeos-kernel-next !sys-kernel/chromeos-kernel-exynos dev-vcs/git sys-apps/debianutils initramfs? ( chromeos-base/chromeos-initramfs ) +DESCRIPTION=Chrome OS Kernel +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_cf09dbf486aa2e7f53a7236d4d77165325586be8 board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host -device_tree -kernel_sources blkdevram ca0132 cifs debug fbconsole gdmwimax gobi highmem i2cdev initramfs kvm nfs pcserial qmi realtekpstor samsung_serial systemtap tpm vfat +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=!sys-kernel/chromeos-kernel-next !sys-kernel/chromeos-kernel-exynos +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-kernel2 57642e7f042772fa81e35cf2b6a2d36d cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=9413c75c7cc96c0e79e65028b9674657 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-9999 new file mode 100644 index 0000000000..0ebe649f46 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=!sys-kernel/chromeos-kernel-next !sys-kernel/chromeos-kernel-exynos dev-vcs/git sys-apps/debianutils initramfs? ( chromeos-base/chromeos-initramfs ) +DESCRIPTION=Chrome OS Kernel +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host -device_tree -kernel_sources blkdevram ca0132 cifs debug fbconsole gdmwimax gobi highmem i2cdev initramfs kvm nfs pcserial qmi realtekpstor samsung_serial systemtap tpm vfat +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=!sys-kernel/chromeos-kernel-next !sys-kernel/chromeos-kernel-exynos +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-kernel2 57642e7f042772fa81e35cf2b6a2d36d cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=03d2235da71e50e876902121718c0842 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-next-3.4_rc7-r348 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-next-3.4_rc7-r348 new file mode 100644 index 0000000000..c9d06fca4e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-next-3.4_rc7-r348 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=!sys-kernel/chromeos-kernel dev-vcs/git sys-apps/debianutils initramfs? ( chromeos-base/chromeos-initramfs ) +DESCRIPTION=Chrome OS Kernel-next +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_b80c11182613432cf1192946a2c95ea1cd742d9d board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host -device_tree -kernel_sources blkdevram ca0132 cifs debug fbconsole gdmwimax gobi highmem i2cdev initramfs kvm nfs pcserial qmi realtekpstor samsung_serial systemtap tpm vfat +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=!sys-kernel/chromeos-kernel +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-kernel2 57642e7f042772fa81e35cf2b6a2d36d cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5e479d04b674c6aa5699921de310d62b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-next-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-next-9999 new file mode 100644 index 0000000000..80efc6e2ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/chromeos-kernel-next-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=!sys-kernel/chromeos-kernel dev-vcs/git sys-apps/debianutils initramfs? ( chromeos-base/chromeos-initramfs ) +DESCRIPTION=Chrome OS Kernel-next +EAPI=4 +HOMEPAGE=http://www.chromium.org/ +IUSE=cros_workon_tree_ board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host -device_tree -kernel_sources blkdevram ca0132 cifs debug fbconsole gdmwimax gobi highmem i2cdev initramfs kvm nfs pcserial qmi realtekpstor samsung_serial systemtap tpm vfat +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=!sys-kernel/chromeos-kernel +REQUIRED_USE=^^ ( board_use_amd64-generic board_use_amd64-corei7 board_use_amd64-drm board_use_amd64-host board_use_aries board_use_arm-generic board_use_beaglebone board_use_butterfly board_use_chronos board_use_daisy board_use_daisy-drm board_use_daisy_spring board_use_daisy_snow board_use_emeraldlake2 board_use_eureka board_use_fb1 board_use_haswell board_use_haswell_baskingridge board_use_haswell_wtm1 board_use_haswell_wtm2 board_use_ironhide board_use_kiev board_use_klang board_use_link board_use_lumpy board_use_panda board_use_parrot board_use_puppy board_use_raspberrypi board_use_stout board_use_stumpy board_use_tegra2 board_use_tegra2_aebl board_use_tegra2_arthur board_use_tegra2_asymptote board_use_tegra2_dev-board board_use_tegra2_dev-board-opengl board_use_tegra2_kaen board_use_tegra2_seaboard board_use_tegra2_wario board_use_tegra3-generic board_use_waluigi board_use_cardhu board_use_x32-generic board_use_x86-agz board_use_x86-alex board_use_x86-alex_he board_use_x86-alex_hubble board_use_x86-alex32 board_use_x86-alex32_he board_use_x86-dogfood board_use_x86-drm board_use_x86-fruitloop board_use_x86-generic board_use_x86-mario board_use_x86-mario64 board_use_x86-pineview board_use_x86-wayland board_use_x86-zgb board_use_x86-zgb_he board_use_x86-zgb32 board_use_x86-zgb32_he cros_host ) +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-board cb702a5d2e48ec0b63029973efa4d744 cros-kernel2 57642e7f042772fa81e35cf2b6a2d36d cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7d368e2e2f491e63d0fc91d56f160bb2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/linux-headers-3.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/linux-headers-3.4 new file mode 100644 index 0000000000..f1a80ddcb5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/linux-headers-3.4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack +DEPEND=app-arch/xz-utils dev-lang/perl +DESCRIPTION=Linux system headers +EAPI=3 +HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RESTRICT=binchecks strip +SLOT=0 +SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-1.tar.xz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a kernel-2 f6bc76f6aacd763879420dba9fa0168e multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e1bb6a1b4f4b2424cce4ee0fa1529ea6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/linux-headers-3.4-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/linux-headers-3.4-r3 new file mode 100644 index 0000000000..f1a80ddcb5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/linux-headers-3.4-r3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack +DEPEND=app-arch/xz-utils dev-lang/perl +DESCRIPTION=Linux system headers +EAPI=3 +HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RESTRICT=binchecks strip +SLOT=0 +SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-1.tar.xz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a kernel-2 f6bc76f6aacd763879420dba9fa0168e multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e1bb6a1b4f4b2424cce4ee0fa1529ea6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.6.21_p4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.6.21_p4 new file mode 100644 index 0000000000..27f08e991b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.6.21_p4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm preinst setup test unpack +DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Oracle Berkeley DB +HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html +IUSE=tcl java doc nocxx doc test elibc_FreeBSD java +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=OracleDB +RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) +SLOT=4.6 +SRC_URI=http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.4 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 db 1135d23301373966b04d357a4397bc9a eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 java-pkg-opt-2 31a1663247652448431dcc8c194e2752 java-utils-2 6beafc7c3d1dbae83a4478182b158f66 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=27a7862c5840714fec13b91d34bc4fee diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.7.25_p4-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.7.25_p4-r4 new file mode 100644 index 0000000000..e9c2790ccb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.7.25_p4-r4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm preinst setup test unpack +DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Oracle Berkeley DB +HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html +IUSE=doc java nocxx tcl test doc test elibc_FreeBSD java +KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=OracleDB +RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 ) +SLOT=4.7 +SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 db 1135d23301373966b04d357a4397bc9a eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 java-pkg-opt-2 31a1663247652448431dcc8c194e2752 java-utils-2 6beafc7c3d1dbae83a4478182b158f66 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=5eb807c394541351031be3c9a3bcab2a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.15-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.15-r5 new file mode 100644 index 0000000000..3c72f7ff5f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.15-r5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install test unpack +DEPEND=>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=app-misc/pax-utils-0.1.10 virtual/os-headers !=sys-devel/patch-2.6.1 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig +DESCRIPTION=GNU libc6 (also called glibc2) C library +HOMEPAGE=http://www.gnu.org/software/libc/libc.html +IUSE=debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only +KEYWORDS=amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=LGPL-2 +RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data ) +RESTRICT=strip +SLOT=2.2 +SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-22.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-22.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-22.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnuconfig 9200bfc8e0184357abfb86a08edd4fc3 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 unpacker 3bad9303b54075673d368b65e22dfdc8 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e1445c70027e5723636a4424cbf24042 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.16.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.16.0 new file mode 100644 index 0000000000..c69af97a2d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.16.0 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install test unpack +DEPEND=>=app-misc/pax-utils-0.1.10 !=sys-devel/binutils-2.20 >=sys-devel/gcc-4.3 virtual/os-headers !vanilla? ( >=sys-libs/timezone-data-2012c ) sys-devel/gnuconfig +DESCRIPTION=GNU libc6 (also called glibc2) C library +HOMEPAGE=http://www.gnu.org/software/libc/libc.html +IUSE=debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only +LICENSE=LGPL-2 +RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data ) +RESTRICT=strip +SLOT=2.2 +SRC_URI=mirror://gnu/glibc/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0.tar.xz mirror://gnu/glibc/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.16.0-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.16.0-patches-8.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnuconfig 9200bfc8e0184357abfb86a08edd4fc3 multilib 5f4ad6cf85e365e8f0c6050ddd21659e multiprocessing 1512bdfe7004902b8cd2c466fc3df772 portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 unpacker 3bad9303b54075673d368b65e22dfdc8 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e513ddc09fe57fce05a45dab662c5de1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-9999 new file mode 100644 index 0000000000..bdc07c358a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install test unpack +DEPEND=>=app-misc/pax-utils-0.1.10 !=sys-devel/binutils-2.20 >=sys-devel/gcc-4.3 virtual/os-headers !vanilla? ( >=sys-libs/timezone-data-2012c ) sys-devel/gnuconfig dev-vcs/git +DESCRIPTION=GNU libc6 (also called glibc2) C library +HOMEPAGE=http://www.gnu.org/software/libc/libc.html +IUSE=debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only +LICENSE=LGPL-2 +RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data ) +RESTRICT=strip +SLOT=2.2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 gnuconfig 9200bfc8e0184357abfb86a08edd4fc3 multilib 5f4ad6cf85e365e8f0c6050ddd21659e multiprocessing 1512bdfe7004902b8cd2c466fc3df772 portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 unpacker 3bad9303b54075673d368b65e22dfdc8 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=3b65885af526d0e49c28f68f4d99b50f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/libbb-1.19.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/libbb-1.19.0 new file mode 100644 index 0000000000..2f05f6c00f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/libbb-1.19.0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install +DESCRIPTION=library for busybox - libbb.a +EAPI=4 +HOMEPAGE=http://www.busybox.net/ +IUSE=32bit_au +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://www.busybox.net/downloads/busybox-1.19.0.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=5f745c9175ed074d5ae468855ab105da diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1 new file mode 100644 index 0000000000..869cea17fc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Samba talloc library +EAPI=2 +HOMEPAGE=http://talloc.samba.org/ +IUSE=compat doc +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=GPL-3 +RDEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Samba talloc library +EAPI=2 +HOMEPAGE=http://talloc.samba.org/ +IUSE=compat doc +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 +LICENSE=GPL-3 +RDEPEND=!=sys-power/powermgmt-base-1.31[-pm-utils] +DESCRIPTION=Suspend and hibernation utilities +EAPI=2 +HOMEPAGE=http://pm-utils.freedesktop.org/ +IUSE=alsa debug networkmanager ntp video_cards_intel video_cards_radeon +KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 +LICENSE=GPL-2 +RDEPEND=!=sys-power/powermgmt-base-1.31[-pm-utils] sys-apps/dbus >=sys-apps/util-linux-2.13 sys-power/pm-quirks alsa? ( media-sound/alsa-utils ) networkmanager? ( net-misc/networkmanager ) ntp? ( || ( net-misc/ntp net-misc/openntpd ) ) amd64? ( !video_cards_intel? ( sys-apps/vbetool ) ) x86? ( !video_cards_intel? ( sys-apps/vbetool ) ) video_cards_radeon? ( app-laptop/radeontool ) +SLOT=0 +SRC_URI=http://pm-utils.freedesktop.org/releases/pm-utils-1.4.1.tar.gz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=02524d505a39cf69aa1efc5ecf8caa6d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r17 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r17 new file mode 100644 index 0000000000..1664c31349 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r17 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-libs/ncurses dev-vcs/git +DESCRIPTION=Utility for looking at top users of system calls +EAPI=2 +HOMEPAGE=http://git.chromium.org/gitweb/?s=ktop +IUSE=cros_workon_tree_df952e3d5bb2f168ccde7a5a1e8684e9b87a078e +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=sys-libs/ncurses +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=76dffd83a14b4a04cf1047c18d942bcc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-9999 new file mode 100644 index 0000000000..61ec7cc879 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile info install setup unpack +DEPEND=sys-libs/ncurses dev-vcs/git +DESCRIPTION=Utility for looking at top users of system calls +EAPI=2 +HOMEPAGE=http://git.chromium.org/gitweb/?s=ktop +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=sys-libs/ncurses +SLOT=0 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=71776e3387d4f4daa29e95545068fd09 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-bsp-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-bsp-1 new file mode 100644 index 0000000000..3b3c22173f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-bsp-1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=- +DEPEND=!chromeos-base/chromeos-bsp-null amd64? ( net-wireless/iwl1000-ucode net-wireless/iwl2000-ucode net-wireless/iwl2030-ucode net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode >=net-wireless/iwl5000-ucode-8.24.2.12 net-wireless/iwl6000-ucode net-wireless/iwl6005-ucode net-wireless/iwl6030-ucode net-wireless/iwl6050-ucode ) x86? ( net-wireless/iwl1000-ucode net-wireless/iwl2000-ucode net-wireless/iwl2030-ucode net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode >=net-wireless/iwl5000-ucode-8.24.2.12 net-wireless/iwl6000-ucode net-wireless/iwl6005-ucode net-wireless/iwl6030-ucode net-wireless/iwl6050-ucode ) +DESCRIPTION=Generic ebuild which satisifies virtual/chromeos-bsp. This is a direct dependency of chromeos-base/chromeos, but is expected to be overridden in an overlay for each specialized board. A typical non-generic implementation will install any board-specific configuration files and drivers which are not suitable for inclusion in a generic board overlay. +EAPI=4 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=!chromeos-base/chromeos-bsp-null amd64? ( net-wireless/iwl1000-ucode net-wireless/iwl2000-ucode net-wireless/iwl2030-ucode net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode >=net-wireless/iwl5000-ucode-8.24.2.12 net-wireless/iwl6000-ucode net-wireless/iwl6005-ucode net-wireless/iwl6030-ucode net-wireless/iwl6050-ucode ) x86? ( net-wireless/iwl1000-ucode net-wireless/iwl2000-ucode net-wireless/iwl2030-ucode net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode >=net-wireless/iwl5000-ucode-8.24.2.12 net-wireless/iwl6000-ucode net-wireless/iwl6005-ucode net-wireless/iwl6030-ucode net-wireless/iwl6050-ucode ) +SLOT=0 +_md5_=fbcbe8a67ec9746e3590d05b4648880a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-coreboot-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-coreboot-1 new file mode 100644 index 0000000000..38ac2fac95 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-coreboot-1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS Firmware virtual package +EAPI=4 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 x86 +LICENSE=BSD +RDEPEND=sys-boot/chromeos-coreboot +SLOT=0 +_md5_=49395584e25a7f848db95b5959c5cf44 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-firmware-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-firmware-1 new file mode 100644 index 0000000000..7a2867760a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/chromeos-firmware-1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS Firmware virtual package +EAPI=2 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=BSD +RDEPEND=chromeos-base/chromeos-firmware-null +SLOT=0 +_md5_=b7784a0867a3eb7e22bf48a9cdc19dca diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/glu-9.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/glu-9.0 new file mode 100644 index 0000000000..32cf78424d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/glu-9.0 @@ -0,0 +1,6 @@ +DEFINED_PHASES=- +DESCRIPTION=Virtual for OpenGL utility library +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +RDEPEND=|| ( media-libs/glu media-libs/opengl-apple ) +SLOT=0 +_md5_=c2d2391024c792f2b089c7381f925629 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/hard-host-depends-bsp-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/hard-host-depends-bsp-1 new file mode 100644 index 0000000000..5d78a654c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/hard-host-depends-bsp-1 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=Host dependencies BSP virtual package. Override this virtual package in a private host overlay by adding a virtual/hard-host-depends-bsp version 2 ebuild, and have that package RDEPEND on any host dependencies needed by the private overlay. +EAPI=4 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 x86 +LICENSE=BSD +SLOT=0 +_md5_=10aaa7f754e08cd0c73344f7d96c09a0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/linux-sources-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/linux-sources-1 new file mode 100644 index 0000000000..c26d2f3afe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/linux-sources-1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS Kernel virtual package +EAPI=2 +HOMEPAGE=http://src.chromium.org +IUSE=-kernel_next -kernel_sources +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=kernel_next? ( sys-kernel/chromeos-kernel-next[kernel_sources=] ) !kernel_next? ( sys-kernel/chromeos-kernel[kernel_sources=] ) +SLOT=0 +_md5_=d3b5ef69d4e4793543fcce8097fbd429 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/modemmanager-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/modemmanager-1 new file mode 100644 index 0000000000..d338db9678 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/modemmanager-1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=- +DEPEND=modemmanager_next? ( net-misc/modemmanager-next net-misc/modemmanager-classic-interfaces !net-misc/modemmanager !net-misc/modemmanager-next-interfaces ) !modemmanager_next? ( !net-misc/modemmanager-next !net-misc/modemmanager-classic-interfaces net-misc/modemmanager net-misc/modemmanager-next-interfaces ) +DESCRIPTION=Chrome OS virtual ModemManager package +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=+modemmanager_next +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=modemmanager_next? ( net-misc/modemmanager-next net-misc/modemmanager-classic-interfaces !net-misc/modemmanager !net-misc/modemmanager-next-interfaces ) !modemmanager_next? ( !net-misc/modemmanager-next !net-misc/modemmanager-classic-interfaces net-misc/modemmanager net-misc/modemmanager-next-interfaces ) +SLOT=0 +_md5_=05ac1d5fc1976721fcd046632df1fb89 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/modemmanager-1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/modemmanager-1-r2 new file mode 100644 index 0000000000..d338db9678 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/modemmanager-1-r2 @@ -0,0 +1,11 @@ +DEFINED_PHASES=- +DEPEND=modemmanager_next? ( net-misc/modemmanager-next net-misc/modemmanager-classic-interfaces !net-misc/modemmanager !net-misc/modemmanager-next-interfaces ) !modemmanager_next? ( !net-misc/modemmanager-next !net-misc/modemmanager-classic-interfaces net-misc/modemmanager net-misc/modemmanager-next-interfaces ) +DESCRIPTION=Chrome OS virtual ModemManager package +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=+modemmanager_next +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=modemmanager_next? ( net-misc/modemmanager-next net-misc/modemmanager-classic-interfaces !net-misc/modemmanager !net-misc/modemmanager-next-interfaces ) !modemmanager_next? ( !net-misc/modemmanager-next !net-misc/modemmanager-classic-interfaces net-misc/modemmanager net-misc/modemmanager-next-interfaces ) +SLOT=0 +_md5_=05ac1d5fc1976721fcd046632df1fb89 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/opengles-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/opengles-1 new file mode 100644 index 0000000000..95c107be4b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/opengles-1 @@ -0,0 +1,6 @@ +DEFINED_PHASES=- +DESCRIPTION=Virtual for OpenGLES implementations +KEYWORDS=alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd +RDEPEND=x11-drivers/opengles +SLOT=0 +_md5_=4ab96122f4cecb2ef387142dd1129351 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/perf-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/perf-1 new file mode 100644 index 0000000000..fcc07406da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/perf-1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS perf virtual package +HOMEPAGE=http://src.chromium.org +IUSE=kernel_next +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=kernel_next? ( dev-util/perf-next ) !kernel_next? ( dev-util/perf ) +SLOT=0 +_md5_=678a887394e8e23f738e2af33743d6c5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/u-boot-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/u-boot-1 new file mode 100644 index 0000000000..ea67cdbaa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/u-boot-1 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=Chrome OS u-boot virtual package +EAPI=4 +HOMEPAGE=http://src.chromium.org +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=sys-boot/chromeos-u-boot +SLOT=0 +_md5_=dcf6dd7328b99ac163c91473a0ff2597 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2 new file mode 100644 index 0000000000..76d634040e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst postrm preinst unpack +DEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0 +DESCRIPTION=intel gpu userland tools +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=debug +KEYWORDS=amd64 x86 +LICENSE=MIT +RDEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo !<=x11-base/xorg-x11-6.9 +RESTRICT=test +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.0.3_pre2.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280 +_md5_=44bf81d69ae01fb36afc31911c34870b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1 new file mode 100644 index 0000000000..42af699d8c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install setup unpack +DEPEND=virtual/glut virtual/opengl virtual/glu +DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo) +HOMEPAGE=http://mesa3d.sourceforge.net/ +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd +LICENSE=LGPL-2 +RDEPEND=virtual/glut virtual/opengl virtual/glu +SLOT=0 +SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaLib-7.5.1.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaDemos-7.5.1.tar.bz2 +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d1c64255283116c9e9fddc28b1c62f7c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22 new file mode 100644 index 0000000000..d4d1a8a1d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info prepare setup unpack +DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Multitouch Contact Plotter +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=cros_workon_tree_ccfcb72fba4959143cc6e3273301e2be6965ff53 +KEYWORDS=amd64 arm x86 +LICENSE=GPL-2 +RDEPEND=x11-libs/libX11 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8be5e1bcd3160cca6ac479709c8e3852 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999 new file mode 100644 index 0000000000..fa7fc87b30 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=info prepare setup unpack +DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Multitouch Contact Plotter +EAPI=4 +HOMEPAGE=http://src.chromium.org +IUSE=cros_workon_tree_ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=x11-libs/libX11 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=f6e2bf580dd4e8030f300bee7fb2a303 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 new file mode 100644 index 0000000000..bed91c0a98 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X Window System initializer +EAPI=3 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=+minimal +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd +LICENSE=MIT GPL-2 +PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm ) +RDEPEND=!=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) +DESCRIPTION=X.Org X servers +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=dmx kdrive xnest xorg xvfb broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev static-libs doc +KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd +LICENSE=MIT +PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 ) +RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) +REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) ) +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=cc1937987d75e7653bcd0e616dbc8461 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 new file mode 100644 index 0000000000..d7c55cc65e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 @@ -0,0 +1,7 @@ +DEFINED_PHASES=install +DESCRIPTION=Rules for setting permissions right on /dev/mali0 +EAPI=4 +KEYWORDS=arm +LICENSE=BSD +SLOT=0 +_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 new file mode 100644 index 0000000000..d7c55cc65e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 @@ -0,0 +1,7 @@ +DEFINED_PHASES=install +DESCRIPTION=Rules for setting permissions right on /dev/mali0 +EAPI=4 +KEYWORDS=arm +LICENSE=BSD +SLOT=0 +_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 new file mode 100644 index 0000000000..b393638a07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack +DEPEND==sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !=x11-libs/libvdpau-0.3-r1 gtk? ( media-video/nvidia-settings ) +RDEPEND==sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Chromium OS multitouch driver regression tests. +EAPI=4 +IUSE=cros_workon_tree_7d097ae9d618817e2c9a274a07c3ec207a631583 +KEYWORDS=arm amd64 x86 +LICENSE=BSD +RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=8a5ea11aa36a73c4e56db6ab6f8ef1ac diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 new file mode 100644 index 0000000000..5e5eafb18d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Chromium OS multitouch driver regression tests. +EAPI=4 +IUSE=cros_workon_tree_ +KEYWORDS=~arm amd64 ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=3c61498470d6bd908bb97cf565c66646 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 new file mode 100644 index 0000000000..35f8c15ac9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Chromium OS multitouch input driver for Xorg X server. +EAPI=4 +IUSE=cros_workon_tree_3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1 +KEYWORDS=arm amd64 x86 +LICENSE=BSD +RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=cf420d228f97cd5a8b4ee387258f2506 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 new file mode 100644 index 0000000000..e21f0078bc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure info install prepare setup test unpack +DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Chromium OS multitouch input driver for Xorg X server. +EAPI=4 +IUSE=cros_workon_tree_ +KEYWORDS=~arm ~amd64 ~x86 +LICENSE=BSD +RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=d96ebc46f1e988ac78f9b3120ae18bc5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 new file mode 100644 index 0000000000..033c11a317 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg] +DESCRIPTION=Generic Linux input driver +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 +LICENSE=MIT +RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg] +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=9d45ae64d4a90840058743a4ab653c51 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 new file mode 100644 index 0000000000..033c11a317 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg] +DESCRIPTION=Generic Linux input driver +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 +LICENSE=MIT +RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg] +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=9d45ae64d4a90840058743a4ab653c51 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 new file mode 100644 index 0000000000..db0e1f8336 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack +DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git +DESCRIPTION=X.Org driver for ARM devices +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=cros_workon_tree_0d2d6cd5e23e84585ebe72df251360086c8408bf +KEYWORDS=-* arm +LICENSE=MIT +RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-armsoc-0.0.1.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=76626a63ead6a130a7b910ce5e45c597 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 new file mode 100644 index 0000000000..031ac9cdbc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack +DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git +DESCRIPTION=X.Org driver for ARM devices +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=cros_workon_tree_ +KEYWORDS=-* ~arm +LICENSE=MIT +RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=944ebfd311dc1090a8066b5328a5fcf8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 new file mode 100644 index 0000000000..968b108f5c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) >=x11-proto/dri2proto-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess +DESCRIPTION=X.Org driver for Intel cards +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=dri sna xvmc broken_partialswaps dri +KEYWORDS=amd64 ~ia64 x86 -x86-fbsd +LICENSE=MIT +RDEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.16.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=84828c443d7f2f2603fb2ab324282add diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 new file mode 100644 index 0000000000..c4cf1388f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm preinst unpack +DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0 +DESCRIPTION=Generic VESA video driver +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=debug +KEYWORDS=-* ~alpha amd64 ~ia64 x86 ~x86-fbsd +LICENSE=MIT +RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9 +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280 +_md5_=9ae88dd31766afb3218be4e38413dea4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 new file mode 100644 index 0000000000..770c106e4d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=A vector graphics library with cross-device output support +EAPI=3 +HOMEPAGE=http://cairographics.org/ +IUSE=X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb cairo-perf-trace +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( LGPL-2.1 MPL-1.1 ) +RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) +RESTRICT=test +SLOT=0 +SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=b5614dee88eda90b8c43e94b9c072d55 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1 new file mode 100644 index 0000000000..da4e613211 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst prepare setup test +DEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) x86-interix? ( sys-libs/itx-bind ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) +DESCRIPTION=Gimp ToolKit + +EAPI=2 +HOMEPAGE=http://www.gtk.org/ +IUSE=aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama test +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=LGPL-2 +PDEPEND=vim-syntax? ( app-vim/gtk-syntax ) +RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) +DESCRIPTION=X.Org Xfont library +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=ipv6 static-libs doc +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.4.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=db339124932f4f4e0a848e0069d4a361 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1 new file mode 100644 index 0000000000..86ccfde89c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X.Org Xft library +EAPI=3 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=static-libs +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +LICENSE=MIT +RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.2.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=367c6899b512349ba82ae0af0eeee0ba diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1 new file mode 100644 index 0000000000..4dbe1c76b4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) +DESCRIPTION=X.Org Xi library +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=static-libs doc +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +LICENSE=MIT +RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.0.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=023590ebd190057dd23a605b6f34afa3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1 new file mode 100644 index 0000000000..5e793044d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst postrm preinst setup unpack +DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto >=x11-misc/util-macros-1.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0 +DESCRIPTION=X.Org Xt library +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=debug +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd +LICENSE=MIT +RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto !<=x11-base/xorg-x11-6.9 +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.6.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280 +_md5_=a2d9a6d549fb2b552bc5a0318b2384b6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39 new file mode 100644 index 0000000000..4a272921b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X.Org libdrm library +EAPI=4 +HOMEPAGE=http://dri.freedesktop.org/ +IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) +RESTRICT=test +SLOT=0 +SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=643307b815fed12113f6105c3491df70 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5 new file mode 100644 index 0000000000..4a272921b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X.Org libdrm library +EAPI=4 +HOMEPAGE=http://dri.freedesktop.org/ +IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) +RESTRICT=test +SLOT=0 +SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=643307b815fed12113f6105c3491df70 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39 new file mode 100644 index 0000000000..9cc444cb26 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X.Org libdrm library +EAPI=4 +HOMEPAGE=http://dri.freedesktop.org/ +IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 +RESTRICT=test +SLOT=0 +SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=a39302dc6251f406fdf336d67ef7a85e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2 new file mode 100644 index 0000000000..9cc444cb26 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X.Org libdrm library +EAPI=4 +HOMEPAGE=http://dri.freedesktop.org/ +IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 +RESTRICT=test +SLOT=0 +SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=a39302dc6251f406fdf336d67ef7a85e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1 new file mode 100644 index 0000000000..fbcb0a0af5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=Library providing generic access to the PCI bus and devices +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=minimal zlib static-libs +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=!=x11-libs/libva-1.1.0_rc1 !=x11-libs/libdrm-2.4.23[video_cards_intel] virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=HW video decode support for Intel integrated graphics +EAPI=3 +HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi +KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux +LICENSE=MIT +RDEPEND=>=x11-libs/libva-1.1.0_rc1 !=x11-libs/libdrm-2.4.23[video_cards_intel] +SLOT=0 +SRC_URI=http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-1.0.19_pre2.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=6f9fe16aace2cab1e655386667acbd39 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1 new file mode 100644 index 0000000000..8eb4c88a81 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt >=x11-proto/xcb-proto-1.7.1 >=dev-lang/python-2.5[xml] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X C-language Bindings library +EAPI=3 +HOMEPAGE=http://xcb.freedesktop.org/ +IUSE=doc selinux static-libs +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd +LICENSE=MIT +RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs +SLOT=0 +SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=c6e17d064c8ad5852ef61735d1de6053 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1 new file mode 100644 index 0000000000..547bdee089 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 dev-vcs/git +DESCRIPTION=X.Org xkbcommon library +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=static-libs +KEYWORDS=amd64 arm x86 +LICENSE=MIT +RDEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 +SLOT=0 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=8003ff2c6465aa25e15a598521c3e84e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4 new file mode 100644 index 0000000000..416d10760c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack +DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 +DESCRIPTION=Internationalized text layout and rendering library +EAPI=3 +HOMEPAGE=http://www.pango.org/ +IUSE=X doc introspection test debug +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2 FTL +RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) +SLOT=0 +SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e910bba8f04a9558bd3a2d94ea1297c0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3 new file mode 100644 index 0000000000..416d10760c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack +DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 +DESCRIPTION=Internationalized text layout and rendering library +EAPI=3 +HOMEPAGE=http://www.pango.org/ +IUSE=X doc introspection test debug +KEYWORDS=amd64 arm x86 +LICENSE=LGPL-2 FTL +RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) +SLOT=0 +SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=e910bba8f04a9558bd3a2d94ea1297c0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7 new file mode 100644 index 0000000000..b3d905c232 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install +DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-proto/xproto +DESCRIPTION=Hides mouse pointer while not in use. +HOMEPAGE=http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README +KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 +LICENSE=public-domain +RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi +SLOT=0 +SRC_URI=ftp://ftp.x.org/contrib/utilities/unclutter-8.tar.Z +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a355a91ecb5832e54d9264a820696f03 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15 new file mode 100644 index 0000000000..d862d40473 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2 x11-proto/xproto >=dev-util/intltool-0.30 dev-perl/XML-Parser || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X keyboard configuration database +EAPI=4 +HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig +IUSE=parrot +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2 +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.4.1.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=f842bf5aa0be0ffead4745fb313a5ba6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 new file mode 100644 index 0000000000..6b4e18b2c9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-libs/libxml2 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 +DESCRIPTION=X C-language Bindings protocol headers +EAPI=3 +HOMEPAGE=http://xcb.freedesktop.org/ +KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) +SLOT=0 +SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 +_md5_=d014d8c7e782e2eb0eb136851b7425a1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0 new file mode 100644 index 0000000000..5464f418a1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) +DESCRIPTION=X.Org XExt protocol headers +EAPI=4 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=doc +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +LICENSE=MIT +RDEPEND=!=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=rxvt clone with xft and unicode support +EAPI=2 +HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html +IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 +SLOT=0 +SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a99a8294e901c6dd487d4c21e409f87d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10 new file mode 100644 index 0000000000..366ca4a801 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=rxvt clone with xft and unicode support +EAPI=2 +HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html +IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 +SLOT=0 +SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.10.tar.bz2 +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a99a8294e901c6dd487d4c21e409f87d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255 new file mode 100644 index 0000000000..cabb5a8d8a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install setup +DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d ) x11-proto/xproto +DESCRIPTION=Terminal Emulator for X Windows +EAPI=2 +HOMEPAGE=http://dickey.his.com/xterm/ +IUSE=-toolbar +truetype +unicode -Xaw3d +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd +LICENSE=MIT +RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d ) +SLOT=0 +SRC_URI=ftp://invisible-island.net/xterm/xterm-255.tgz +_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 +_md5_=0e8c765a4b6d83bf496a1cb03122fff8 diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/ChangeLog b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/ChangeLog new file mode 100644 index 0000000000..573216de2d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/ChangeLog @@ -0,0 +1,885 @@ +# ChangeLog for net-analyzer/wireshark +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.215 2010/01/30 15:07:41 pva Exp $ + + 30 Jan 2010; Peter Volkov -wireshark-1.2.5.ebuild, + wireshark-1.2.6.ebuild: + amd64 stable, bug #302665. Drop vulnerable. + + 30 Jan 2010; Raúl Porcel wireshark-1.2.6.ebuild: + alpha/ia64/sparc/x86 stable wrt #302665 + + 28 Jan 2010; Jeroen Roovers wireshark-1.2.6.ebuild: + Stable for HPPA (bug #302665). + + 28 Jan 2010; Brent Baude wireshark-1.2.6.ebuild: + Marking wireshark-1.2.6 ppc for bug 302665 + + 28 Jan 2010; Brent Baude wireshark-1.2.6.ebuild: + Marking wireshark-1.2.6 ppc64 for bug 302665 + +*wireshark-1.2.6 (28 Jan 2010) + + 28 Jan 2010; Peter Volkov -wireshark-1.2.3.ebuild, + -wireshark-1.2.4.ebuild, +wireshark-1.2.6.ebuild: + Version bump, fixes security issue #302665. Remove old. + + 11 Jan 2010; Mike Frysinger wireshark-1.2.3.ebuild, + wireshark-1.2.4.ebuild, wireshark-1.2.5.ebuild: + Drop -fomit-frame-pointer filter for USE=profile. + + 22 Dec 2009; Jeroen Roovers wireshark-1.2.5.ebuild: + Stable for PPC (bug #297388). + + 21 Dec 2009; Raúl Porcel wireshark-1.2.5.ebuild: + alpha/ia64/sparc stable wrt #297388 + + 20 Dec 2009; Brent Baude wireshark-1.2.5.ebuild: + Marking wireshark-1.2.5 ppc64 for bug 297388 + + 19 Dec 2009; Jeroen Roovers wireshark-1.2.5.ebuild: + Stable for HPPA (bug #297388). + + 19 Dec 2009; Richard Freeman wireshark-1.2.5.ebuild: + amd64 stable - 297388 + + 18 Dec 2009; Christian Faulhammer + wireshark-1.2.5.ebuild: + stable x86, security bug 297388 + +*wireshark-1.2.5 (18 Dec 2009) + + 18 Dec 2009; Peter Volkov +wireshark-1.2.5.ebuild: + Version bump. Fixes security bug #297388. + +*wireshark-1.2.4 (17 Nov 2009) + + 17 Nov 2009; Peter Volkov +wireshark-1.2.4.ebuild: + Version bump. + + 14 Nov 2009; Peter Volkov wireshark-1.2.3.ebuild: + USE='profile' and PIE are incompatible, bug 292991, thank Radoslaw Madej + for report. + + 04 Nov 2009; Peter Volkov -wireshark-1.2.1.ebuild, + -wireshark-1.2.2.ebuild: + Revert ChangeLog, thank PSYCHO___ for report. Remove vulnerable versions. + + 01 Nov 2009; nixnut wireshark-1.2.3.ebuild: + ppc stable #290710 + + 31 Oct 2009; Brent Baude wireshark-1.2.3.ebuild: + Marking wireshark-1.2.3 ppc64 for bug 290710 + + 30 Oct 2009; Raúl Porcel wireshark-1.2.3.ebuild: + alpha/ia64/sparc stable wrt #290710 + + 29 Oct 2009; Jeroen Roovers wireshark-1.2.3.ebuild: + Stable for HPPA (bug #290710). + + 29 Oct 2009; wireshark-1.2.3.ebuild: + Marked stable on AMD64 as requested by Alex "a3li" Legler in security bug + #290710. Tested capture on a Marvell "sky2" 88E8055 Gig-copper NIC. + + 28 Oct 2009; Christian Faulhammer + wireshark-1.2.3.ebuild: + stable x86, security bug 290710 + +*wireshark-1.2.3 (28 Oct 2009) + + 28 Oct 2009; Peter Volkov +wireshark-1.2.3.ebuild: + Version bump, fixes number of security issues, bug #290710, thank Alex + Legler for report. + + 26 Oct 2009; Mounir Lamouri wireshark-1.2.2.ebuild: + Stable for ppc, bug 285280 + + 18 Oct 2009; Brent Baude wireshark-1.2.2.ebuild: + Marking wireshark-1.2.2 ppc64 for bug 285280 + + 12 Oct 2009; Raúl Porcel wireshark-1.2.2.ebuild: + ia64/sparc stable wrt #285280 + + 11 Oct 2009; Jeroen Roovers wireshark-1.2.2.ebuild: + Stable for HPPA (bug #285280). + + 11 Oct 2009; Tobias Klausmann + wireshark-1.2.2.ebuild: + Stable on alpha, bug #285280 + + 09 Oct 2009; Markus Meier wireshark-1.2.2.ebuild: + x86 stable, bug #285280 + + 09 Oct 2009; Richard Freeman wireshark-1.2.2.ebuild: + amd64 stable - 285280 + +*wireshark-1.2.2 (08 Oct 2009) + + 08 Oct 2009; Peter Volkov -wireshark-1.0.8.ebuild, + +wireshark-1.2.2.ebuild: + Version bump, fixes security issue bug #285280, thank Alex Legler for + report. Dropped gtk IUSE default, bug #279849. + + 09 Aug 2009; nixnut wireshark-1.2.1.ebuild: + ppc stable #278564 + + 02 Aug 2009; Raúl Porcel wireshark-1.2.1.ebuild: + ia64 stable wrt #278564 + + 31 Jul 2009; Tiago Cunha wireshark-1.2.1.ebuild: + stable sparc, security bug 278564 + + 26 Jul 2009; Brent Baude wireshark-1.2.1.ebuild: + Marking wireshark-1.2.1 ppc64 for bug 278564 + + 21 Jul 2009; Jeroen Roovers wireshark-1.2.1.ebuild: + Stable for HPPA (bug #278564). + + 21 Jul 2009; Christian Faulhammer + wireshark-1.2.1.ebuild: + stable x86, security bug 278564 + + 21 Jul 2009; Tobias Klausmann + wireshark-1.2.1.ebuild: + Stable on alpha, bug #278564 + + 21 Jul 2009; wireshark-1.2.1.ebuild: + Marked stable on AMD64 for security bug #278564. Tested on a Core2 Duo + with a Marvell "Sky2" 88E8055 NIC. + +*wireshark-1.2.1 (21 Jul 2009) + + 21 Jul 2009; Peter Volkov -wireshark-1.2.0.ebuild, + +wireshark-1.2.1.ebuild: + Version bump, bug #278564, thank Alex Legler for report. Remove vulnerable + version. + +*wireshark-1.2.0 (17 Jun 2009) + + 17 Jun 2009; Peter Volkov + -files/wireshark-1.1.2-misc-warnings.patch, + -files/wireshark-1.1.3-misc-warnings.patch, -wireshark-1.2.0_rc1.ebuild, + +wireshark-1.2.0.ebuild: + Version bump. Dropped unused patches. + +*wireshark-1.2.0_rc1 (29 May 2009) + + 29 May 2009; Peter Volkov -wireshark-1.0.7.ebuild, + -wireshark-1.1.3.ebuild, +wireshark-1.2.0_rc1.ebuild: + Version bump. Remove old/unused. + + 27 May 2009; Raúl Porcel wireshark-1.0.8.ebuild: + alpha/ia64 stable wrt #271062 + + 26 May 2009; Tiago Cunha wireshark-1.0.8.ebuild: + stable sparc, security bug 271062 + + 25 May 2009; Brent Baude wireshark-1.0.8.ebuild: + Marking wireshark-1.0.8 ppc64 and ppc for bug 271062 + + 24 May 2009; Jeroen Roovers wireshark-1.0.8.ebuild: + Stable for HPPA (bug #271062). + + 24 May 2009; Markus Meier wireshark-1.0.8.ebuild: + amd64/x86 stable, bug #271062 + +*wireshark-1.0.8 (24 May 2009) + + 24 May 2009; Peter Volkov +wireshark-1.0.8.ebuild: + Version bump, fixes security issue #271062. + + 04 May 2009; Peter Volkov -wireshark-1.0.6-r1.ebuild, + wireshark-1.0.7, wireshark-1.1.3: + tshark should not be suid, bug #268324, thank Wolfgang Goetz for report. + Remove old. + + 11 Apr 2009; Jeroen Roovers wireshark-1.0.7.ebuild: + Stable for HPPA (bug #264571). + + 10 Apr 2009; Raúl Porcel wireshark-1.0.7.ebuild: + alpha/ia64/sparc/x86 stable wrt #264571 + + 10 Apr 2009; Tobias Heinlein + wireshark-1.0.7.ebuild: + amd64 stable wrt security bug #264571 + + 09 Apr 2009; Brent Baude wireshark-1.0.7.ebuild: + Marking wireshark-1.0.7 ppc64 and ppc for bug 264571 + +*wireshark-1.0.7 (09 Apr 2009) + + 09 Apr 2009; Peter Volkov -wireshark-1.0.6.ebuild, + +wireshark-1.0.7.ebuild, -wireshark-1.1.2.ebuild: + Version bump, fixes security bug #264571, thank Robert Buchholz for report. + + 02 Apr 2009; Raúl Porcel wireshark-1.0.6-r1.ebuild: + alpha/ia64 stable wrt #263443 + + 27 Mar 2009; Jeroen Roovers wireshark-1.0.6-r1.ebuild: + Stable for HPPA (bug #263443). + + 25 Mar 2009; Joseph Jezak wireshark-1.0.6-r1.ebuild: + Marked ppc/ppc64 stable for bug #263443. + + 24 Mar 2009; Tiago Cunha wireshark-1.0.6-r1.ebuild: + stable sparc, bug 263443 + +*wireshark-1.1.3 (24 Mar 2009) + + 24 Mar 2009; Peter Volkov + +files/wireshark-1.1.3-misc-warnings.patch, +wireshark-1.1.3.ebuild: + Version bump. + + 23 Mar 2009; Markus Meier wireshark-1.0.6-r1.ebuild: + amd64/x86 stable, bug #263443 + + 08 Mar 2009; Peter Volkov + +files/wireshark-1.1.2-misc-warnings.patch, wireshark-1.1.2.ebuild: + Fixed build failure in function 'dissect_sflow_sample_rawheaderdata' + +*wireshark-1.0.6-r1 (05 Mar 2009) + + 05 Mar 2009; Peter Volkov + -files/wireshark-1.0.5-glib-1-build.patch, + +files/wireshark-1.0-sigpipe.patch, -wireshark-1.0.5.ebuild, + +wireshark-1.0.6-r1.ebuild: + Fixed freeze on start issue, bug #260457, thank haarp for report. + + 11 Feb 2009; Tobias Scherbaum + wireshark-1.0.6.ebuild: + ppc stable, bug #258013 + + 10 Feb 2009; Brent Baude wireshark-1.0.6.ebuild: + Marking wireshark-1.0.6 ppc64 for bug 258013 + + 09 Feb 2009; Raúl Porcel wireshark-1.0.6.ebuild: + ia64/sparc stable wrt #258013 + + 08 Feb 2009; Markus Meier wireshark-1.0.6.ebuild: + amd64/x86 stable, bug #258013 + + 07 Feb 2009; Jeroen Roovers wireshark-1.0.6.ebuild: + Stable for HPPA (bug #258013). + + 07 Feb 2009; Tobias Klausmann + wireshark-1.0.6.ebuild: + Stable on alpha, bug #258013 + +*wireshark-1.0.6 (07 Feb 2009) + + 07 Feb 2009; Peter Volkov +wireshark-1.0.6.ebuild: + Version bump. + +*wireshark-1.1.2 (19 Jan 2009) + + 19 Jan 2009; Peter Volkov + -files/wireshark-1.0.4-zlib-build.patch, + -files/wireshark-1.1.1--as-needed.patch, + -files/wireshark-1.1.1-misc-warnings.patch, + +files/wireshark-1.1.2--as-needed.patch, -wireshark-1.0.4.ebuild, + -wireshark-1.1.1.ebuild, +wireshark-1.1.2.ebuild: + Version bump of development version, remove old. + + 26 Dec 2008; Mike Frysinger + +files/wireshark-1.0.5-text2pcap-protos.patch, wireshark-1.0.5.ebuild: + Fix building on 64bit systems due to implicit string prototypes. + + 18 Dec 2008; Tobias Scherbaum + wireshark-1.0.5.ebuild: + ppc stable, bug #248425 + + 16 Dec 2008; Brent Baude wireshark-1.0.5.ebuild: + Marking wireshark-1.0.5 ppc64 for bug 248425 + + 16 Dec 2008; Raúl Porcel wireshark-1.0.5.ebuild: + ia64 stable wrt #248425 + + 15 Dec 2008; Jeroen Roovers wireshark-1.0.5.ebuild: + Stable for HPPA (bug #248425). + + 14 Dec 2008; Peter Volkov wireshark-1.0.5.ebuild: + Fixed dodoc on nonexistent files, bug #248425, thank Markus Meier for report. + + 14 Dec 2008; Tobias Klausmann + wireshark-1.0.5.ebuild: + Stable on alpha, bug #248425 + + 14 Dec 2008; Markus Meier wireshark-1.0.5.ebuild: + amd64/x86 stable, bug #248425 + + 14 Dec 2008; Friedrich Oslage + wireshark-1.0.5.ebuild: + Stable on sparc, security bug #248425 + +*wireshark-1.0.5 (13 Dec 2008) + + 13 Dec 2008; Peter Volkov + +files/wireshark-1.0.5-glib-1-build.patch, +wireshark-1.0.5.ebuild: + Version bump, fixes security issue #248425, thank Steven Susbauer for report. + + 22 Nov 2008; Peter Volkov + files/wireshark-1.1.1-misc-warnings.patch, -wireshark-1.0.3.ebuild: + Updated patch to handle more points of failure. Remove old. + + 15 Nov 2008; Tobias Scherbaum + wireshark-1.0.4.ebuild: + ppc stable, bug #242996 + + 30 Oct 2008; Peter Volkov + +files/wireshark-1.0.4-zlib-build.patch, wireshark-1.0.4.ebuild: + Build fails without zlib, this patch fixes it, bug #244931, thank emos696 + AT hotmail.com for this work. + + 22 Oct 2008; Guy Martin wireshark-1.0.4.ebuild: + hppa stable, #242996 + + 22 Oct 2008; Raúl Porcel wireshark-1.0.4.ebuild: + alpha/ia64/x86 stable wrt #242996 + + 21 Oct 2008; Markus Rothe wireshark-1.0.4.ebuild: + Stable on ppc64; bug #242996 + + 21 Oct 2008; Ferris McCormick wireshark-1.0.4.ebuild: + Sparc stable --- Security Bug #242996 --- appears to work fine. + + 21 Oct 2008; Jeremy Olexa wireshark-1.0.4.ebuild: + amd64 stable, accelerated due to security. bug #242996 + +*wireshark-1.0.4 (21 Oct 2008) + + 21 Oct 2008; Peter Volkov +wireshark-1.0.4.ebuild, + wireshark-1.1.1.ebuild: + Version bump. + + 17 Oct 2008; Peter Volkov + +files/wireshark-1.1.1--as-needed.patch, + +files/wireshark-1.1.1-misc-warnings.patch, wireshark-1.1.1.ebuild: + Fixed build issue with --as-needed and lua enabled. Fixed build issues with + -ftracer, bug #239941, thank Thomas Pegeot for report. + +*wireshark-1.1.1 (10 Oct 2008) + + 10 Oct 2008; Peter Volkov + -files/wireshark-1.1.0-as-needed.patch, -wireshark-1.1.0.ebuild, + +wireshark-1.1.1.ebuild: + Version bump. Some cleanups in ebuild. + + 04 Oct 2008; Peter Volkov metadata.xml, + wireshark-1.1.0.ebuild: + Change c-ares USE flag to ares, as other packages already USE ares. + + 18 Sep 2008; Peter Volkov wireshark-1.1.0.ebuild: + Fixed dependency on c-ares and configuration. + +*wireshark-1.1.0 (17 Sep 2008) + + 17 Sep 2008; Peter Volkov + +files/wireshark-1.1.0-as-needed.patch, metadata.xml, + -wireshark-1.0.2.ebuild, +wireshark-1.1.0.ebuild: + Bump development version. + + 10 Sep 2008; Olivier Crête wireshark-1.0.3.ebuild: + amd64 stable, bug #236515 + + 10 Sep 2008; Brent Baude wireshark-1.0.3.ebuild: + Marking wireshark-1.0.3 ppc64 and ppc for bug 236515 + + 10 Sep 2008; Raúl Porcel wireshark-1.0.3.ebuild: + alpha/ia64/sparc/x86 stable wrt #236515 + + 10 Sep 2008; Jeroen Roovers wireshark-1.0.3.ebuild: + Stable for HPPA (bug #236515). + +*wireshark-1.0.3 (10 Sep 2008) + + 10 Sep 2008; Peter Volkov +wireshark-1.0.3.ebuild: + Version bump, fixes security issues #236515, thank Robert Buchholz for + report. + + 04 Aug 2008; Jeroen Roovers metadata.xml: + Describe local USE flags for GLEP 56. + + 03 Aug 2008; Cédric Krier wireshark-1.0.2.ebuild: + Add gtk m4 for bug #233158 + + 20 Jul 2008; Peter Volkov -wireshark-1.0.0.ebuild, + -wireshark-1.0.1.ebuild: + Removing vulnerable versions. + + 17 Jul 2008; Kenneth Prugh wireshark-1.0.2.ebuild: + amd64 stable, bug #231587 + + 15 Jul 2008; Tobias Scherbaum + wireshark-1.0.2.ebuild: + ppc stable, bug #231587 + + 15 Jul 2008; Markus Rothe wireshark-1.0.2.ebuild: + Stable on ppc64; bug #231587 + + 14 Jul 2008; Jeroen Roovers wireshark-1.0.2.ebuild: + Stable for HPPA (bug #231587). + + 13 Jul 2008; Raúl Porcel wireshark-1.0.2.ebuild: + alpha/ia64/sparc/x86 stable wrt #231587 + +*wireshark-1.0.2 (12 Jul 2008) + + 12 Jul 2008; Marcelo Goes +wireshark-1.0.2.ebuild: + 1.0.2 version bump for security bug 231587. Thanks to 7v5w7go9ub0o + <7v5w7go9ub0o at gmail dot com>. + + 05 Jul 2008; Markus Meier wireshark-1.0.1.ebuild: + amd64 stable, bug #230411 + + 05 Jul 2008; Brent Baude wireshark-1.0.1.ebuild: + Marking wireshark-1.0.1 ppc64 for bug 230411 + + 05 Jul 2008; Tobias Scherbaum + wireshark-1.0.1.ebuild: + ppc stable, bug #230411 + + 04 Jul 2008; Jeroen Roovers wireshark-1.0.1.ebuild: + Stable for HPPA (bug #230411). + + 03 Jul 2008; Raúl Porcel wireshark-1.0.1.ebuild: + alpha/ia64/sparc/x86 stable wrt #230411 + +*wireshark-1.0.1 (03 Jul 2008) + + 03 Jul 2008; Peter Volkov + -files/wireshark-0.99.8-libpcap-compile.patch, -wireshark-0.99.8.ebuild, + +wireshark-1.0.1.ebuild: + Version bump, bug #230411, thank 7v5w7go9ub0o for report. + + 10 Apr 2008; Peter Volkov wireshark-1.0.0.ebuild: + cap_kill is not required in wireshark-1.0.0, bug #217061, thank Justin + Bronder for report. + + 03 Apr 2008; Tobias Scherbaum + wireshark-1.0.0.ebuild: + ppc stable, bug #215276 + + 03 Apr 2008; Peter Volkov wireshark-1.0.0.ebuild: + Fixed build with profile USE flag and -fomit-frame-pointer, bug #215806, + thank Joel Thompson for report and Mikael Magnusson for solution. + + 02 Apr 2008; Markus Rothe wireshark-1.0.0.ebuild: + Stable on ppc64; bug #215276 + + 02 Apr 2008; Jeroen Roovers wireshark-1.0.0.ebuild: + Stable for HPPA (bug #215276). + + 02 Apr 2008; Raúl Porcel wireshark-1.0.0.ebuild: + alpha/ia64/sparc stable wrt security #215276 + + 02 Apr 2008; Christian Faulhammer + wireshark-1.0.0.ebuild: + stable x86, security bug 215276 + + 02 Apr 2008; Richard Freeman wireshark-1.0.0.ebuild: + amd64 stable - 215276 + +*wireshark-1.0.0 (01 Apr 2008) + + 01 Apr 2008; Peter Volkov + -files/wireshark-1.0.0_rc1-fix-setcap-EPERM.patch, + -files/wireshark-1.0.0_rc1-fix-stop-capture.patch, + -wireshark-1.0.0_rc1.ebuild, -wireshark-1.0.0_rc1-r1.ebuild, + +wireshark-1.0.0.ebuild: + Version bump, as usual security fixes, bug #215276, thank Robert Buchholz + and Christian Faulhammer for report. + +*wireshark-1.0.0_rc1-r1 (23 Mar 2008) + + 23 Mar 2008; Peter Volkov + +files/wireshark-1.0.0_rc1-fix-setcap-EPERM.patch, + +files/wireshark-1.0.0_rc1-fix-stop-capture.patch, + +wireshark-1.0.0_rc1-r1.ebuild: + Fix wireshark stop when built with caps. + +*wireshark-1.0.0_rc1 (19 Mar 2008) + + 19 Mar 2008; Peter Volkov + -files/wireshark-0.99.7-libgcrypt.patch, -wireshark-0.99.7.ebuild, + +wireshark-1.0.0_rc1.ebuild: + Bump to 1.0.0pre1. Removed old vulnerable. + + 19 Mar 2008; Markus Rothe wireshark-0.99.8.ebuild: + Stable on ppc64; bug #212149 + + 18 Mar 2008; Peter Volkov + -files/wireshark-0.99.7-crash-emem.c.patch, + -files/wireshark-0.99.7-exit.patch, + -files/wireshark-0.99.7-glib-1.2-compile-fix.patch, + -wireshark-0.99.7-r1.ebuild, -wireshark-0.99.7-r2.ebuild, + -wireshark-0.99.8_rc1.ebuild, wireshark-0.99.8.ebuild: + Removed unused ebuilds. Made pcap USE flag enabled by default to avoid + further questions why wireshark is unable to capture packets. + + 18 Mar 2008; Tobias Scherbaum + wireshark-0.99.8.ebuild: + ppc stable, bug #212149 + + 18 Mar 2008; Raúl Porcel wireshark-0.99.8.ebuild: + alpha/ia64/sparc stable wrt security #212149 + + 17 Mar 2008; Jeroen Roovers wireshark-0.99.8.ebuild: + Stable for HPPA (bug #212149). + + 17 Mar 2008; Peter Volkov wireshark-0.99.8.ebuild: + Fixed build problem with heimdal, bug #213705, thank Doug Goldstein for + report. + + 17 Mar 2008; Dawid Węgliński wireshark-0.99.8.ebuild: + Stable on x86 (bug #212149) + + 17 Mar 2008; Olivier Crête wireshark-0.99.8.ebuild: + Stable on amd64, bug #212149 + + 17 Mar 2008; Peter Volkov + +files/wireshark-0.99.8-libpcap-compile.patch: + Missed patch added, thank steev for IRC notification. + +*wireshark-0.99.8 (16 Mar 2008) + + 16 Mar 2008; Peter Volkov +wireshark-0.99.8.ebuild: + Finally version bump, fixes security bug #212149, reported by Robert + Buchholz. Fixes libsmi autodep, bug #211324, reported by Fabio Erculiani. + Many other fixes here and there... Dropped check for minimal USE flag in perl. + + 21 Feb 2008; +files/wireshark-0.99.8-as-needed.patch, + wireshark-0.99.8_rc1.ebuild: + Fixed regression: compilation failure with --as-needed, bug 210998, reported + by Mike Auty and Hanno Böck. + +*wireshark-0.99.8_rc1 (20 Feb 2008) + + 20 Feb 2008; metadata.xml, +wireshark-0.99.8_rc1.ebuild: + Version bump to pre-release. Took maintainance. + +*wireshark-0.99.7-r2 (27 Jan 2008) + + 27 Jan 2008; + +files/wireshark-0.99.7-glib-1.2-compile-fix.patch, + +wireshark-0.99.7-r2.ebuild: + Enable lua support, bug 206151, thank you Jaroslaw Niec . + +*wireshark-0.99.7-r1 (10 Jan 2008) + + 10 Jan 2008; -files/wireshark-0.99.6-asneeded.patch, + -files/wireshark-0.99.6-asneeded-r1.patch, + -files/wireshark-0.99.6-gint64-warnings.patch, + -files/wireshark-0.99.6-libgcrypt.patch, -files/wireshark-0.99.6-lm.patch, + +files/wireshark-0.99.7-crash-emem.c.patch, + +files/wireshark-0.99.7-exit.patch, + -files/wireshark-epan_dissectors_packet-diameter.diff, + -wireshark-0.99.6.ebuild, -wireshark-0.99.6-r1.ebuild, + +wireshark-0.99.7-r1.ebuild: + Fixed crash on bad bLength. Fixed crash if user is not in wireshark group, + thank you M. Edward Borasky for report and Kevin Pyle + for investigation and work with upstream to + make this fixed. Removed old and vulnerable. + + 26 Dec 2007; Peter Weller wireshark-0.99.7.ebuild: + Stable on amd64; bug 199958 + + 24 Dec 2007; Raúl Porcel wireshark-0.99.7.ebuild: + alpha/ia64/sparc stable wrt #199958 + + 24 Dec 2007; Jeroen Roovers wireshark-0.99.7.ebuild: + Stable for HPPA (bug #199958). + + 23 Dec 2007; Markus Meier wireshark-0.99.7.ebuild: + x86 stable, security bug #199958 + + 23 Dec 2007; Brent Baude wireshark-0.99.7.ebuild: + Marking wireshark-0.99.7 ppc and ppc64 stable for bug 199958 + + 20 Dec 2007; +files/wireshark-0.99.7-asneeded.patch, + +files/wireshark-0.99.7-libgcrypt.patch: + Missed patches added, bug 202866 reported by + +*wireshark-0.99.7 (20 Dec 2007) + + 20 Dec 2007; +wireshark-0.99.7.ebuild: + New release. Fixes security issues, bug #199958. Thank Robert Buchholz for lots of usefull suggestions on how to improve ebuild. + + 02 Aug 2007; Raphael Marichez wireshark-0.99.6.ebuild, + wireshark-0.99.6-r1.ebuild: + Remove redundant econf lines, reported by steev + + 26 Jul 2007; Chris Gianelloni + wireshark-0.99.6.ebuild, wireshark-0.99.6-r1.ebuild: + Cosmetic changes only... rearranged some of the post-merge output so it fits + properly on 80 columns. + + 24 Jul 2007; Markus Ullmann + -files/wireshark-0.99.5-sizet.patch, -wireshark-0.99.5.ebuild: + Clean out old stuff + +*wireshark-0.99.6-r1 (24 Jul 2007) + + 24 Jul 2007; +files/wireshark-0.99.6-asneeded-r1.patch, + +files/wireshark-0.99.6-gint64-warnings.patch, + +files/wireshark-0.99.6-libgcrypt.patch, +files/wireshark-0.99.6-lm.patch, + +wireshark-0.99.6-r1.ebuild: + Fixed -lm problem with ulibc (bug #186424; thank Natanael Copa + for report. Commited fix for bug #184529 and + enabled warnings treated as errors for gtk-2.0 build like upstream wants us. + Fix for libgcrypt problem reported by armin76 and fixed by drac. + + 20 Jul 2007; Tobias Scherbaum + wireshark-0.99.6.ebuild: + ppc stable, bug #183520 + + 16 Jul 2007; Jeroen Roovers wireshark-0.99.6.ebuild: + Stable for HPPA (bug #183520). + + 16 Jul 2007; Markus Rothe wireshark-0.99.6.ebuild: + Stable on ppc64; bug #183520 + + 16 Jul 2007; Marcus D. Hanwell wireshark-0.99.6.ebuild: + Marked stable on amd64, bug 183520. + + 16 Jul 2007; Raúl Porcel wireshark-0.99.6.ebuild: + alpha/ia64/x86 stable wrt security #183520 + + 16 Jul 2007; Gustavo Zacarias + wireshark-0.99.6.ebuild: + Stable on sparc wrt security #183520 + + 15 Jul 2007; Samuli Suominen + +files/wireshark-0.99.6-asneeded.patch, wireshark-0.99.6.ebuild: + Fix building with asneeded for bug 184668. + + 09 Jul 2007; Raúl Porcel wireshark-0.99.6.ebuild: + Fix bug #184529, blame Jokey + +*wireshark-0.99.6 (06 Jul 2007) + + 06 Jul 2007; Markus Ullmann +wireshark-0.99.6.ebuild: + Security version bump wrt bug #183520 + + 18 Apr 2007; Markus Ullmann -wireshark-0.99.4.ebuild, + -wireshark-0.99.4-r1.ebuild, wireshark-0.99.5.ebuild: + Fix gcc 3.4 bug #165340 thanks to Guenther Brunthaler for the solution, do + some cleanup as well + + 17 Apr 2007; Gustavo Zacarias + wireshark-0.99.5.ebuild: + Stable on sparc wrt #174625 + + 17 Apr 2007; Bryan Østergaard + wireshark-0.99.5.ebuild: + Stable on Alpha, bug 174625. + + 16 Apr 2007; Raúl Porcel wireshark-0.99.5.ebuild: + ia64 stable wrt bug 174625 + + 15 Apr 2007; Andrej Kacian wireshark-0.99.5.ebuild: + Stable on x86, bug #174625. + + 15 Apr 2007; Markus Rothe wireshark-0.99.5.ebuild: + Stable on ppc64; bug #174625 + + 15 Apr 2007; Olivier Crête wireshark-0.99.5.ebuild: + Stable on amd64, bug #174625 + + 14 Apr 2007; Jeroen Roovers wireshark-0.99.5.ebuild: + Stable for HPPA (bug #174625). + + 24 Feb 2007; Daniel Black + wireshark-0.99.4.ebuild, wireshark-0.99.4-r1.ebuild, + wireshark-0.99.5.ebuild: + removed unused autotools import thanks to Flameeyes + + 16 Feb 2007; Daniel Black + +files/wireshark-0.99.5-sizet.patch, wireshark-0.99.5.ebuild: + upstream patch to fix bug #165896 - hopefully + + 10 Feb 2007; Martin Jackson + +files/wireshark-epan_dissectors_packet-diameter.diff, + wireshark-0.99.5.ebuild: + Add patch from FC3/FreeBSD to fix GCC 3.4 link error (#165340) + +*wireshark-0.99.5 (03 Feb 2007) + + 03 Feb 2007; Marcelo Goes + +wireshark-0.99.5.ebuild: + 0.99.5 version bump for bug 165077, reported by Executioner . + + 16 Nov 2006; Roy Marples wireshark-0.99.4.ebuild, + wireshark-0.99.4-r1.ebuild: + Added ~x86-fbsd keyword. + +*wireshark-0.99.4-r1 (12 Nov 2006) + + 12 Nov 2006; Daniel Black + +files/wireshark-except-double-free.diff, -wireshark-0.99.3.ebuild, + +wireshark-0.99.4-r1.ebuild: + Thanks a7x, didier who made great efforts with upstream to prove it was a + Gentoo compiler bug. bug #145974 and bug #133092. removed sec vulnerable + version + + 05 Nov 2006; Brent Baude wireshark-0.99.4.ebuild: + Marking wireshark-0.99.4 ppc64 stable for bug #152951 + + 02 Nov 2006; Olivier Crête wireshark-0.99.4.ebuild: + Stable on amd64 for security bug #152951 + + 02 Nov 2006; Jeroen Roovers wireshark-0.99.4.ebuild: + Stable for HPPA (bug #152951). + + 01 Nov 2006; Bryan Østergaard + wireshark-0.99.4.ebuild: + Stable on ia64, bug 152951. + + 01 Nov 2006; Bryan Østergaard + wireshark-0.99.4.ebuild: + Stable on Alpha, bug 152951. + + 01 Nov 2006; Andrej Kacian wireshark-0.99.4.ebuild: + Stable on x86, security bug #152951. + + 01 Nov 2006; Gustavo Zacarias + wireshark-0.99.4.ebuild: + Stable on sparc wrt security #152951 + + 01 Nov 2006; Tobias Scherbaum + wireshark-0.99.4.ebuild: + ppc stable, bug #152951 + +*wireshark-0.99.4 (01 Nov 2006) + + 01 Nov 2006; Daniel Black + +wireshark-0.99.4.ebuild: + version bump as per security bug #152951. Also fixes dead symlink - bug + #145067, wifiscanner & wireshark: File collision /usr/lib/libwiretap.la bug + #146286 + + 18 Sep 2006; Benjamin Smee wireshark-0.99.3.ebuild: + Small change for bug #147814 + + 12 Sep 2006; Markus Ullmann wireshark-0.99.3.ebuild: + Fixing built_with_use check for non-existant IUSE ( bug #146839 ) + + 30 Aug 2006; Daniel Black + wireshark-0.99.3.ebuild: + changed description to emerge -s ethereal will find it + + 29 Aug 2006; Bryan Østergaard + wireshark-0.99.3.ebuild: + Stable on ia64. + + 27 Aug 2006; Daniel Black + -files/wireshark-0.99.2-libgcrypt-asneeded.patch, + -wireshark-0.99.2.ebuild: + purge vulnerable version + + 27 Aug 2006; Rene Nussbaumer + wireshark-0.99.3.ebuild: + Stable on hppa. See bug #144946. + + 25 Aug 2006; Daniel Black + wireshark-0.99.3.ebuild: + seemed to have dropped hppa - re-added + + 25 Aug 2006; Bryan Østergaard + wireshark-0.99.3.ebuild: + Stable on alpha, bug 144946. + + 25 Aug 2006; Olivier Crête wireshark-0.99.3.ebuild: + Stable on amd64 per security bug #144946 + + 25 Aug 2006; wireshark-0.99.3.ebuild: + Stable on x86, security bug #144946. + + 25 Aug 2006; Jason Wever wireshark-0.99.3.ebuild: + Stable on SPARC wrt security bug #144946. + + 24 Aug 2006; Tobias Scherbaum + wireshark-0.99.3.ebuild: + ppc stable, bug #144946 + + 24 Aug 2006; Markus Rothe wireshark-0.99.3.ebuild: + Stable on ppc64; bug #144946 + +*wireshark-0.99.3 (24 Aug 2006) + + 24 Aug 2006; Daniel Black + +wireshark-0.99.3.ebuild: + version bump - security bug #144946 + + 19 Aug 2006; Jeroen Roovers wireshark-0.99.2.ebuild: + Stable for HPPA. + + 30 Jul 2006; Daniel Black + wireshark-0.99.2.ebuild: + added filter-flags -fstack-protector thanks to Richard Hansen and Kevin F. + Quinn see bug #133092 + + 25 Jul 2006; Daniel Black + wireshark-0.99.2.ebuild: + added RDEPEND on selinux-wireshark for USE=selinux. Thanks to Petre bug #141156 + removed RDEPEND=!net-analyzer in preparation for ethereal->wireshark move. + added ethereal -> wireshark and tethereal -> tshark symlinks thanks to + suggestion from solar + + 20 Jul 2006; Gustavo Zacarias + wireshark-0.99.2.ebuild: + Stable on sparc wrt security #140856 + + 20 Jul 2006; Joshua Jackson wireshark-0.99.2.ebuild: + Stable x86; bug #140856 + + 19 Jul 2006; Daniel Black + +files/wireshark-0.99.2-libgcrypt-asneeded.patch, wireshark-0.99.2.ebuild: + added patch to include gcrypt libraries to solve bug #141021. Thanks to + Alberto Ornaghi for the bug report + + 19 Jul 2006; Simon Stelling wireshark-0.99.2.ebuild: + stable wrt bug 140856 + + 19 Jul 2006; Tobias Scherbaum + wireshark-0.99.2.ebuild: + ppc stable, bug #140856 + + 19 Jul 2006; wireshark-0.99.2.ebuild: + Stable on alpha wrt security Bug #140856. + + 19 Jul 2006; Markus Rothe wireshark-0.99.2.ebuild: + Stable on ppc64; bug #140856 + +*wireshark-0.99.2 (18 Jul 2006) + + 18 Jul 2006; Markus Ullmann + -files/wireshark-0.99.1_pre1-as-needed.patch, + -wireshark-0.99.1_pre1.ebuild, +wireshark-0.99.2.ebuild: + Security version bump wrt bug #140856 + + 17 Jul 2006; Daniel Black + wireshark-0.99.1_pre1.ebuild: + added keywords (~alpha ~ia64 ~ppc64) as this is off the same codebase as + ethereal - bug #136729 + + 16 Jul 2006; Daniel Gryniewicz + wireshark-0.99.1_pre1.ebuild: + Marked ~amd64 per bug #136729 + + 15 Jul 2006; Stephanie Lockwood-Childs + wireshark-0.99.1_pre1.ebuild: + mark ~ppc (Bug #136729) + + 01 Jul 2006; Jason Wever wireshark-0.99.1_pre1.ebuild: + Added ~sparc keyword. + +*wireshark-0.99.1_pre1 (30 Jun 2006) + + 30 Jun 2006; Markus Ullmann + +files/wireshark-0.99.1_pre1-as-needed.patch, +metadata.xml, + +wireshark-0.99.1_pre1.ebuild: + Initial import, fixes bug #136729 , thanks to gentooperson@yahoo.com for + providing an ebuild + diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch new file mode 100644 index 0000000000..36069368e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch @@ -0,0 +1,10 @@ +--- ./epan/dissectors/Makefile.am.orig 2007-12-11 16:38:03.000000000 +0300 ++++ ./epan/dissectors/Makefile.am 2007-12-11 16:38:37.000000000 +0300 +@@ -32,6 +32,7 @@ + + libasndissectors_la_SOURCES = \ + $(ASN_DISSECTOR_SRC) ++libasndissectors_la_LIBADD = ../../wiretap/libwiretap.la + + libpidldissectors_la_SOURCES = \ + $(PIDL_DISSECTOR_SRC) diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch new file mode 100644 index 0000000000..df495f8cf7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch @@ -0,0 +1,11 @@ +--- wiretap/Makefile.am.orig 2008-02-21 23:11:41.000000000 +0300 ++++ wiretap/Makefile.am 2008-02-21 23:12:08.000000000 +0300 +@@ -67,7 +67,7 @@ + $(GENERATOR_FILES) \ + $(GENERATED_FILES) + +-libwiretap_la_LIBADD = libwiretap_generated.la ++libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) + libwiretap_la_DEPENDENCIES = libwiretap_generated.la + + RUNLEX = $(top_srcdir)/tools/runlex.sh diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch new file mode 100644 index 0000000000..ad81e382e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch @@ -0,0 +1,31 @@ +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1740 +https://bugs.gentoo.org/show_bug.cgi?id=260457 + +=== modified file 'capture_opts.c' +--- capture_opts.c 2009-03-05 16:59:51 +0000 ++++ capture_opts.c 2009-03-05 17:06:49 +0000 +@@ -59,6 +59,7 @@ + # include "inet_v6defs.h" + #endif + ++#include + #include + + #include +@@ -759,6 +760,15 @@ + "Dropped"); + } + ++#ifndef _WIN32 ++ /* handle SIGPIPE signal to default action */ ++ struct sigaction act; ++ act.sa_handler = SIG_DFL; ++ sigemptyset(&act.sa_mask); ++ act.sa_flags = SA_RESTART; ++ sigaction(SIGPIPE,&act,NULL); ++#endif ++ + while (1) { /* XXX - Add signal handling? */ + for (stat_entry = g_list_first(stat_list); stat_entry != NULL; stat_entry = g_list_next(stat_entry)) { + if_stat = stat_entry->data; + diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch new file mode 100644 index 0000000000..eed2df16a7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch @@ -0,0 +1,18 @@ +defining _XOPEN_SOURCE to nothing means the oldest version which means glibc +will not provide the strdup() prototype. this leads to an implicit decl which +leads to a return type of "int" -- 32bits of a ptr on a 64bit arch leads to +kaboom. + +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161 + +--- text2pcap.c ++++ text2pcap.c +@@ -90,7 +90,7 @@ + # define __USE_XOPEN + #endif + #ifndef _XOPEN_SOURCE +-# define _XOPEN_SOURCE ++# define _XOPEN_SOURCE 600 + #endif + + #include diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8--as-needed.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8--as-needed.patch new file mode 100644 index 0000000000..75b07e894b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8--as-needed.patch @@ -0,0 +1,18 @@ +--- a/epan/Makefile.am 2010-05-05 10:13:00.000000000 -0700 ++++ b/epan/Makefile.am 2010-05-21 09:11:20.000000000 -0700 +@@ -130,6 +130,7 @@ + dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ + @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ + @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ ++ ${top_builddir}/wiretap/libwiretap.la \ + ${top_builddir}/wsutil/libwsutil.la -lm + + libwireshark_la_DEPENDENCIES = \ +@@ -137,6 +138,7 @@ + libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \ + ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ + dissectors/libdirtydissectors.la $(wslua_lib) \ ++ ${top_builddir}/wiretap/libwiretap.la \ + ${top_builddir}/wsutil/libwsutil.la + + #EXTRA_PROGRAMS = reassemble_test diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8-no-pton.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8-no-pton.patch new file mode 100644 index 0000000000..fbdddd7049 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8-no-pton.patch @@ -0,0 +1,29 @@ +--- Makefile.am.orig 2010-05-24 11:26:37.000000000 -0700 ++++ Makefile.am 2010-05-24 11:31:05.000000000 -0700 +@@ -299,6 +299,8 @@ + # @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in + # @GTK_LIBS@ (as those are also needed for X applications, and GTK+ + # applications are X applications). ++wireshark_DEPENDENCIES = \ ++ @INET_PTON_LO@ + wireshark_LDADD = \ + $(wireshark_optional_objects) \ + gtk/libui.a \ +@@ -330,6 +332,8 @@ + endif + + # Libraries and plugin flags with which to link tshark. ++tshark_DEPENDENCIES = \ ++ @INET_PTON_LO@ + tshark_LDADD = \ + $(wireshark_optional_objects) \ + wiretap/libwiretap.la \ +@@ -360,6 +364,8 @@ + endif + + # Libraries and plugin flags with which to link tshark. ++rawshark_DEPENDENCIES = \ ++ @INET_PTON_LO@ + rawshark_LDADD = \ + $(wireshark_optional_objects) \ + wiretap/libwiretap.la \ diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-except-double-free.diff b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-except-double-free.diff new file mode 100644 index 0000000000..a7ca896a49 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-except-double-free.diff @@ -0,0 +1,16 @@ +Index: except.c +=================================================================== +--- except.c (revision 19876) ++++ except.c (working copy) +@@ -192,6 +192,11 @@ + + assert (top->except_type == XCEPT_CATCHER); + except_free(catcher->except_obj.except_dyndata); ++ /* make sure no else can free this pointer again ++ See http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 ++ http://bugs.gentoo.org/show_bug.cgi?id=133092 ++ http://bugs.gentoo.org/show_bug.cgi?id=145974 */ ++ catcher->except_obj.except_dyndata = NULL; + + for (i = 0; i < catcher->except_size; pi++, i++) { + if (match(&except->except_id, pi)) { diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/metadata.xml new file mode 100644 index 0000000000..059e62c806 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/metadata.xml @@ -0,0 +1,37 @@ + + + +netmon + + pva@gentoo.org + Peter Volkov + + + Wireshark is the world's foremost network protocol analyzer, and is the de + facto (and often de jure) standard across many industries and educational + institutions. Wireshark has a rich feature set which includes 1) deep + inspection of hundreds of protocols, with more being added all the time, 2) + live capture and offline analysis, 3) standard three-pane packet browser, 4) + captured network data can be browsed via a GUI, or via the TTY-mode TShark + utility, 5) the most powerful display filters in the industry, 6) rich VoIP + analysis, 7) read/write many different capture file formats: tcpdump + (libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network + Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer® + Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM + WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks + Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) + capture files compressed with gzip can be decompressed on the fly, 9) live + data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, + Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many + protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and + WPA/WPA2, 11) coloring rules can be applied to the packet list for quick, + intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or + plain text + + +Use GNU crypto library (dev-libs/libgcrypt) to decrypt SSL traffic +Use GNU net-dns/c-ares library to resolve DNS names +Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark) +Use net-libs/libsmi to resolve numeric OIDs into human readable format + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/wireshark-1.2.8.ebuild b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/wireshark-1.2.8.ebuild new file mode 100644 index 0000000000..568465ea1f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/wireshark-1.2.8.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6.ebuild,v 1.6 2010/01/30 15:07:41 pva Exp $ + +EAPI=2 +inherit autotools libtool flag-o-matic eutils toolchain-funcs + +DESCRIPTION="A network protocol analyzer formerly known as ethereal" +HOMEPAGE="http://www.wireshark.org/" + +# _rc versions has different download location. +[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && { +SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz"; +S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \ +SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux" + +RDEPEND=">=dev-libs/glib-2.4.0:2 + zlib? ( sys-libs/zlib ) + smi? ( net-libs/libsmi ) + gtk? ( >=x11-libs/gtk+-2.4.0:2 + x11-libs/pango + dev-libs/atk ) + gnutls? ( net-libs/gnutls ) + gcrypt? ( dev-libs/libgcrypt ) + pcap? ( net-libs/libpcap ) + pcre? ( dev-libs/libpcre ) + caps? ( sys-libs/libcap ) + kerberos? ( virtual/krb5 ) + portaudio? ( media-libs/portaudio ) + ares? ( >=net-dns/c-ares-1.5 ) + !ares? ( adns? ( net-libs/adns ) ) + geoip? ( dev-libs/geoip ) + lua? ( >=dev-lang/lua-5.1 ) + selinux? ( sec-policy/selinux-wireshark )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.15.0 + dev-lang/perl + sys-devel/bison + sys-devel/flex" + +pkg_setup() { + if ! use gtk; then + ewarn "USE=-gtk will means no gui called wireshark will be created and" + ewarn "only command line utils are available" + fi + + # Add group for users allowed to sniff. + enewgroup wireshark +} + +src_prepare() { + cd "${S}"/epan # our hardened toolchain bug... + epatch "${FILESDIR}/wireshark-except-double-free.diff" + + cd "${S}" + epatch "${FILESDIR}/${PN}-1.2.8--as-needed.patch" + + cd "${S}" + epatch "${FILESDIR}/${PN}-1.2.8-no-pton.patch" + + eautoreconf +} + +src_configure() { + local myconf + + # optimization bug, see bug #165340, bug #40660 + if [[ $(gcc-version) == 3.4 ]] ; then + elog "Found gcc 3.4, forcing -O3 into CFLAGS" + replace-flags -O? -O3 + elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then + elog "Found <=gcc-3.3, forcing -O into CFLAGS" + replace-flags -O? -O + fi + + if use ares && use adns; then + einfo "You asked for both, ares and adns, but we can use only one of them." + einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)." + myconf="$(use_with ares c-ares) --without-adns" + else + myconf="$(use_with adns) $(use_with ares c-ares)" + fi + + # see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 + # our hardened toolchain bug + filter-flags -fstack-protector + + # profile and pie are incompatible #215806, #292991 + if use profile; then + ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." + append-flags $(test-flags-CC -nopie) + fi + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos; then + case `krb5-config --libs` in + *-lcrypto*) myconf="${myconf} --with-ssl" ;; + esac + fi + + # dumpcap requires libcap, setuid-install requires dumpcap + econf $(use_enable gtk wireshark) \ + $(use_enable profile profile-build) \ + $(use_with gnutls) \ + $(use_with gcrypt) \ + $(use_enable ipv6) \ + $(use_enable threads) \ + $(use_with lua) \ + $(use_with kerberos krb5) \ + $(use_with smi libsmi) \ + $(use_with pcap) \ + $(use_with zlib) \ + $(use_with pcre) \ + $(use_with geoip) \ + $(use_with portaudio) \ + $(use_with caps libcap) \ + $(use_enable pcap setuid-install) \ + --sysconfdir=/etc/wireshark \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + use pcap && fowners 0:wireshark /usr/bin/dumpcap + use pcap && fperms 6550 /usr/bin/dumpcap + + insinto /usr/include/wiretap + doins wiretap/wtap.h + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt + + if use gtk; then + for c in hi lo; do + for d in 16 32 48; do + insinto /usr/share/icons/${c}color/${d}x${d}/apps + newins image/${c}${d}-app-wireshark.png wireshark.png + done + done + insinto /usr/share/applications + doins wireshark.desktop + fi +} + +pkg_postinst() { + echo + ewarn "NOTE: To run wireshark as normal user you have to add yourself into" + ewarn "wireshark group. This security measure ensures that only trusted" + ewarn "users allowed to sniff your traffic." + echo +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/Manifest b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/Manifest new file mode 100644 index 0000000000..d3caf42195 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/Manifest @@ -0,0 +1,6 @@ +DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 RMD160 5f37dbae97a4e55ae25ed54d8ae521cb51064c50 SHA1 b35cbec42b3a0794281921e7879eab322f27da70 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716 +DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea +DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 RMD160 b9aa87b7f185eda2d022580ccbb9b23d2c2a4f42 SHA1 b63aa5c0c91458fe82a2be2cca2fbe264db2b301 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd +DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 RMD160 e94c89a8404182ae0b2b9757c23ae69db012918d SHA1 98748395fbbd85509ba0059745ae708e57cc9f91 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed +DIST ppp-2.4.5.tar.gz 684342 RMD160 231682ab2314d182c893c64523fd89f571a258de SHA1 cb977b31584e3488e08a643aaa672fdb229d2e78 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 +DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/README.mpls b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/README.mpls new file mode 100644 index 0000000000..1ae7ae4605 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/README.mpls @@ -0,0 +1,15 @@ +MPLS consists of 3 components: +1. MPLS forwarding +2. MPLS signalling +3. Mapping layer 3 traffic onto MPLS LSPs + +The document mpls-forwarding basics explains item 1. + +Examples of MPLS signalling protocols are: RSVP-TE LDP and CR-LDP. +The package ldp-portable is an implementation of LDP and contains more +information about LDP based MPLS signalling. + +Mapping of layer 3 traffic to MPLS LSPs is accomplised in a couple of +different ways. +-Per FEC where FEC is an entry in the routing table +-Virtual interface that represents an LSP diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/modules.ppp b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/modules.ppp new file mode 100644 index 0000000000..e936041c6b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/modules.ppp @@ -0,0 +1,10 @@ +alias char-major-108 ppp_generic +alias /dev/ppp ppp_generic +alias tty-ldisc-3 ppp_async +alias tty-ldisc-13 n_hdlc +alias tty-ldisc-14 ppp_synctty +alias ppp-compress-18 ppp_mppe +alias ppp-compress-21 bsd_comp +alias ppp-compress-24 ppp_deflate +alias ppp-compress-26 ppp_deflate +alias net-pf-24 pppoe diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/ppp-2.4.5-systemconfig.patch b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/ppp-2.4.5-systemconfig.patch new file mode 100644 index 0000000000..fe649e8b15 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/files/ppp-2.4.5-systemconfig.patch @@ -0,0 +1,100 @@ +diff -rupN ppp-2.4.5/pppd/ipcp.c ppp-2.4.5.patched/pppd/ipcp.c +--- ppp-2.4.5/pppd/ipcp.c 2012-01-17 15:19:56.530166462 -0800 ++++ ppp-2.4.5.patched/pppd/ipcp.c 2012-01-17 15:21:18.371378120 -0800 +@@ -90,6 +90,7 @@ struct notifier *ip_down_notifier = NULL + /* local vars */ + static int default_route_set[NUM_PPP]; /* Have set up a default route */ + static int proxy_arp_set[NUM_PPP]; /* Have created proxy arp entry */ ++static bool neg_systemconfig; /* Skip system configuration */ + static bool usepeerdns; /* Ask peer for DNS addrs */ + static bool usepeerwins; /* Ask peer for WINS addrs */ + static int ipcp_is_up; /* have called np_up() */ +@@ -214,6 +215,9 @@ static option_t ipcp_option_list[] = { + { "usepeerwins", o_bool, &usepeerwins, + "Ask peer for WINS address(es)", 1 }, + ++ { "nosystemconfig", o_bool, &neg_systemconfig, ++ "Avoid IP and route configuration of ppp device", 1 }, ++ + { "netmask", o_special, (void *)setnetmask, + "set netmask", OPT_PRIO | OPT_A2STRVAL | OPT_STATIC, netmask_str }, + +@@ -1861,7 +1865,8 @@ ipcp_up(f) + script_setenv("DNS2", ip_ntoa(go->dnsaddr[1]), 0); + if (usepeerdns && (go->dnsaddr[0] || go->dnsaddr[1])) { + script_setenv("USEPEERDNS", "1", 0); +- create_resolv(go->dnsaddr[0], go->dnsaddr[1]); ++ if (!neg_systemconfig) ++ create_resolv(go->dnsaddr[0], go->dnsaddr[1]); + } + + if (go->winsaddr[0]) +@@ -1933,8 +1938,12 @@ ipcp_up(f) + */ + mask = GetMask(go->ouraddr); + ++ if (neg_systemconfig && debug) ++ warn("Avoiding system configuration by request"); ++ + #if !(defined(SVR4) && (defined(SNI) || defined(__USLC__))) +- if (!sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) { ++ if (!neg_systemconfig && ++ !sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) { + if (debug) + warn("Interface configuration failed"); + ipcp_close(f->unit, "Interface configuration failed"); +@@ -1946,7 +1955,7 @@ ipcp_up(f) + ipcp_script(_PATH_IPPREUP, 1); + + /* bring the interface up for IP */ +- if (!sifup(f->unit)) { ++ if (!neg_systemconfig && !sifup(f->unit)) { + if (debug) + warn("Interface failed to come up"); + ipcp_close(f->unit, "Interface configuration failed"); +@@ -1954,7 +1963,8 @@ ipcp_up(f) + } + + #if (defined(SVR4) && (defined(SNI) || defined(__USLC__))) +- if (!sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) { ++ if (!neg_systemconfig && ++ !sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) { + if (debug) + warn("Interface configuration failed"); + ipcp_close(f->unit, "Interface configuration failed"); +@@ -1964,12 +1974,13 @@ ipcp_up(f) + sifnpmode(f->unit, PPP_IP, NPMODE_PASS); + + /* assign a default route through the interface if required */ +- if (ipcp_wantoptions[f->unit].default_route) ++ if (!neg_systemconfig && ipcp_wantoptions[f->unit].default_route) + if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) + default_route_set[f->unit] = 1; + + /* Make a proxy ARP entry if requested. */ +- if (ho->hisaddr != 0 && ipcp_wantoptions[f->unit].proxy_arp) ++ if (!neg_systemconfig && ++ ho->hisaddr != 0 && ipcp_wantoptions[f->unit].proxy_arp) + if (sifproxyarp(f->unit, ho->hisaddr)) + proxy_arp_set[f->unit] = 1; + +@@ -2041,7 +2052,8 @@ ipcp_down(f) + sifnpmode(f->unit, PPP_IP, NPMODE_QUEUE); + } else { + sifnpmode(f->unit, PPP_IP, NPMODE_DROP); +- sifdown(f->unit); ++ if (!neg_systemconfig) ++ sifdown(f->unit); + ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, + ipcp_hisoptions[f->unit].hisaddr); + } +@@ -2072,7 +2084,8 @@ ipcp_clear_addrs(unit, ouraddr, hisaddr) + cifdefaultroute(unit, ouraddr, hisaddr); + default_route_set[unit] = 0; + } +- cifaddr(unit, ouraddr, hisaddr); ++ if (!neg_systemconfig) ++ cifaddr(unit, ouraddr, hisaddr); + } + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/ppp-2.4.5-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/ppp-2.4.5-r3.ebuild new file mode 100644 index 0000000000..0d5a343eba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/ppp/ppp-2.4.5-r3.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r2.ebuild,v 1.2 2011/11/11 12:07:15 flameeyes Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs linux-info pam + +DESCRIPTION="Point-to-Point Protocol (PPP)" +HOMEPAGE="http://www.samba.org/ppp" +SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz + http://dev.gentoo.org/~flameeyes/qa-copies/${P}-gentoo-20111111.tar.gz + dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius" + +DEPEND="activefilter? ( net-libs/libpcap ) + atm? ( net-dialup/linux-atm ) + pam? ( virtual/pam ) + gtk? ( x11-libs/gtk+:2 ) + eap-tls? ( net-misc/curl dev-libs/openssl )" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${WORKDIR}/patch/make-vars.patch" + epatch "${WORKDIR}/patch/mpls.patch" + epatch "${WORKDIR}/patch/killaddr-smarter.patch" + epatch "${WORKDIR}/patch/wait-children.patch" + epatch "${WORKDIR}/patch/defaultgateway.patch" + epatch "${WORKDIR}/patch/linkpidfile.patch" + epatch "${WORKDIR}/patch/qa-fixes.patch" + epatch "${WORKDIR}/patch/auth-fail.patch" + epatch "${WORKDIR}/patch/defaultmetric.patch" + epatch "${WORKDIR}/patch/dev-ppp.patch" + epatch "${WORKDIR}/patch/gtk2.patch" + epatch "${WORKDIR}/patch/passwordfd-read-early.patch" + epatch "${WORKDIR}/patch/pppd-usepeerwins.patch" + epatch "${WORKDIR}/patch/connect-errors.patch" + epatch "${WORKDIR}/patch/Makefile.patch" + epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch" + epatch "${WORKDIR}/patch/pado-timeout.patch" + epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch" + # Apply Chromium OS specific patch regarding the nosystemconfig option + # See https://gerrit.chromium.org/gerrit/7751 and + # http://crosbug.com/17185 for details. + epatch "${FILESDIR}/${PN}-2.4.5-systemconfig.patch" + + use eap-tls && { + # see http://www.nikhef.nl/~janjust/ppp for more info + einfo "Enabling EAP-TLS support" + epatch "${WORKDIR}/patch/eaptls-mppe-0.991-gentoo.patch" + } + + use atm && { + einfo "Enabling PPPoATM support" + sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux + } + + use activefilter || { + einfo "Disabling active filter" + sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux + } + + use pam && { + einfo "Enabling PAM" + sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux + } + + use ipv6 && { + einfo "Enabling IPv6" + sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux + } + + einfo "Enabling CBCP" + sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux + + use dhcp && { + # copy the ppp-dhcp plugin files + einfo "Adding ppp-dhcp plugin files..." + mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" \ + && sed -i -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' pppd/plugins/Makefile.linux \ + || die "ppp-dhcp plugin addition failed" + epatch "${WORKDIR}/patch/dhcp-make-vars.patch" + epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch" + } + + # Set correct libdir + sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \ + pppd/{pathnames.h,pppd.8} + + if use radius; then + #set the right paths in radiusclient.conf + sed -i -e "s:/usr/local/etc:/etc:" \ + -e "s:/usr/local/sbin:/usr/sbin:" pppd/plugins/radius/etc/radiusclient.conf + #set config dir to /etc/ppp/radius + sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \ + pppd/plugins/radius/{*.8,*.c,*.h} \ + pppd/plugins/radius/etc/* + else + einfo "Disabling radius" + sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux + fi +} + +src_configure() { + export CC="$(tc-getCC)" + export AR="$(tc-getAR)" + econf || die "econf failed" +} + +src_compile() { + emake COPTS="${CFLAGS} -D_GNU_SOURCE" || die "compile failed" + + #build pppgetpass + cd contrib/pppgetpass + if use gtk; then + emake -f Makefile.linux || die "failed to build pppgetpass" + else + emake pppgetpass.vt || die "failed to build pppgetpass" + fi +} + +src_install() { + local i + for i in chat pppd pppdump pppstats ; do + doman ${i}/${i}.8 || die "man page for ${i} not build" + dosbin ${i}/${i} || die "${i} not build" + done + fperms u+s-w /usr/sbin/pppd + + # Install pppd header files + pushd pppd >/dev/null + emake INSTROOT="${D}" install-devel || die "emake install-devel failed" + popd >/dev/null + + dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die "pppoe-discovery not build" + + dodir /etc/ppp/peers + insinto /etc/ppp + insopts -m0600 + newins etc.ppp/pap-secrets pap-secrets.example || die "pap-secrets.example not found" + newins etc.ppp/chap-secrets chap-secrets.example || die "chap-secrets.example not found" + + insopts -m0644 + doins etc.ppp/options + + exeinto /etc/ppp + for i in ip-up ip-down ; do + doexe "${WORKDIR}/scripts/${i}" || die "failed to install ${i} script" + insinto /etc/ppp/${i}.d + use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6} + doins "${WORKDIR}/scripts/${i}.d"/* || die "failed to install ${i}.d scripts" + # Remove ip-up/ip-down 40-dns.sh scripts because these scripts + # modify /etc/resolv.conf, which should only be managed by the + # connection manager (shill). See http://crosbug.com/24486. + rm -f ${D}/etc/ppp/${i}.d/40-dns.sh || die "failed to remove /etc/ppp/${i}.d/40-dns.sh" + done + + pamd_mimic_system ppp auth account session + + local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h) + #closing " for syntax coloring + insinto "${PLUGINS_DIR}" + insopts -m0755 + doins pppd/plugins/minconn.so || die "minconn.so not build" + doins pppd/plugins/passprompt.so || die "passprompt.so not build" + doins pppd/plugins/passwordfd.so || die "passwordfd.so not build" + doins pppd/plugins/winbind.so || die "winbind.so not build" + doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build" + doins pppd/plugins/pppol2tp/openl2tp.so || die "openl2tp.so not build" + doins pppd/plugins/pppol2tp/pppol2tp.so || die "pppol2tp.so not build" + if use atm; then + doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build" + fi + if use dhcp; then + doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build" + fi + if use radius; then + doins pppd/plugins/radius/radius.so || die "radius.so not build" + doins pppd/plugins/radius/radattr.so || die "radattr.so not build" + doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build" + + #Copy radiusclient configuration files (#92878) + insinto /etc/ppp/radius + insopts -m0644 + doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers} + + doman pppd/plugins/radius/pppd-radius.8 + doman pppd/plugins/radius/pppd-radattr.8 + fi + + insinto /etc/modprobe.d + insopts -m0644 + newins "${FILESDIR}/modules.ppp" ppp.conf + + dodoc PLUGINS README* SETUP Changes-2.3 FAQ + dodoc "${FILESDIR}/README.mpls" + + dosbin scripts/pon && \ + dosbin scripts/poff && \ + dosbin scripts/plog && \ + doman scripts/pon.1 || die "failed to install pon&poff scripts" + + # Adding misc. specialized scripts to doc dir + insinto /usr/share/doc/${PF}/scripts/chatchat + doins scripts/chatchat/* || die "failed to install chat scripts in doc dir" + insinto /usr/share/doc/${PF}/scripts + doins scripts/* || die "failed to install scripts in doc dir" + + if use gtk; then + dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk} + newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass + else + newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass + fi + doman contrib/pppgetpass/pppgetpass.8 +} + +pkg_postinst() { + if linux-info_get_any_version && linux_config_src_exists; then + echo + ewarn "If the following test report contains a missing kernel configuration option that you need," + ewarn "you should reconfigure and rebuild your kernel before running pppd." + CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY" + local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)" + local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)" + local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)" + if use activefilter ; then + CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER" + local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)" + fi + CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE" + local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)" + local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)" + local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)" + CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET" + local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)" + local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)" + if use atm ; then + CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM" + local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)" + fi + check_extra_config + fi + + if [ ! -e "${ROOT}/dev/.devfsd" ] && [ ! -e "${ROOT}/dev/.udev" ] && [ ! -e "${ROOT}/dev/ppp" ]; then + mknod "${ROOT}/dev/ppp" c 108 0 + fi + if [ "$ROOT" = "/" ]; then + if [ -x /sbin/update-modules ]; then + /sbin/update-modules + else + /sbin/modules-update + fi + fi + + # create *-secrets files if not exists + [ -f "${ROOT}/etc/ppp/pap-secrets" ] || \ + cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets" + [ -f "${ROOT}/etc/ppp/chap-secrets" ] || \ + cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets" + + # lib name has changed + sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" + + if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then + echo + ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from" + ewarn " /etc/radiusclient to /etc/ppp/radius." + einfo "For your convenience, radiusclient directory was copied to the new location." + fi + + echo + elog "Pon, poff and plog scripts have been supplied for experienced users." + elog "Users needing particular scripts (ssh,rsh,etc.) should check out the" + elog "/usr/share/doc/${PF}/scripts directory." + + # move the old user-defined files into ip-{up,down}.d directories + # TO BE REMOVED AFTER SEPT 2008 + local i + for i in ip-up ip-down; do + if [ -f "${ROOT}"/etc/ppp/${i}.local ]; then + mv /etc/ppp/${i}.local /etc/ppp/${i}.d/90-local.sh && \ + ewarn "/etc/ppp/${i}.local has been moved to /etc/ppp/${i}.d/90-local.sh" + fi + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/Manifest b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/Manifest new file mode 100644 index 0000000000..e6a6c2173f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/Manifest @@ -0,0 +1,2 @@ +DIST xl2tpd-1.2.3.tar.gz 332454 RMD160 73528e1f5e28eb60e2a25509b59dcbc141721908 SHA1 fee344f7771ae295f882a16c46c71234fe1b733a SHA256 db8fa5f7c19cd7928d7e87ea5c99c6a89bc1ad66f27132aaf12d4b3b3febf2e3 +DIST xl2tpd-1.3.0.tar.gz 550901 RMD160 ef2cec6d363bdc8b107f2efcb5db2df9b1d2c7ec SHA1 e0382fdce023f577f8914a6f98f1fbff74a54490 SHA256 972b9440d637c7cff3e28ca4cb4131bc33b9394cfcb7d391383202136632c8c0 diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch new file mode 100644 index 0000000000..a87ab3fff8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch @@ -0,0 +1,13 @@ +=== modified file 'Makefile' +--- Makefile 2011-09-20 04:44:23 +0000 ++++ Makefile 2011-09-20 04:44:35 +0000 +@@ -114,7 +114,7 @@ + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) + + $(CONTROL_EXEC): $(CONTROL_SRCS) +- $(CC) $(CONTROL_SRCS) -o $@ ++ $(CC) $(LDFLAGS) $(CONTROL_SRCS) -o $@ + + pfc: + $(CC) $(CFLAGS) -c contrib/pfc.c + diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-1.3.0-avp-workaround.patch b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-1.3.0-avp-workaround.patch new file mode 100644 index 0000000000..db6b55c301 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-1.3.0-avp-workaround.patch @@ -0,0 +1,56 @@ +diff -rupN xl2tpd-1.3.0/avpsend.c xl2tpd-1.3.0.patched/avpsend.c +--- xl2tpd-1.3.0/avpsend.c 2011-07-23 17:13:59.000000000 -0700 ++++ xl2tpd-1.3.0.patched/avpsend.c 2011-11-01 17:02:17.149552006 -0700 +@@ -18,6 +18,13 @@ + #include + #include "l2tp.h" + ++/* ++ * Several AVPs seem to be rejected by some VPN servers such as Check Point VPN. ++ * This macro is defined to exclude those AVPs from L2TP control packets as a ++ * workaround. ++ */ ++#define XL2TPD_WORK_AROUND_AVP_ISSUES ++ + struct half_words { + _u16 s0; + _u16 s1; +@@ -81,10 +88,12 @@ int add_bearer_caps_avp (struct buffer * + + int add_firmware_avp (struct buffer *buf) + { ++#ifndef XL2TPD_WORK_AROUND_AVP_ISSUES + struct half_words *ptr = (struct half_words *) (buf->start + buf->len + sizeof(struct avp_hdr)); + add_header(buf, 0x8, 0x6); + ptr->s0 = htons (FIRMWARE_REV); + buf->len += 0x8; ++#endif /* XL2TPD_WORK_AROUND_AVP_ISSUES */ + return 0; + } + +@@ -103,9 +112,11 @@ int add_hostname_avp (struct buffer *buf + + int add_vendor_avp (struct buffer *buf) + { ++#ifndef XL2TPD_WORK_AROUND_AVP_ISSUES + add_header(buf, 0x6 + strlen (VENDOR_NAME), 0x8); + strcpy ((char *) (buf->start + buf->len + sizeof(struct avp_hdr)), VENDOR_NAME); + buf->len += 0x6 + strlen (VENDOR_NAME); ++#endif /* XL2TPD_WORK_AROUND_AVP_ISSUES */ + return 0; + } + +@@ -227,11 +238,13 @@ int add_txspeed_avp (struct buffer *buf, + + int add_rxspeed_avp (struct buffer *buf, int speed) + { ++#ifndef XL2TPD_WORK_AROUND_AVP_ISSUES + struct half_words *ptr = (struct half_words *) (buf->start + buf->len + sizeof(struct avp_hdr)); + add_header(buf, 0xA, 0x26); + ptr->s0 = htons ((speed >> 16) & 0xFFFF); + ptr->s1 = htons (speed & 0xFFFF); + buf->len += 0xA; ++#endif /* XL2TPD_WORK_AROUND_AVP_ISSUES */ + return 0; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch new file mode 100644 index 0000000000..b27703fe43 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/show_bug.cgi?id=307489 +http://homenet.beeline.ru/index.php?showtopic=192551&st=0&p=1063626345&#entry1063626345 + +--- xl2tpd.c 2010-05-10 22:35:43.000000000 +0200 ++++ xl2tpd.c 2010-08-15 22:02:14.000000000 +0200 +@@ -587,9 +587,33 @@ + hp = gethostbyname (host); + if (!hp) + { +- l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n", +- host); +- return NULL; ++ if ( lac->redial ) ++ { ++ int imax=lac->rmax; ++ if ( lac->rmax == 0 ) ++ imax = 1; ++ while ( imax > 0 ) ++ { ++ hp = gethostbyname ( host ); ++ if ( hp ) ++ break; ++ l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s. Trying to look again in %d seconds.\n", host, lac->rtimeout ); ++ if ( lac->rtimeout > 0 ) ++ sleep ( lac->rtimeout ); ++ if ( lac->rmax > 0 ) ++ imax--; ++ } ++ if ( ( imax == 0 ) && ( lac->rmax > 0 ) ) ++ { ++ l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s after %d tries. Lookup stops now.\n", host, lac->rmax ); ++ return NULL; ++ } ++ } ++ else ++ { ++ l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n", host); ++ return NULL; ++ } + } + bcopy (hp->h_addr, &addr, hp->h_length); + /* Force creation of a new tunnel diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-init b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-init new file mode 100644 index 0000000000..639007b577 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/files/xl2tpd-init @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init,v 1.2 2007/03/05 10:50:54 mrness Exp $ + +depend() { + need net +} + +checkconfig() { + if [[ ! -f /etc/xl2tpd/xl2tpd.conf ]] ; then + eerror "Missing /etc/xl2tpd/xl2tpd.conf configuration file!" + eerror "Example configuration file could be found in doc directory." + return 1 + fi + + return 0 +} + +start() { + checkconfig || return 1 + + ebegin "Starting xl2tpd" + start-stop-daemon --start --quiet --exec /usr/sbin/xl2tpd + eend $? +} + +stop() { + ebegin "Stopping xl2tpd" + start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd.pid + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/xl2tpd-1.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/xl2tpd-1.3.0-r1.ebuild new file mode 120000 index 0000000000..6557f0aa41 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/xl2tpd-1.3.0-r1.ebuild @@ -0,0 +1 @@ +xl2tpd-1.3.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild new file mode 100644 index 0000000000..8ec409a0eb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild,v 1.1 2011/09/20 04:49:45 pva Exp $ + +EAPI="4" + +inherit eutils toolchain-funcs + +DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon" +HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/" +SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="dnsretry" + +DEPEND="net-libs/libpcap" +RDEPEND="${DEPEND} + net-dialup/ppp" + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.patch" + epatch "${FILESDIR}/${PN}-1.3.0-avp-workaround.patch" + sed -i Makefile -e 's| -O2 ||g' || die "sed Makefile" + use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch" +} + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + emake PREFIX=/usr DESTDIR="${D}" install + + dodoc CREDITS README.xl2tpd \ + doc/README.patents doc/rfc2661.txt doc/*.sample + + dodir /etc/xl2tpd + head -n 2 doc/l2tp-secrets.sample > "${ED}/etc/xl2tpd/l2tp-secrets" || die + fperms 0600 /etc/xl2tpd/l2tp-secrets + newinitd "${FILESDIR}"/xl2tpd-init xl2tpd + + keepdir /var/run/xl2tpd +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/ip6tables-1.3.2.confd b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/ip6tables-1.3.2.confd new file mode 100644 index 0000000000..93c0bc89b3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/ip6tables-1.3.2.confd @@ -0,0 +1,11 @@ +# /etc/conf.d/ip6tables + +# Location in which iptables initscript will save set rules on +# service shutdown +IP6TABLES_SAVE="/var/lib/ip6tables/rules-save" + +# Options to pass to iptables-save and iptables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.3.2.confd b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.3.2.confd new file mode 100644 index 0000000000..91287debdb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.3.2.confd @@ -0,0 +1,11 @@ +# /etc/conf.d/iptables + +# Location in which iptables initscript will save set rules on +# service shutdown +IPTABLES_SAVE="/var/lib/iptables/rules-save" + +# Options to pass to iptables-save and iptables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.3.2.init b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.3.2.init new file mode 100755 index 0000000000..e63d8ea9e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.3.2.init @@ -0,0 +1,114 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.6 2007/03/12 21:49:04 vapier Exp $ + +opts="save reload panic" + +iptables_name=${SVCNAME} +if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then + iptables_name="iptables" +fi + +iptables_bin="/sbin/${iptables_name}" +case ${iptables_name} in + iptables) iptables_proc="/proc/net/ip_tables_names" + iptables_save=${IPTABLES_SAVE};; + ip6tables) iptables_proc="/proc/net/ip6_tables_names" + iptables_save=${IP6TABLES_SAVE};; +esac + +depend() { + before net + use logger +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${iptables_bin} -t ${table} -P ${chain} ${policy} + done +} + +checkkernel() { + if [ ! -e ${iptables_proc} ] ; then + eerror "Your kernel lacks ${iptables_name} support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} +checkconfig() { + if [ ! -f ${iptables_save} ] ; then + eerror "Not starting ${iptables_name}. First create some rules then run:" + eerror "/etc/init.d/${iptables_name} save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ${iptables_name} state and starting firewall" + ${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + checkkernel || return 1 + ebegin "Stopping firewall" + local a + for a in $(cat ${iptables_proc}) ; do + set_table_policy $a ACCEPT + + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? +} + +reload() { + checkkernel || return 1 + ebegin "Flushing firewall" + local a + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? + + start +} + +save() { + ebegin "Saving ${iptables_name} state" + touch "${iptables_save}" + chmod 0600 "${iptables_save}" + ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" + eend $? +} + +panic() { + checkkernel || return 1 + service_started ${iptables_name} && svc_stop + + local a + ebegin "Dropping all packets" + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + + set_table_policy $a DROP + done + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.4.8-build.patch b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.4.8-build.patch new file mode 100644 index 0000000000..92ea925f29 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/files/iptables-1.4.8-build.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/show_bug.cgi?id=321271 +http://marc.info/?l=netfilter&m=127468045031428&w=2 +http://marc.info/?l=netfilter&m=127468044931416&w=2 + +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -1,5 +1,7 @@ + # -*- Makefile -*- + ++AM_CFLAGS = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ++ + sbin_PROGRAMS = nfnl_osf + pkgdata_DATA = pf.os + diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.4.8-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.4.8-r2.ebuild new file mode 100644 index 0000000000..4f7df72180 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.4.8-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.8-r1.ebuild,v 1.2 2010/05/25 13:20:57 pva Exp $ + +EAPI="2" +inherit eutils toolchain-funcs autotools + +DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://www.iptables.org/" +SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +IUSE="ipv6" + +DEPEND="virtual/os-headers" +RDEPEND="" + +src_prepare() { + # use the saner headers from the kernel + rm -f include/linux/{kernel,types}.h + + epatch "${FILESDIR}/${P}-build.patch" #321271 + epatch_user + eautoreconf +} + +src_configure() { + econf \ + --sbindir=/sbin \ + --libexecdir=/$(get_libdir) \ + --enable-devel \ + --enable-libipq \ + --enable-shared \ + --enable-static \ + $(use_enable ipv6) +} + +src_compile() { + emake V=1 || die +} + +src_install() { + emake install DESTDIR="${D}" || die + dosbin iptables-apply || die + doman iptables-apply.8 || die + dodoc INCOMPATIBILITIES iptables.xslt || die + + insinto /usr/include + doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die + insinto /usr/include/iptables + doins include/iptables/internal.h || die + + keepdir /var/lib/iptables + newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die + newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die + if use ipv6 ; then + keepdir /var/lib/ip6tables + newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die + newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/ChangeLog b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/ChangeLog new file mode 100644 index 0000000000..12aaaff308 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/ChangeLog @@ -0,0 +1,739 @@ +# ChangeLog for net-fs/nfs-utils +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.174 2010/10/08 19:48:08 vapier Exp $ + +*nfs-utils-1.2.3 (08 Oct 2010) + + 08 Oct 2010; Mike Frysinger +nfs-utils-1.2.3.ebuild: + Version bump #339288. + + 19 Sep 2010; Mike Frysinger nfs-utils-1.2.2-r2.ebuild: + Fix multilib dir handling with backed up /var/lib/nfs. + + 07 Aug 2010; Mike Frysinger files/nfs.initd: + Port logic over for detecting rpc.gssd needs in nfs init.d script #330795 by + Jared. + + 02 Aug 2010; Diego E. Pettenò files/nfs.initd: + Only require rpc.svcgssd if sec=krb is used rather than sec=sys (default). + Thanks to Jared in bug #330795. + + 26 Jul 2010; Diego E. Pettenò files/nfs.initd: + Fix nfs init script dependency generation for kerberos exports. + +*nfs-utils-1.2.2-r2 (23 Jul 2010) + + 23 Jul 2010; Diego E. Pettenò + +nfs-utils-1.2.2-r2.ebuild, +files/nfs-utils-1.2.2-nfsv4.patch: + Fix configure script when enabling NFSv4 and Kerberos, some tests would + have been skipped. + + 28 Jun 2010; Mike Frysinger files/nfsmount.initd: + Fix idmapd/gssd dep calculation with nfs mounts #324725 by Михаил. + +*nfs-utils-1.2.2-r1 (20 Apr 2010) + + 20 Apr 2010; Mike Frysinger + +nfs-utils-1.2.2-r1.ebuild, +files/nfs-utils-1.2.2-optional-libcap.patch: + Make libcap support optional via USE=caps #314777. + + 20 Apr 2010; Mike Frysinger nfs-utils-1.2.2.ebuild: + Disable tests since they require no rpc.statd to be running on the system + beforehand #315573 by Pacho Ramos. + +*nfs-utils-1.2.2 (11 Apr 2010) + + 11 Apr 2010; Mike Frysinger +nfs-utils-1.2.2.ebuild: + Version bump #314603 by Tim Harder. + + 31 Mar 2010; nfs-utils-1.1.4-r1.ebuild, + nfs-utils-1.1.5.ebuild, nfs-utils-1.1.6.ebuild, nfs-utils-1.1.6-r1.ebuild, + nfs-utils-1.2.0.ebuild, nfs-utils-1.2.1.ebuild: + - elibc_glibc has to be defined in IUSE= for profiles that are unable to + use.force that flag bug #312085 + + 22 Nov 2009; Sven Wegener nfs-utils-1.2.1.ebuild: + Use src_configure and src_prepare for EAPI-2 compliance, this should fix + bug #294082. + +*nfs-utils-1.2.1 (22 Nov 2009) + + 22 Nov 2009; Mike Frysinger +nfs-utils-1.2.1.ebuild: + Version bump #293523 by Florian Manschwetus and update kerberos depends + #274793 by Andrew Savchenko. + + 11 Sep 2009; Zac Medico nfs-utils-1.2.0.ebuild: + Move !net-nds/portmap out of DEPEND, as per bug #108449, comment #4. + + 25 Aug 2009; Mike Frysinger + -files/nfs-utils-1.1.2-rpcgen-ioctl.patch, nfs-utils-1.1.4-r1.ebuild, + +files/nfs-utils-1.1.4-rpcgen-ioctl.patch, nfs-utils-1.1.5.ebuild, + nfs-utils-1.1.6.ebuild, nfs-utils-1.1.6-r1.ebuild: + Update rpcgen ioctl patch to reflect changes in upstream. + +*nfs-utils-1.2.0 (02 Jun 2009) + + 02 Jun 2009; Mike Frysinger +nfs-utils-1.2.0.ebuild: + Version bump. + + 30 May 2009; Mike Frysinger nfs-utils-1.1.6-r1.ebuild, + files/nfs.confd, files/nfs.initd: + Have nfs init.d depend on rpc.idmapd by default when USE=nfsv4, but allow + people to disable it via conf.d #234132 by roger. + + 30 May 2009; Mike Frysinger + +nfs-utils-1.1.6-r1.ebuild, metadata.xml: + Add support for USE=ipv6 #261926, switch to rpcbind over portmap, switch + to libtirpc all the time, and make nfs3/nfs4 optional. + +*nfs-utils-1.1.6-r1 (30 May 2009) + + 30 May 2009; Mike Frysinger + +nfs-utils-1.1.6-r1.ebuild: + Add support for USE=ipv6 #261926, switch to rpcbind over portmap, switch + to libtirpc all the time, and make nfs3/nfs4 optional. + +*nfs-utils-1.1.6 (09 May 2009) + + 09 May 2009; Mike Frysinger +nfs-utils-1.1.6.ebuild: + Version bump. + + 25 Mar 2009; Raúl Porcel nfs-utils-1.1.4-r1.ebuild: + arm/ia64/s390/sh/sparc stable wrt #261334 + + 18 Mar 2009; Joseph Jezak nfs-utils-1.1.4-r1.ebuild: + Marked ppc stable for bug #261334. + + 15 Mar 2009; Markus Meier nfs-utils-1.1.4-r1.ebuild: + x86 stable, bug #261334 + + 15 Mar 2009; Brent Baude nfs-utils-1.1.4-r1.ebuild: + Marking nfs-utils-1.1.4-r1 ppc64 for bug 261334 + + 14 Mar 2009; Mike Frysinger files/rpc.idmapd.initd: + Add a warning upon failure that DNOTIFY is needed #261697 by Pacho Ramos. + + 11 Mar 2009; Tobias Klausmann + nfs-utils-1.1.4-r1.ebuild: + Stable on alpha, bug #261334 + + 10 Mar 2009; Dawid Węgliński nfs-utils-1.1.4-r1.ebuild: + Stable on amd64 (bug #261334) + +*nfs-utils-1.1.5 (06 Mar 2009) + + 06 Mar 2009; Mike Frysinger +nfs-utils-1.1.5.ebuild: + Version bump. + + 06 Mar 2009; Jeroen Roovers nfs-utils-1.1.4-r1.ebuild: + Stable for HPPA (bug #261334). + + 27 Feb 2009; Mike Frysinger files/nfs.initd: + Fixup bashism in init.d script #260149 by Timothy Redaelli. + +*nfs-utils-1.1.4-r1 (31 Jan 2009) + + 31 Jan 2009; Mike Frysinger + +files/nfs-utils-1.1.4-ascii-man.patch, + +files/nfs-utils-1.1.4-mtab-sym.patch, + +files/nfs-utils-1.1.4-no-exec.patch, +nfs-utils-1.1.4-r1.ebuild: + Add some fixes from Debian and push out init.d fixes. + + 31 Jan 2009; Mike Frysinger files/nfs.initd: + Also use rpc.nfsd to try to shutdown nfsd #228127 by Maurice Volaski. + + 31 Jan 2009; Mike Frysinger files/rpc.statd.initd: + Make sure stop() works even if rpc.statd is dead so init.d doesnt fake + stop silently. + + 31 Jan 2009; Mike Frysinger files/nfs.initd: + Add /proc/fs/nfs -> /proc/fs/nfsd fix again. + + 31 Jan 2009; Mike Frysinger files/nfs.initd: + Restart rpc.idmapd if nfsd is a module #220747 by Jochen Radmacher. + + 30 Dec 2008; Friedrich Oslage + nfs-utils-1.1.3.ebuild: + Stable on sparc, security bug #242696 + + 09 Nov 2008; Mike Frysinger nfs-utils-1.1.4.ebuild: + Always own /etc/exports from now on #246021 by Ian Kelling. + + 08 Nov 2008; Raúl Porcel nfs-utils-1.1.3.ebuild: + alpha/ia64 stable wrt #242696 + + 02 Nov 2008; Tobias Scherbaum + nfs-utils-1.1.3.ebuild: + ppc stable, bug #242696 + + 30 Oct 2008; Jeroen Roovers nfs-utils-1.1.3.ebuild: + Stable for HPPA (bug #242696). + + 28 Oct 2008; Brent Baude nfs-utils-1.1.3.ebuild: + Marking nfs-utils-1.1.3 ppc64 for bug 242696 + + 27 Oct 2008; Markus Meier nfs-utils-1.1.3.ebuild: + amd64/x86 stable, bug #242696 + + 26 Oct 2008; Mike Frysinger files/rpc.gssd.initd, + files/rpc.idmapd.initd, +files/rpc.pipefs.initd, files/rpc.svcgssd.initd, + nfs-utils-1.0.12-r5.ebuild, nfs-utils-1.1.0-r1.ebuild, + nfs-utils-1.1.1.ebuild, nfs-utils-1.1.1-r1.ebuild, nfs-utils-1.1.2.ebuild, + nfs-utils-1.1.2-r1.ebuild, nfs-utils-1.1.3.ebuild, nfs-utils-1.1.4.ebuild: + Split rpc.pipefs mounting into its own init.d script so we handle parallel + execution properly #238593 by Michele Schiavo. + + 26 Oct 2008; Mike Frysinger nfs-utils-1.1.4.ebuild: + Force newer libnfsidmap as it provides idmapd.conf #243066. + +*nfs-utils-1.1.4 (18 Oct 2008) + + 18 Oct 2008; Mike Frysinger +nfs-utils-1.1.4.ebuild: + Version bump. + +*nfs-utils-1.1.3 (16 Aug 2008) + + 16 Aug 2008; Mike Frysinger files/rpc.gssd.initd, + files/rpc.svcgssd.initd, +nfs-utils-1.1.3.ebuild: + Version bump. Fix arg passing for gssd binaries #232387 by Michele + Schiavo. Depend on e2fsprogs-libs for libblkid #221773 by Triffid Hunter. + + 16 Aug 2008; Doug Goldstein metadata.xml: + add GLEP 56 USE flag desc from use.local.desc + +*nfs-utils-1.1.2-r1 (04 May 2008) + + 04 May 2008; Mike Frysinger + +files/nfs-utils-1.1.2-mount-eacces.patch, files/nfs.initd, + files/nfsmount.initd, files/rpc.gssd.initd, files/rpc.idmapd.initd, + files/rpc.svcgssd.initd, +nfs-utils-1.1.2-r1.ebuild: + Dont bother checking for config anymore #219495 by Davide Pesavento. Load + sunrpc module if rpc_pipefs is not available #219566 by Martin von Gagern. + Add change from Fedora to exit immediately upon perm denied errors when + mounting #219729 by Stefaan De Roeck. + + 21 Apr 2008; Mike Frysinger files/nfsmount.initd: + Use non-common awk exit values so that the default exit values dont trigger + false positives #218713 by Paolo Pedroni. + + 21 Apr 2008; Mike Frysinger files/rpc.gssd.initd, + files/rpc.svcgssd.initd: + Fix typo in start() func in new gssd init.d scripts as pointed out by Ryan + Tandy #218665. + + 20 Apr 2008; Diego Pettenò nfs-utils-1.1.2.ebuild: + Fix building without kerberos and with nonfsv4 USE flag enabled. See bug + #218595. + + 20 Apr 2008; Mike Frysinger + +files/nfs-utils-1.1.2-rpcgen-ioctl.patch, nfs-utils-1.1.2.ebuild: + Make sure rpcgen includes sys/ioctl.h #174393. + +*nfs-utils-1.1.2 (20 Apr 2008) + + 20 Apr 2008; Mike Frysinger +nfs-utils-1.1.2.ebuild: + Version bump. + +*nfs-utils-1.1.1-r1 (20 Apr 2008) + + 20 Apr 2008; Mike Frysinger + +nfs-utils-1.1.1-r1.ebuild: + Push out accumulated changes. + + 20 Apr 2008; Mike Frysinger files/nfs.initd, + files/rpc.gssd.initd, +files/rpc.svcgssd.initd, + nfs-utils-1.0.12-r5.ebuild, nfs-utils-1.1.0-r1.ebuild, + nfs-utils-1.1.1.ebuild: + Split the gssd and svcgssd init.d scripts #186037 by Paul B. Henson. + + 20 Apr 2008; Mike Frysinger nfs-utils-1.1.1.ebuild: + Only leverage kerberos when USE="-nonfsv4" #212160. + + 20 Apr 2008; Mike Frysinger files/nfsmount.initd: + Fix nfs4/idmapd detection #213384 by Marek Szuba. + + 14 Jan 2008; Mike Frysinger files/nfs.initd, + files/nfsmount.initd: + Until newer baselayout stabilizes, only use config() when it exists #203906. + + 08 Jan 2008; Raúl Porcel nfs-utils-1.1.0-r1.ebuild: + alpha/ia64/sparc stable wrt #201552 + + 08 Jan 2008; Jeroen Roovers nfs-utils-1.1.0-r1.ebuild: + Stable for HPPA (bug #201552). + + 30 Dec 2007; Mike Frysinger files/nfs.initd, + files/nfsmount.initd: + Make sure /etc/exports and /etc/fstab exist to account for the stupid cases + of running these init.d scripts without anything useful to do. + + 30 Dec 2007; Samuli Suominen nfs-utils-1.1.0-r1.ebuild: + amd64 stable wrt #201552 + + 29 Dec 2007; nixnut nfs-utils-1.1.0-r1.ebuild: + Stable on ppc wrt bug 201552 + + 29 Dec 2007; Mike Frysinger files/nfsmount.initd: + Make sure we check for "nfs" and not "nfsd" when doing client filesystem setup. + +*nfs-utils-1.1.1 (29 Dec 2007) + + 29 Dec 2007; Mike Frysinger files/nfs.initd, + files/rpc.gssd.initd, files/rpc.idmapd.initd, files/rpc.statd.initd, + +nfs-utils-1.1.1.ebuild: + Version bump #197336 by Francisco Javier. Tweak nfs init.d needs based on + exportfs #172431. Only mount nfsd fs in nfs init.d script. Mount rpc_pipefs + in rpc.idmapd and rpc.gssd after making sure the dir exists #180425 by + Maurice Volaski. + + 29 Dec 2007; Mike Frysinger files/rpc.statd.initd: + Look up the full path of rpc.statd to avoid matching the init.d script + #203646 by legate. + + 15 Oct 2007; Markus Rothe nfs-utils-1.1.0-r1.ebuild: + Stable on ppc64 + + 21 Sep 2007; Christian Faulhammer + nfs-utils-1.1.0-r1.ebuild: + stable x86, bug 190182 + +*nfs-utils-1.1.0-r1 (15 Sep 2007) +*nfs-utils-1.0.12-r1 (15 Sep 2007) +*nfs-utils-1.0.12-r5 (15 Sep 2007) + + 15 Sep 2007; Mike Frysinger + +nfs-utils-1.0.12-r1.ebuild, +nfs-utils-1.0.12-r5.ebuild, + +nfs-utils-1.1.0-r1.ebuild: + Force bumpage for versions to clean up libgssglue nightmare #191746. + + 23 Aug 2007; Joshua Kinard nfs-utils-1.0.12-r3.ebuild: + Stable on mips. + +*nfs-utils-1.0.12-r4 (16 Aug 2007) + + 16 Aug 2007; Mike Frysinger files/nfs.initd, + files/nfsmount.initd, +nfs-utils-1.0.12-r4.ebuild: + Only force kerb init.d scripts when the NFSv4 mount needs it #180428 by + Maurice Volaski. Load the nfs module in the nfsmount client script, not + nfsd. + + 13 May 2007; Mike Frysinger nfs-utils-1.1.0.ebuild: + Make sure we pull in >=app-crypt/libgssapi-0.11 #178217 by Markus Ullmann. + +*nfs-utils-1.1.0 (12 May 2007) + + 12 May 2007; Mike Frysinger files/nfs.initd, + files/nfsmount.initd, files/rpc.gssd.initd, files/rpc.idmapd.initd, + files/rpc.statd.initd, +nfs-utils-1.1.0.ebuild: + Version bump. + + 06 May 2007; Marius Mauch nfs-utils-1.0.6-r6.ebuild: + Replacing einfo with elog + + 07 Apr 2007; Mike Frysinger nfs-utils-1.0.12-r3.ebuild: + Bind rpc.gssd install to USE=kerberos rather than USE=!nonfsv4 + #172431 by emerald. + +*nfs-utils-1.0.12-r3 (02 Apr 2007) + + 02 Apr 2007; Roy Marples files/nfs.initd, + files/rpc.gssd.initd, files/rpc.idmapd.initd, files/rpc.statd.initd, + +nfs-utils-1.0.12-r3.ebuild: + Remove some bashisms and support baselayout-2 restart option. + + 27 Mar 2007; Chris Gianelloni + nfs-utils-1.0.12.ebuild: + Stable on alpha/amd64 wrt bug #172133. + + 26 Mar 2007; Gustavo Zacarias + nfs-utils-1.0.12.ebuild: + Stable on sparc wrt #172133 + + 26 Mar 2007; Jeroen Roovers nfs-utils-1.0.12.ebuild: + Stable for HPPA (bug #172133). + + 26 Mar 2007; Alec Warner nfs-utils-1.0.6-r6.ebuild, + nfs-utils-1.0.7-r2.ebuild, nfs-utils-1.0.9.ebuild, + nfs-utils-1.0.10.ebuild, nfs-utils-1.0.12.ebuild, + nfs-utils-1.0.12-r1.ebuild, nfs-utils-1.0.12-r2.ebuild: + Remove dependency on portage: ref bug 162516 + +*nfs-utils-1.0.12-r2 (25 Mar 2007) + + 25 Mar 2007; Mike Frysinger files/nfs.confd, + +files/nfs.initd, +files/nfsmount.initd, +files/rpc.gssd.initd, + +files/rpc.idmapd.initd, +files/rpc.statd.initd, + +nfs-utils-1.0.12-r2.ebuild: + Split init.d scripts up so client/server configurations are handled properly + #101624 by Tim Hobbs. Special thanks to Daniel Burr and Thomas Bettler. + + 25 Mar 2007; Tobias Scherbaum + nfs-utils-1.0.12.ebuild: + Stable on ppc wrt bug #172133. + + 25 Mar 2007; Andrej Kacian nfs-utils-1.0.12.ebuild: + Stable on x86, bug #172133. + + 25 Mar 2007; Markus Rothe nfs-utils-1.0.12.ebuild: + Stable on ppc64; bug #172133 + + 24 Mar 2007; Mike Frysinger files/nfs: + Mount nfsd filesystem at /proc/fs/nfsd rather than /proc/fs/nfs #172019. + +*nfs-utils-1.0.12-r1 (24 Mar 2007) + + 24 Mar 2007; Mike Frysinger + +files/nfs-utils-1.0.12-mountd-memleak.patch, +nfs-utils-1.0.12-r1.ebuild: + Grab fix from upstream for memleak in mountd #172014 by Bardur Arantsson. + + 21 Mar 2007; Chris Gianelloni + nfs-utils-1.0.10.ebuild: + Stable on amd64 wrt bug #167664. + + 16 Mar 2007; nixnut nfs-utils-1.0.10.ebuild: + Stable on ppc wrt bug 167664 + +*nfs-utils-1.0.12 (27 Feb 2007) + + 27 Feb 2007; Mike Frysinger +nfs-utils-1.0.12.ebuild: + Version bump. + + 23 Feb 2007; Markus Rothe nfs-utils-1.0.10.ebuild: + Stable on ppc64; bug #167664 + + 23 Feb 2007; Christian Faulhammer + nfs-utils-1.0.10.ebuild: + stable x86; bug 167664 + + 10 Jan 2007; Roy Marples files/nfs: + Use --name for s-s-d starting nfsd so baselayout-1.13 correctly finds it. + + 05 Jan 2007; Diego Pettenò + nfs-utils-1.0.6-r6.ebuild: + Remove gnuconfig inherit. + + 28 Dec 2006; Gustavo Zacarias + nfs-utils-1.0.10.ebuild: + Stable on sparc + + 04 Dec 2006; Jeroen Roovers nfs-utils-1.0.10.ebuild: + Stable for HPPA. + + 23 Oct 2006; Mike Frysinger + +files/nfs-utils-1.0.10-uts-release.patch, nfs-utils-1.0.10.ebuild: + Fix building with linux-headers-2.6.18+. + + 21 Oct 2006; Aron Griffis nfs-utils-1.0.10.ebuild: + Mark 1.0.10 stable on alpha/ia64 + +*nfs-utils-1.0.10 (22 Aug 2006) + + 22 Aug 2006; Mike Frysinger +nfs-utils-1.0.10.ebuild: + Version bump. + +*nfs-utils-1.0.9 (16 Jul 2006) + + 16 Jul 2006; Mike Frysinger +nfs-utils-1.0.9.ebuild: + Version bump. + +*nfs-utils-1.0.8 (10 Jun 2006) + + 10 Jun 2006; Mike Frysinger +nfs-utils-1.0.8.ebuild: + Version bump #136038 by Mario Fetka. + + 09 Mar 2006; Mike Frysinger + +files/nfs-utils-1.0.7-no-stripping.patch, nfs-utils-1.0.7-r2.ebuild: + Let portage strip binaries. + + 29 Jan 2006; Mike Frysinger + +files/nfs-utils-1.0.6-usn36.patch, -files/nfs-utils-1.0.6-usn36.patch.gz, + nfs-utils-1.0.6-r6.ebuild: + Uncompress patch #120673 by Simon Stelling. + +*nfs-utils-1.0.7-r2 (08 Oct 2005) + + 08 Oct 2005; Mike Frysinger + +files/nfs-utils-1.0.7-man-pages.patch, files/nfs, files/nfs.confd, + +nfs-utils-1.0.7-r2.ebuild: + Add support for starting/stopping gssd daemons #108276 and installing their + config files. Also tweak the man-pages SEE ALSO #107991. + + 23 Mar 2005; Jeremy Huddleston files/nfsmount: + Corrected init script to use 'svc_stop; svc_start' and not 'stop; start'. + + 15 Mar 2005; Seemant Kulleen + nfs-utils-1.0.7-r1.ebuild: + add kerberos to IUSE + +*nfs-utils-1.0.7-r1 (15 Mar 2005) + + 15 Mar 2005; Mike Frysinger files/nfs, + files/nfs.confd, -nfs-utils-1.0.7.ebuild, +nfs-utils-1.0.7-r1.ebuild: + Add support for integrated idmapd #71607 by Keith M Wesolowski. + +*nfs-utils-1.0.7 (04 Feb 2005) + + 04 Feb 2005; Aron Griffis +nfs-utils-1.0.7.ebuild: + Bump to 1.0.7. New local USE-flag nfsv4 since that pulls in mit-krb5 which + has its own problems + + 15 Jan 2005; Robin H. Johnson : + Fix digest, bug #78168. + + 15 Jan 2005; +files/nfs-utils-1.0.6-uclibc.patch, + nfs-utils-1.0.6-r6.ebuild: + - getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc + + 11 Dec 2004; Markus Rothe nfs-utils-1.0.6-r6.ebuild: + Stable on ppc64; bug #72113 + + 11 Dec 2004; Joseph Jezak nfs-utils-1.0.6-r6.ebuild: + Marked ppc stable for bug #72113. + + 10 Dec 2004; Guy Martin nfs-utils-1.0.6-r6.ebuild: + Stable on hppa. + + 07 Dec 2004; Hardave Riar nfs-utils-1.0.6-r6.ebuild: + Stable on mips, bug #72113 + + 07 Dec 2004; Bryan Østergaard + nfs-utils-1.0.6-r6.ebuild: + Stable on alpha, bug 72113. + + 06 Dec 2004; Karol Wojtaszek + nfs-utils-1.0.6-r6.ebuild: + Stable on amd64, bug #72113 + + 06 Dec 2004; Olivier Crete nfs-utils-1.0.6-r6.ebuild: + Stable on x86 wrt security bug 72113 + + 06 Dec 2004; Gustavo Zacarias + nfs-utils-1.0.6-r6.ebuild: + Stable on sparc wrt #72113 + + 06 Dec 2004; nfs-utils-1.0.6-r6.ebuild: + Added ubuntu's DOS vulnerability patch. fixes #72113 + + 05 Dec 2004; Jason Wever nfs-utils-1.0.6-r5.ebuild: + Stable on sparc wrt security bug #72113. + + 05 Dec 2004; Bryan Østergaard + nfs-utils-1.0.6-r5.ebuild: + Stable on alpha, bug 72113. + + 04 Dec 2004; Hardave Riar nfs-utils-1.0.6-r5.ebuild: + Stable on mips, bug #72113 + + 04 Dec 2004; Markus Rothe nfs-utils-1.0.6-r5.ebuild: + Stable on ppc64; bug #72113 + + 04 Dec 2004; Mike Doty nfs-utils-1.0.6-r5.ebuild: + stable on amd64 per #72113 + +*nfs-utils-1.0.6-r5 (22 Nov 2004) + + 22 Nov 2004; + +files/nfs-utils-0.3.3-rquotad-overflow.patch, +nfs-utils-1.0.6-r5.ebuild: + Security bump for 64bit arches bug #72113 - CAN-2004-0946 + + 07 Nov 2004; Joshua Kinard nfs-utils-1.0.6-r4.ebuild: + Marked stable on mips. + + 01 Nov 2004; Bryan Østergaard + nfs-utils-1.0.6-r4.ebuild: + Stable on alpha. + + 19 Oct 2004; Dylan Carlson + nfs-utils-1.0.6-r4.ebuild: + Stable on amd64. + + 09 Oct 2004; Christian Birchinger + nfs-utils-1.0.6-r4.ebuild: + Added sparc stable keyword + + 23 Jul 2004; Jeremy Huddleston files/nfsmount: + Added 'use ypbind' to nfsmount script to close bug #28195. + +*nfs-utils-1.0.6-r4 (07 Jul 2004) + + 07 Jul 2004; Aron Griffis files/nfs-5, + -nfs-utils-1.0.6-r3.ebuild, +nfs-utils-1.0.6-r4.ebuild: + Set a default timeout of 30 seconds in case EXPORTFSTIMEOUT is unset in + conf.d/nfs + + 25 Jun 2004; Danny van Dyk nfs-utils-1.0.6.ebuild: + Marked stable on amd64. + +*nfs-utils-1.0.6-r3 (11 Jun 2004) + + 11 Jun 2004; Mike Frysinger : + While i'm here, might as well fix more things :P. + Run make for the depend target so that we can then build everything + else in parallel. Add tweakable exportfs timeout to nfs init script + #37004 by Vlastimil Holer. Enable the '--enable-secure-statd' option + by default (seems to work fine on my nfs3 machines) #49444 by Juergen + Nagel. Make sure the emtpy state dirs dont get autocleaned #30522 by + Brave Cobra. + +*nfs-utils-1.0.6-r2 (08 Jun 2004) + + 08 Jun 2004; Mike Frysinger +files/nfs-4, + +nfs-utils-1.0.6-r2.ebuild: + Add support for NFSv4 #25106 by Michael Locher. + + 11 May 2004; Michael McCabe nfs-utils-1.0.6-r1.ebuild: + Added s390 keywords + + 13 Apr 2004; Joshua Kinard nfs-utils-1.0.6-r1.ebuild: + Marked stable on mips. + + 11 Mar 2004; Lars Weiler nfs-utils-1.0.6.ebuild: + stable on ppc + + 07 Mar 2004; Tom Gall nfs-utils-1.0.6-r1.ebuild: + stable on ppc64 + + 06 Mar 2004; Ilya A. Volynets-Evenbakh : + mark as ~mips + + 06 Mar 2004; Joshua Kinard nfs-utils-1.0.5-r1.ebuild, + nfs-utils-1.0.6-r1.ebuild: + Added ~mips to KEYWORDS. + +*nfs-utils-1.0.6-r1 (30 Jan 2004) + + 30 Jan 2004; Daniel Robbins nfs-utils-1.0.6-r1.ebuild: + Add a new ebuild (currently unmasked for ~x86 and ~amd64 only) that mounts + the nfsd filesystem to /proc/fs/nfs to provide robust exports handling for + 2.6 kernels. (See /usr/src/linux/Documentation/Changes in a 2.6 kernel source + tree for more information on this.) I needed this fix for mountd to support + nfs version 3 on my server with a 2.6 kernel. Also changed default + "restarting" behavior to "yes," which seems to be what most users will want. + This ebuild is not in stable on any arch, so nfs-team, please let me know + what you think of these changes. + + 15 Jan 2004; Aron Griffis nfs-utils-1.0.6.ebuild: + Fix bug 30486 by refraining from overwriting /var/lib/nfs/* + + 14 Jan 2004; Martin Holzer files/nfs.confd: + removing quota entry from conf.d + + 05 Jan 2004; zhen metadata.xml: + adding to net-fs herd + + 28 Dec 2003; Guy Martin nfs-utils-1.0.6.ebuild: + Marked stable on hppa. + + 02 Nov 2003; Daniel Robbins nfs-utils-1.0.6.ebuild: + added util-linux RDEPEND to ensure "mount" command it up-to-date. (See + nfs-utils README.) + + 22 Oct 2003; Martin Holzer nfs-utils-1.0.5-r1.ebuild, + nfs-utils-1.0.6.ebuild: + adding RESTRICT="nomirror" + + 03 Oct 2003; Christian Birchinger nfs-utils-1.0.6.ebuild: + Added sparc stable keyword + +*nfs-utils-1.0.6 (18 Sep 2003) + + 18 Sep 2003; Martin Holzer nfs-utils-1.0.6.ebuild: + Version bumped. + +*nfs-utils-1.0.5-r1 (19 Jul 2003) + + 26 Jul 2003; Stefan Jones files/nfs-2: + Fixed waiting on exportfs to finish. Use wait $pidofexportfs ( let kill + finish in background ) Speedups of 29secs! + + 19 Jul 2003; Aron Griffis nfs-utils-1.0.5-r1.ebuild, + files/nfs-2: + Change exportfs timeouts from 5 seconds to 30 seconds to prevent prematurely + killing exportfs + + 19 Jul 2003; Daniel Ahlberg nfs-utils-1.0.5.ebuild : + Security update, unmasking. + +*nfs-utils-1.0.5 (19 Jul 2003) + + 19 Jul 2003; Don Seiler ; nfs-utils-1.0.4.ebuild, + nfs-utils-1.0.5.ebuild: + Version bumped and v1.0.4 deleted due to bugs that are fixed in 1.0.5 + +*nfs-utils-1.0.4 (17 Jul 2003) + + 17 Jul 2003; Martin Holzer nfs-utils-1.0.4.ebuild: + Version bumped. + + 21 May 2003; Christian Birchinger nfs-utils-1.0.3.ebuild: + Added sparc stable keyword + + 16 May 2003; Martin Holzer nfs-utils-1.0.3.ebuild: + Marked as stable + +*nfs-utils-1.0.3 (27 Mar 2003) + + 21 Jun 2003; Guy martin nfs-utils-1.0.3.ebuild : + Marked stable on hppa. + + 17 Apr 2003; Guy Martin nfs-utils-1.0.3.ebuild : + Added ~hppa to KEYWORDS. + + 27 Mar 2003; Brandon Low nfs-utils-1.0.3.ebuild: + Bump to latest released today + +*nfs-utils-1.0.1-r1 (03 Mar 2003) + + 30 Mar 2003; Christian Birchinger + nfs-utils-1.0.1-r1.ebuild: + Added sparc stable keyword + + 13 Mar 2003; Zach Welch nfs-utils-1.0.1-r1.ebuild: + add arm keyword + + 03 Mar 2003; Aron Griffis nfs-utils-1.0.1-r1.ebuild, + files/nfs-1: + Fix bug 16075 by installing server binaries into /usr/sbin (thanks Tero + Pelander for the clue and the updated ebuild). Fix bug 13838 by using + rpc.rquotad from the quota package instead of the nfs-utils version (thanks + Andrea Barisani for the heads-up). Finally, mark stable on x86 and alpha + where I can test as part of the package upgrade phase. + +*nfs-utils-1.0.1 (12 Dec 2002) + + 12 Dec 2002; Brad Cowan : + + Added options to config file thanks to Cardoe and j2ee. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*nfs-utils-1.0.1 (13 Oct 2002) + + 07 Dec 2002; Jack Morgan nfs-utils-1.0.1.ebuild : + Changed ~sparc64 to ~sparc keyword + + 13 Oct 2002; Brad Cowan nfs-utils-1.0.1.ebuild, + files/digest-nfs-utils-1.0.1 : + + Version bump thanks to j2ee. + +*nfs-utils-0.3.3-r1 (24 Apr 2002) + + 16 Sep 2002; Maarten Thibaut nfs-utils-0.3.3-r1.ebuild : + Adding sparc/sparc64 keywords. + + 22 Jul 2002; Kyle Manna nfs-utils-0.3.3-r1.ebuild : + Parallel make fails sometimes. Replaced emake with make. + + 24 Apr 2002; Daniel Robbins : Some rc script fixes + (removal of NFSSERVER) and cleanups in the ebuild, removal of old ebuilds and + old files in /files + +*nfs-utils-0.3.3 (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest new file mode 100644 index 0000000000..2a36e02710 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest @@ -0,0 +1 @@ +DIST nfs-utils-1.2.3.tar.bz2 672759 RMD160 dad6fe83fa60c4854849e36d2128208c4e3234ab SHA1 da70a29191b07056d71b6e427a87d5cfd8628523 SHA256 5575ece941097cbfa67fbe0d220dfa11b73f5e6d991e7939c9339bd72259ff19 diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/exports b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/exports new file mode 100644 index 0000000000..5102ef27c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/exports @@ -0,0 +1 @@ +# /etc/exports: NFS file systems being exported. See exports(5). diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch new file mode 100644 index 0000000000..83ed4aa426 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch @@ -0,0 +1,16 @@ +ripped from Debian + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659 +patch by nbreen@ofb.net (Nicholas Breen) + +--- nfs-utils-1.1.3/utils/mount/nfs.man ++++ nfs-utils-1.1.3/utils/mount/nfs.man +@@ -799,7 +799,7 @@ + and server load. + .P + However, UDP can be quite effective in specialized settings where +-the network’s MTU is large relative to NFS’s data transfer size (such ++the network's MTU is large relative to NFS's data transfer size (such + as network environments that enable jumbo Ethernet frames). In such + environments, trimming the + .B rsize diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch new file mode 100644 index 0000000000..c9e60afc74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch @@ -0,0 +1,39 @@ +ripped from Debian + +--- nfs-utils-1.1.4/utils/mount/fstab.c ++++ nfs-utils-1.1.4/utils/mount/fstab.c +@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { + return var_mtab_does_not_exist; + } + +-static int ++int + mtab_is_a_symlink(void) { + get_mtab_info(); + return var_mtab_is_a_symlink; +--- nfs-utils-1.1.4/utils/mount/fstab.h ++++ nfs-utils-1.1.4/utils/mount/fstab.h +@@ -7,6 +7,7 @@ + #define _PATH_FSTAB "/etc/fstab" + #endif + ++int mtab_is_a_symlink(void); + int mtab_is_writable(void); + int mtab_does_not_exist(void); + void reset_mtab_info(void); +--- nfs-utils-1.1.4/utils/mount/mount.c ++++ nfs-utils-1.1.4/utils/mount/mount.c +@@ -230,6 +230,13 @@ create_mtab (void) { + int flags; + mntFILE *mfp; + ++ /* Avoid writing if the mtab is a symlink to /proc/mounts, since ++ that would create a file /proc/mounts in case the proc filesystem ++ is not mounted, and the fchmod below would also fail. */ ++ if (mtab_is_a_symlink()) { ++ return EX_SUCCESS; ++ } ++ + lock_mtab(); + + mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch new file mode 100644 index 0000000000..ea50a21d85 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch @@ -0,0 +1,15 @@ +ripped from Debian + +--- nfs-utils-1.1.2/utils/mount/mount.c ++++ nfs-utils-1.1.2/utils/mount/mount.c +@@ -381,10 +381,6 @@ + mount_error(NULL, mount_point, ENOTDIR); + return 1; + } +- if (access(mount_point, X_OK) < 0) { +- mount_error(NULL, mount_point, errno); +- return 1; +- } + + return 0; + } diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch new file mode 100644 index 0000000000..176541845e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/174393 + +--- tools/rpcgen/rpc_main.c ++++ tools/rpcgen/rpc_main.c +@@ -548,7 +548,7 @@ + f_print(fout, "#include /* TIOCNOTTY */\n"); + #else + if( !tirpcflag ) +- f_print(fout, "#include /* TIOCNOTTY */\n"); ++ f_print(fout, "#include /* TIOCNOTTY */\n"); + #endif + if( Cflag && (inetdflag || pmflag ) ) { + f_print(fout, "#ifdef __cplusplus\n"); diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch new file mode 100644 index 0000000000..cef774fe4b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch @@ -0,0 +1,13 @@ +Index: nfs-utils-1.2.2/configure.ac +=================================================================== +--- nfs-utils-1.2.2.orig/configure.ac ++++ nfs-utils-1.2.2/configure.ac +@@ -81,7 +81,7 @@ AC_ARG_ENABLE(nfsv41, + if test "$enable_nfsv41" = yes; then + AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in]) + else +- enable_nfsv4= ++ enable_nfsv41= + fi + AC_SUBST(enable_nfsv41) + AM_CONDITIONAL(CONFIG_NFSV41, [test "$enable_nfsv41" = "yes"]) diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch new file mode 100644 index 0000000000..eb8ce44d59 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch @@ -0,0 +1,79 @@ +From 655f6933b5db66c560098d039e3c91812399beca Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 20 Apr 2010 04:45:35 -0400 +Subject: [PATCH] make capabilities support optional + +The new code using libcap is quite minor, so rather than always reqiure +libcap support, make it a normal --enable type flag. Current default +behavior is retained -- if libcap is found, it is enabled, else it is +disabled like every nfs-utils version in the past. + +URL: https://bugs.gentoo.org/314777 +Signed-off-by: Mike Frysinger +--- + aclocal/libcap.m4 | 18 +++++++++++++----- + support/nsm/file.c | 4 ++++ + 2 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/aclocal/libcap.m4 b/aclocal/libcap.m4 +index eabe507..68a624c 100644 +--- a/aclocal/libcap.m4 ++++ b/aclocal/libcap.m4 +@@ -5,11 +5,19 @@ AC_DEFUN([AC_LIBCAP], [ + dnl look for prctl + AC_CHECK_FUNC([prctl], , ) + +- dnl look for the library; do not add to LIBS if found +- AC_CHECK_LIB([cap], [cap_get_proc], [LIBCAP=-lcap], ,) +- AC_SUBST(LIBCAP) ++ AC_ARG_ENABLE([caps], ++ [AS_HELP_STRING([--disable-caps], [Disable capabilities support])]) ++ ++ LIBCAP= ++ ++ if test "x$enable_caps" != "xno" ; then ++ dnl look for the library; do not add to LIBS if found ++ AC_CHECK_LIB([cap], [cap_get_proc], [LIBCAP=-lcap], ,) + +- AC_CHECK_HEADERS([sys/capability.h], , +- [AC_MSG_ERROR([libcap headers not found.])]) ++ AC_CHECK_HEADERS([sys/capability.h], , ++ [test "x$enable_caps" = "xyes" && AC_MSG_ERROR([libcap headers not found.])]) ++ fi ++ ++ AC_SUBST(LIBCAP) + + ])dnl +diff --git a/support/nsm/file.c b/support/nsm/file.c +index d469219..f4baeb9 100644 +--- a/support/nsm/file.c ++++ b/support/nsm/file.c +@@ -67,7 +67,9 @@ + #endif + + #include ++#ifdef HAVE_SYS_CAPABILITY_H + #include ++#endif + #include + #include + +@@ -347,6 +349,7 @@ nsm_is_default_parentdir(void) + static _Bool + nsm_clear_capabilities(void) + { ++#ifdef HAVE_SYS_CAPABILITY_H + cap_t caps; + + caps = cap_from_text("cap_net_bind_service=ep"); +@@ -362,6 +365,7 @@ nsm_clear_capabilities(void) + } + + (void)cap_free(caps); ++#endif + return true; + } + +-- +1.7.0.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.3-cross-compile.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.3-cross-compile.patch new file mode 100644 index 0000000000..7b70b63fa4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.2.3-cross-compile.patch @@ -0,0 +1,56 @@ +diff -urN nfs-utils-1.1.2.orig/tools/locktest/Makefile.am nfs-utils-1.1.2/tools/locktest/Makefile.am +--- nfs-utils-1.1.2.orig/tools/locktest/Makefile.am 2009-03-03 17:33:48.000000000 +0200 ++++ nfs-utils-1.1.2/tools/locktest/Makefile.am 2009-03-03 18:12:59.000000000 +0200 +@@ -1,12 +1,8 @@ + ## Process this file with automake to produce Makefile.in + +-CC=$(CC_FOR_BUILD) + LIBTOOL = @LIBTOOL@ --tag=CC + + noinst_PROGRAMS = testlk + testlk_SOURCES = testlk.c +-testlk_CFLAGS=$(CFLAGS_FOR_BUILD) +-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) +-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) + + MAINTAINERCLEANFILES = Makefile.in +diff -urN nfs-utils-1.1.2.orig/tools/rpcdebug/Makefile.am nfs-utils-1.1.2/tools/rpcdebug/Makefile.am +--- nfs-utils-1.1.2.orig/tools/rpcdebug/Makefile.am 2009-03-03 17:33:48.000000000 +0200 ++++ nfs-utils-1.1.2/tools/rpcdebug/Makefile.am 2009-03-03 18:30:27.000000000 +0200 +@@ -1,6 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-CC=$(CC_FOR_BUILD) + LIBTOOL = @LIBTOOL@ --tag=CC + + man8_MANS = rpcdebug.man +@@ -8,8 +7,5 @@ + + sbin_PROGRAMS = rpcdebug + rpcdebug_SOURCES = rpcdebug.c +-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD) +-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include +-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD) + + MAINTAINERCLEANFILES = Makefile.in +diff -urN nfs-utils-1.1.2.orig/tools/rpcgen/Makefile.am nfs-utils-1.1.2/tools/rpcgen/Makefile.am +--- nfs-utils-1.1.2.orig/tools/rpcgen/Makefile.am 2009-03-03 17:33:48.000000000 +0200 ++++ nfs-utils-1.1.2/tools/rpcgen/Makefile.am 2009-03-03 18:13:10.000000000 +0200 +@@ -1,6 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-CC=$(CC_FOR_BUILD) + LIBTOOL = @LIBTOOL@ --tag=CC + + noinst_PROGRAMS = rpcgen +@@ -9,10 +8,6 @@ + rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ + rpc_scan.h rpc_util.h + +-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) +-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) +-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) +- + MAINTAINERCLEANFILES = Makefile.in + + EXTRA_DIST = rpcgen.new.1 diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.confd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.confd new file mode 100644 index 0000000000..ad9e34f2a9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.confd @@ -0,0 +1,34 @@ +# /etc/conf.d/nfs + +# If you wish to set the port numbers for lockd, +# please see /etc/sysctl.conf + +# Optional services to include in default `/etc/init.d/nfs start` +# For NFSv4 users, you'll want to add "rpc.idmapd" here. +NFS_NEEDED_SERVICES="" + +# Number of servers to be started up by default +OPTS_RPC_NFSD="8" + +# Options to pass to rpc.mountd +# ex. OPTS_RPC_MOUNTD="-p 32767" +OPTS_RPC_MOUNTD="" + +# Options to pass to rpc.statd +# ex. OPTS_RPC_STATD="-p 32765 -o 32766" +OPTS_RPC_STATD="" + +# Options to pass to rpc.idmapd +OPTS_RPC_IDMAPD="" + +# Options to pass to rpc.gssd +OPTS_RPC_GSSD="" + +# Options to pass to rpc.svcgssd +OPTS_RPC_SVCGSSD="" + +# Options to pass to rpc.rquotad (requires sys-fs/quota) +OPTS_RPC_RQUOTAD="" + +# Timeout (in seconds) for exportfs +EXPORTFS_TIMEOUT=30 diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.initd new file mode 100755 index 0000000000..b8e292caf1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.initd @@ -0,0 +1,162 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.22 2010/08/07 21:13:02 vapier Exp $ + +opts="reload" + +# This variable is used for controlling whether or not to run exportfs -ua; +# see stop() for more information +restarting=no + +# The binary locations +exportfs=/usr/sbin/exportfs + mountd=/usr/sbin/rpc.mountd + nfsd=/usr/sbin/rpc.nfsd +smnotify=/usr/sbin/sm-notify + +depend() { + local myneed="" + if [ -e /etc/exports ] ; then + # XXX: no way to detect NFSv4 is desired and so need rpc.idmapd + myneed="${myneed} $( + awk '!/^[[:space:]]*#/ { + # clear the path to avoid spurious matches + $1 = ""; + if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) { + print "rpc.gssd" + exit 0 + } + }' /etc/exports + )" + fi + config /etc/exports + need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} + use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd + after quota +} + +mkdir_nfsdirs() { + local d + for d in rpc_pipefs v4recovery v4root ; do + d="/var/lib/nfs/${d}" + [ ! -d "${d}" ] && mkdir -p "${d}" + done +} + +waitfor_exportfs() { + local pid=$1 + ( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 $pid 2>/dev/null ) & + wait $1 +} + +mount_nfsd() { + if [ -e /proc/modules ] ; then + # Make sure nfs support is loaded in the kernel #64709 + if ! grep -qs nfsd /proc/filesystems ; then + modprobe -q nfsd + fi + # Restart idmapd if needed #220747 + if grep -qs nfsd /proc/modules ; then + killall -q -HUP rpc.idmapd + fi + fi + + # This is the new "kernel 2.6 way" to handle the exports file + if grep -qs nfsd /proc/filesystems ; then + if ! grep -qs "nfsd /proc/fs/nfsd" /proc/mounts ; then + ebegin "Mounting nfsd filesystem in /proc" + mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd + eend $? + fi + fi +} + +start_it() { + ebegin "Starting NFS $1" + shift + "$@" + eend $? + ret=$((ret + $?)) +} +start() { + mount_nfsd + mkdir_nfsdirs + + # Exportfs likes to hang if networking isn't working. + # If that's the case, then try to kill it so the + # bootup process can continue. + if grep -qs '^[[:space:]]*/' /etc/exports ; then + ebegin "Exporting NFS directories" + ${exportfs} -r & + waitfor_exportfs $! + eend $? + fi + + local ret=0 + start_it mountd ${mountd} ${OPTS_RPC_MOUNTD} + start_it daemon ${nfsd} ${OPTS_RPC_NFSD} + [ -x "${smnotify}" ] && start_it smnotify ${smnotify} ${OPTS_SMNOTIFY} + return ${ret} +} + +stop() { + local ret=0 + + # Don't check NFSSERVER variable since it might have changed, + # instead use --oknodo to smooth things over + ebegin "Stopping NFS mountd" + start-stop-daemon --stop --oknodo --exec ${mountd} + eend $? + ret=$((ret + $?)) + + # nfsd sets its process name to [nfsd] so don't look for $nfsd + ebegin "Stopping NFS daemon" + start-stop-daemon --stop --oknodo --name nfsd --user root --signal 2 + eend $? + ret=$((ret + $?)) + # in case things don't work out ... #228127 + rpc.nfsd 0 + + # When restarting the NFS server, running "exportfs -ua" probably + # isn't what the user wants. Running it causes all entries listed + # in xtab to be removed from the kernel export tables, and the + # xtab file is cleared. This effectively shuts down all NFS + # activity, leaving all clients holding stale NFS filehandles, + # *even* when the NFS server has restarted. + # + # That's what you would want if you were shutting down the NFS + # server for good, or for a long period of time, but not when the + # NFS server will be running again in short order. In this case, + # then "exportfs -r" will reread the xtab, and all the current + # clients will be able to resume NFS activity, *without* needing + # to umount/(re)mount the filesystem. + if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then + ebegin "Unexporting NFS directories" + # Exportfs likes to hang if networking isn't working. + # If that's the case, then try to kill it so the + # shutdown process can continue. + ${exportfs} -ua & + waitfor_exportfs $! + eend $? + fi + + return ${ret} +} + +reload() { + # Exportfs likes to hang if networking isn't working. + # If that's the case, then try to kill it so the + # bootup process can continue. + ebegin "Reloading /etc/exports" + ${exportfs} -r 1>&2 & + waitfor_exportfs $! + eend $? +} + +restart() { + # See long comment in stop() regarding "restarting" and exportfs -ua + restarting=yes + svc_stop + svc_start +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.initd new file mode 100755 index 0000000000..62bf0284b7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.initd @@ -0,0 +1,48 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.14 2010/06/28 21:03:11 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + local myneed="" + if [ -e /etc/fstab ] ; then + myneed="${myneed} $( + awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") { + if ($3 == "nfs4") + idmapd = "rpc.idmapd" + if ($4 ~ /sec=(krb|spkm)/) + gssd = "rpc.gssd" + } + END { print idmapd " " gssd } + ' /etc/fstab + )" + fi + config /etc/fstab + need net portmap rpc.statd ${myneed} + use ypbind dns rpc.idmapd rpc.gssd +} + +start() { + if [ -x /usr/sbin/sm-notify ] ; then + ebegin "Starting NFS sm-notify" + /usr/sbin/sm-notify ${OPTS_SMNOTIFY} + eend $? + fi + + # Make sure nfs support is loaded in the kernel #64709 + if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then + modprobe -q nfs + fi + + ebegin "Mounting NFS filesystems" + mount -a -t nfs,nfs4 + eend $? +} + +stop() { + ebegin "Unmounting NFS filesystems" + umount -a -t nfs,nfs4 + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.gssd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.gssd.initd new file mode 100755 index 0000000000..f1b8f87745 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.gssd.initd @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.11 2008/10/26 09:02:47 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting gssd" + start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD} + eend $? +} + +stop() { + ebegin "Stopping gssd" + start-stop-daemon --stop --exec /usr/sbin/rpc.gssd + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.idmapd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.idmapd.initd new file mode 100755 index 0000000000..52838b5da7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.idmapd.initd @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.8 2009/03/14 18:43:18 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +rpc_bin=/usr/sbin/rpc.idmapd + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting idmapd" + ${rpc_bin} ${OPTS_RPC_IDMAPD} + eend $? "make sure DNOTIFY support is enabled ..." +} + +stop() { + ebegin "Stopping idmapd" + start-stop-daemon --stop --exec ${rpc_bin} + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.pipefs.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.pipefs.initd new file mode 100644 index 0000000000..701ac77892 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.pipefs.initd @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.1 2008/10/26 09:02:47 vapier Exp $ + +mount_pipefs() { + # if rpc_pipefs is not available, try to load sunrpc for it #219566 + grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc + # if still not available, let's bail + grep -qs rpc_pipefs /proc/filesystems || return 1 + + # now just do it for kicks + mkdir -p /var/lib/nfs/rpc_pipefs + mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs +} + +start() { + # if things are already mounted, let's just return + grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0 + + ebegin "Mounting RPC pipefs" + mount_pipefs + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.statd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.statd.initd new file mode 100755 index 0000000000..14f8b34db6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.statd.initd @@ -0,0 +1,33 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.7 2009/01/31 22:16:11 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +rpc_bin=/sbin/rpc.statd +rpc_pid=/var/run/rpc.statd.pid + +depend() { + use ypbind net + need portmap + after quota +} + +start() { + # Don't start rpc.statd if already started by someone else ... + # Don't try and kill it if it's already dead ... + if killall -q -0 ${rpc_bin} ; then + return 0 + fi + + ebegin "Starting NFS statd" + start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD} + eend $? +} + +stop() { + ebegin "Stopping NFS statd" + start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.svcgssd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.svcgssd.initd new file mode 100755 index 0000000000..74383e24db --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.svcgssd.initd @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.5 2008/10/26 09:02:47 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting svcgssd" + start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD} + eend $? +} + +stop() { + ebegin "Stopping svcgssd" + start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/metadata.xml new file mode 100644 index 0000000000..91d9c189da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/metadata.xml @@ -0,0 +1,11 @@ + + + +net-fs + NFS client and server daemons + + Enable support for NFSv3 + Enable support for NFSv4 + Disable support for NFSv4 + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild new file mode 100644 index 0000000000..e097cd162c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild,v 1.1 2010/10/08 19:48:08 vapier Exp $ + +EAPI="2" + +inherit eutils flag-o-matic multilib + +DESCRIPTION="NFS client and server daemons" +HOMEPAGE="http://linux-nfs.org/" +SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +IUSE="caps ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc" +RESTRICT="test" #315573 + +# kth-krb doesn't provide the right include +# files, and nfs-utils doesn't build against heimdal either, +# so don't depend on virtual/krb. +# (04 Feb 2005 agriffis) +DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) + caps? ( sys-libs/libcap ) + sys-libs/e2fsprogs-libs + net-nds/rpcbind + net-libs/libtirpc + nfsv4? ( + >=dev-libs/libevent-1.0b + >=net-libs/libnfsidmap-0.21-r1 + kerberos? ( + net-libs/librpcsecgss + net-libs/libgssglue + net-libs/libtirpc[kerberos] + app-crypt/mit-krb5 + ) + )" +RDEPEND="${DEPEND_COMMON} !net-nds/portmap" +# util-linux dep is to prevent man-page collision +DEPEND="${DEPEND_COMMON} + >=sys-apps/util-linux-2.12r-r7" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.3-cross-compile.patch +} + +src_configure() { + econf \ + --with-statedir=/var/lib/nfs \ + --with-tirpcinclude=${ROOT}/usr/include/tirpc \ + --enable-tirpc \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable nfsv3) \ + $(use_enable nfsv4) \ + $(use_enable ipv6) \ + $(use_enable caps) \ + $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss") +} + +src_compile() { + if tc-is-cross-compiler; then + emake CC=$(tc-getCC) || die "Failed to compile" + else + emake || die "Failed to compile" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + + # Don't overwrite existing xtab/etab, install the original + # versions somewhere safe... more info in pkg_postinst + keepdir /var/lib/nfs/{,sm,sm.bak} + mv "${D}"/var/lib "${D}"/usr/$(get_libdir) || die + + # Install some client-side binaries in /sbin + dodir /sbin + mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die + + dodoc ChangeLog README + docinto linux-nfs ; dodoc linux-nfs/* + + insinto /etc + doins "${FILESDIR}"/exports + + local f list="" opt_need="" + if use nfsv4 ; then + opt_need="rpc.idmapd" + list="${list} rpc.idmapd rpc.pipefs" + use kerberos && list="${list} rpc.gssd rpc.svcgssd" + fi + for f in nfs nfsmount rpc.statd ${list} ; do + newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}" + done + newconfd "${FILESDIR}"/nfs.confd nfs + dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132 + + # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils + if ! use elibc_glibc ; then + dobin tools/rpcgen/rpcgen || die "rpcgen" + newdoc tools/rpcgen/README README.rpcgen + fi +} + +pkg_postinst() { + # Install default xtab and friends if there's none existing. In + # src_install we put them in /usr/lib/nfs for safe-keeping, but + # the daemons actually use the files in /var/lib/nfs. #30486 + local f + for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do + [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue + einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs" + cp -pPR "${f}" "${ROOT}"/var/lib/nfs/ + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libqmi/libqmi-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/libqmi/libqmi-0.0.1-r7.ebuild new file mode 100644 index 0000000000..65cb7dbea2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libqmi/libqmi-0.0.1-r7.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Based on gentoo's modemmanager ebuild + +EAPI="4" +CROS_WORKON_COMMIT="40cdaccf673aec850816cdd1b535c5ab3a1f3bf7" +CROS_WORKON_TREE="860a508ab8dba4e63abecc47b2d67b3b906f6301" +CROS_WORKON_PROJECT="chromiumos/third_party/libqmi" + +inherit eutils autotools cros-workon + +DESCRIPTION="QMI modem protocol helper library" +HOMEPAGE="http://cgit.freedesktop.org/libqmi/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="doc static-libs test" + +RDEPEND=">=dev-libs/glib-2.32" +DEPEND="${RDEPEND} + doc? ( dev-util/gtk-doc ) + virtual/pkgconfig" + +src_prepare() { + gtkdocize + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static{-libs,}) \ + $(use_with doc{,s}) \ + $(use_with test{,s}) +} + +src_install() { + default + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libqmi-glib.la +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libqmi/libqmi-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/libqmi/libqmi-9999.ebuild new file mode 100644 index 0000000000..34ec9c6ddd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libqmi/libqmi-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Based on gentoo's modemmanager ebuild + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/third_party/libqmi" + +inherit eutils autotools cros-workon + +DESCRIPTION="QMI modem protocol helper library" +HOMEPAGE="http://cgit.freedesktop.org/libqmi/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc static-libs test" + +RDEPEND=">=dev-libs/glib-2.32" +DEPEND="${RDEPEND} + doc? ( dev-util/gtk-doc ) + virtual/pkgconfig" + +src_prepare() { + gtkdocize + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static{-libs,}) \ + $(use_with doc{,s}) \ + $(use_with test{,s}) +} + +src_install() { + default + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libqmi-glib.la +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/neon/neon-0.29.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/neon/neon-0.29.0-r1.ebuild new file mode 100644 index 0000000000..9e96389364 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/neon/neon-0.29.0-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.29.0.ebuild,v 1.7 2009/11/30 10:08:11 maekke Exp $ + +EAPI="2" + +inherit autotools libtool versionator + +DESCRIPTION="HTTP and WebDAV client library" +HOMEPAGE="http://www.webdav.org/neon/" +SRC_URI="http://www.webdav.org/neon/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl zlib" +IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN" +for lingua in ${IUSE_LINGUAS}; do + IUSE+=" linguas_${lingua}" +done +unset lingua +RESTRICT="test" + +RDEPEND="expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) + gnutls? ( + >=net-libs/gnutls-2.0 + pkcs11? ( dev-libs/pakchois ) + ) + !gnutls? ( ssl? ( + >=dev-libs/openssl-0.9.6f + pkcs11? ( dev-libs/pakchois ) + ) ) + kerberos? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + nls? ( virtual/libintl ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" + +src_prepare() { + local lingua linguas + for lingua in ${IUSE_LINGUAS}; do + use linguas_${lingua} && linguas+=" ${lingua}" + done + sed -i -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/g" configure.in + + AT_M4DIR="macros" eautoreconf + + elibtoolize +} + +src_configure() { + local myconf + + if has_version sys-libs/glibc; then + einfo "Enabling SSL library thread-safety using POSIX threads..." + myconf+=" --enable-threadsafe-ssl=posix" + fi + + if use expat; then + myconf+=" --with-expat" + else + myconf+=" --with-libxml2" + fi + + if use gnutls; then + myconf+=" --with-ssl=gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" + elif use ssl; then + myconf+=" --with-ssl=openssl" + fi + + econf \ + --enable-static \ + --enable-shared \ + $(use_with kerberos gssapi) \ + $(use_with libproxy) \ + $(use_enable nls) \ + $(use_with pkcs11 pakchois) \ + $(use_with zlib) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install-lib install-headers install-config install-nls || die "emake install failed" + + if use doc; then + emake DESTDIR="${D}" install-docs || die "emake install-docs failed" + fi + + dodoc AUTHORS BUGS NEWS README THANKS TODO + doman doc/man/*.[1-8] +} + +pkg_postinst() { + ewarn "Neon has a policy of breaking API across minor versions, this means" + ewarn "that any package that links against Neon may be broken after" + ewarn "updating. They will remain broken until they are ported to the" + ewarn "new API. You can downgrade Neon to the previous version by doing:" + ewarn + ewarn " emerge --oneshot ' +Date: Wed, 30 Nov 2011 23:39:02 -0500 +Subject: [PATCH] CURLOPT_DNS_SERVERS: set name servers if possible (fix) + +Ensure that CURLE_OK is returned if setting the name servers is successfull. +--- + lib/asyn-ares.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c +index 7c2c372..1a105c2 100644 +--- a/lib/asyn-ares.c ++++ b/lib/asyn-ares.c +@@ -609,6 +609,7 @@ CURLcode Curl_set_dns_servers(struct SessionHandle *data, + int ares_result = ares_set_servers_csv(data->state.resolver, servers); + switch(ares_result) { + case ARES_SUCCESS: ++ result = CURLE_OK; + break; + case ARES_ENOMEM: + result = CURLE_OUT_OF_MEMORY; +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-CURLOPT_DNS_SERVERS-set-name-servers-if-possible.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-CURLOPT_DNS_SERVERS-set-name-servers-if-possible.patch new file mode 100644 index 0000000000..775baa0b7f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-CURLOPT_DNS_SERVERS-set-name-servers-if-possible.patch @@ -0,0 +1,160 @@ +From 8d0a504f0d34c2471393ef23fb2345c73c5d4746 Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Tue, 12 Apr 2011 11:34:28 -0400 +Subject: [PATCH] CURLOPT_DNS_SERVERS: set name servers if possible + +--- + docs/libcurl/curl_easy_setopt.3 | 14 ++++++++++++++ + include/curl/curl.h | 3 +++ + lib/asyn-ares.c | 26 ++++++++++++++++++++++++++ + lib/asyn-thread.c | 9 +++++++++ + lib/hostip.h | 5 +++++ + lib/hostsyn.c | 11 +++++++++++ + lib/url.c | 4 ++++ + 7 files changed, 72 insertions(+), 0 deletions(-) + +diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 +index 31464bf..3b86476 100644 +--- a/docs/libcurl/curl_easy_setopt.3 ++++ b/docs/libcurl/curl_easy_setopt.3 +@@ -2045,6 +2045,20 @@ resolves, by including a string in the linked list that uses the format + and port number must exactly match what was already added previously. + + (Added in 7.21.3) ++.IP CURLOPT_DNS_SERVERS ++Set the list of DNS servers to be used instead of the system default. ++The format of the dns servers option is: ++ ++host[:port][,host[:port]]... ++ ++For example: ++ ++192.168.1.100,192.168.1.101,3.4.5.6 ++ ++This option requires that libcurl was built with a resolver backend that ++supports this operation. The c-ares backend is the only such one. ++ ++(Added in 7.24.0) + .SH SSL and SECURITY OPTIONS + .IP CURLOPT_SSLCERT + Pass a pointer to a zero terminated string as parameter. The string should be +diff --git a/include/curl/curl.h b/include/curl/curl.h +index f4aa17f..8f82348 100644 +--- a/include/curl/curl.h ++++ b/include/curl/curl.h +@@ -1486,6 +1486,9 @@ typedef enum { + /* allow GSSAPI credential delegation */ + CINIT(GSSAPI_DELEGATION, LONG, 210), + ++ /* Set the name servers to use for DNS resolution */ ++ CINIT(DNS_SERVERS, OBJECTPOINT, 211), ++ + CURLOPT_LASTENTRY /* the last unused */ + } CURLoption; + +diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c +index 7f3bdf8..7c2c372 100644 +--- a/lib/asyn-ares.c ++++ b/lib/asyn-ares.c +@@ -600,4 +600,30 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn, + } + return NULL; /* no struct yet */ + } ++ ++CURLcode Curl_set_dns_servers(struct SessionHandle *data, ++ char *servers) ++{ ++ CURLcode result = CURLE_NOT_BUILT_IN; ++#if (ARES_VERSION >= 0x010704) ++ int ares_result = ares_set_servers_csv(data->state.resolver, servers); ++ switch(ares_result) { ++ case ARES_SUCCESS: ++ break; ++ case ARES_ENOMEM: ++ result = CURLE_OUT_OF_MEMORY; ++ break; ++ case ARES_ENOTINITIALIZED: ++ case ARES_ENODATA: ++ case ARES_EBADSTR: ++ default: ++ result = CURLE_BAD_FUNCTION_ARGUMENT; ++ break; ++ } ++#else /* too old c-ares version! */ ++ (void)data; ++ (void)servers; ++#endif ++ return result; ++} + #endif /* CURLRES_ARES */ +diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c +index 38cde5d..cd035dc 100644 +--- a/lib/asyn-thread.c ++++ b/lib/asyn-thread.c +@@ -696,4 +696,13 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn, + + #endif /* !HAVE_GETADDRINFO */ + ++CURLcode Curl_set_dns_servers(struct SessionHandle *data, ++ char *servers) ++{ ++ (void)data; ++ (void)servers; ++ return CURLE_NOT_BUILT_IN; ++ ++} ++ + #endif /* CURLRES_THREADED */ +diff --git a/lib/hostip.h b/lib/hostip.h +index 32a37b9..dbbb1f7 100644 +--- a/lib/hostip.h ++++ b/lib/hostip.h +@@ -195,4 +195,9 @@ Curl_cache_addr(struct SessionHandle *data, Curl_addrinfo *addr, + extern sigjmp_buf curl_jmpenv; + #endif + ++/* ++ * Function provided by the resolver backend to set DNS servers to use. ++ */ ++CURLcode Curl_set_dns_servers(struct SessionHandle *data, char *servers); ++ + #endif /* HEADER_CURL_HOSTIP_H */ +diff --git a/lib/hostsyn.c b/lib/hostsyn.c +index b601887..d1a9079 100644 +--- a/lib/hostsyn.c ++++ b/lib/hostsyn.c +@@ -66,5 +66,16 @@ + **********************************************************************/ + #ifdef CURLRES_SYNCH + ++/* ++ * Function provided by the resolver backend to set DNS servers to use. ++ */ ++CURLcode Curl_set_dns_servers(struct SessionHandle *data, ++ char *servers) ++{ ++ (void)data; ++ (void)servers; ++ return CURLE_NOT_BUILT_IN; ++ ++} + + #endif /* truly sync */ +diff --git a/lib/url.c b/lib/url.c +index 4bc82a6..f478e38 100644 +--- a/lib/url.c ++++ b/lib/url.c +@@ -2531,6 +2531,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, + data->set.ssl.authtype = CURL_TLSAUTH_NONE; + break; + #endif ++ case CURLOPT_DNS_SERVERS: ++ result = Curl_set_dns_servers(data, va_arg(param, char *)); ++ break; ++ + default: + /* unknown tag and its companion, just ignore: */ + result = CURLE_UNKNOWN_OPTION; +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-Do-not-try-to-do-DNS-name-resolution-on-interface-na.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-Do-not-try-to-do-DNS-name-resolution-on-interface-na.patch new file mode 100644 index 0000000000..39c3a3baf5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-Do-not-try-to-do-DNS-name-resolution-on-interface-na.patch @@ -0,0 +1,100 @@ +From 1909c8096fc8ab5083e929e5b721d74d35bfe414 Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Fri, 4 Nov 2011 16:48:05 -0400 +Subject: [PATCH] Do not try to do DNS name resolution on interface names + +Do not try to do DNS name resolution on interface names because it can +block and that is no desirable when using multi interfaces. +--- + lib/connect.c | 5 ++++- + lib/if2ip.c | 31 +++++++++++++++++++++++++++++++ + lib/if2ip.h | 1 + + 3 files changed, 36 insertions(+), 1 deletions(-) + +diff --git a/lib/connect.c b/lib/connect.c +index 56a57b1..4305864 100644 +--- a/lib/connect.c ++++ b/lib/connect.c +@@ -265,7 +265,10 @@ static CURLcode bindlocal(struct connectdata *conn, + if(dev && (strlen(dev)<255) ) { + + /* interface */ +- if(Curl_if2ip(af, dev, myhost, sizeof(myhost))) { ++ if(Curl_if_is_interface_name(dev)) { ++ if(Curl_if2ip(af, dev, myhost, sizeof(myhost)) == NULL) ++ return CURLE_INTERFACE_FAILED; ++ + /* + * We now have the numerical IP address in the 'myhost' buffer + */ +diff --git a/lib/if2ip.c b/lib/if2ip.c +index 4924f73..0ae375b 100644 +--- a/lib/if2ip.c ++++ b/lib/if2ip.c +@@ -71,6 +71,24 @@ + + #if defined(HAVE_GETIFADDRS) + ++bool Curl_if_is_interface_name(const char *interface) ++{ ++ bool result = FALSE; ++ ++ struct ifaddrs *iface, *head; ++ ++ if(getifaddrs(&head) >= 0) { ++ for(iface=head; iface != NULL; iface=iface->ifa_next) { ++ if(curl_strequal(iface->ifa_name, interface)) { ++ result = TRUE; ++ break; ++ } ++ } ++ freeifaddrs(head); ++ } ++ return result; ++} ++ + char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) + { + struct ifaddrs *iface, *head; +@@ -109,6 +127,14 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) + + #elif defined(HAVE_IOCTL_SIOCGIFADDR) + ++bool Curl_if_is_interface_name(const char *interface) ++{ ++ /* This is here just to support the old interfaces */ ++ char buf[256]; ++ ++ return (Curl_if2ip(AF_INET, interface, buf, sizeof(buf)) != NULL); ++} ++ + char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) + { + struct ifreq req; +@@ -148,6 +174,11 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) + + #else + ++bool Curl_if_is_interface_name(const char *interface) ++{ ++ return FALSE; ++} ++ + char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size) + { + (void) af; +diff --git a/lib/if2ip.h b/lib/if2ip.h +index cdf2638..678e3a5 100644 +--- a/lib/if2ip.h ++++ b/lib/if2ip.h +@@ -23,6 +23,7 @@ + ***************************************************************************/ + #include "setup.h" + ++extern bool Curl_if_is_interface_name(const char *interface); + extern char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size); + + #ifdef __INTERIX +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-multi-handle-timeouts-on-DNS-servers-by-checking-for.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-multi-handle-timeouts-on-DNS-servers-by-checking-for.patch new file mode 100644 index 0000000000..8e083ebed9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-multi-handle-timeouts-on-DNS-servers-by-checking-for.patch @@ -0,0 +1,78 @@ +From 595f2e5385c3ca8d1216327eff8f0a635c198008 Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Wed, 30 Nov 2011 15:23:44 -0500 +Subject: [PATCH] multi: handle timeouts on DNS servers by checking for new sockets + +If the first name server is not available, the multi interface does +not invoke the socket_cb when the DNS request to the first name server +timesout. Ensure that the list of sockets are always updated after +calling Curl_resolver_is_resolved. + +This bug can be reproduced if Curl is complied with --enable_ares and +your code uses the multi socket interfaces and the +CURLMOPT_SOCKETFUNCTION option. To test try: + iptables -I INPUT \ + -s $(sed -n -e '/name/{s/.* //p;q}' /etc/resolv.conf)/32 \ + -j REJECT +and then run a program which uses the multi-interface. +--- + lib/asyn-ares.c | 9 +++++---- + lib/multi.c | 13 ++++++++----- + 2 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c +index 7c2c372..0b45484 100644 +--- a/lib/asyn-ares.c ++++ b/lib/asyn-ares.c +@@ -227,18 +227,19 @@ int Curl_resolver_getsock(struct connectdata *conn, + struct timeval maxtime; + struct timeval timebuf; + struct timeval *timeout; ++ long milli; + int max = ares_getsock((ares_channel)conn->data->state.resolver, + (ares_socket_t *)socks, numsocks); + +- + maxtime.tv_sec = CURL_TIMEOUT_RESOLVE; + maxtime.tv_usec = 0; + + timeout = ares_timeout((ares_channel)conn->data->state.resolver, &maxtime, + &timebuf); +- +- Curl_expire(conn->data, +- (timeout->tv_sec * 1000) + (timeout->tv_usec/1000)); ++ milli = (timeout->tv_sec * 1000) + (timeout->tv_usec/1000); ++ if(milli == 0) ++ milli += 10; ++ Curl_expire(conn->data, milli); + + return max; + } +diff --git a/lib/multi.c b/lib/multi.c +index ae70851..3059e49 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -1085,12 +1085,15 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, + /* check if we have the name resolved by now */ + easy->result = Curl_resolver_is_resolved(easy->easy_conn, &dns); + +- if(dns) { +- /* Update sockets here. Mainly because the socket(s) may have been +- closed and the application thus needs to be told, even if it is +- likely that the same socket(s) will again be used further down. */ +- singlesocket(multi, easy); ++ /* Update sockets here, because the socket(s) may have been ++ closed and the application thus needs to be told, even if it ++ is likely that the same socket(s) will again be used further ++ down. If the name has not yet been resolved, it is likely ++ that new sockets have been opened in an attempt to contact ++ another resolver. */ ++ singlesocket(multi, easy); + ++ if(dns) { + /* Perform the next step in the connection phase, and then move on + to the WAITCONNECT state */ + easy->result = Curl_async_resolved(easy->easy_conn, +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-multi-interface-only-use-non-NULL-function-pointer.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-multi-interface-only-use-non-NULL-function-pointer.patch new file mode 100644 index 0000000000..00a6b39871 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/0001-multi-interface-only-use-non-NULL-function-pointer.patch @@ -0,0 +1,54 @@ +From d81f5ea3e0a5f9a532fcf685898e041fafa93a5b Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Fri, 2 Dec 2011 21:10:28 +0100 +Subject: [PATCH] multi interface: only use non-NULL function pointer! + +If the socket callback function pointer hasn't been set, we must not +attempt to use it. Commit adc88ca20 made it more likely to occur. +--- + lib/multi.c | 22 ++++++++++++---------- + 1 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/lib/multi.c b/lib/multi.c +index 3059e49..f3b892c 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -1940,11 +1940,12 @@ static void singlesocket(struct Curl_multi *multi, + } + + /* we know (entry != NULL) at this point, see the logic above */ +- multi->socket_cb(easy->easy_handle, +- s, +- action, +- multi->socket_userp, +- entry->socketp); ++ if(multi->socket_cb) ++ multi->socket_cb(easy->easy_handle, ++ s, ++ action, ++ multi->socket_userp, ++ entry->socketp); + + entry->action = action; /* store the current action state */ + } +@@ -2019,11 +2020,12 @@ static void singlesocket(struct Curl_multi *multi, + remove_sock_from_hash = FALSE; + + if(remove_sock_from_hash) { +- multi->socket_cb(easy->easy_handle, +- s, +- CURL_POLL_REMOVE, +- multi->socket_userp, +- entry ? entry->socketp : NULL); ++ if(multi->socket_cb) ++ multi->socket_cb(easy->easy_handle, ++ s, ++ CURL_POLL_REMOVE, ++ multi->socket_userp, ++ entry ? entry->socketp : NULL); + sh_delentry(multi->sockhash, s); + } + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.18.2-prefix.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.18.2-prefix.patch new file mode 100644 index 0000000000..9f7761f4ed --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.18.2-prefix.patch @@ -0,0 +1,20 @@ +--- curl-config.in.orig 2008-10-10 13:43:19.000000000 +0200 ++++ curl-config.in 2008-10-10 13:43:56.000000000 +0200 +@@ -181,7 +181,7 @@ + ;; + + --cflags) +- if test "X@includedir@" = "X/usr/include"; then ++ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then + echo "" + else + echo "-I@includedir@" +@@ -189,7 +189,7 @@ + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then ++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then + CURLLIBDIR="-L@libdir@ " + else + CURLLIBDIR="" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.19.7-test241.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.19.7-test241.patch new file mode 100644 index 0000000000..7297c1b5b1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.19.7-test241.patch @@ -0,0 +1,20 @@ +--- tests/data/test241.orig 2008-11-20 08:12:35.000000000 +1100 ++++ tests/data/test241 2009-11-05 14:22:07.000000000 +1100 +@@ -33,7 +33,7 @@ + HTTP-IPv6 GET (using ip6-localhost) + + +--g "http://ip6-localhost:%HTTP6PORT/241" ++-g "http://::1:%HTTP6PORT/241" + + + ./server/resolve --ipv6 ip6-localhost +@@ -48,7 +48,7 @@ + + + GET /241 HTTP/1.1 +-Host: ip6-localhost:%HTTP6PORT ++Host: ::1:%HTTP6PORT + Accept: */* + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch new file mode 100644 index 0000000000..8c074fbd4e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch @@ -0,0 +1,14 @@ +--- curl-config.in.orig 2007-09-14 07:36:18.000000000 +1000 ++++ curl-config.in 2007-09-14 07:37:14.000000000 +1000 +@@ -187,9 +187,9 @@ + CURLLIBDIR="" + fi + if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then +- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ ++ echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@ + else +- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@ ++ echo ${CURLLIBDIR}-lcurl @LIBS@ + fi + ;; + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-respect-cflags-3.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-respect-cflags-3.patch new file mode 100644 index 0000000000..4a4a614ee4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/curl/files/curl-respect-cflags-3.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index e9b49c7..e374ab6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -280,9 +280,6 @@ dnl ********************************************************************** + + CURL_CHECK_COMPILER + CURL_SET_COMPILER_BASIC_OPTS +-CURL_SET_COMPILER_DEBUG_OPTS +-CURL_SET_COMPILER_OPTIMIZE_OPTS +-CURL_SET_COMPILER_WARNING_OPTS + + if test "$compiler_id" = "INTEL_UNIX_C"; then + # diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/dhcpcd/dhcpcd-5.1.4-r31.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/dhcpcd/dhcpcd-5.1.4-r31.ebuild new file mode 100644 index 0000000000..35574dce4f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/dhcpcd/dhcpcd-5.1.4-r31.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.1.ebuild,v 1.1 2010/03/02 18:14:07 williamh Exp $ + +EAPI=2 +CROS_WORKON_COMMIT="6bd2948d948278035123aa653325e7964afd0843" +CROS_WORKON_TREE="9124b6c37d47408449c8c99dad31680c020e0173" +CROS_WORKON_PROJECT="chromiumos/third_party/dhcpcd" + +inherit cros-workon + +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" +HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" +LICENSE="BSD-2" + +SLOT="0" +KEYWORDS="amd64 arm x86" + +RDEPEND=">=sys-apps/dbus-1.2" +DEPEND="${RDEPEND}" + +src_configure() { + econf --prefix= \ + --libexecdir=/lib/dhcpcd \ + --dbdir=/var/lib/dhcpcd \ + --rundir=/var/run/dhcpcd -- +} + +src_compile() { + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/dhcpcd/dhcpcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/dhcpcd/dhcpcd-9999.ebuild new file mode 100644 index 0000000000..6557b8a875 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.1.ebuild,v 1.1 2010/03/02 18:14:07 williamh Exp $ + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/dhcpcd" + +inherit cros-workon + +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" +HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" +LICENSE="BSD-2" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=">=sys-apps/dbus-1.2" +DEPEND="${RDEPEND}" + +src_configure() { + econf --prefix= \ + --libexecdir=/lib/dhcpcd \ + --dbdir=/var/lib/dhcpcd \ + --rundir=/var/run/dhcpcd -- +} + +src_compile() { + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/ChangeLog b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/ChangeLog new file mode 100644 index 0000000000..e4d2cfb46f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/ChangeLog @@ -0,0 +1,177 @@ +# ChangeLog for net-misc/htpdate +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/ChangeLog,v 1.41 2009/06/19 22:08:34 ranger Exp $ + + 19 Jun 2009; Brent Baude htpdate-1.0.4.ebuild: + keyworded ~arch for ppc64, bug 272590 + + 16 Jun 2009; Tobias Klausmann htpdate-1.0.4.ebuild: + Keyworded on alpha, bug #272769 + + 07 Mar 2009; Jeremy Olexa htpdate-1.0.4.ebuild: + amd64 stable, bug 254417 + + 21 Feb 2009; Jeroen Roovers htpdate-1.0.4.ebuild: + Stable for HPPA (bug #254417). + + 20 Feb 2009; Raúl Porcel htpdate-1.0.4.ebuild: + arm/s390/sh/x86 stable wrt #254417 + + 10 Jan 2009; Tobias Scherbaum + -htpdate-0.9.2.ebuild, -htpdate-0.9.3.ebuild, htpdate-1.0.4.ebuild: + ppc stable, bug #254417 + +*htpdate-1.0.4 (23 Oct 2008) + + 23 Oct 2008; Tobias Scherbaum + +htpdate-1.0.4.ebuild: + Version bump, #243294 + + 28 Mar 2008; Jeroen Roovers htpdate-1.0.0.ebuild: + Stable for HPPA (bug #214724). + + 13 Mar 2008; Santiago M. Mola htpdate-1.0.0.ebuild: + amd64 stable + + 02 Aug 2007; Raúl Porcel htpdate-1.0.0.ebuild: + x86 stable + + 10 Jun 2007; Tobias Scherbaum + htpdate-1.0.0.ebuild: + ppc stable + + 06 Apr 2007; Tobias Scherbaum + htpdate-0.9.3.ebuild: + ppc stable + +*htpdate-1.0.0 (25 Mar 2007) + + 25 Mar 2007; Tobias Scherbaum + -htpdate-0.9.0.ebuild, +htpdate-1.0.0.ebuild: + version bump + + 17 Mar 2007; Steve Dibb htpdate-0.9.2.ebuild, + htpdate-0.9.3.ebuild: + amd64 stable + + 13 Mar 2007; Raúl Porcel htpdate-0.9.3.ebuild: + x86 stable + + 22 Feb 2007; Piotr Jaroszyński ChangeLog: + Transition to Manifest2. + +*htpdate-0.9.3 (26 Dec 2006) + + 26 Dec 2006; Tobias Scherbaum + -htpdate-0.9.1-r1.ebuild, +htpdate-0.9.3.ebuild: + Version bump, Cleanup + + 15 Jul 2006; Tobias Scherbaum + htpdate-0.9.2.ebuild: + ppc and hppa stable + +*htpdate-0.9.2 (08 Jun 2006) + + 08 Jun 2006; Tobias Scherbaum + +htpdate-0.9.2.ebuild: + Version bump + + 08 Jun 2006; Tobias Scherbaum + htpdate-0.9.1-r1.ebuild: + ppc and hppa stable + + 10 Apr 2006; Tobias Scherbaum -files/ppc.patch, + -htpdate-0.8.2.ebuild, -htpdate-0.8.7.ebuild, -htpdate-0.8.8.ebuild, + -htpdate-0.9.1.ebuild: + Remove old ebuilds. + + 10 Apr 2006; Andrej Kacian htpdate-0.9.0.ebuild: + Stable on x86, bug #129317. + + 09 Apr 2006; Tobias Scherbaum + htpdate-0.9.0.ebuild: + hppa stable, bug #129317 + + 09 Apr 2006; Tobias Scherbaum + htpdate-0.9.0.ebuild: + ppc stable + +*htpdate-0.9.1-r1 (09 Apr 2006) + + 09 Apr 2006; Tobias Scherbaum +files/htpdate.conf, + +files/htpdate.init, +htpdate-0.9.1-r1.ebuild: + Added Initscript to run htpdate as a daemon + + 25 Mar 2006; Danny van Dyk htpdate-0.9.0.ebuild: + Marked stable on amd64. + +*htpdate-0.9.1 (25 Mar 2006) + + 25 Mar 2006; Tobias Scherbaum + +htpdate-0.9.1.ebuild: + Version bump, thanks to Christian Hartmann for notifying me + + 07 Jan 2006; Tobias Scherbaum + htpdate-0.9.0.ebuild: + Reintroduce Changes now know as Changelog, fixes bug #117413 + + 02 Jan 2006; Tobias Scherbaum + htpdate-0.9.0.ebuild: + Remove CHANGES file, thanks Danny ! + +*htpdate-0.9.0 (22 Dec 2005) + + 22 Dec 2005; Tobias Scherbaum + +htpdate-0.9.0.ebuild: + Version bump + +*htpdate-0.8.8 (03 Dec 2005) + + 03 Dec 2005; Tobias Scherbaum + +htpdate-0.8.8.ebuild: + Version bump + + 03 Dec 2005; Tobias Scherbaum + htpdate-0.8.7.ebuild: + Marked 0.8.7 as ppc stable. + + 17 Sep 2005; Tobias Scherbaum + htpdate-0.8.7.ebuild: + Added ~hppa Keyword + + 15 Sep 2005; Tobias Scherbaum + htpdate-0.8.2.ebuild, htpdate-0.8.7.ebuild: + Re-added ~ppc keyword for 0.8.7, marked 0.8.2 stable on all archs. + +*htpdate-0.8.7 (07 Sep 2005) + + 07 Sep 2005; Markus Nigbur +htpdate-0.8.7.ebuild: + Version bump. + + 30 Jul 2005; Sven Wegener htpdate-0.8.2.ebuild: + Modified to apply patches in src_unpack() + + 02 Jul 2005; Tobias Scherbaum + htpdate-0.8.2.ebuild: + Added to ~amd64. + + 01 Jul 2005; Tobias Scherbaum +files/ppc.patch, + htpdate-0.8.2.ebuild: + Fixed endianess problem. Thanks to Danny van Dyk + . + Marked ~ppc. + + 23 Jun 2005; Sven Wegener htpdate-0.8.2.ebuild: + Added cross-compile support. Trim whitespace. Pass CFLAGS in a better way. + + 22 Jun 2005; Tobias Scherbaum + htpdate-0.8.2.ebuild: + Was keyworded ppc by a mistake. Removed the keyword. + It is currently known to be broken on ppc machines. + +*htpdate-0.8.2 (22 Jun 2005) + + 22 Jun 2005; Tobias Scherbaum +metadata.xml, + +htpdate-0.8.2.ebuild: + Initial ebuild thanks to Christian Hartmann in #96364. + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/Manifest new file mode 100644 index 0000000000..7f22045b39 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/Manifest @@ -0,0 +1,2 @@ +DIST htpdate-1.0.0.tar.gz 13856 RMD160 e9f8072525345e703283f7f72a1d4e0f0fe1ab71 SHA1 063f6d36b16fb4e2b7255590d2c6c78bc8907333 SHA256 7bc3ab8a3437c90af2b8ac7b72fcf61101045e71bf83f354f0e091b93616c8a5 +DIST htpdate-1.0.4.tar.gz 16474 RMD160 037f84db34ccc2ad66d2cde68ece60d68db7ec04 SHA1 e86d383e25452ef88695526c1d4851e89fa84bb5 SHA256 8c59b3f66a429eb3be038f66eb9f942398fca9002fe2c3f027010c815f91dedd diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-64bit_limits.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-64bit_limits.patch new file mode 100644 index 0000000000..32d53476e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-64bit_limits.patch @@ -0,0 +1,51 @@ +diff --git a/htpdate.c b/htpdate.c +index 7524ce2..aa66e9f 100644 +--- a/htpdate.c ++++ b/htpdate.c +@@ -67,7 +67,7 @@ + #define URLSIZE 128 + #define BUFFERSIZE 1024 + +-#define ERR_TIMESTAMP 0x7FFFFFFF /* Err fetching date in getHTTPdate */ ++#define ERR_TIMESTAMP LONG_MAX /* Err fetching date in getHTTPdate */ + + #define sign(x) (x < 0 ? (-1) : 1) + +@@ -82,8 +82,8 @@ static int waitfornw = 0; + static int recvdvalidresp = 0; + + /* Insertion sort is more efficient (and smaller) than qsort for small lists */ +-static void insertsort( int a[], int length ) { +- int i, j, value; ++static void insertsort( long a[], int length ) { ++ long i, j, value; + + for ( i = 1; i < length; i++ ) { + value = a[i]; +@@ -535,14 +535,14 @@ int main( int argc, char *argv[] ) { + char *user = NULL, *userstr = NULL, *group = NULL; + long long sumtimes; + double timeavg, drift = 0; +- int timedelta[MAX_HTTP_HOSTS], timestamp; +- int numservers, validtimes, goodtimes, mean; ++ long timedelta[MAX_HTTP_HOSTS], timestamp; ++ long numservers, validtimes, goodtimes, mean; + int nap = 0, when = 500000, precision = 0; + int setmode = 0, burstmode = 0, try, offsetdetect; + int i, burst, param; + int daemonize = 0; + int ipversion = DEFAULT_IP_VERSION; +- int timelimit = DEFAULT_TIME_LIMIT; ++ long timelimit = DEFAULT_TIME_LIMIT; + int minsleep = DEFAULT_MIN_SLEEP; + int maxsleep = DEFAULT_MAX_SLEEP; + int sleeptime = minsleep; +@@ -608,7 +608,7 @@ int main( int argc, char *argv[] ) { + setmode = 2; + break; + case 't': /* disable "sanity" time check */ +- timelimit = 2100000000; ++ timelimit = LONG_MAX - 1; + break; + case 'u': /* drop root privileges and run as user */ + user = (char *)optarg; diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-all_headers.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-all_headers.patch new file mode 100644 index 0000000000..1e95bdd58a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-all_headers.patch @@ -0,0 +1,22 @@ +diff --git a/htpdate.c b/htpdate.c +index d0e7fbb..adf351f 100644 +--- a/htpdate.c ++++ b/htpdate.c +@@ -65,7 +65,7 @@ + #define MAX_ATTEMPT 2 /* Poll attempts */ + #define DEFAULT_PID_FILE "/var/run/htpdate.pid" + #define URLSIZE 128 +-#define BUFFERSIZE 1024 ++#define BUFFERSIZE 8192 + + #define ERR_TIMESTAMP LONG_MAX /* Err fetching date in getHTTPdate */ + +@@ -246,7 +246,7 @@ static long getHTTPdate( char *host, char *port, char *proxy, char *proxyport, c + /* Receive data from the web server + The return code from recv() is the number of bytes received + */ +- buffer_size = recv(server_s, buffer, BUFFERSIZE - 1, 0); ++ buffer_size = recv(server_s, buffer, BUFFERSIZE - 1, MSG_WAITALL); + if ( buffer_size >= 0 ) { + /* NUL terminate the string data. */ + buffer[buffer_size] = '\0'; diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-checkagainstbuildtime.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-checkagainstbuildtime.patch new file mode 100644 index 0000000000..06013b8f0e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-checkagainstbuildtime.patch @@ -0,0 +1,78 @@ +diff -ruN htpdate/htpdate.c htpdate.new/htpdate.c +--- htpdate/htpdate.c 2010-10-13 17:19:57.000000000 -0700 ++++ new/htpdate.c 2010-10-13 17:16:06.000000000 -0700 +@@ -301,9 +301,23 @@ static long getHTTPdate( char *host, cha + return 0; + } + ++static int is_before_build_time(time_t time) ++{ ++ time_t build_time; ++ /* Is the given time before the build time? */ ++ /* If no build date given, default to 0 (01 Jan 1970) */ ++#ifdef BUILD_TIME_UTC ++ build_time = BUILD_TIME_UTC; ++#else ++ build_time = 0; ++#endif ++ return time < build_time; ++} + + static int setclock( double timedelta, int setmode ) { +- struct timeval timeofday; ++ struct timeval timediff; /* Change in time (case 1 */ ++ struct timeval timeofday; /* Actual time of day (case 2) */ ++ double target_time; /* Time to adjust clock to, in sec */ + + if ( timedelta == 0 ) { + printlog( 0, "No time correction needed" ); +@@ -317,8 +331,20 @@ static int setclock( double timedelta, i + return(0); + + case 1: /* Adjust time smoothly */ +- timeofday.tv_sec = (long)timedelta; +- timeofday.tv_usec = (long)((timedelta - timeofday.tv_sec) * 1000000); ++ timediff.tv_sec = (long)timedelta; ++ timediff.tv_usec = (long)((timedelta - timediff.tv_sec) * 1000000); ++ ++ /* Check against build time */ ++ gettimeofday( &timeofday, NULL ); ++ target_time = timedelta + (double)timeofday.tv_sec + 1e-6 * timeofday.tv_usec; ++ ++ timeofday.tv_sec = (long)target_time; ++ timeofday.tv_usec = (long)((target_time - timeofday.tv_sec) * 1000000); ++ ++ if (is_before_build_time(timeofday.tv_sec)) { ++ printlog(1, "Cannot set time to be before build time."); ++ return (-1); ++ } + + printlog( 0, "Adjusting %.3f seconds", timedelta ); + +@@ -327,17 +353,22 @@ static int setclock( double timedelta, i + printlog( 1, "seteuid()" ); + exit(1); + } else { +- return( adjtime(&timeofday, NULL) ); ++ return( adjtime(&timediff, NULL) ); + } + + case 2: /* Set time */ + printlog( 0, "Setting %.3f seconds", timedelta ); + + gettimeofday( &timeofday, NULL ); +- timedelta += ( timeofday.tv_sec + timeofday.tv_usec*1e-6 ); ++ target_time = timedelta + (double)timeofday.tv_sec + 1e-6 * timeofday.tv_usec; + +- timeofday.tv_sec = (long)timedelta; +- timeofday.tv_usec = (long)(timedelta - timeofday.tv_sec) * 1000000; ++ timeofday.tv_sec = (long)target_time; ++ timeofday.tv_usec = (long)((target_time - timeofday.tv_sec) * 1000000); ++ ++ if (is_before_build_time(timeofday.tv_sec)) { ++ printlog(1, "Cannot set time to be before build time."); ++ return (-1); ++ } + + printlog( 0, "Set: %s", asctime(localtime(&timeofday.tv_sec)) ); + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-errorcheckhttpresp.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-errorcheckhttpresp.patch new file mode 100644 index 0000000000..53b42846f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-errorcheckhttpresp.patch @@ -0,0 +1,33 @@ +--- htpdate/htpdate.c 2010-07-23 13:26:43.052392000 -0700 ++++ new_htpdate/htpdate.c 2010-07-23 13:23:28.687877000 -0700 +@@ -157,7 +157,8 @@ + char remote_time[25] = { '\0' }; + char url[URLSIZE] = { '\0' }; + char *pdate = NULL; +- ++ int error = -1; /* used when returning non-zero return values */ ++ + + /* Connect to web server via proxy server or directly */ + memset( &hints, 0, sizeof(hints) ); +@@ -272,6 +273,7 @@ + /* Web server timestamps are without daylight saving */ + tm.tm_isdst = 0; + timevalue.tv_sec = mktime(&tm); ++ error = 0; + } else { + printlog( 1, "%s unknown time format", host ); + } +@@ -293,8 +295,10 @@ + /* Return the time delta between web server time (timevalue) + and system time (timeofday) + */ +- return( timevalue.tv_sec - timeofday.tv_sec + gmtoffset ); +- ++ if (!error) ++ return( timevalue.tv_sec - timeofday.tv_sec + gmtoffset ); ++ else ++ return 0; + } + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-errorsarentsuccess.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-errorsarentsuccess.patch new file mode 100644 index 0000000000..3d642f6383 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-errorsarentsuccess.patch @@ -0,0 +1,49 @@ +--- htpdate-1.0.4-cros/htpdate.c 2011-04-07 15:58:17.000000000 -0700 ++++ htpdate-1.0.4/htpdate.c 2011-04-07 21:51:53.000000000 -0700 +@@ -67,6 +67,8 @@ + #define URLSIZE 128 + #define BUFFERSIZE 1024 + ++#define ERR_TIMESTAMP 0x7FFFFFFF /* Err fetching date in getHTTPdate */ ++ + #define sign(x) (x < 0 ? (-1) : 1) + + +@@ -185,7 +187,7 @@ + /* Was the hostname and service resolvable? */ + if ( rc ) { + printlog( 1, "%s host or service unavailable", host ); +- return(0); /* Assume correct time */ ++ return(ERR_TIMESTAMP); + } + + /* Build a combined HTTP/1.0 and 1.1 HEAD request +@@ -218,7 +220,7 @@ + + if ( rc ) { + printlog( 1, "%s connection failed", host ); +- return(0); /* Assume correct time */ ++ return(ERR_TIMESTAMP); + } + + /* Initialize timer */ +@@ -303,7 +305,7 @@ + if (!error) + return( timevalue.tv_sec - timeofday.tv_sec + gmtoffset ); + else +- return 0; ++ return ERR_TIMESTAMP; + } + + static int is_before_build_time(time_t time) +@@ -746,7 +748,9 @@ + try--; + } while ( timestamp && try ); + +- /* Only include valid responses in timedelta[] */ ++ /* Only include valid responses in timedelta[] ++ Note that ERR_TIMESTAMP explicitly can't be valid here. ++ */ + if ( timestamp < timelimit && timestamp > -timelimit ) { + timedelta[validtimes] = timestamp; + validtimes++; diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-oob_date_read.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-oob_date_read.patch new file mode 100644 index 0000000000..6a3e91a5e6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-oob_date_read.patch @@ -0,0 +1,40 @@ +diff -ruN htpdate/htpdate.c htpdate.new/htpdate.c +--- htpdate/htpdate.c 2010-11-30 14:53:31.637209639 -0600 ++++ htpdate.new/htpdate.c 2010-11-30 15:48:25.647523022 -0600 +@@ -158,7 +158,7 @@ + char url[URLSIZE] = { '\0' }; + char *pdate = NULL; + int error = -1; /* used when returning non-zero return values */ +- ++ ssize_t buffer_size = 0; + + /* Connect to web server via proxy server or directly */ + memset( &hints, 0, sizeof(hints) ); +@@ -244,8 +244,10 @@ + /* Receive data from the web server + The return code from recv() is the number of bytes received + */ +- if ( recv(server_s, buffer, BUFFERSIZE, 0) != -1 ) { +- ++ buffer_size = recv(server_s, buffer, BUFFERSIZE - 1, 0); ++ if ( buffer_size >= 0 ) { ++ /* NUL terminate the string data. */ ++ buffer[buffer_size] = '\0'; + /* Assuming that network delay (server->htpdate) is neglectable, + the received web server time "should" match the local time. + +@@ -264,9 +266,12 @@ + rtt = ( timeofday.tv_sec - rtt ) * 1000000 + \ + timeofday.tv_usec - when; + +- /* Look for the line that contains Date: */ +- if ( (pdate = strstr(buffer, "Date: ")) != NULL ) { ++ /* Look for the line that contains Date: and has enough data. */ ++ pdate = strstr(buffer, "Date: "); ++ /* strlen("Date: ...") must be >= 11. */ ++ if ( pdate != NULL && strlen(pdate) >= 11 ) { + strncpy(remote_time, pdate + 11, 24); ++ remote_time[24] = '\0'; + recvdvalidresp = 1; + + if ( strptime( remote_time, "%d %b %Y %T", &tm) != NULL) { diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-relative_path.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-relative_path.patch new file mode 100644 index 0000000000..09b1949c97 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-relative_path.patch @@ -0,0 +1,75 @@ +diff --git a/htpdate.c b/htpdate.c +index aa66e9f..d0e7fbb 100644 +--- a/htpdate.c ++++ b/htpdate.c +@@ -146,7 +146,7 @@ static void printlog( int is_error, char *format, ... ) { + } + + +-static long getHTTPdate( char *host, char *port, char *proxy, char *proxyport, char *httpversion, int ipversion, int when ) { ++static long getHTTPdate( char *host, char *port, char *proxy, char *proxyport, char *relpath, char *httpversion, int ipversion, int when ) { + int server_s; + int rc; + struct addrinfo hints, *res, *res0; +@@ -196,7 +196,7 @@ static long getHTTPdate( char *host, char *port, char *proxy, char *proxyport, c + Connection: close, allows the server the immediately close the + connection after sending the response. + */ +- snprintf(buffer, BUFFERSIZE, "HEAD %s/ HTTP/1.%s\r\nHost: %s\r\nUser-Agent: htpdate/"VERSION"\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nConnection: close\r\n\r\n", url, httpversion, host); ++ snprintf(buffer, BUFFERSIZE, "HEAD %s/%s HTTP/1.%s\r\nHost: %s\r\nUser-Agent: htpdate/"VERSION"\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nConnection: close\r\n\r\n", url, relpath, httpversion, host); + + /* Loop through the available canonical names */ + res = res0; +@@ -433,7 +433,7 @@ static void showhelp() { + puts("htpdate version "VERSION"\n\ + Usage: htpdate [-046abdhlqstxD] [-i pid file] [-m minpoll] [-M maxpoll]\n\ + [-p precision] [-P [:port]] [-u user[:group]]\n\ +- ...\n\n\ ++ [-r relative/path] ...\n\n\ + -0 HTTP/1.0 request\n\ + -4 Force IPv4 name resolution only\n\ + -6 Force IPv6 name resolution only\n\ +@@ -449,6 +449,7 @@ Usage: htpdate [-046abdhlqstxD] [-i pid file] [-m minpoll] [-M maxpoll]\n\ + -p precision (ms)\n\ + -P proxy server\n\ + -q query only, don't make time changes (default)\n\ ++ -r relative path to add the URL for the HTTP request\n\ + -s set time\n\ + -t turn off sanity time check\n\ + -u run daemon as user\n\ +@@ -530,6 +531,7 @@ static void runasdaemon( char *pidfile ) { + int main( int argc, char *argv[] ) { + char *host = NULL, *proxy = NULL, *proxyport = NULL; + char *port; ++ char *relpath = ""; + char *httpversion = DEFAULT_HTTP_VERSION; + char *pidfile = DEFAULT_PID_FILE; + char *user = NULL, *userstr = NULL, *group = NULL; +@@ -557,7 +559,7 @@ int main( int argc, char *argv[] ) { + + + /* Parse the command line switches and arguments */ +- while ( (param = getopt(argc, argv, "046abdhi:lm:p:qstu:wxDM:P:") ) != -1) ++ while ( (param = getopt(argc, argv, "046abdhi:lm:p:qr:stu:wxDM:P:") ) != -1) + switch( param ) { + + case '0': /* HTTP/1.0 */ +@@ -604,6 +606,9 @@ int main( int argc, char *argv[] ) { + break; + case 'q': /* query only */ + break; ++ case 'r': /* relative path for the URL */ ++ relpath = (char *)optarg; ++ break; + case 's': /* set time */ + setmode = 2; + break; +@@ -744,7 +749,7 @@ int main( int argc, char *argv[] ) { + if ( debug ) printlog( 0, "burst: %d try: %d when: %d", \ + burst + 1, MAX_ATTEMPT - try + 1, when ); + timestamp = getHTTPdate( host, port, proxy, proxyport,\ +- httpversion, ipversion, when ); ++ relpath, httpversion, ipversion, when ); + try--; + } while ( timestamp && try ); + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-waitforvalidhttpresp.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-waitforvalidhttpresp.patch new file mode 100644 index 0000000000..b98d6da530 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate-1.0.4-waitforvalidhttpresp.patch @@ -0,0 +1,57 @@ +diff -ruN htpdate/htpdate.c htpdate.new/htpdate.c +--- htpdate/htpdate.c 2010-05-19 11:27:53.000000000 -0700 ++++ htpdate.new/htpdate.c 2010-05-19 11:32:51.000000000 -0700 +@@ -75,6 +75,9 @@ + static int logmode = 0; + static time_t gmtoffset; + ++/* By default do not wait for valid http response to turn off settime */ ++static int waitfornw = 0; ++static int recvdvalidresp = 0; + + /* Insertion sort is more efficient (and smaller) than qsort for small lists */ + static void insertsort( int a[], int length ) { +@@ -263,6 +266,7 @@ + /* Look for the line that contains Date: */ + if ( (pdate = strstr(buffer, "Date: ")) != NULL ) { + strncpy(remote_time, pdate + 11, 24); ++ recvdvalidresp = 1; + + if ( strptime( remote_time, "%d %b %Y %T", &tm) != NULL) { + /* Web server timestamps are without daylight saving */ +@@ -406,6 +410,7 @@ + -s set time\n\ + -t turn off sanity time check\n\ + -u run daemon as user\n\ ++ -w wait for at least one valid http response before turning off set time\n\ + -x adjust kernel clock\n\ + host web server hostname or ip address (maximum of 16)\n\ + port port number (default 80 and 8080 for proxy server)\n"); +@@ -510,7 +515,7 @@ + + + /* Parse the command line switches and arguments */ +- while ( (param = getopt(argc, argv, "046abdhi:lm:p:qstu:xDM:P:") ) != -1) ++ while ( (param = getopt(argc, argv, "046abdhi:lm:p:qstu:wxDM:P:") ) != -1) + switch( param ) { + + case '0': /* HTTP/1.0 */ +@@ -586,6 +591,9 @@ + } + } + break; ++ case 'w': ++ waitfornw = 1; ++ break; + case 'x': /* adjust time and "kernel" */ + setmode = 3; + break; +@@ -815,7 +823,7 @@ + } + + /* After first poll cycle do not step through time, only adjust */ +- if ( setmode != 3 ) { ++ if ( setmode != 3 && (!waitfornw || ( waitfornw && recvdvalidresp ))) { + setmode = 1; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate.conf new file mode 100644 index 0000000000..32d8809162 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate.conf @@ -0,0 +1,12 @@ +# config file for /etc/init.d/htpdate + +# Add at least one http server to use: +SERVERS="www.google.com" + +# If you are using a proxy server to connect to the +# internet comment out the following line and insert the +# address and port of your proxy server. +#PROXY="-P :" + +# Set additional options, see 'man htpdate' for refernce +HTPDATE_OPTS="-D -u ntp:ntp -m 5 -s -t -r generate_204 -w" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate.init b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate.init new file mode 100644 index 0000000000..8d40d93ed3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/files/htpdate.init @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/files/htpdate.init,v 1.3 2006/08/24 02:23:18 vapier Exp $ + +depend() { + need net + use dns logger +} + +checkconfig() { + if [[ -z ${SERVERS} ]] ; then + eerror "You need to set at least one http server to use in /etc/conf.d/htpdate" + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting htpdate" + htpdate ${HTPDATE_OPTS} ${PROXY} ${SERVERS} + eend $? +} + +stop() { + ebegin "Stopping htpdate" + start-stop-daemon --stop --quiet --pidfile /var/run/htpdate.pid + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.0.ebuild new file mode 100644 index 0000000000..3b4380bac2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-1.0.0.ebuild,v 1.7 2008/12/07 11:06:55 vapier Exp $ + +inherit toolchain-funcs + +DESCRIPTION="Synchronize local workstation with time offered by remote webservers" +HOMEPAGE="http://www.clevervest.com/htp/" +SRC_URI="http://www.clevervest.com/htp/archive/c/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm hppa ~mips ppc s390 sh x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + gunzip htpdate.8.gz || die +} + +src_compile() { + emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die +} + +src_install() { + dosbin htpdate || die + doman htpdate.8 + dodoc README Changelog + + newconfd "${FILESDIR}"/htpdate.conf htpdate + newinitd "${FILESDIR}"/htpdate.init htpdate +} + +pkg_postinst() { + einfo "If you would like to run htpdate as a daemon set" + einfo "appropriate http servers in /etc/conf.d/htpdate!" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.4-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.4-r6.ebuild new file mode 120000 index 0000000000..6ce3480a68 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.4-r6.ebuild @@ -0,0 +1 @@ +htpdate-1.0.4.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.4.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.4.ebuild new file mode 100644 index 0000000000..a744caf35c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/htpdate-1.0.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-1.0.4.ebuild,v 1.7 2009/06/19 22:08:34 ranger Exp $ + +inherit toolchain-funcs eutils + +DESCRIPTION="Synchronize local workstation with time offered by remote webservers" +HOMEPAGE="http://www.clevervest.com/htp/" +SRC_URI="http://www.clevervest.com/htp/archive/c/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm hppa ~mips ppc ~ppc64 s390 sh x86" +IUSE="" + +DEPEND="" +RDEPEND="" + + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-waitforvalidhttpresp.patch" + epatch "${FILESDIR}/${P}-errorcheckhttpresp.patch" + epatch "${FILESDIR}/${P}-checkagainstbuildtime.patch" + epatch "${FILESDIR}/${P}-oob_date_read.patch" + epatch "${FILESDIR}/${P}-errorsarentsuccess.patch" + epatch "${FILESDIR}/${P}-64bit_limits.patch" + epatch "${FILESDIR}/${P}-relative_path.patch" + epatch "${FILESDIR}/${P}-all_headers.patch" + gunzip htpdate.8.gz || die +} + +src_compile() { + # Provide timestamp of when this was built, in number of seconds since + # 01 Jan 1970 in UTC time. + DATE=`date -u +%s` + # Set it back one day to avoid dealing with time zones. + DATE_OPT="-DBUILD_TIME_UTC=`expr $DATE - 86400`" + emake CFLAGS="-Wall $DATE_OPT ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die +} + +src_install() { + dosbin htpdate || die + doman htpdate.8 + dodoc README Changelog + + newconfd "${FILESDIR}"/htpdate.conf htpdate + newinitd "${FILESDIR}"/htpdate.init htpdate +} + +pkg_postinst() { + einfo "If you would like to run htpdate as a daemon set" + einfo "appropriate http servers in /etc/conf.d/htpdate!" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/metadata.xml new file mode 100644 index 0000000000..d593759d8e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/htpdate/metadata.xml @@ -0,0 +1,9 @@ + + + +no-herd + + dertobi123@gentoo.org + Tobias Scherbaum + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/Manifest new file mode 100644 index 0000000000..23bab0aca2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/Manifest @@ -0,0 +1 @@ +DIST iperf-2.0.4.tar.gz 248493 RMD160 b021cc5f2a05465ff04d4b914c94692489e49a9e SHA1 78b6b78789eccf42b5deb783bd8a92469d1383e1 SHA256 3b52f1c178d6a99c27114929d5469c009197d15379c967b329bafb956f397944 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf-so_linger.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf-so_linger.patch new file mode 100644 index 0000000000..7e69c9593f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf-so_linger.patch @@ -0,0 +1,107 @@ +Set SO_LINGER on client sockets so that we don't stop timing a +transfer until the server has acked our data. Without this, we end up +stopping timing while data is still in flight and, if there's enough +data in flight, we overreport bandwidth. + + +diff --git a/include/Client.hpp b/include/Client.hpp +index 1309a00..e1ab11c 100644 +--- a/include/Client.hpp ++++ b/include/Client.hpp +@@ -82,6 +82,9 @@ public: + // client connect + void Connect( ); + ++ // Closes underlying socket ++ void Close( ); ++ + protected: + thread_Settings *mSettings; + char* mBuf; +diff --git a/src/Client.cpp b/src/Client.cpp +index e0a6950..484a240 100644 +--- a/src/Client.cpp ++++ b/src/Client.cpp +@@ -104,13 +104,18 @@ Client::Client( thread_Settings *inSettings ) { + * ------------------------------------------------------------------- */ + + Client::~Client() { ++ Close(); ++ DELETE_ARRAY( mBuf ); ++} // end ~Client ++ ++void Client::Close() { + if ( mSettings->mSock != INVALID_SOCKET ) { + int rc = close( mSettings->mSock ); + WARN_errno( rc == SOCKET_ERROR, "close" ); + mSettings->mSock = INVALID_SOCKET; + } +- DELETE_ARRAY( mBuf ); +-} // end ~Client ++} ++ + + const double kSecs_to_usecs = 1e6; + const int kBytes_to_Bits = 8; +@@ -176,6 +181,8 @@ void Client::RunTCP( void ) { + } while ( ! (sInterupted || + (!mMode_Time && 0 >= mSettings->mAmount)) && canRead ); + ++ Close(); ++ + // stop timing + gettimeofday( &(reportstruct->packetTime), NULL ); + +@@ -193,7 +200,6 @@ void Client::RunTCP( void ) { + /* ------------------------------------------------------------------- + * Send data using the connected UDP/TCP socket, + * until a termination flag is reached. +- * Does not close the socket. + * ------------------------------------------------------------------- */ + + void Client::Run( void ) { +@@ -316,7 +322,9 @@ void Client::Run( void ) { + } while ( ! (sInterupted || + (mMode_Time && mEndTime.before( reportstruct->packetTime )) || + (!mMode_Time && 0 >= mSettings->mAmount)) && canRead ); +- ++ if (! isUDP( mSettings)) { ++ Close(); ++ } + // stop timing + gettimeofday( &(reportstruct->packetTime), NULL ); + CloseReport( mSettings->reporthdr, reportstruct ); +@@ -422,6 +430,9 @@ void Client::write_UDP_FIN( ) { + fd_set readSet; + struct timeval timeout; + ++ FAIL(mSettings->mSock == INVALID_SOCKET, ++ "Closed socket in write_UDP_FIN", mSettings); ++ + int count = 0; + while ( count < 10 ) { + count++; +diff --git a/src/PerfSocket.cpp b/src/PerfSocket.cpp +index 3ecdbe0..0a9a27a 100644 +--- a/src/PerfSocket.cpp ++++ b/src/PerfSocket.cpp +@@ -152,6 +152,19 @@ void SetSocketOptions( thread_Settings *inSettings ) { + (char*) &nodelay, len ); + WARN_errno( rc == SOCKET_ERROR, "setsockopt TCP_NODELAY" ); + } ++ ++#ifdef SO_LINGER ++ { ++ // Set SO_LINGER so that we don't stop timing before the ++ // far end acks our data. ++ struct linger linger = {1, 360}; // { linger, seconds to linger for} ++ int rc = setsockopt(inSettings->mSock, SOL_SOCKET, SO_LINGER, ++ &linger, sizeof(linger)); ++ WARN_errno( rc == SOCKET_ERROR, "setsockopt SO_LINGER"); ++ } ++#endif // SO_LINGER ++ ++ + #endif + } + } diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf.confd b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf.confd new file mode 100644 index 0000000000..adf238910a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf.confd @@ -0,0 +1,6 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.confd,v 1.1 2005/01/23 10:52:13 ka0ttic Exp $ + +# extra options (run iperf -h for a list of supported options) +IPERF_OPTS="--format Mbytes" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf.initd b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf.initd new file mode 100644 index 0000000000..968257cf97 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/files/iperf.initd @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.2 2005/01/23 10:52:13 ka0ttic Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting iperf server" + start-stop-daemon --start --quiet \ + --exec /usr/bin/iperf -- -s -D ${IPERF_OPTS} &>/dev/null + eend $? +} + +stop() { + ebegin "Shutting down iperf server" + start-stop-daemon --stop --quiet --exec /usr/bin/iperf + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/iperf-2.0.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/iperf-2.0.4-r1.ebuild new file mode 100644 index 0000000000..680464f0df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iperf/iperf-2.0.4-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.4.ebuild,v 1.11 2010/01/07 15:48:39 fauli Exp $ +inherit eutils + +DESCRIPTION="tool to measure IP bandwidth using UDP or TCP" +HOMEPAGE="http://iperf.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" +IUSE="ipv6 threads debug" + +DEPEND="" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-so_linger.patch +} + +src_compile() { + econf \ + $(use_enable ipv6) \ + $(use_enable threads) \ + $(use_enable debug debuginfo) + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc INSTALL README + dohtml doc/* + newinitd "${FILESDIR}"/${PN}.initd ${PN} || die + newconfd "${FILESDIR}"/${PN}.confd ${PN} || die +} + +pkg_postinst() { + echo + einfo "To run iperf in server mode, run:" + einfo " /etc/init.d/iperf start" + echo +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/ChangeLog b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/ChangeLog new file mode 100644 index 0000000000..0afb190f30 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/ChangeLog @@ -0,0 +1,352 @@ +# ChangeLog for net-misc/iputils +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.87 2010/09/14 01:58:24 vapier Exp $ + +*iputils-20100418-r1 (14 Sep 2010) + + 14 Sep 2010; Mike Frysinger +iputils-20100418-r1.ebuild, + +files/iputils-20100418-arping-broadcast.patch: + Add fix for arping broadcast handling #337049 by Aleksander Machniak. + + 06 Sep 2010; Brent Baude iputils-20100418.ebuild: + Marking iputils-20100418 ppc64 for bug 332527 + + 04 Sep 2010; Raúl Porcel iputils-20100418.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #332527 + + 31 Aug 2010; Mike Frysinger iputils-20100418.ebuild, + +files/iputils-20100418-openssl.patch, +files/iputils-20100418-so_mark.patch: + Make openssl support optional #335436 by Jorge Manuel B. S. Vicetto. Fix + building with older linux headers #335347 by Mark Wagner. + + 30 Aug 2010; Jeroen Roovers iputils-20100418.ebuild: + Stable for HPPA PPC (bug #332527). + + 29 Aug 2010; Markos Chandras + iputils-20100418.ebuild: + Stable on amd64 wrt bug #332527 + + 28 Aug 2010; Pawel Hajdan jr + iputils-20100418.ebuild: + x86 stable wrt security bug #332527 + + 22 Aug 2010; Luca Barbato + +files/iputils-20100418-proper-libs.patch, iputils-20100418.ebuild: + Fix cross compilation + + 14 Aug 2010; Diego E. Pettenò + iputils-20100418.ebuild: + Add missing dependency over sysfsutils (bug #332703, reported by Ryan + Hill, diagnosed by Lars Wendler). + +*iputils-20100418 (14 Aug 2010) + + 14 Aug 2010; Mike Frysinger +iputils-20100418.ebuild, + +files/iputils-20100418-aliasing.patch, + +files/iputils-20100418-makefile.patch, + +files/iputils-20100418-ping-CVE-2010-2529.patch, + +files/iputils-20100418-printf-size.patch: + Version bump #306101 by Andrew Brouwers. Add fix for ping CVE-2010-2529 + #332527 by Tim Sammut. + + 07 Jan 2010; Christian Faulhammer + iputils-20071127-r2.ebuild: + Transfer Prefix keywords + + 23 Aug 2009; Diego E. Pettenò + iputils-20070202.ebuild: + Drop to ~mips (for docbook cleanup). + +*iputils-20071127-r2 (10 Jun 2008) + + 10 Jun 2008; + +files/iputils-20071127-nonroot-floodping.patch, + +iputils-20071127-r2.ebuild: + Introduce USE=SECURITY_HAZARD which allows non-root users to floodping. + This can be useful in some IXP/ISP environments where 10Gbit fibre links + have to be tested. As the name suggests, it should not be enabled unless + you know it makes sense for your situation. + +*iputils-20071127-r1 (20 Apr 2008) + + 20 Apr 2008; Mike Frysinger + +files/iputils-20070202-idn.patch, +iputils-20071127-r1.ebuild: + Add support for USE=idn #218638 by Hanno Boeck. + + 20 Apr 2008; Mike Frysinger iputils-20071127.ebuild: + Mark amd64 stable. + + 31 Mar 2008; Sven Wegener iputils-20071127.ebuild: + Use mirror://gentoo/ for the manpages. + + 29 Mar 2008; Raúl Porcel iputils-20071127.ebuild: + alpha/ia64/sparc stable wrt #214734 + + 29 Mar 2008; Jeroen Roovers iputils-20071127.ebuild: + Stable for HPPA (bug #214734). + + 29 Mar 2008; Brent Baude ChangeLog: + Marking iputils-20071127 ppc for bug 214734 + + 29 Mar 2008; Brent Baude iputils-20071127.ebuild: + stable ppc64, bug 214734 + + 29 Mar 2008; Dawid Węgliński iputils-20071127.ebuild: + Stable on x86 (bug #214734) + + 29 Mar 2008; Mike Frysinger iputils-20071127.ebuild: + Fixup manpage install. + + 28 Mar 2008; Brent Baude iputils-20071127.ebuild: + stable ppc, bug 214734 + +*iputils-20071127 (26 Jan 2008) + + 26 Jan 2008; Mike Frysinger + +files/iputils-20071127-gcc34.patch, + +files/iputils-20071127-kernel-ifaddr.patch, +iputils-20071127.ebuild: + Version bump #207289. + + 28 Oct 2007; Mike Frysinger iputils-20070202.ebuild: + Block net-misc/rarpd #197110 by kouyu. + + 21 Oct 2007; nixnut iputils-20070202.ebuild: + Stable on ppc wrt bug 195915 + + 19 Oct 2007; Raúl Porcel iputils-20070202.ebuild: + alpha/ia64/sparc stable wrt #195915 + + 16 Oct 2007; Christoph Mende iputils-20070202.ebuild: + Stable on amd64 wrt bug #195915 + + 16 Oct 2007; Markus Rothe iputils-20070202.ebuild: + Stable on ppc64; bug #195915 + + 15 Oct 2007; Christian Faulhammer + iputils-20070202.ebuild: + stable x86, bug 195915 + + 15 Oct 2007; Jeroen Roovers iputils-20070202.ebuild: + Stable for HPPA (bug #195915). + + 15 Oct 2007; Mike Frysinger + +files/iputils-20070202-no-open-max.patch, iputils-20070202.ebuild: + Fix building with newer kernel headers that lack OPEN_MAX #195861 by Markus + Meier. + +*iputils-99999999 (30 Apr 2007) + + 30 Apr 2007; Mike Frysinger +iputils-99999999.ebuild: + Live git version. + + 09 Feb 2007; Alexander H. Færøy + iputils-20060512.ebuild: + Stable on MIPS; bug #165179 + + 05 Feb 2007; Chris Gianelloni + iputils-20060512.ebuild: + Stable on alpha wrt bug #165179. + + 05 Feb 2007; Jeroen Roovers iputils-20060512.ebuild: + Stable for HPPA (bug #165179). + + 04 Feb 2007; Steve Dibb iputils-20060512.ebuild: + amd64 stable, bug 165179 + + 04 Feb 2007; nixnut iputils-20060512.ebuild: + Stable on ppc wrt bug 165179 + + 04 Feb 2007; Markus Rothe iputils-20060512.ebuild: + Added ~ppc64; bug #165179 + + 03 Feb 2007; Torsten Veller iputils-20060512.ebuild: + Stable on x86 (#165179) + + 03 Feb 2007; Jason Wever iputils-20060512.ebuild: + Stable on SPARC wrt bug #165179. + +*iputils-20070202 (03 Feb 2007) + + 03 Feb 2007; Mike Frysinger + +files/iputils-20070202-makefile.patch, +iputils-20070202.ebuild: + Version bump. + + 21 Dec 2006; Mike Frysinger iputils-20060512.ebuild: + Only generate man pages for USE=doc until next release where they include + man pages #158660. + +*iputils-20060512 (20 Dec 2006) + + 20 Dec 2006; Mike Frysinger + +files/iputils-20060512-RFC3542.patch, +files/iputils-20060512-gcc4.patch, + +files/iputils-20060512-kernel-ifaddr.patch, + +files/iputils-20060512-linux-headers.patch, + +files/iputils-20060512-makefile.patch, +iputils-20060512.ebuild: + Version bump. + + 20 Aug 2006; Mike Frysinger + +files/iputils-021109-ipv6-updates.patch, iputils-021109-r3.ebuild: + Handle ipv6 define updates in newer kernels #134751 by Mekong. + + 08 Jun 2006; Mike Frysinger + +files/iputils-021109-gcc4.patch, iputils-021109-r3.ebuild: + Fixup a lot of incorrect type use. + + 06 May 2006; Mike Frysinger iputils-021109-r3.ebuild: + Generate a ping6.8 symlink to ping.8 as pointed out by Matej Stepanek #132010. + + 29 May 2005; iputils-021109-r3.ebuild: + echangelog - update package to use libc expanded variable elibc_uclibc vs + uclibc so USE=-* works + + 02 May 2005; Mike Frysinger + +files/iputils-021109-bindnow.patch, -files/021109-gcc34.patch, + +files/iputils-021109-gcc34.patch, iputils-021109-r3.ebuild: + Update the gcc-inline patch by Dave Stahl #80969 and fix lazy bindings for + setuid apps #77526. + + 18 Jan 2005; Mike Frysinger + -files/iputils-021109-pfkey.patch, iputils-021109-r3.ebuild: + Punt setkey since ipsec-tools exists now to handle it #78588. + + 03 Jan 2005; Mike Frysinger iputils-021109-r3.ebuild: + Restore USE=doc with an extra check in case we're in the middle of a + bootstrap #23156. + + 03 Jan 2005; Mike Frysinger iputils-021109-r3.ebuild: + Make sure linux/ipsec.h is usuable before building ipsec stuff #67569. + + 03 Jan 2005; Mike Frysinger + +files/021109-ipg-linux-2.6.patch, iputils-021109-r3.ebuild: + Add support to ipg for newer kernels #71756 by Christoph M. + + 06 Oct 2004; Travis Tilley + +files/iputils-021109-linux-udp-header.patch, iputils-021109-r3.ebuild: + fix compiling iputils using newer glibc snapshots + + 04 Aug 2004; Jon Portnoy iputils-021109-r3.ebuild : + Fix bison sed line. Bugs 59414 and 59191. + + 01 Jul 2004; Jon Hood iputils-020927.ebuild, + iputils-021109-r3.ebuild: + virtual/glibc -> virtual/libc + + 28 Jun 2004; Brandon Hale iputils-021109-r3.ebuild: + Stable on x86. + + 15 Jun 2004; iputils-021109-r3.ebuild, + files/iputils-20020927-no-ether_ntohost.patch: + added patch to allow iputils to compile with uclibc + + 14 Jun 2004; Aron Griffis iputils-020927.ebuild: + Fix use invocation + +*iputils-021109-r3 (24 Apr 2004) + + 24 Apr 2004; Mike Frysinger : + Remove racoon since (1) net-firewall/ipsec-tools installs this and + (2) the packaged racoon has a nice remote DoS #48847. + +*iputils-021109-r2 (07 Apr 2004) + + 09 Apr 2004; Travis Tilley iputils-021109-r1.ebuild: + marked stable on amd64 + + 08 Apr 2004; Joshua Kinard iputils-020927.ebuild: + Typo fix + + 07 Apr 2004; Mike Frysinger : + Clean up src_unpack and src_compile steps and add flex/openssl to DEPEND #38774. + + 23 Mar 2004; Daniel Ahlberg iputils-021109-r1.ebuild: + Closing #44555. + + 01 Mar 2004; Tom Gall iputils-021109-r1.ebuild: + make sure ppc64 has yacc dependancy + + 16 Jan 2004; Bartosch Pixa : + set ppc in keywords + + 13 Jan 2004; Ned Ludd iputils-021109-r1.ebuild: + Make ipv6 traceroute6, tracepath6 and ping6 made optional based on + ipv6 use flag. Prepare for x86 stable in the next day to two for + GRP release. + +*iputils-021109-r1 (13 Jan 2004) + + 12 Jan 2004; Luca Barbato iputils-021109.ebuild: + Marked ppc to match the linux-headers changes + + 08 Jan 2004; iputils-021109.ebuild: + Added 2.6 support; this now installs setkey and racoon if you have 2.6 + headers. + +*iputils-021109 (16 Nov 2003) + + 16 Nov 2003; Joshua Kinard iputils-021109.ebuild: + Version bump to a package that appears to be beta. It builds against 2.4.22+ + linux-headers, however, so worth testing. + +*iputils-020927 (03 Jan 2003) + + 21 Sep 2003; Mike Frysinger : + Add static support #29202. + + 12 Aug 2003; Jason Wever iputils-020927.ebuild: + Changed ~sparc keyword to sparc. + + 07 Jul 2003; Jan Seidel iputils-020927.ebuild: + Mark stable on mips + + 01 Jul 2003; Luca Barbato iputils-020927.ebuild: + Mark stable on ppc + + 24 Jun 2003; Aron Griffis iputils-020927.ebuild: + Mark stable on alpha + + 20 Jun 2003; Jon Portnoy iputils-020927.ebuild : + Temporarily yanked out all of the USE="doc" stuff until a more + permanent fix can be implemented. Was breaking emerge system for + users with doc in USE. + + 06 Apr 2003; Guy Martin iputils-020927.ebuild : + Marked stable on hppa. Changed depend sys-kernel/linux-headers to virtual/os-headers. + + 24 Feb 2003; Nicholas Wourms iputils-020927.ebuild : + Added testing mips keyword to the ebuild. + + 03 Jan 2003; Daniel Ahlberg iputils-020927.ebuild : + Version bump, found by Torgeir Hansen in #13052. + Made use of "doc" use variable to decide whetever to depend on openjade to + compile and install documentation. + + 03 Jan 2003; Daniel Ahlberg iputils-020124-r1.ebuild : + Changed where the bins are installed. Also made ping and traceroute tools setuid. + Closes #10090. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*iputils-020124-r1 (16 Aug 2002) + + 06 Apr 2003; Guy Martin iputils-020124-r1.ebuild : + Changed depend sys-kernel/linux-headers to virtual/os-headers. + + 12 Feb 2003; Guy Martin iputils-020124-r1.ebuild : + Added hppa to keywords. + + 24 Feb 2003; Nicholas Wourms iputils-020124-r1.ebuild : + Added stable mips keyword to the ebuild. + + 16 Aug 2002; Matthew Turk ChangeLog: + + Updated by enabling documentation; recent changes in DocBook ebuilds have + fixed the outstanding issues. + +*iputils-020124 (16 Jul 2002) + + 24 Feb 2003; Nicholas Wourms iputils-020124.ebuild : + Added stable mips keyword to the ebuild. + + 16 Jul 2002; Grant Goodyear ChangeLog : + + new package diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/Manifest new file mode 100644 index 0000000000..e850e6b573 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/Manifest @@ -0,0 +1,2 @@ +DIST iputils-s20100418-manpages.tar.bz2 21613 RMD160 cc42f88053c120f875b33c4f1567931b307aff85 SHA1 6522c2ccf713143de0fbc4e9d39497a2143a1713 SHA256 db42afbd393260cc72b53532b5812b35e377a38714e253fdcd7e2a6637b6a948 +DIST iputils-s20100418.tar.bz2 94237 RMD160 64ea24bb57ae2b8d666b4bf5d35c2d37236882d5 SHA1 eb787a65341d7bced3458766f7094b08f02b712f SHA256 d0e8cbe6ce6a484ffb81697425b3b933746882f6f1521ac71c5c88971cee7684 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch new file mode 100644 index 0000000000..e790d2b510 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch @@ -0,0 +1,24 @@ +--- iputils/rarpd.c.mps 2004-06-10 15:27:01.000000000 +0200 ++++ iputils/rarpd.c 2004-06-10 15:26:29.000000000 +0200 +@@ -42,7 +42,9 @@ int listen_arp; + char *ifname; + char *tftp_dir = "/etc/tftpboot"; + ++#ifndef __UCLIBC__ + extern int ether_ntohost(char *name, unsigned char *ea); ++#endif + void usage(void) __attribute__((noreturn)); + + struct iflink +@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex + 6, + }; + ++#ifndef __UCLIBC__ + if (ether_ntohost(ename, lladdr) != 0 || ++#else ++ if ( ++#endif + (hp = gethostbyname(ename)) == NULL) { + if (verbose) + syslog(LOG_INFO, "not found in /etc/ethers"); diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20060512-linux-headers.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20060512-linux-headers.patch new file mode 100644 index 0000000000..0281f85dce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20060512-linux-headers.patch @@ -0,0 +1,10 @@ +--- rdisc.c ++++ rdisc.c +@@ -34,6 +34,7 @@ + #include + /* Do not use "improved" glibc version! */ + #include ++#include + + #include + #include diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-idn.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-idn.patch new file mode 100644 index 0000000000..98dc3ce545 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-idn.patch @@ -0,0 +1,158 @@ +sniped from Fedora and made to not suck + +http://bugs.gentoo.org/218638 + +--- iputils-s20070202/Makefile ++++ iputils-s20070202/Makefile +@@ -22,6 +22,11 @@ + + all: $(TARGETS) + ++ifeq ($(IDN),yes) ++CPPFLAGS += -DIDN ++ping: LDLIBS += -lidn ++ping6: LDLIBS += -lidn ++endif + + tftpd: tftpd.o tftpsubs.o + ping: ping.o ping_common.o +--- iputils-s20070202/ping.c ++++ iputils-s20070202/ping.c +@@ -58,6 +58,11 @@ + * This program has to run SUID to ROOT to access the ICMP socket. + */ + ++#ifdef IDN ++#include ++#include ++#endif ++ + #include "ping_common.h" + + #include +@@ -122,6 +128,12 @@ + char *target, hnamebuf[MAXHOSTNAMELEN]; + char rspace[3 + 4 * NROUTES + 1]; /* record route space */ + ++#ifdef IDN ++ char *idn; ++ int rc = 0; ++ setlocale(LC_ALL, ""); ++#endif ++ + icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); + socket_errno = errno; + +@@ -242,13 +254,35 @@ + if (argc == 1) + options |= F_NUMERIC; + } else { ++#ifdef IDN ++ rc = idna_to_ascii_lz (target, &idn, 0); ++ if (rc == IDNA_SUCCESS) ++ hp = gethostbyname (idn); ++ else { ++ fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc); ++ exit(2); ++ } ++ free(idn); ++#else + hp = gethostbyname(target); ++#endif + if (!hp) { + fprintf(stderr, "ping: unknown host %s\n", target); + exit(2); + } + memcpy(&whereto.sin_addr, hp->h_addr, 4); ++#ifdef IDN ++ rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0); ++ if (rc == IDNA_SUCCESS) ++ strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1); ++ else { ++ fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", hp->h_name, rc); ++ exit(2); ++ } ++ free(idn); ++#else + strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1); ++#endif + hnamebuf[sizeof(hnamebuf) - 1] = 0; + hostname = hnamebuf; + } +--- iputils-s20070202/ping6.c ++++ iputils-s20070202/ping6.c +@@ -66,6 +66,13 @@ + * More statistics could always be gathered. + * This program has to run SUID to ROOT to access the ICMP socket. + */ ++#ifdef IDN ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++#include ++#endif ++ + #include "ping_common.h" + + #include +@@ -210,6 +216,10 @@ + int err, csum_offset, sz_opt; + static uint32_t scope_id = 0; + ++#ifdef IDN ++ setlocale(LC_ALL, ""); ++#endif ++ + icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); + socket_errno = errno; + +@@ -296,6 +306,9 @@ + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_INET6; ++#ifdef IDN ++ hints.ai_flags = AI_IDN; ++#endif + gai = getaddrinfo(target, NULL, &hints, &ai); + if (gai) { + fprintf(stderr, "unknown host\n"); +@@ -328,6 +341,9 @@ + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_INET6; ++#ifdef IDN ++ hints.ai_flags = AI_IDN; ++#endif + gai = getaddrinfo(target, NULL, &hints, &ai); + if (gai) { + fprintf(stderr, "unknown host\n"); +--- iputils-s20070202/ping_common.c ++++ iputils-s20070202/ping_common.c +@@ -1,3 +1,7 @@ ++#ifdef IDN ++#include ++#endif ++ + #include "ping_common.h" + #include + #include +@@ -97,6 +102,9 @@ + + void common_options(int ch) + { ++#ifdef IDN ++ setlocale(LC_ALL, "C"); ++#endif + switch(ch) { + case 'a': + options |= F_AUDIBLE; +@@ -222,6 +230,9 @@ + default: + abort(); + } ++#ifdef IDN ++ setlocale(LC_ALL, ""); ++#endif + } + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-makefile.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-makefile.patch new file mode 100644 index 0000000000..9426053a16 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-makefile.patch @@ -0,0 +1,35 @@ +--- Makefile ++++ Makefile +@@ -1,20 +1,17 @@ + # Path to parent kernel include files directory + LIBC_INCLUDE=/usr/include + +-DEFINES= +- + #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) + LDLIBS=-lresolv +-ADDLIB= + + #options if you compile with libc5, and without a bind>=4.9.4 libresolv + # NOT AVAILABLE. Please, use libresolv. + +-CC=gcc + # What a pity, all new gccs are buggy and -Werror does not work. Sigh. + #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror +-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g +-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) ++CFLAGS ?= -O2 -g ++CFLAGS += -Wstrict-prototypes -Wall ++CPPFLAGS += -D_GNU_SOURCE + + IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd + IPV6_TARGETS=tracepath6 traceroute6 ping6 +@@ -35,7 +32,7 @@ + rdisc_srv: rdisc_srv.o + + rdisc_srv.o: rdisc.c +- $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c + + + check-kernel: diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-no-open-max.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-no-open-max.patch new file mode 100644 index 0000000000..5013ba4fdc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20070202-no-open-max.patch @@ -0,0 +1,16 @@ +the OPEN_MAX define has been removed in newer kernel headers so use the +proper method of getting the value dynamically + +http://bugs.gentoo.org/195861 + +--- a/rdisc.c ++++ b/rdisc.c +@@ -247,7 +247,7 @@ void do_fork(void) + if ((pid=fork()) != 0) + exit(0); + +- for (t = 0; t < OPEN_MAX; t++) ++ for (t = 0; t < sysconf(_SC_OPEN_MAX); t++) + if (t != s) + close(t); + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-gcc34.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-gcc34.patch new file mode 100644 index 0000000000..36ea5424cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-gcc34.patch @@ -0,0 +1,134 @@ +iputils has a lot of ugly goto's that break when using +large gcc inline-limits. + +Fixes by Robert Moss and Dave Stahl +http://bugs.gentoo.org/49241 +http://bugs.gentoo.org/80969 + +--- iputils/tracepath.c ++++ iputils/tracepath.c +@@ -76,7 +76,7 @@ + int progress = -1; + int broken_router; + +-restart: ++ while (1) { + memset(&rcvbuf, -1, sizeof(rcvbuf)); + iov.iov_base = &rcvbuf; + iov.iov_len = sizeof(rcvbuf); +@@ -93,7 +93,7 @@ + if (res < 0) { + if (errno == EAGAIN) + return progress; +- goto restart; ++ continue; + } + + progress = mtu; +@@ -216,7 +216,7 @@ + perror("NET ERROR"); + return 0; + } +- goto restart; ++ } + } + + int probe_ttl(int fd, int ttl) +@@ -227,7 +227,6 @@ + + memset(sndbuf,0,mtu); + +-restart: + for (i=0; i<10; i++) { + int res; + +@@ -243,7 +242,8 @@ + if (res==0) + return 0; + if (res > 0) +- goto restart; ++ i = 0; ++ continue; + } + hisptr = (hisptr + 1)&63; + +--- iputils/tracepath6.c ++++ iputils/tracepath6.c +@@ -66,7 +66,7 @@ + int progress = -1; + int broken_router; + +-restart: ++ while (1) { + memset(&rcvbuf, -1, sizeof(rcvbuf)); + iov.iov_base = &rcvbuf; + iov.iov_len = sizeof(rcvbuf); +@@ -83,7 +83,7 @@ + if (res < 0) { + if (errno == EAGAIN) + return progress; +- goto restart; ++ continue; + } + + progress = 2; +@@ -222,34 +222,29 @@ + perror("NET ERROR"); + return 0; + } +- goto restart; ++ } + } + + int probe_ttl(int fd, int ttl) + { +- int i; ++ int i=0, res; + char sndbuf[mtu]; + struct probehdr *hdr = (struct probehdr*)sndbuf; + +-restart: +- +- for (i=0; i<10; i++) { +- int res; +- +- hdr->ttl = ttl; +- gettimeofday(&hdr->tv, NULL); +- if (send(fd, sndbuf, mtu-overhead, 0) > 0) +- break; +- res = recverr(fd, ttl); +- if (res==0) +- return 0; +- if (res > 0) +- goto restart; +- } +- +- if (i<10) { +- int res; +- ++ while (i<10) { ++ for (i=0; i<10; i++) { ++ hdr->ttl = ttl; ++ gettimeofday(&hdr->tv, NULL); ++ if (send(fd, sndbuf, mtu-overhead, 0) > 0) ++ break; ++ res = recverr(fd, ttl); ++ if (res==0) ++ return 0; ++ if (res > 0) { ++ i = 0; ++ continue; ++ } ++ } + data_wait(fd); + if (recv(fd, sndbuf, sizeof(sndbuf), MSG_DONTWAIT) > 0) { + printf("%2d?: reply received 8)\n", ttl); +@@ -257,7 +252,7 @@ + } + res = recverr(fd, ttl); + if (res == 1) +- goto restart; ++ continue; + return res; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-infiniband.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-infiniband.patch new file mode 100644 index 0000000000..2bf06a2045 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-infiniband.patch @@ -0,0 +1,280 @@ +Otherwise same as Fedora patch except for the Makefile part + +http://bugs.gentoo.org/show_bug.cgi?id=377687 +http://pkgs.fedoraproject.org/gitweb/?p=iputils.git;a=blob_plain;f=iputils-20071127-infiniband.patch;hb=HEAD + +--- arping.c ++++ arping.c +@@ -32,8 +32,6 @@ + #include + #include + +-#include +- + #include "SNAPSHOT.h" + + static void usage(void) __attribute__((noreturn)); +@@ -52,14 +50,22 @@ int unicasting; + int s; + int broadcast_only; + +-struct sockaddr_storage me; +-struct sockaddr_storage he; ++struct sockaddr_ll *me=NULL; ++struct sockaddr_ll *he=NULL; + + struct timeval start, last; + + int sent, brd_sent; + int received, brd_recv, req_recv; + ++#define SYSFS_MNT_PATH "/sys" ++#define SYSFS_CLASS "class" ++#define SYSFS_NET "net" ++#define SYSFS_BROADCAST "broadcast" ++#define SYSFS_PATH_ENV "SYSFS_PATH" ++#define SYSFS_PATH_LEN 256 ++#define SOCKADDR_LEN (2 * sizeof(struct sockaddr_ll)) ++ + #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \ + ((tv1).tv_usec-(tv2).tv_usec)/1000 ) + +@@ -166,6 +172,10 @@ void finish(void) + printf("\n"); + fflush(stdout); + } ++ ++ free(me); ++ free(he); ++ + if (dad) + exit(!!received); + if (unsolicited) +@@ -186,8 +196,7 @@ void catcher(void) + finish(); + + if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { +- send_pack(s, src, dst, +- (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he); ++ send_pack(s, src, dst, me, he); + if (count == 0 && unsolicited) + finish(); + } +@@ -234,7 +243,7 @@ int recv_pack(unsigned char *buf, int le + return 0; + if (ah->ar_pln != 4) + return 0; +- if (ah->ar_hln != ((struct sockaddr_ll *)&me)->sll_halen) ++ if (ah->ar_hln != me->sll_halen) + return 0; + if (len < sizeof(*ah) + 2*(4 + ah->ar_hln)) + return 0; +@@ -245,7 +254,7 @@ int recv_pack(unsigned char *buf, int le + return 0; + if (src.s_addr != dst_ip.s_addr) + return 0; +- if (memcmp(p+ah->ar_hln+4, ((struct sockaddr_ll *)&me)->sll_addr, ah->ar_hln)) ++ if (memcmp(p+ah->ar_hln+4, me->sll_addr, ah->ar_hln)) + return 0; + } else { + /* DAD packet was: +@@ -263,7 +272,7 @@ int recv_pack(unsigned char *buf, int le + */ + if (src_ip.s_addr != dst.s_addr) + return 0; +- if (memcmp(p, ((struct sockaddr_ll *)&me)->sll_addr, ((struct sockaddr_ll *)&me)->sll_halen) == 0) ++ if (memcmp(p, me->sll_addr, me->sll_halen) == 0) + return 0; + if (src.s_addr && src.s_addr != dst_ip.s_addr) + return 0; +@@ -279,7 +288,7 @@ int recv_pack(unsigned char *buf, int le + printf("for %s ", inet_ntoa(dst_ip)); + s_printed = 1; + } +- if (memcmp(p+ah->ar_hln+4, ((struct sockaddr_ll *)&me)->sll_addr, ah->ar_hln)) { ++ if (memcmp(p+ah->ar_hln+4, me->sll_addr, ah->ar_hln)) { + if (!s_printed) + printf("for "); + printf("["); +@@ -305,40 +314,67 @@ int recv_pack(unsigned char *buf, int le + if (quit_on_reply) + finish(); + if(!broadcast_only) { +- memcpy(((struct sockaddr_ll *)&he)->sll_addr, p, ((struct sockaddr_ll *)&me)->sll_halen); ++ memcpy(he->sll_addr, p, me->sll_halen); + unicasting=1; + } + return 1; + } + +-void set_device_broadcast(char *device, unsigned char *ba, size_t balen) ++int get_sysfs_mnt_path(char *mnt_path, size_t len) + { +- struct sysfs_class_device *dev; +- struct sysfs_attribute *brdcast; +- unsigned char *p; +- int ch; ++ const char *sysfs_path_env; ++ int pth_len=0; + +- dev = sysfs_open_class_device("net", device); +- if (!dev) { +- perror("sysfs_open_class_device(net)"); +- exit(2); +- } ++ if (len == 0 || mnt_path == NULL) ++ return -1; + +- brdcast = sysfs_get_classdev_attr(dev, "broadcast"); +- if (!brdcast) { +- perror("sysfs_get_classdev_attr(broadcast)"); +- exit(2); +- } ++ /* possible overrride of real mount path */ ++ sysfs_path_env = getenv(SYSFS_PATH_ENV); ++ memset(mnt_path, 0, len); ++ strncpy(mnt_path, ++ sysfs_path_env != NULL ? sysfs_path_env : SYSFS_MNT_PATH, ++ len-1); + +- if (sysfs_read_attribute(brdcast)) { +- perror("sysfs_read_attribute"); +- exit(2); +- } ++ if ((pth_len = strlen(mnt_path)) > 0 && mnt_path[pth_len-1] == '/') ++ mnt_path[pth_len-1] = '\0'; ++ ++ return 0; ++} ++ ++int make_sysfs_broadcast_path(char *broadcast_path, size_t len) ++{ ++ char mnt_path[SYSFS_PATH_LEN]; ++ ++ if (get_sysfs_mnt_path(mnt_path, len) != 0) ++ return -1; + +- for (p = ba, ch = 0; p < ba + balen; p++, ch += 3) +- *p = strtoul(brdcast->value + ch, NULL, 16); ++ snprintf(broadcast_path, len, ++ "%s/" SYSFS_CLASS "/" SYSFS_NET "/%s/" SYSFS_BROADCAST, ++ mnt_path, device); + +- return; ++ return 0; ++} ++ ++char * read_sysfs_broadcast(char *brdcast_path) ++{ ++ int fd; ++ int len_to_read; ++ char *brdcast = NULL; ++ ++ if ((fd = open(brdcast_path, O_RDONLY)) > -1) { ++ len_to_read = lseek(fd, 0L, SEEK_END); ++ if ((brdcast = malloc(len_to_read+1)) != NULL) { ++ lseek(fd, 0L, SEEK_SET); ++ memset(brdcast, 0, len_to_read+1); ++ if (read(fd, brdcast, len_to_read) == -1) { ++ free(brdcast); ++ brdcast = NULL; ++ } ++ } ++ close(fd); ++ } ++ ++ return brdcast; + } + + int +@@ -356,6 +392,17 @@ main(int argc, char **argv) + exit(-1); + } + ++ me = malloc(SOCKADDR_LEN); ++ if (!me) { ++ fprintf(stderr, "arping: could not allocate memory\n"); ++ exit(1); ++ } ++ he = malloc(SOCKADDR_LEN); ++ if (!he) { ++ fprintf(stderr, "arping: could not allocate memory\n"); ++ exit(1); ++ } ++ + while ((ch = getopt(argc, argv, "h?bfDUAqc:w:s:I:V")) != EOF) { + switch(ch) { + case 'b': +@@ -504,34 +551,51 @@ main(int argc, char **argv) + close(probe_fd); + }; + +- ((struct sockaddr_ll *)&me)->sll_family = AF_PACKET; +- ((struct sockaddr_ll *)&me)->sll_ifindex = ifindex; +- ((struct sockaddr_ll *)&me)->sll_protocol = htons(ETH_P_ARP); +- if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) { ++ me->sll_family = AF_PACKET; ++ me->sll_ifindex = ifindex; ++ me->sll_protocol = htons(ETH_P_ARP); ++ if (bind(s, (struct sockaddr*)me, SOCKADDR_LEN) == -1) { + perror("bind"); + exit(2); + } + + if (1) { +- socklen_t alen = sizeof(me); +- if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) { ++ socklen_t alen = SOCKADDR_LEN; ++ if (getsockname(s, (struct sockaddr*)me, &alen) == -1) { + perror("getsockname"); + exit(2); + } + } +- if (((struct sockaddr_ll *)&me)->sll_halen == 0) { ++ if (me->sll_halen == 0) { + if (!quiet) + printf("Interface \"%s\" is not ARPable (no ll address)\n", device); + exit(dad?0:2); + } + +- he = me; ++ memcpy(he, me, SOCKADDR_LEN); + + #if 1 +- set_device_broadcast(device, ((struct sockaddr_ll *)&he)->sll_addr, +- ((struct sockaddr_ll *)&he)->sll_halen); ++ char brdcast_path[SYSFS_PATH_LEN]; ++ char *brdcast_val=NULL; ++ char *next_ch; ++ ++ if (make_sysfs_broadcast_path(brdcast_path, sizeof brdcast_path) != 0) { ++ perror("sysfs attribute broadcast"); ++ exit(2); ++ } ++ ++ if ((brdcast_val = read_sysfs_broadcast(brdcast_path)) == NULL) { ++ perror("sysfs read broadcast value"); ++ exit(2); ++ } ++ ++ for (ch=0; chsll_halen; ch++) { ++ he->sll_addr[ch] = strtol(brdcast_val + (ch*3), &next_ch, 16); ++ } ++ ++ free(brdcast_val); + #else +- memset(((struct sockaddr_ll *)&he)->sll_addr, -1, ((struct sockaddr_ll *)&he)->sll_halen); ++ memset(he->sll_addr, -1, he->sll_halen); + #endif + + if (!quiet) { +--- Makefile ++++ Makefile +@@ -28,7 +28,6 @@ + ping6: LDLIBS += -lidn + endif + +-arping: LDLIBS += -lsysfs + ping6: LDLIBS += -lresolv -lcrypto + + tftpd: tftpd.o tftpsubs.o diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-kernel-ifaddr.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-kernel-ifaddr.patch new file mode 100644 index 0000000000..af5587fa6f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-kernel-ifaddr.patch @@ -0,0 +1,55 @@ +--- rarpd.c ++++ rarpd.c +@@ -55,10 +55,10 @@ struct iflink + unsigned char lladdr[16]; + char name[IFNAMSIZ]; +- struct ifaddr *ifa_list; ++ struct kern_ifaddr *ifa_list; + } *ifl_list; + +-struct ifaddr ++struct kern_ifaddr + { +- struct ifaddr *next; ++ struct kern_ifaddr *next; + __u32 prefix; + __u32 mask; +@@ -92,5 +92,5 @@ void load_if(void) + struct ifreq *ifrp, *ifend; + struct iflink *ifl; +- struct ifaddr *ifa; ++ struct kern_ifaddr *ifa; + struct ifconf ifc; + struct ifreq ibuf[256]; +@@ -183,5 +183,5 @@ void load_if(void) + if (mask == 0 || prefix == 0) + continue; +- ifa = (struct ifaddr*)malloc(sizeof(*ifa)); ++ ifa = (struct kern_ifaddr*)malloc(sizeof(*ifa)); + memset(ifa, 0, sizeof(*ifa)); + ifa->local = addr; +@@ -239,8 +239,8 @@ int bootable(__u32 addr) + } + +-struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) ++struct kern_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) + { + struct iflink *ifl; +- struct ifaddr *ifa; ++ struct kern_ifaddr *ifa; + int retry = 0; + int i; +@@ -298,5 +298,5 @@ struct rarp_map *rarp_lookup(int ifindex + if (r == NULL) { + if (hatype == ARPHRD_ETHER && halen == 6) { +- struct ifaddr *ifa; ++ struct kern_ifaddr *ifa; + struct hostent *hp; + char ename[256]; +@@ -371,5 +371,5 @@ int put_myipaddr(unsigned char **ptr_p, + __u32 laddr = 0; + struct iflink *ifl; +- struct ifaddr *ifa; ++ struct kern_ifaddr *ifa; + + for (ifl=ifl_list; ifl; ifl = ifl->next) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch new file mode 100644 index 0000000000..cae87791dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch @@ -0,0 +1,11 @@ +--- iputils-s20071127/ping_common.h.orig 2008-06-10 11:16:06.000000000 +0100 ++++ iputils-s20071127/ping_common.h 2008-06-10 11:16:18.000000000 +0100 +@@ -28,7 +28,7 @@ + + #define MAXWAIT 10 /* max seconds to wait for response */ + #define MININTERVAL 10 /* Minimal interpacket gap */ +-#define MINUSERINTERVAL 200 /* Minimal allowed interval for non-root */ ++#define MINUSERINTERVAL 0 /* Minimal allowed interval for non-root */ + + #define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a)) + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-aliasing.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-aliasing.patch new file mode 100644 index 0000000000..48fb4d3bc2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-aliasing.patch @@ -0,0 +1,93 @@ +From f36fbe8c85223def663f46499d0b6b9a75939aaa Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 14 Aug 2010 01:34:13 -0400 +Subject: [PATCH] fix up strict-aliasing warnings + +Current build of some tools results in gcc warning about strict-aliasing +violations. So change those freaky casts to memcpy's. When the pointer +types work out, gcc will optimize this away anyways. + +Signed-off-by: Mike Frysinger +--- + ping6.c | 13 +++++++++---- + tracepath.c | 2 +- + tracepath6.c | 2 +- + 3 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/ping6.c b/ping6.c +index c5ff881..86f9216 100644 +--- a/ping6.c ++++ b/ping6.c +@@ -1104,18 +1104,21 @@ int build_niquery(__u8 *_nih) + { + struct ni_hdr *nih; + int cc; ++ __u16 this_nonce; + + nih = (struct ni_hdr *)_nih; + nih->ni_cksum = 0; + +- CLR(ntohs((*(__u16*)(nih->ni_nonce))) % mx_dup_ck); ++ memcpy(&this_nonce, &nih->ni_nonce, sizeof(this_nonce)); ++ CLR(ntohs(this_nonce) % mx_dup_ck); + + nih->ni_type = ICMPV6_NI_QUERY; + cc = sizeof(*nih); + datalen = 0; + + memcpy(nih->ni_nonce, ni_nonce, sizeof(nih->ni_nonce)); +- *(__u16*)(nih->ni_nonce) = htons(ntransmitted + 1); ++ this_nonce = htons(ntransmitted + 1); ++ memcpy(&nih->ni_nonce, &this_nonce, sizeof(this_nonce)); + + nih->ni_code = ni_subject_type; + nih->ni_qtype = htons(ni_query); +@@ -1331,7 +1334,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) + #endif + if (c->cmsg_len < CMSG_LEN(sizeof(int))) + continue; +- hops = *(int*)CMSG_DATA(c); ++ memcpy(&hops, CMSG_DATA(c), sizeof(int)); + } + } + +@@ -1355,7 +1358,9 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) + return 0; + } else if (icmph->icmp6_type == ICMPV6_NI_REPLY) { + struct ni_hdr *nih = (struct ni_hdr *)icmph; +- __u16 seq = ntohs(*(__u16 *)nih->ni_nonce); ++ __u16 seq; ++ memcpy(&seq, &nih->ni_nonce, sizeof(seq)); ++ seq = ntohs(seq); + if (memcmp(&nih->ni_nonce[2], &ni_nonce[2], sizeof(ni_nonce) - sizeof(__u16))) + return 1; + if (gather_statistics((__u8*)icmph, sizeof(*icmph), cc, +diff --git a/tracepath.c b/tracepath.c +index ca84a69..0a14b1b 100644 +--- a/tracepath.c ++++ b/tracepath.c +@@ -142,7 +142,7 @@ restart: + if (cmsg->cmsg_type == IP_RECVERR) { + e = (struct sock_extended_err *) CMSG_DATA(cmsg); + } else if (cmsg->cmsg_type == IP_TTL) { +- rethops = *(int*)CMSG_DATA(cmsg); ++ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int)); + } else { + printf("cmsg:%d\n ", cmsg->cmsg_type); + } +diff --git a/tracepath6.c b/tracepath6.c +index 5c2db8f..77a3563 100644 +--- a/tracepath6.c ++++ b/tracepath6.c +@@ -170,7 +170,7 @@ restart: + #ifdef IPV6_2292HOPLIMIT + case IPV6_2292HOPLIMIT: + #endif +- rethops = *(int*)CMSG_DATA(cmsg); ++ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int)); + break; + default: + printf("cmsg6:%d\n ", cmsg->cmsg_type); +-- +1.7.1.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-arping-broadcast.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-arping-broadcast.patch new file mode 100644 index 0000000000..a5c906346b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-arping-broadcast.patch @@ -0,0 +1,50 @@ +http://bugs.gentoo.org/337049 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585591 + +From: Jesper Dangaard Brouer +Subject: [PATCH] iputils: arping fails to set correct broadcast address + +From: Paul Martin + +There seems to have been introduced a bug in iputils release s20100418. + +This patch is based upon git://www.linux-ipv6.org/gitroot/iputils.git +(git commit fe342ca3148) + +The regression is caused by commit 56018bf1b3 + arping: Support link-layer type with larger link-layer address. + +As reported by: Paul Martin in Debian bugreport #585591. + + There's a logic error in the function that parses the interface's + broadcast address, causing it not to fill the broadcast address array + correctly. + +Please apply. + +Reported-by: Paul Martin +Tested-by: Jesper Dangaard Brouer +Signed-off-by: Jesper Dangaard Brouer +--- + arping.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arping.c b/arping.c +index 9bd6927..2613a12 100644 +--- a/arping.c ++++ b/arping.c +@@ -336,7 +336,7 @@ void set_device_broadcast(char *device, unsigned char *ba, size_t balen) + } + + for (p = ba, ch = 0; p < ba + balen; p++, ch += 3) +- *p++ = strtoul(brdcast->value + ch * 3, NULL, 16); ++ *p = strtoul(brdcast->value + ch, NULL, 16); + + return; + } + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-makefile.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-makefile.patch new file mode 100644 index 0000000000..50a0e81c13 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-makefile.patch @@ -0,0 +1,35 @@ +--- Makefile ++++ Makefile +@@ -1,20 +1,17 @@ + # Path to parent kernel include files directory + LIBC_INCLUDE=/usr/include + +-DEFINES= +- + #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) + LDLIBS= +-ADDLIB= + + #options if you compile with libc5, and without a bind>=4.9.4 libresolv + # NOT AVAILABLE. Please, use libresolv. + +-CC=gcc + # What a pity, all new gccs are buggy and -Werror does not work. Sigh. + #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror +-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g +-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) ++CFLAGS ?= -O2 -g ++CFLAGS += -Wstrict-prototypes -Wall ++CPPFLAGS += -D_GNU_SOURCE + + IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd + IPV6_TARGETS=tracepath6 traceroute6 ping6 +@@ -35,7 +32,7 @@ + rdisc_srv: rdisc_srv.o + + rdisc_srv.o: rdisc.c +- $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c + + + check-kernel: diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-openssl.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-openssl.patch new file mode 100644 index 0000000000..db09ac0e65 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-openssl.patch @@ -0,0 +1,35 @@ +make openssl optional + +https://bugs.gentoo.org/335436 + +--- ping6.c ++++ ping6.c +@@ -161,7 +161,9 @@ + + static int icmp_sock; + ++#ifdef HAVE_OPENSSL + #include ++#endif + + /* Node Information query */ + int ni_query = -1; +@@ -478,6 +480,7 @@ + + char *ni_groupaddr(const char *name) + { ++#ifdef HAVE_OPENSSL + MD5_CTX ctxt; + __u8 digest[16]; + static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ]; +@@ -518,6 +521,10 @@ + if (q) + strcat(nigroup_buf, q); + return nigroup_buf; ++#else ++ fprintf(stderr, "ping6: function not available; openssl disabled\n"); ++ exit(1); ++#endif + } + + int main(int argc, char *argv[]) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-ping-CVE-2010-2529.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-ping-CVE-2010-2529.patch new file mode 100644 index 0000000000..e9ffb04e85 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-ping-CVE-2010-2529.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/332527 + +--- iputils-s20100418/ping.c ++++ iputils-s20100418/ping.c +@@ -1083,7 +1083,7 @@ void pr_options(unsigned char * cp, int + i = j; + i -= IPOPT_MINOFF; + if (i <= 0) +- continue; ++ break; + if (i == old_rrlen + && !strncmp((char *)cp, old_rr, i) + && !(options & F_FLOOD)) { +@@ -1120,7 +1120,7 @@ void pr_options(unsigned char * cp, int + i = j; + i -= 5; + if (i <= 0) +- continue; ++ break; + flags = *++cp; + printf("\nTS: "); + cp++; diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-printf-size.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-printf-size.patch new file mode 100644 index 0000000000..edde65b591 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-printf-size.patch @@ -0,0 +1,62 @@ +From 6ccd3b91c18d8b13bc468ef962a9ef9dfc6c4515 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 14 Aug 2010 01:16:42 -0400 +Subject: [PATCH] tracepath: re-use printf return in print_host + +The printf funcs take an int for field widths, not a size_t. Also, since +the printf funcs already return the length of chars displayed, use that +value instead of re-calculating the length with strlen. + +Signed-off-by: Mike Frysinger +--- + tracepath.c | 11 ++++------- + tracepath6.c | 11 ++++------- + 2 files changed, 8 insertions(+), 14 deletions(-) + +diff --git a/tracepath.c b/tracepath.c +index 81c22e9..ca84a69 100644 +--- a/tracepath.c ++++ b/tracepath.c +@@ -68,13 +68,10 @@ void data_wait(int fd) + + void print_host(const char *a, const char *b, int both) + { +- size_t plen = 0; +- printf("%s", a); +- plen = strlen(a); +- if (both) { +- printf(" (%s)", b); +- plen += strlen(b) + 3; +- } ++ int plen; ++ plen = printf("%s", a); ++ if (both) ++ plen += printf(" (%s)", b); + if (plen >= HOST_COLUMN_SIZE) + plen = HOST_COLUMN_SIZE - 1; + printf("%*s", HOST_COLUMN_SIZE - plen, ""); +diff --git a/tracepath6.c b/tracepath6.c +index 5cc7424..5c2db8f 100644 +--- a/tracepath6.c ++++ b/tracepath6.c +@@ -80,13 +80,10 @@ void data_wait(int fd) + + void print_host(const char *a, const char *b, int both) + { +- size_t plen = 0; +- printf("%s", a); +- plen = strlen(a); +- if (both) { +- printf(" (%s)", b); +- plen += strlen(b) + 3; +- } ++ int plen; ++ plen = printf("%s", a); ++ if (both) ++ plen += printf(" (%s)", b); + if (plen >= HOST_COLUMN_SIZE) + plen = HOST_COLUMN_SIZE - 1; + printf("%*s", HOST_COLUMN_SIZE - plen, ""); +-- +1.7.1.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-proper-libs.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-proper-libs.patch new file mode 100644 index 0000000000..96e529b1b8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-proper-libs.patch @@ -0,0 +1,20 @@ +http://bugs.gentoo.org/332703 + +--- Makefile ++++ Makefile +@@ -28,10 +28,13 @@ + ping6: LDLIBS += -lidn + endif + ++arping: LDLIBS += -lsysfs ++ping6: LDLIBS += -lresolv -lcrypto ++ + tftpd: tftpd.o tftpsubs.o +-arping: arping.o -lsysfs ++arping: arping.o + ping: ping.o ping_common.o +-ping6: ping6.o ping_common.o -lresolv -lcrypto ++ping6: ping6.o ping_common.o + ping.o ping6.o ping_common.o: ping_common.h + tftpd.o tftpsubs.o: tftp.h + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-so_mark.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-so_mark.patch new file mode 100644 index 0000000000..ad92254d6f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/files/iputils-20100418-so_mark.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/335347 + +fix building with older linux headers that don't define SO_MARK + +--- ping_common.c ++++ ping_common.c +@@ -485,6 +485,7 @@ + fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n"); + } + #endif ++#ifdef SO_MARK + if (options & F_MARK) { + if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK, + &mark, sizeof(mark)) == -1) { +@@ -494,6 +495,7 @@ + fprintf(stderr, "Warning: Failed to set mark %d\n", mark); + } + } ++#endif + + /* Set some SNDTIMEO to prevent blocking forever + * on sends, when device is too slow or stalls. Just put limit diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/iputils-20100418-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/iputils-20100418-r3.ebuild new file mode 100644 index 0000000000..f6f8768c05 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/iputils-20100418-r3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20100418-r1.ebuild,v 1.1 2010/09/14 01:58:24 vapier Exp $ + +inherit flag-o-matic eutils toolchain-funcs + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils" +SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 + mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" +IUSE="doc extras idn ipv6 SECURITY_HAZARD ssl static" + +RDEPEND="extras? ( !net-misc/rarpd ) + ssl? ( dev-libs/openssl ) + idn? ( net-dns/libidn )" +DEPEND="${RDEPEND} + virtual/os-headers" + +S=${WORKDIR}/${PN}-s${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch + epatch "${FILESDIR}"/${PN}-20100418-arping-broadcast.patch #337049 + epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436 + epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347 + epatch "${FILESDIR}"/${PN}-20100418-makefile.patch + epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703 + epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch + epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch + epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch + epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638 + epatch "${FILESDIR}"/${PN}-20100418-ping-CVE-2010-2529.patch #332527 + epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687 + use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch + use static && append-ldflags -static + use ssl && append-cppflags -DHAVE_OPENSSL + use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile + export IDN=$(use idn && echo yes) +} + +src_compile() { + tc-export CC + emake || die "make main failed" +} + +src_install() { + into / + dobin ping || die "ping" + use ipv6 && dobin ping6 + dosbin arping || die "arping" + into /usr + dosbin tracepath || die "tracepath" + use ipv6 && dosbin trace{path,route}6 + use extras && \ + { dosbin clockdiff rarpd rdisc ipg tftpd || die "misc sbin"; } + + fperms 4711 /bin/ping + use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6 + + dodoc INSTALL RELNOTES + use ipv6 \ + && dosym ping.8 /usr/share/man/man8/ping6.8 \ + || rm -f doc/*6.8 + rm -f doc/setkey.8 + doman doc/*.8 + + use doc && dohtml doc/*.html +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/metadata.xml new file mode 100644 index 0000000000..0cfd41eb8a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/iputils/metadata.xml @@ -0,0 +1,8 @@ + + + + base-system + + Allow non-root users to flood (ping -f). This is generally a very bad idea. + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/ChangeLog b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/ChangeLog new file mode 100644 index 0000000000..56a3e51ccd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/ChangeLog @@ -0,0 +1,36 @@ +# ChangeLog for net-misc/mobile-broadband-provider-info +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/ChangeLog,v 1.7 2010/10/19 19:09:09 ranger Exp $ + + 19 Oct 2010; Brent Baude + mobile-broadband-provider-info-20100510.ebuild: + Marking mobile-broadband-provider-info-20100510 ppc for bug 321593 + + 20 Aug 2010; Markos Chandras + mobile-broadband-provider-info-20100510.ebuild: + Stable on amd64 wrt bug #321593 + + 13 Aug 2010; Christian Faulhammer + mobile-broadband-provider-info-20100510.ebuild: + stable x86, bug 321593 + +*mobile-broadband-provider-info-20100510 (07 Jul 2010) + + 07 Jul 2010; Nirbheek Chauhan + +mobile-broadband-provider-info-20100510.ebuild: + Bump to 20100510, adds new broadband providers + + 10 Mar 2010; Joseph Jezak + mobile-broadband-provider-info-20100122.ebuild: + Marked ~ppc. + +*mobile-broadband-provider-info-20100122 (25 Jan 2010) + + 25 Jan 2010; Nirbheek Chauhan + +mobile-broadband-provider-info-20100122.ebuild, metadata.xml: + Bump to 20100122, use gnome.org for SRC_URI, add myself to metadata.xml + + 02 Jul 2009; Robert Piasek + mobile-broadband-provider-info-20090602.ebuild, +metadata.xml: + New ebuild for mobole mroadband providers info + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/Manifest new file mode 100644 index 0000000000..79f8e5f8d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/Manifest @@ -0,0 +1,4 @@ +DIST mobile-broadband-provider-info-20090602.tar.bz2 59018 RMD160 b55e42de07ce9f20103e5fda63a8ac4434ee2076 SHA1 eae262e37cd95a029e33cb9f312c1c0b829cc358 SHA256 e2065e338d4057786c6697d9a0d745ba60d12fbe8f4fc13a418616890113310a +DIST mobile-broadband-provider-info-20100122.tar.bz2 63811 RMD160 96d82f86415ef6b483c9afe8c0b8dc0e74ccfc35 SHA1 b16b2e635c25bbd2ed150d9328a5e1521dbfa7ca SHA256 4aed0c48306b10ab5a5758c5e547fc9bee2c9857f854b442cb6dc49874f3d620 +DIST mobile-broadband-provider-info-20100510.tar.bz2 65091 RMD160 b7f03d4530338fbce63672076aa64ef133047cbf SHA1 0741b248fb96d170271ade13cb72d43f02ff2af3 SHA256 2effc6bab2214620400e1252a1dfc9d13d00bf446e4cfd50e9d9e31542053b51 +DIST mobile-broadband-provider-info-20110218.tar.bz2 68955 RMD160 0234502011c6a1dae63b856877e38ded6e5ccf3c SHA1 39ea2361485bb7cd61ce8b8972bcb2e3c30b08bc SHA256 5a5224801291ecd34652597ac4d80db1b87682e8c8cf4b291bc42233711e8370 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch new file mode 100644 index 0000000000..38be686c5c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch @@ -0,0 +1,38 @@ +From 269c066abec763012fcabaff667b1a264c17e0bc Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Fri, 1 Apr 2011 10:01:05 -0400 +Subject: [PATCH] Add gsm APN information for KTF and SKTelecom + +--- + serviceproviders.xml | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/serviceproviders.xml b/serviceproviders.xml +index 3673d31..0b7bd56 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -3763,6 +3763,10 @@ conceived. + ktf + ktf + ++ ++ ++ ++ + + + LGTelecom +@@ -3782,6 +3786,10 @@ conceived. + + sktelecom + ++ ++ ++ ++ + + + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-KPN-Rename-KPN-Mobile-to-KPN-NL.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-KPN-Rename-KPN-Mobile-to-KPN-NL.patch new file mode 100644 index 0000000000..701dd40790 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-KPN-Rename-KPN-Mobile-to-KPN-NL.patch @@ -0,0 +1,25 @@ +From 65b1df64716e4cdac1cf481d3ca646c7240a65ac Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Wed, 1 Jun 2011 09:24:29 -0400 +Subject: [PATCH] KPN: Rename KPN Mobile to KPN NL + +--- + serviceproviders.xml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/serviceproviders.xml b/serviceproviders.xml +index f81292c..1562227 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -4784,7 +4784,7 @@ conceived. + + + +- KPN Mobile ++ KPN NL + + + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-KPN-remove-old-APNs.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-KPN-remove-old-APNs.patch new file mode 100644 index 0000000000..71d69d6ad8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-KPN-remove-old-APNs.patch @@ -0,0 +1,33 @@ +From 315cbd5572a808a0bd07ea12fcfe8532b191d945 Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Thu, 26 May 2011 17:42:15 -0400 +Subject: [PATCH] KPN: remove old APNs + +--- + serviceproviders.xml | 10 ---------- + 1 files changed, 0 insertions(+), 10 deletions(-) + +diff --git a/serviceproviders.xml b/serviceproviders.xml +index e431696..f81292c 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -4789,16 +4789,6 @@ conceived. + + + +- +- KPN +- gprs +- 62.133.126.28 +- 62.133.126.29 +- +- +- 62.133.126.28 +- 62.133.126.29 +- + + + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Mark-providers-as-primary-to-disambiguate-providers-.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Mark-providers-as-primary-to-disambiguate-providers-.patch new file mode 100644 index 0000000000..366e25e99a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Mark-providers-as-primary-to-disambiguate-providers-.patch @@ -0,0 +1,52 @@ +From 5c38643109c0ab404dfb3d14f530485f1600222a Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Wed, 25 May 2011 17:19:12 -0400 +Subject: [PATCH] Mark providers as primary to disambiguate providers with same MPLN + +--- + serviceproviders.xml | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/serviceproviders.xml b/serviceproviders.xml +index e431696..d4d9eac 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -1467,7 +1467,7 @@ conceived. + + + +- ++ + E-Plus + + +@@ -1793,7 +1793,7 @@ conceived. + + + +- ++ + 3 + + +@@ -3697,7 +3697,7 @@ conceived. + + + +- ++ + 3 + + +@@ -5896,7 +5896,7 @@ conceived. + + + +- ++ + 3 + + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Remove-NetColgne-26203-it-interferes-with-eplus.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Remove-NetColgne-26203-it-interferes-with-eplus.patch new file mode 100644 index 0000000000..db3a345a78 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Remove-NetColgne-26203-it-interferes-with-eplus.patch @@ -0,0 +1,33 @@ +From bda53b737ee0e954c8738a3a89e25b126a3b0595 Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Fri, 20 May 2011 13:34:56 -0400 +Subject: [PATCH] Remove NetColgne - 26203, it interferes with eplus. + +--- + serviceproviders.xml | 10 ---------- + 1 files changed, 0 insertions(+), 10 deletions(-) + +diff --git a/serviceproviders.xml b/serviceproviders.xml +index f975a9e..9c54797 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -1739,16 +1739,6 @@ conceived. + + + +- NetCologne +- +- +- +- web +- password +- +- +- +- + Alice + + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Vodafone-Update-with-data-from-mbb-apn-settings-2011.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Vodafone-Update-with-data-from-mbb-apn-settings-2011.patch new file mode 100644 index 0000000000..b24ee961be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-Vodafone-Update-with-data-from-mbb-apn-settings-2011.patch @@ -0,0 +1,234 @@ +From 16600c557279128ccd56e61568a741452457bcb2 Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Thu, 19 May 2011 20:10:04 -0400 +Subject: [PATCH] Vodafone: Update with data from mbb apn settings 20110519 + +--- + serviceproviders.xml | 87 +++++++++++++++++++++++++++---------------------- + 1 files changed, 48 insertions(+), 39 deletions(-) + +diff --git a/serviceproviders.xml b/serviceproviders.xml +index f975a9e..4f2b489 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -646,12 +646,9 @@ conceived. + M-Tel + + +- ++ + +- +- mtel +- mtel +- ++ + + + +@@ -1588,8 +1585,6 @@ conceived. + *100*CODE# + + +- vodafone +- vodafone + 139.7.30.125 + 139.7.30.126 + +@@ -1597,8 +1592,6 @@ conceived. + WebSessions + vodafone + vodafone +- 139.7.30.125 +- 139.7.30.126 + + + +@@ -1853,11 +1846,11 @@ conceived. + TDC + + +- +- 194.239.134.83 +- 193.162.153.164 +- ++ ++ + ++ ++ + + + +@@ -2185,18 +2178,16 @@ conceived. + + + +- +- Airtel (old) ++ ++ Vodafone + vodafone + vodafone +- 212.73.32.3 +- 212.73.32.67 + +- +- Vodafone ++ ++ Airtel (old) + vodafone + vodafone +- 212.166.132.96 ++ 212.73.32.3 + 212.73.32.67 + + +@@ -2308,6 +2299,7 @@ conceived. + + + ++ + + + +@@ -2549,8 +2541,6 @@ conceived. + Contract + web + web +- 10.206.65.68 +- 10.203.65.68 + + + Prepaid +@@ -2564,6 +2554,14 @@ conceived. + web + web + ++ ++ web ++ web ++ ++ ++ web ++ web ++ + + + +@@ -2945,8 +2943,6 @@ conceived. + + + Előf. töm. +- vodawap +- vodawap + + + Felt. norm. +@@ -3316,10 +3312,11 @@ conceived. + + + ++ ++ + + + +- + + + +@@ -3655,8 +3652,6 @@ conceived. + + + Internet Facile (old) +- 83.224.70.62 +- 83.224.70.78 + + + +@@ -4200,17 +4195,25 @@ conceived. + + + ++ ++ ++ ++ Vodacom Lesotho ++ ++ ++ ++ ++ ++ ++ ++ + + + + Bite + + +- +- bite +- 213.226.131.131 +- 193.219.88.36 +- ++ + + + +@@ -4523,9 +4526,11 @@ conceived. + Vodafone + + +- +- Internet +- Internet ++ ++ internet ++ internet ++ 80.85.96.131 ++ 80.85.97.70 + + + +@@ -5405,12 +5410,12 @@ conceived. + Vodafone + + +- +- Web (old) +- + + Web + ++ ++ Web (old) ++ + + + +@@ -5539,6 +5544,7 @@ conceived. + VIP Mobile + + ++ + + vipmobile + vipmobile +@@ -6402,7 +6408,10 @@ conceived. + + + +- ++ ++ web ++ web ++ + + + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-netherlands-add-fastinternet-and-prepaidinternet-to-KPN.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-netherlands-add-fastinternet-and-prepaidinternet-to-KPN.patch new file mode 100644 index 0000000000..c90d0feaa2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/0001-netherlands-add-fastinternet-and-prepaidinternet-to-KPN.patch @@ -0,0 +1,27 @@ +From 1b96ed455e0a6902b4836f62131faba6ea8c5cdf Mon Sep 17 00:00:00 2001 +From: Jason Glasgow +Date: Mon, 2 May 2011 11:05:15 -0400 +Subject: [PATCH] netherlands: add fastinternet and prepaidinternet to KPN + +--- + serviceproviders.xml | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/serviceproviders.xml b/serviceproviders.xml +index ef4d6e5..0b79527 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -4729,6 +4729,10 @@ conceived. + 62.133.126.28 + 62.133.126.29 + ++ ++ ++ ++ + + + +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/android-apns.py b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/android-apns.py new file mode 100644 index 0000000000..958e630bf8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/android-apns.py @@ -0,0 +1,327 @@ +#!/usr/bin/env python +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +from xml.dom.minidom import parse +from collections import defaultdict +import codecs +import sys + +def groupby(func, items): + result = defaultdict(list) + for x in items: + result[func(x)].append(x) + return result + +class APNDB: + """Represents a set of APNs. + + Allows adding and some primitive kinds of searching. Subclasses are expected + to override add() to enforce their own constraints as necessary. Also + supports loading contents from a data file. + + """ + ANDROID = 0 + MBPI = 1 + def __init__(self): + self._apns = [] + + def add(self, apn): + if type(apn) == list: + self._apns += apn + else: + self._apns.append(apn) + + def apns(self): + return self._apns + + def carriers(self): + return set([x['nwid'] for x in self._apns]) + + def find(self, name, pred): + return [x for x in self._apns if name in x and pred(x[name])] + + def groupby(self, func): + return groupby(func, self._apns) + + def filter(self, func): + return [x for x in self._apns if func(x)] + + def parse(self): + pass + +class AndroidAPNDB(APNDB): + """Android APN database. + + Supports loading its contents from an android-format XML file. + + """ + + def __init__(self): + APNDB.__init__(self) + + def _parse_android_apn(self, element): + # The android APN database isn't as rich as the public one; in + # particular, it doesn't know whether APNs are CDMA or GSM. Assume they + # are all GSM :\ + apn = {'technology': 'gsm'} + for k,v in element.attributes.items(): + apn[k] = v + apn['nwid'] = '%s:%s' % (apn['mcc'], apn['mnc']) + apn['source'] = APNDB.ANDROID + + if apn['type'] == 'mms': # XXX: ignore MMS APNs + return None + return apn + + def parse(self, xmlfile): + dom = parse(xmlfile) + apn_lists = dom.getElementsByTagName('apns') + for apn_list in apn_lists: + dom_apns = apn_list.getElementsByTagName('apn') + for dom_apn in dom_apns: + r = self._parse_android_apn(dom_apn) + if r: + self._apns.append(r) + +class MBPIDB(APNDB): + """Mobile broadband provider info APN database. + + Supports loading its contents from an MBPI-format XML file. + + """ + + def __init__(self): + APNDB.__init__(self) + + def _add_child_key(self, apn, element, name, rename=None): + if not rename: + rename = name + children = element.getElementsByTagName(name) + # If we have multiple keys, we construct a list... + values = [x.data for x in children if 'data' in dir(x)] + if len(values) > 1: + apn[rename] = values + elif len(values) == 1: + apn[rename] = values[0] + + def _parse_mbpi_apn(self, apn, element): + apn['apn'] = element.getAttribute('value') + self._add_child_key(apn, element, 'name') + self._add_child_key(apn, element, 'username', 'user') + self._add_child_key(apn, element, 'password') + self._add_child_key(apn, element, 'dns') + + def _parse_mbpi_apns(self, carrier, tech, element, country): + apns = [] + nwids = element.getElementsByTagName('network-id') + dom_apns = element.getElementsByTagName('apn') + for nwid in nwids: + mcc = nwid.getAttribute('mcc') + mnc = nwid.getAttribute('mnc') + for dom_apn in dom_apns: + apn = { + 'carrier': carrier, + 'technology': tech, + 'mcc': mcc, + 'mnc': mnc, + 'nwid': '%s:%s' % (mcc, mnc), + 'source': APNDB.MBPI + } + self._parse_mbpi_apn(apn, dom_apn) + apns.append(apn) + return apns + + def _parse_mbpi_provider(self, country, element): + apns = [] + names = [x for x in element.getElementsByTagName('name') if x.parentNode == element] + # XXX: if there's more than one name, we just take the first one. The + # DTD allows one or more names in the provider block. I have no idea + # what the semantics of this are. + carrier = names[0].childNodes[0].data + if not carrier: + print 'Entry with no carrier code?' + gsms = element.getElementsByTagName('gsm') + cdmas = element.getElementsByTagName('cdma') + for gsm in gsms: + apns += self._parse_mbpi_apns(carrier, 'gsm', gsm, country) + for cdma in cdmas: + apns += self._parse_mbpi_apns(carrier, 'cdma', cdma, country) + return apns + + def parse(self, xmlfile): + """Loads contents from a supplied filehandle. + + The dtd for mobile-broadband-provider-info's xml files is really hairy, + so these parsing functions are too. Oh well. See serviceproviders.2.dtd + in the mbpi distribution for the gory details. + + """ + dom = parse(xmlfile) + countries = dom.getElementsByTagName('country') + for country in countries: + providers = country.getElementsByTagName('provider') + for provider in providers: + self._apns += self._parse_mbpi_provider( + country.getAttribute('code'), + provider) + +class MergedAPNDB(APNDB): + """A merged APN database. + + This class overrides the add method to support incremental merging of the + android database into the mbpi database. There are several major caveats to + this: + + 1) The logic here is extraordinarily brittle, and changes in the MBPIDB and + AndroidAPNDB classes are likely to break it + 2) Whichever database is added first will get to decide the names of many + common carriers, so adding the android DB before the MBPI DB may have + catastrophic results in terms of the generated delta being very large. + 3) The merging is still imperfect and might produce duplicate carriers. + + """ + + def __init__(self): + APNDB.__init__(self) + self._carriers = defaultdict(lambda: {'apns': [], + 'aliases': [], + 'mcc': 'none'}) + self._conflicts = 0 + self._apnmismatch = 0 + + def _should_add(self, apn): + def validapn(a): + if 'apn' not in a: + return False + if 'carrier' not in a: + return False + if 'mcc' not in a or 'mnc' not in a: + return False + return True + + def matchprop(a,b,p): + if p not in a and p not in b: + return True + if p in a and p not in b: + return True # XXX: fuzzy match. + if p not in a and p in b: + return True + return a[p] == b[p] + + def matchapn(a, b): + if a['mcc'] != b['mcc']: + return False + if a['mnc'] != b['mnc']: + return False + if a['apn'] != b['apn']: + return False + if not matchprop(a, b, 'user'): + return False + if not matchprop(a, b, 'password'): + return False + return True + + if not validapn(apn): + return False + + matches = [x for x in self.apns() if matchapn(apn, x)] + if matches: + self._conflicts += 1 + return False + return True + + def carriers(self): + return self._carriers + + def find_carriers(self, pred): + return [x for x in self._carriers.values() if pred(x)] + + def _learn_carrier(self, apn): + # When we get a new APN, we might a new carrier, or a new mcc:mnc for an + # existing carrier. + nwid = apn['nwid'] + carrier = apn['mcc'] + ":" + apn['carrier'] + mcc = apn['mcc'] + key = carrier + + # Let's see if we can merge carriers. We're looking for another carrier + # with whom our set of nwids overlaps. Note that there can be at most + # one carrier that we overlap with, nwid-wise, since if there existed + # carriers a and b that both had our nwid, they would have been merged + # previously. + ournwids = [x['nwid'] for x in self._carriers[key]['apns']] + ournwids.append(nwid) + othercarrier = None + for c in self._carriers: + if key == c or mcc != self._carriers[c]['mcc']: + continue + theirnwids = [x['nwid'] for x in self._carriers[c]['apns']] + if set(theirnwids) & set(ournwids): + key = c + break + + # Do we intersect another carrier by nwid? If so, add ourselves to their + # list; otherwise, create a new list for just us. After this step, this + # APN has been added to some carrier named after either: + # 1) its own name, or + # 2) the carrier whose nwid set already contains us. + self._carriers[key]['apns'].append(apn) + self._carriers[key]['mcc'] = mcc + if carrier not in self._carriers[key]['aliases']: + self._carriers[key]['aliases'].append(carrier) + + def _add_one(self, apn): + # This function is responsible for actually merging new APNs into the + # database. We want to keep all existing APNs for a particular carrier, + # so we basically just need to avoid adding duplicate APNs. + if self._should_add(apn): + self._apns.append(apn) + self._learn_carrier(apn) + + def add(self, apn): + if type(apn) == list: + for a in apn: + self.add(a) + else: + self._add_one(apn) + + def stats(self): + return {'conflicts': self._conflicts} + +def print_carriers(db): + carriers = db.carriers() + res = [] + for name,c in carriers.items(): + droidapns = [x for x in c['apns'] if x['source'] == APNDB.ANDROID] + mbpiapns = [x for x in c['apns'] if x['source'] == APNDB.MBPI] + newapns = [x['nwid'] for x in droidapns] + newapns = filter(lambda x: x not in [y['nwid'] for y in mbpiapns], + newapns) + if newapns: + res.append('Carrier %s: add nwids %s' % (name.encode('utf-8'), + newapns)) + newapns = [x['apn'] for x in droidapns] + newapns = filter(lambda x: x not in [y['apn'] for y in mbpiapns], + newapns) + if newapns: + res.append('Carrier %s: add apns %s' % (name.encode('utf-8'), + newapns)) + res.sort() + for r in res: + print r + +if len(sys.argv) < 3: + print 'Usage: %s ' % sys.argv[0] + sys.exit(0) + +mbpi_db = MBPIDB() +mbpi_db.parse(file(sys.argv[2])) +android_db = AndroidAPNDB() +android_db.parse(file(sys.argv[1])) + +result = MergedAPNDB() +result.add(mbpi_db.apns()) +result.add(android_db.apns()) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/mobile-broadband-provider-info-20110218-r1.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/mobile-broadband-provider-info-20110218-r1.patch new file mode 100644 index 0000000000..295980b45f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/files/mobile-broadband-provider-info-20110218-r1.patch @@ -0,0 +1,23 @@ +diff --git a/serviceproviders.xml b/serviceproviders.xml +index 3673d31..e3b8264 100644 +--- a/serviceproviders.xml ++++ b/serviceproviders.xml +@@ -6306,15 +6306,12 @@ conceived. + + + +- ++ ++ + MEdia Net +- WAP@CINGULARGPRS.COM +- CINGULAR1 + +- ++ + Data Connect +- ISP@CINGULARGPRS.COM +- CINGULAR1 + + + Data Connect (Accelerated) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/metadata.xml new file mode 100644 index 0000000000..8ea105f4ba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/metadata.xml @@ -0,0 +1,13 @@ + + + + no-herd + + dagger@gentoo.org + Robert Piasek + + + nirbheek@gentoo.org + Nirbheek Chauhan + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20090602.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20090602.ebuild new file mode 100644 index 0000000000..8ee85870c5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20090602.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20090602.ebuild,v 1.1 2009/08/24 13:21:52 dagger Exp $ + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +SRC_URI="http://dev.gentoo.org/~dagger/files/${P}.tar.bz2" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="" +RDEPEND="" + +DEPEND="" + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild new file mode 100644 index 0000000000..d2f2d29c7c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild,v 1.2 2010/03/10 09:00:52 josejx Exp $ + +inherit gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +# Weird bug in gnome.org causes a dot to be added in uri +SRC_URI="${SRC_URI/${PV}./${PV}}" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild new file mode 100644 index 0000000000..610489417b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +inherit gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +# Weird bug in gnome.org causes a dot to be added in uri +SRC_URI="${SRC_URI/${PV}./${PV}}" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 ~arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218-r1.ebuild new file mode 100644 index 0000000000..b73d3b8737 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit eutils gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +# Weird bug in gnome.org causes a dot to be added in uri +SRC_URI="${SRC_URI/${PV}./${PV}}" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 ~arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patch" + epatch "${FILESDIR}"/${PF}.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218-r2.ebuild new file mode 100644 index 0000000000..0d0f95e885 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit eutils gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +# Weird bug in gnome.org causes a dot to be added in uri +SRC_URI="${SRC_URI/${PV}./${PV}}" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 ~arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patch" + epatch "${FILESDIR}"/mobile-broadband-provider-info-20110218-r1.patch + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218.ebuild new file mode 100644 index 0000000000..610489417b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110218.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +inherit gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +# Weird bug in gnome.org causes a dot to be added in uri +SRC_URI="${SRC_URI/${PV}./${PV}}" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 ~arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110503-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110503-r1.ebuild new file mode 100644 index 0000000000..fc557acb94 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110503-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit autotools eutils git + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +EGIT_REPO_URI="git://git.gnome.org/mobile-broadband-provider-info" +EGIT_COMMIT="f29d31e0ce94866c3339f44cdbb2695cc2e9ba87" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patches" + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch + epatch "${FILESDIR}"/0001-netherlands-add-fastinternet-and-prepaidinternet-to-KPN.patch +} + +src_compile() { + eautoreconf || die "eautoreconf failed" + econf || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110503.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110503.ebuild new file mode 100644 index 0000000000..81653ad75e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110503.ebuild @@ -0,0 +1,36 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit autotools eutils git + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +EGIT_REPO_URI="git://git.gnome.org/mobile-broadband-provider-info" +EGIT_COMMIT="f29d31e0ce94866c3339f44cdbb2695cc2e9ba87" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patch" + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch +} + +src_compile() { + eautoreconf || die "eautoreconf failed" + econf || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r1.ebuild new file mode 100644 index 0000000000..39a6491bc4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit autotools eutils git + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +EGIT_REPO_URI="git://git.gnome.org/mobile-broadband-provider-info" +EGIT_COMMIT="d9995ef693cb1ea7237f928df18e03cccba96f16" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patches" + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch + epatch "${FILESDIR}"/0001-Remove-NetColgne-26203-it-interferes-with-eplus.patch +} + +src_compile() { + eautoreconf || die "eautoreconf failed" + econf || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r2.ebuild new file mode 100644 index 0000000000..6712139c6e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit autotools eutils git + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +EGIT_REPO_URI="git://git.gnome.org/mobile-broadband-provider-info" +EGIT_COMMIT="d9995ef693cb1ea7237f928df18e03cccba96f16" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patches" + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch + epatch "${FILESDIR}"/0001-Remove-NetColgne-26203-it-interferes-with-eplus.patch + epatch "${FILESDIR}"/0001-Vodafone-Update-with-data-from-mbb-apn-settings-2011.patch +} + +src_compile() { + eautoreconf || die "eautoreconf failed" + econf || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r3.ebuild new file mode 100644 index 0000000000..f838aafecb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r3.ebuild @@ -0,0 +1,39 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit autotools eutils git + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +EGIT_REPO_URI="git://git.gnome.org/mobile-broadband-provider-info" +EGIT_COMMIT="d9995ef693cb1ea7237f928df18e03cccba96f16" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patches" + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch + epatch "${FILESDIR}"/0001-Remove-NetColgne-26203-it-interferes-with-eplus.patch + epatch "${FILESDIR}"/0001-Vodafone-Update-with-data-from-mbb-apn-settings-2011.patch + epatch "${FILESDIR}"/0001-Mark-providers-as-primary-to-disambiguate-providers-.patch +} + +src_compile() { + eautoreconf || die "eautoreconf failed" + econf || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r5.ebuild new file mode 100644 index 0000000000..9554d851e3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511-r5.ebuild @@ -0,0 +1,41 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit autotools eutils git + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +EGIT_REPO_URI="git://git.gnome.org/mobile-broadband-provider-info" +EGIT_COMMIT="d9995ef693cb1ea7237f928df18e03cccba96f16" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patches" + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch + epatch "${FILESDIR}"/0001-Remove-NetColgne-26203-it-interferes-with-eplus.patch + epatch "${FILESDIR}"/0001-Vodafone-Update-with-data-from-mbb-apn-settings-2011.patch + epatch "${FILESDIR}"/0001-Mark-providers-as-primary-to-disambiguate-providers-.patch + epatch "${FILESDIR}"/0001-KPN-remove-old-APNs.patch + epatch "${FILESDIR}"/0001-KPN-Rename-KPN-Mobile-to-KPN-NL.patch +} + +src_compile() { + eautoreconf || die "eautoreconf failed" + econf || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511.ebuild new file mode 100644 index 0000000000..eb08513ec2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20110511.ebuild @@ -0,0 +1,36 @@ +# Copyright 2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100510.ebuild,v 1.4 2010/10/19 19:09:09 ranger Exp $ + +EAPI="2" + +inherit autotools eutils git + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +EGIT_REPO_URI="git://git.gnome.org/mobile-broadband-provider-info" +EGIT_COMMIT="d9995ef693cb1ea7237f928df18e03cccba96f16" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + # update to latest version of the database + elog "Applying patch" + epatch "${FILESDIR}"/0001-Add-gsm-APN-information-for-KTF-and-SKTelecom.patch +} + +src_compile() { + eautoreconf || die "eautoreconf failed" + econf || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-mobile-error.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-mobile-error.xml new file mode 100644 index 0000000000..d639a6620c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-mobile-error.xml @@ -0,0 +1,318 @@ + + + Copyright (C) 2008 Novell, Inc. + + + + A phone failure. + + + + + + No connection to phone. + + + + + + Phone-adaptor link reserved. + + + + + + Operation not allowed. + + + + + + Operation not supported. + + + + + + PH-SIM PIN required. + + + + + + PH-FSIM PIN required. + + + + + + PH-FSIM PUK required. + + + + + + SIM not inserted. + + + + + + SIM PIN required. + + + + + + SIM PUK required. + + + + + + SIM failure. + + + + + + SIM busy. + + + + + + SIM wrong. + + + + + + Incorrect password. + + + + + + SIM PIN2 required. + + + + + + SIM PUK2 required. + + + + + + Memory full. + + + + + + Invalid index. + + + + + + Not found. + + + + + + Memory failure. + + + + + + Text string too long. + + + + + + Invalid characters in text string. + + + + + + Dial string too long. + + + + + + Invalid characters in dial string. + + + + + + No network service. + + + + + + Network timeout. + + + + + + Network not allowed - emergency calls only. + + + + + + Network personalization PIN required. + + + + + + Network personalization PUK required. + + + + + + Network subset personalization PIN required. + + + + + + Network subset personalization PUK required. + + + + + + Service provider personalization PIN required. + + + + + + Service provider personalization PUK required. + + + + + + Corporate personalization PIN required. + + + + + + Corporate personalization PUK required. + + + + + + Hidden key required. This key is required when accessing hidden phonebook entries. + + + + + + EAP method not supported. + + + + + + Incorrect parameters. + + + + + + An unknown error. + + + + + + Illegal MS. + + + + + + Illegal ME. + + + + + + GPRS services not allowed. + + + + + + PLMN not allowed. + + + + + + Location area not allowed. + + + + + + Roaming not allowed in this location area. + + + + + + Service option not supported. + + + + + + Requested service option not subscribed. + + + + + + Service option temporarily out of order. + + + + + + PDP authentication failure. + + + + + + Unspecified GPRS error + + + + + + Invalid mobile class. + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem-connect-error.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem-connect-error.xml new file mode 100644 index 0000000000..78c33b4607 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem-connect-error.xml @@ -0,0 +1,30 @@ + + + Copyright (C) 2008 Novell, Inc. + + + + No carrier. + + + + + + No dialtone. + + + + + + Busy. + + + + + + No answer. + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem-error.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem-error.xml new file mode 100644 index 0000000000..004173849c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem-error.xml @@ -0,0 +1,36 @@ + + + Copyright (C) 2008 Novell, Inc. + + + + A generic error. An example of a generic error is ModemManager not being able to parse the response from modem. + + + + + + Operation not implemented by modem. + + + + + + Operation could not be performed while the modem is connected. + + + + + + Operation could not be performed while the modem is disconnected. + + + + + + Operation could not be performed because it is already in progress. + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem.h b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem.h new file mode 100644 index 0000000000..83a4163e36 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-modem.h @@ -0,0 +1,404 @@ + +/* Generated Header file do not edit */ +/* ModemManager D-Bus Interface Specification */ + +/* + * version 0.5 + */ + +#define MM_MODEMMANAGER_PATH "/org/freedesktop/ModemManager" +#define MM_MODEMMANAGER_SERVICE "org.freedesktop.ModemManager" + +/************** + * Interfaces * + **************/ + +#define MM_MODEMMANAGER_INTERFACE "org.freedesktop.ModemManager" +#define MM_MODEM_INTERFACE "org.freedesktop.ModemManager.Modem" +#define MM_MODEM_SIMPLE_INTERFACE "org.freedesktop.ModemManager.Modem.Simple" +#define MM_MODEM_CDMA_INTERFACE "org.freedesktop.ModemManager.Modem.Cdma" +#define MM_MODEM_GSM_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm" +#define MM_MODEM_GSM_CARD_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm.Card" +#define MM_MODEM_GSM_CONTACTS_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm.Contacts" +#define MM_MODEM_GSM_HSO_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm.Hso" +#define MM_MODEM_GSM_NETWORK_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm.Network" +#define MM_MODEM_GSM_SMS_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm.SMS" +#define MM_MODEM_GSM_USSD_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm.Ussd" +#define MM_MODEM_FIRMWARE_INTERFACE "org.freedesktop.ModemManager.Modem.Firmware" +#define MM_MODEM_LOCATION_INTERFACE "org.freedesktop.ModemManager.Modem.Location" +#define MM_MODEM_TIME_INTERFACE "org.freedesktop.ModemManager.Modem.Time" +#define MM_DBUS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties" + +/*********************** + * Methods/Enums/Flags * + ***********************/ + +/* + * Interface org.freedesktop.ModemManager + */ + +#define MM_MANAGER_METHOD_ENUMERATEDEVICES "EnumerateDevices" +#define MM_MANAGER_METHOD_SCANDEVICES "ScanDevices" +#define MM_MANAGER_METHOD_SETLOGGING "SetLogging" + +#define MM_MANAGER_SIGNAL_DEVICEADDED "DeviceAdded" +#define MM_MANAGER_SIGNAL_DEVICEREMOVED "DeviceRemoved" + +/* + * Interface org.freedesktop.ModemManager.Modem + */ + +#define MM_MODEM_METHOD_ENABLE "Enable" +#define MM_MODEM_METHOD_CONNECT "Connect" +#define MM_MODEM_METHOD_DISCONNECT "Disconnect" +#define MM_MODEM_METHOD_GETIP4CONFIG "GetIP4Config" +#define MM_MODEM_METHOD_GETINFO "GetInfo" +#define MM_MODEM_METHOD_RESET "Reset" +#define MM_MODEM_METHOD_FACTORYRESET "FactoryReset" + +#define MM_MODEM_SIGNAL_STATECHANGED "StateChanged" + +/* MM_MODEM_TYPE enum values */ + +#define MM_MODEM_TYPE_GSM 1 +#define MM_MODEM_TYPE_CDMA 2 + +/* MM_MODEM_IP_METHOD enum values */ + +#define MM_MODEM_IP_METHOD_PPP 0 +#define MM_MODEM_IP_METHOD_STATIC 1 +#define MM_MODEM_IP_METHOD_DHCP 2 + +/* MM_MODEM_STATE_CHANGED_REASON enum values */ + +#define MM_MODEM_STATE_CHANGED_REASON_UNKNOWN 0 +#define MM_MODEM_STATE_CHANGED_REASON_USER_REQUESTED 1 +#define MM_MODEM_STATE_CHANGED_REASON_SUSPEND 2 + +/* + * Interface org.freedesktop.ModemManager.Modem.Simple + */ + +#define MM_MODEM_SIMPLE_METHOD_CONNECT "Connect" +#define MM_MODEM_SIMPLE_METHOD_GETSTATUS "GetStatus" + +/* + * Interface org.freedesktop.ModemManager.Modem.Cdma + */ + +#define MM_MODEM_CDMA_METHOD_ACTIVATE "Activate" +#define MM_MODEM_CDMA_METHOD_ACTIVATEMANUAL "ActivateManual" +#define MM_MODEM_CDMA_METHOD_ACTIVATEMANUALDEBUG "ActivateManualDebug" +#define MM_MODEM_CDMA_METHOD_GETSIGNALQUALITY "GetSignalQuality" +#define MM_MODEM_CDMA_METHOD_GETESN "GetEsn" +#define MM_MODEM_CDMA_METHOD_GETSERVINGSYSTEM "GetServingSystem" +#define MM_MODEM_CDMA_METHOD_GETREGISTRATIONSTATE "GetRegistrationState" + +#define MM_MODEM_CDMA_SIGNAL_ACTIVATIONSTATECHANGED "ActivationStateChanged" +#define MM_MODEM_CDMA_SIGNAL_SIGNALQUALITY "SignalQuality" +#define MM_MODEM_CDMA_SIGNAL_REGISTRATIONSTATECHANGED "RegistrationStateChanged" + +/* MM_MODEM_CDMA_REGISTRATION_STATE enum values */ + +#define MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN 0 +#define MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED 1 +#define MM_MODEM_CDMA_REGISTRATION_STATE_HOME 2 +#define MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING 3 + +/* MM_MODEM_CDMA_ACTIVATION_STATE enum values */ + +#define MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED 0 +#define MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING 1 +#define MM_MODEM_CDMA_ACTIVATION_STATE_PARTIALLY_ACTIVATED 2 +#define MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED 3 + +/* MM_MODEM_CDMA_ACTIVATION_ERROR enum values */ + +#define MM_MODEM_CDMA_ACTIVATION_ERROR_NO_ERROR 0 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_ROAMING 1 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE 2 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT 3 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED 4 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED 5 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_NO_SIGNAL 6 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_UNKNOWN 7 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_TIMED_OUT 8 +#define MM_MODEM_CDMA_ACTIVATION_ERROR_START_FAILED 9 + +/* + * Interface org.freedesktop.ModemManager.Modem.Gsm + */ + +/* MM_MODEM_GSM_ALLOWED_MODE enum values */ + +#define MM_MODEM_GSM_ALLOWED_MODE_ANY 0 +#define MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED 1 +#define MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED 2 +#define MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY 3 +#define MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY 4 + +/* MM_MODEM_GSM_ACCESS_TECH enum values */ + +#define MM_MODEM_GSM_ACCESS_TECH_UNKNOWN 0 +#define MM_MODEM_GSM_ACCESS_TECH_GSM 1 +#define MM_MODEM_GSM_ACCESS_TECH_GSM_COMPACT 2 +#define MM_MODEM_GSM_ACCESS_TECH_GPRS 3 +#define MM_MODEM_GSM_ACCESS_TECH_EDGE 4 +#define MM_MODEM_GSM_ACCESS_TECH_UMTS 5 +#define MM_MODEM_GSM_ACCESS_TECH_HSDPA 6 +#define MM_MODEM_GSM_ACCESS_TECH_HSUPA 7 +#define MM_MODEM_GSM_ACCESS_TECH_HSPA 8 +#define MM_MODEM_GSM_ACCESS_TECH_HSPA_PLUS 9 + +/* MM_MODEM_GSM_MODE flag values */ + +#define MM_MODEM_GSM_MODE_UNKNOWN 0x0 +#define MM_MODEM_GSM_MODE_ANY 0x1 +#define MM_MODEM_GSM_MODE_GPRS 0x2 +#define MM_MODEM_GSM_MODE_EDGE 0x4 +#define MM_MODEM_GSM_MODE_UMTS 0x8 +#define MM_MODEM_GSM_MODE_HSDPA 0x10 +#define MM_MODEM_GSM_MODE_2G_PREFERRED 0x20 +#define MM_MODEM_GSM_MODE_3G_PREFERRED 0x40 +#define MM_MODEM_GSM_MODE_2G_ONLY 0x80 +#define MM_MODEM_GSM_MODE_3G_ONLY 0x100 +#define MM_MODEM_GSM_MODE_HSUPA 0x200 +#define MM_MODEM_GSM_MODE_HSPA 0x400 +#define MM_MODEM_GSM_MODE_GSM 0x800 +#define MM_MODEM_GSM_MODE_GSM_COMPACT 0x1000 + +/* MM_MODEM_GSM_BAND flag values */ + +#define MM_MODEM_GSM_BAND_UNKNOWN 0x0 +#define MM_MODEM_GSM_BAND_ANY 0x1 +#define MM_MODEM_GSM_BAND_EGSM 0x2 +#define MM_MODEM_GSM_BAND_DCS 0x4 +#define MM_MODEM_GSM_BAND_PCS 0x8 +#define MM_MODEM_GSM_BAND_G850 0x10 +#define MM_MODEM_GSM_BAND_U2100 0x20 +#define MM_MODEM_GSM_BAND_U1800 0x40 +#define MM_MODEM_GSM_BAND_U17IV 0x80 +#define MM_MODEM_GSM_BAND_U800 0x100 +#define MM_MODEM_GSM_BAND_U850 0x200 +#define MM_MODEM_GSM_BAND_U900 0x400 +#define MM_MODEM_GSM_BAND_U17IX 0x800 +#define MM_MODEM_GSM_BAND_U1900 0x1000 +#define MM_MODEM_GSM_BAND_U2600 0x2000 + +/* MM_MODEM_GSM_FACILITY flag values */ + +#define MM_MODEM_GSM_FACILITY_NONE 0x0 +#define MM_MODEM_GSM_FACILITY_SIM 0x1 +#define MM_MODEM_GSM_FACILITY_FIXED_DIALING 0x2 +#define MM_MODEM_GSM_FACILITY_PH_SIM 0x4 +#define MM_MODEM_GSM_FACILITY_PH_FSIM 0x8 +#define MM_MODEM_GSM_FACILITY_NET_PERS 0x10 +#define MM_MODEM_GSM_FACILITY_NET_SUB_PERS 0x20 +#define MM_MODEM_GSM_FACILITY_PROVIDER_PERS 0x40 +#define MM_MODEM_GSM_FACILITY_CORP_PERS 0x80 + +/* + * Interface org.freedesktop.ModemManager.Modem.Gsm.Card + */ + +#define MM_MODEM_GSM_CARD_METHOD_GETIMEI "GetImei" +#define MM_MODEM_GSM_CARD_METHOD_GETIMSI "GetImsi" +#define MM_MODEM_GSM_CARD_METHOD_GETOPERATORID "GetOperatorId" +#define MM_MODEM_GSM_CARD_METHOD_GETSPN "GetSpn" +#define MM_MODEM_GSM_CARD_METHOD_GETMSISDN "GetMsIsdn" +#define MM_MODEM_GSM_CARD_METHOD_SENDPUK "SendPuk" +#define MM_MODEM_GSM_CARD_METHOD_SENDPIN "SendPin" +#define MM_MODEM_GSM_CARD_METHOD_ENABLEPIN "EnablePin" +#define MM_MODEM_GSM_CARD_METHOD_CHANGEPIN "ChangePin" + +/* + * Interface org.freedesktop.ModemManager.Modem.Gsm.Contacts + */ + +#define MM_MODEM_GSM_CONTACTS_METHOD_ADD "Add" +#define MM_MODEM_GSM_CONTACTS_METHOD_DELETE "Delete" +#define MM_MODEM_GSM_CONTACTS_METHOD_GET "Get" +#define MM_MODEM_GSM_CONTACTS_METHOD_LIST "List" +#define MM_MODEM_GSM_CONTACTS_METHOD_FIND "Find" +#define MM_MODEM_GSM_CONTACTS_METHOD_GETCOUNT "GetCount" + +/* + * Interface org.freedesktop.ModemManager.Modem.Gsm.Hso + */ + +#define MM_MODEM_GSM_HSO_METHOD_AUTHENTICATE "Authenticate" + +/* + * Interface org.freedesktop.ModemManager.Modem.Gsm.Network + */ + +#define MM_MODEM_GSM_NETWORK_METHOD_REGISTER "Register" +#define MM_MODEM_GSM_NETWORK_METHOD_SCAN "Scan" +#define MM_MODEM_GSM_NETWORK_METHOD_SETAPN "SetApn" +#define MM_MODEM_GSM_NETWORK_METHOD_GETSIGNALQUALITY "GetSignalQuality" +#define MM_MODEM_GSM_NETWORK_METHOD_SETBAND "SetBand" +#define MM_MODEM_GSM_NETWORK_METHOD_GETBAND "GetBand" +#define MM_MODEM_GSM_NETWORK_METHOD_SETNETWORKMODE "SetNetworkMode" +#define MM_MODEM_GSM_NETWORK_METHOD_GETNETWORKMODE "GetNetworkMode" +#define MM_MODEM_GSM_NETWORK_METHOD_GETREGISTRATIONINFO "GetRegistrationInfo" +#define MM_MODEM_GSM_NETWORK_METHOD_SETALLOWEDMODE "SetAllowedMode" + +#define MM_MODEM_GSM_NETWORK_SIGNAL_SIGNALQUALITY "SignalQuality" +#define MM_MODEM_GSM_NETWORK_SIGNAL_REGISTRATIONINFO "RegistrationInfo" +#define MM_MODEM_GSM_NETWORK_SIGNAL_NETWORKMODE "NetworkMode" + +/* MM_MODEM_GSM_NETWORK_REG_STATUS enum values */ + +#define MM_MODEM_GSM_NETWORK_REG_STATUS_IDLE 0 +#define MM_MODEM_GSM_NETWORK_REG_STATUS_HOME 1 +#define MM_MODEM_GSM_NETWORK_REG_STATUS_SEARCHING 2 +#define MM_MODEM_GSM_NETWORK_REG_STATUS_DENIED 3 +#define MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN 4 +#define MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING 5 + +/* MM_MODEM_GSM_NETWORK_DEPRECATED_MODE enum values */ + +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_ANY 0 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_GPRS 1 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_EDGE 2 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_UMTS 3 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSDPA 4 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_PREFERRED 5 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_PREFERRED 6 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_ONLY 7 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_ONLY 8 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSUPA 9 +#define MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSPA 10 + +/* + * Interface org.freedesktop.ModemManager.Modem.Gsm.SMS + */ + +#define MM_MODEM_GSM_SMS_METHOD_DELETE "Delete" +#define MM_MODEM_GSM_SMS_METHOD_GET "Get" +#define MM_MODEM_GSM_SMS_METHOD_GETFORMAT "GetFormat" +#define MM_MODEM_GSM_SMS_METHOD_SETFORMAT "SetFormat" +#define MM_MODEM_GSM_SMS_METHOD_GETSMSC "GetSmsc" +#define MM_MODEM_GSM_SMS_METHOD_SETSMSC "SetSmsc" +#define MM_MODEM_GSM_SMS_METHOD_LIST "List" +#define MM_MODEM_GSM_SMS_METHOD_SAVE "Save" +#define MM_MODEM_GSM_SMS_METHOD_SEND "Send" +#define MM_MODEM_GSM_SMS_METHOD_SENDFROMSTORAGE "SendFromStorage" +#define MM_MODEM_GSM_SMS_METHOD_SETINDICATION "SetIndication" + +#define MM_MODEM_GSM_SMS_SIGNAL_SMSRECEIVED "SmsReceived" +#define MM_MODEM_GSM_SMS_SIGNAL_COMPLETED "Completed" + +/* + * Interface org.freedesktop.ModemManager.Modem.Gsm.Ussd + */ + +#define MM_MODEM_GSM_USSD_METHOD_INITIATE "Initiate" +#define MM_MODEM_GSM_USSD_METHOD_RESPOND "Respond" +#define MM_MODEM_GSM_USSD_METHOD_CANCEL "Cancel" + +/* + * Interface org.freedesktop.ModemManager.Modem.Firmware + */ + +#define MM_MODEM_FIRMWARE_METHOD_LIST "List" +#define MM_MODEM_FIRMWARE_METHOD_SELECT "Select" +#define MM_MODEM_FIRMWARE_METHOD_INSTALL "Install" + +/* + * Interface org.freedesktop.ModemManager.Modem.Location + */ + +#define MM_MODEM_LOCATION_METHOD_ENABLE "Enable" +#define MM_MODEM_LOCATION_METHOD_GETLOCATION "GetLocation" + +/* MM_MODEM_LOCATION_CAPABILITIES flag values */ + +#define MM_MODEM_LOCATION_CAPABILITY_UNKNOWN 0x0 +#define MM_MODEM_LOCATION_CAPABILITY_GPS_NMEA 0x1 +#define MM_MODEM_LOCATION_CAPABILITY_GSM_LAC_CI 0x2 +#define MM_MODEM_LOCATION_CAPABILITY_GPS_RAW 0x4 + +/* + * Interface org.freedesktop.ModemManager.Modem.Time + */ + +#define MM_MODEM_TIME_METHOD_GETNETWORKTIME "GetNetworkTime" + +#define MM_MODEM_TIME_SIGNAL_NETWORKTIMECHANGED "NetworkTimeChanged" + +/* + * Interface org.freedesktop.DBus.Properties + */ + +#define MM_MANAGER_SIGNAL_MMPROPERTIESCHANGED "MmPropertiesChanged" +#define MM_MANAGER_SIGNAL_PROPERTIESCHANGED "PropertiesChanged" + +/********** + * Errors * + **********/ + +#define MM_ERROR_MODEM_SERIALOPENFAILED "SerialOpenFailed" +#define MM_ERROR_MODEM_SERIALSENDFAILED "SerialSendFailed" +#define MM_ERROR_MODEM_SERIALRESPONSETIMEOUT "SerialResponseTimeout" +#define MM_ERROR_MODEM_GENERAL "General" +#define MM_ERROR_MODEM_OPERATIONNOTSUPPORTED "OperationNotSupported" +#define MM_ERROR_MODEM_CONNECTED "Connected" +#define MM_ERROR_MODEM_DISCONNECTED "Disconnected" +#define MM_ERROR_MODEM_OPERATIONINPROGRESS "OperationInProgress" +#define MM_ERROR_MODEM_NOCARRIER "NoCarrier" +#define MM_ERROR_MODEM_NODIALTONE "NoDialtone" +#define MM_ERROR_MODEM_BUSY "Busy" +#define MM_ERROR_MODEM_NOANSWER "NoAnswer" +#define MM_ERROR_MODEM_GSM_PHONEFAILURE "PhoneFailure" +#define MM_ERROR_MODEM_GSM_NOCONNECTION "NoConnection" +#define MM_ERROR_MODEM_GSM_LINKRESERVED "LinkReserved" +#define MM_ERROR_MODEM_GSM_OPERATIONNOTALLOWED "OperationNotAllowed" +#define MM_ERROR_MODEM_GSM_OPERATIONNOTSUPPORTED "OperationNotSupported" +#define MM_ERROR_MODEM_GSM_PHSIMPINREQUIRED "PhSimPinRequired" +#define MM_ERROR_MODEM_GSM_PHFSIMPINREQUIRED "PhFSimPinRequired" +#define MM_ERROR_MODEM_GSM_PHFSIMPUKREQUIRED "PhFSimPukRequired" +#define MM_ERROR_MODEM_GSM_SIMNOTINSERTED "SimNotInserted" +#define MM_ERROR_MODEM_GSM_SIMPINREQUIRED "SimPinRequired" +#define MM_ERROR_MODEM_GSM_SIMPUKREQUIRED "SimPukRequired" +#define MM_ERROR_MODEM_GSM_SIMFAILURE "SimFailure" +#define MM_ERROR_MODEM_GSM_SIMBUSY "SimBusy" +#define MM_ERROR_MODEM_GSM_SIMWRONG "SimWrong" +#define MM_ERROR_MODEM_GSM_INCORRECTPASSWORD "IncorrectPassword" +#define MM_ERROR_MODEM_GSM_SIMPIN2REQUIRED "SimPin2Required" +#define MM_ERROR_MODEM_GSM_SIMPUK2REQUIRED "SimPuk2Required" +#define MM_ERROR_MODEM_GSM_MEMORYFULL "MemoryFull" +#define MM_ERROR_MODEM_GSM_INVALIDINDEX "InvalidIndex" +#define MM_ERROR_MODEM_GSM_NOTFOUND "NotFound" +#define MM_ERROR_MODEM_GSM_MEMORYFAILURE "MemoryFailure" +#define MM_ERROR_MODEM_GSM_TEXTTOOLONG "TextTooLong" +#define MM_ERROR_MODEM_GSM_INVALIDCHARS "InvalidChars" +#define MM_ERROR_MODEM_GSM_DIALSTRINGTOOLONG "DialStringTooLong" +#define MM_ERROR_MODEM_GSM_INVALIDDIALSTRING "InvalidDialString" +#define MM_ERROR_MODEM_GSM_NONETWORK "NoNetwork" +#define MM_ERROR_MODEM_GSM_NETWORKTIMEOUT "NetworkTimeout" +#define MM_ERROR_MODEM_GSM_NETWORKNOTALLOWED "NetworkNotAllowed" +#define MM_ERROR_MODEM_GSM_NETWORKPINREQUIRED "NetworkPinRequired" +#define MM_ERROR_MODEM_GSM_NETWORKPUKREQUIRED "NetworkPukRequired" +#define MM_ERROR_MODEM_GSM_NETWORKSUBSETPINREQUIRED "NetworkSubsetPinRequired" +#define MM_ERROR_MODEM_GSM_NETWORKSUBSETPUKREQUIRED "NetworkSubsetPukRequired" +#define MM_ERROR_MODEM_GSM_SERVICEPINREQUIRED "ServicePinRequired" +#define MM_ERROR_MODEM_GSM_SERVICEPUKREQUIRED "ServicePukRequired" +#define MM_ERROR_MODEM_GSM_CORPORATEPINREQUIRED "CorporatePinRequired" +#define MM_ERROR_MODEM_GSM_CORPORATEPUKREQUIRED "CorporatePukRequired" +#define MM_ERROR_MODEM_GSM_HIDDENKEYREQUIRED "HiddenKeyRequired" +#define MM_ERROR_MODEM_GSM_EAPMETHODNOTSUPPORTED "EapMethodNotSupported" +#define MM_ERROR_MODEM_GSM_INCORRECTPARAMS "IncorrectParams" +#define MM_ERROR_MODEM_GSM_UNKNOWN "Unknown" +#define MM_ERROR_MODEM_GSM_GPRSILLEGALMS "GprsIllegalMs" +#define MM_ERROR_MODEM_GSM_GPRSILLEGALME "GprsIllegalMe" +#define MM_ERROR_MODEM_GSM_GPRSSERVICENOTALLOWED "GprsServiceNotAllowed" +#define MM_ERROR_MODEM_GSM_GPRSPLMNNOTALLOWED "GprsPlmnNotAllowed" +#define MM_ERROR_MODEM_GSM_GPRSLOCATIONNOTALLOWED "GprsLocationNotAllowed" +#define MM_ERROR_MODEM_GSM_GPRSROAMINGNOTALLOWED "GprsRoamingNotAllowed" +#define MM_ERROR_MODEM_GSM_GPRSOPTIONNOTSUPPORTED "GprsOptionNotSupported" +#define MM_ERROR_MODEM_GSM_GPRSNOTSUBSCRIBED "GprsNotSubscribed" +#define MM_ERROR_MODEM_GSM_GPRSOUTOFORDER "GprsOutOfOrder" +#define MM_ERROR_MODEM_GSM_GPRSPDPAUTHFAILURE "GprsPdpAuthFailure" +#define MM_ERROR_MODEM_GSM_GPRSUNSPECIFIED "GprsUnspecified" +#define MM_ERROR_MODEM_GSM_GPRSINVALIDCLASS "GprsInvalidClass" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-serial-error.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-serial-error.xml new file mode 100644 index 0000000000..8551b6ef03 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/mm-serial-error.xml @@ -0,0 +1,24 @@ + + + Copyright (C) 2008 Novell, Inc. + + + + Could not open serial device. + + + + + + Could not write to the serial device. + + + + + + A response was not received in time. + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Cdma.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Cdma.xml new file mode 100644 index 0000000000..4f7b00a5a4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Cdma.xml @@ -0,0 +1,235 @@ + + + + + + + + Activates the modem for use with a given carrier. In the + event of immediate failure, returns an error value instead of + setting a DBus error. + + + + + + Name of carrier. + + + + + An enum from MM_MODEM_CDMA_ACTIVATION_ERROR. This is + returned for immediate errors. Delayed errors are returned + via an ActivationStateChanged signal + + + + + + + Sets modem configuration data. Unlike regular Activate(), + this does not contact the carrier. Some modems will reboot + after this call is made. + + + + + + A dictionary of properties to set on the modem. Keys include 'mdn', 'min' + + + + + + + Workaround for the fact that dbus-send cannot send + dictionaries of variants. Calls ActivateManual, with + system_id converted to int. + + + + + + Same as ActivateManual + + + + + + + The device activation state changed. + + + Current activation state + + + Carrier-specific error code + + + Selected Modem.Simple.GetStatus keys that have changed as a + result of this activation state change. Will include 'mdn' + and 'min'. + + + + + + + Get the current signal quality. + + + + + + Signal quality (percent). + + + + + + + Get the Electronic Serial Number of the card. + + + + + + The ESN. + + + + + + + Get the Service System details of the current network, if registered. + + + + + + A structure containing the Band Class (0 = unknown, 1 = 800 MHz, 2 = 1900 MHz), the Band ("A" - "F" as defined by IS707-A), and the System ID of the serving network. + + + + + + + The signal quality changed. + + + + The new quality in percent, 0..100. + + + + + + Get device registration state. + + + + CDMA 1x registration state. + + + EVDO registration state. + + + + + + The modem's Mobile Equipment Identifier. + + + + + + The device registration state changed. + + + CDMA 1x registration state. + + + EVDO registration state. + + + + + + Registration status is unknown or the device is not registered. + + + Registered, but roaming status is unknown or cannot be provided by the device. The device may or may not be roaming. + + + Currently registered on the home network. + + + Currently registered on a roaming network. + + + + + + Device is not activated + + + Device is activating + + + Device is partially activated; carrier-specific steps required to continue. + + + Device is ready for use. + + + + + + + + Device cannot activate while roaming. + + + + + Device cannot activate on this network type (eg EVDO vs 1xRTT). + + + + + Device could not connect to the network for activation. + + + + + Device could not authenticate to the network for activation. + + + + + Later stages of device provisioning failed. + + + + + No signal available. + + + + + An error occurred. + + + + + Activation timed out. + + + + + API call for initial activation failed. + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Firmware.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Firmware.xml new file mode 100644 index 0000000000..42bcae1282 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Firmware.xml @@ -0,0 +1,114 @@ + + + + + + This interface allows clients to select or install firmware images on + modems. + + Firmware slots and firmware images are identified by arbitrary opaque + strings. + + Firmware images are represented as dictionaries of properties. + Certain properties are pre-defined, and some are required: + + Name (string, required): A user-readable name for the firmware image. + Version (string, optional): The version of the firmware. The format is + unspecified; tools attempting to upgrade firmware automatically must + understand the versioning scheme used by the modem driver they are + interacting with. May be displayed to the user. + + + + + List installed and available firmware images. + + Depending on the type of modem, installed images may be stored on the + host or the modem. The distinction between "installed" and + "available" is not one of where the firmware is stored, but that + installed images can be selected non-destructively, while available + images must be installed into a slot, possibly overwriting another + installed image. + + + + + The identifier of the selected firmware slot, or the empty string if + no slot is selected (such as if all slots are empty, or no slots + exist). + + + + + A dictionary of slots into which firmware is and/or can be + installed. The key of each entry is the identifier of the slot, + and the value is either an empty dictionary if the slot is empty, + or a dictionary of properties of the firmware image installed in + that slot. + + The slot identifiers and the mapping between slots and firmware + images are guaranteed to remain stable only as long as the modem + remains present. + + + + + A dictionary of available firmware images. The key of each entry is + the identifier of the image, and the value is a dictionary of + properties of the image. + + The image identifiers are guaranteed to remain stable only as long + as the modem remains present. + + + + + + + Selects a different firmware image to use, and immediately resets the + modem so that it begins using the new firmware image. + + Select will fail if the identifier does not match any of the slot + identifiers returned by List, or if the slot could not be selected + for some reason. + + + + + + The identifier of the firmware slot to select. + + + + + + + Install an available firmware image into a slot. + + Install does not guarantee that the image will be installed into the + specified slot, but does guarantee that, if the slot is empty, no + image will be overwritten, and if the slot is not empty, no image + other than the one in that slot will be overwritten. + + Install will fail if either of the identifiers is invalid, or if the + image could not be installed into the slot for some reason. + + + + + + The identifier of the firmware image to install. + + + + + The identifier of the slot into which the firmware should be + installed. + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Card.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Card.xml new file mode 100644 index 0000000000..c84107d01d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Card.xml @@ -0,0 +1,167 @@ + + + + + + + Get the IMEI of the card. + + + + + + The IMEI. + + + + + + + Get the IMSI of the SIM card. + + + + + + The IMSI. + + + + + + + Returns the ID of the network operator that issued the SIM card, + formatted as a 5 or 6-digit MCC/MNC code (ex "310410"). + + + + + + The operator ID formatted as an MCC/MNC code. + + + + + + + Returns the SPN (Service Provider Name) from the SIM card, + + + + + + The Service Provider Name. + + + + + + + Get the subscriber phone number. + + + + + + The MSISDN. + + + + + + + Send the PUK and a new PIN to unlock the SIM card. + + + + + + The PUK code. + + + + + The PIN code. + + + + + + + Send the PIN to unlock the SIM card. + + + + + + The PIN code. + + + + + + + Enable or disable the PIN checking. + + + + + + The PIN code. + + + + + True to enable PIN checking. + + + + + + + Change the PIN code. + + + + + + The current PIN code. + + + + + The new PIN code. + + + + + + + An obfuscated SIM identifier based on the IMSI or the ICCID. This may + be available before the PIN has been entered depending on the device + itself. + + + + + + Bands supported by the card. (Note for plugin writers: + returned value must not contain ANY) + + + + + + Network selection modes supported by the card. (Note for plugin writers: + returned value must not contain ANY) + + + + + + Facilities for which PIN locking is enabled. + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml new file mode 100644 index 0000000000..bef1de8236 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml @@ -0,0 +1,104 @@ + + + + + + + Add a new contact to the SIM card. + + + + + + The name of the contact. + + + + + The phone number of the contact. + + + + + The index of the new contact. + + + + + + + Delete a contact from the SIM card. + + + + + + The index of the contact. + + + + + + + Retrieve a contact from the SIM card. + + + + + + The index of the contact. + + + + + The contact structure containing index, name, and number. + + + + + + + List all contacts on the SIM card. + + + + + + The list of contacts where each contact has an index, name, and number. + + + + + + + Find a contact from the SIM card. + + + + + + The pattern to search for. + + + + + The list of matching contacts where a contact has an index, name, and number. + + + + + + + Get the number of contacts stored on the SIM card. + + + + + + The number of contacts. + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml new file mode 100644 index 0000000000..5f548d1207 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml @@ -0,0 +1,19 @@ + + + + + + + Authenticate using the passed user name and password. + + + + + The user name. + + + The password. + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Network.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Network.xml new file mode 100644 index 0000000000..5ba6c59232 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Network.xml @@ -0,0 +1,340 @@ + + + + + + + Register the device to network. + + + + + + The network ID to register. An empty string can be used to register to the home network. + + + + + + + Scan for available networks. + + + + + +

Found networks. It's an array of dictionaries (strings for both + keys and values) with each array element describing a mobile network + found in the scan. Each dict may include one or more of the following + keys:

+
    +
  • + "status": a number representing network availability status as + defined in 3GPP TS 27.007 section 7.3. e.g. "0" (unknown), "1" + (available), "2" (current), or "3" (forbidden). This key will + always be present. +
    • +
  • + "operator-long": long-format name of operator. If the name is + unknown, this field should not be present. +
    • +
  • + "operator-short": short-format name of operator. If the name is + unknown, this field should not be present. +
    • +
  • + "operator-num": mobile code of the operator. Returned in the + format "MCCMNC", where MCC is the three-digit ITU E.212 Mobile + Country Code and MNC is the two- or three-digit GSM Mobile + Network Code. e.g. "31026" or "310260". +
    • +
  • + "access-tech": a number representing the access technology used by + this mobile network as described in 3GPP TS 27.007 section 7.3. + e.g. "0" (GSM), "1" (GSM Compact), "2" (UTRAN/UMTS), "3" (EDGE), + etc. +
    • +
+ + + + + + + Set the APN. + + + + + + The APN. + + + + + + + Get the current signal quality. + + + + + + Signal quality (percent). + + + + + + + Sets the bands the device is allowed to use when connecting to a mobile network. + + + + + + The desired bands, as a set of flags. + + + + + + + Returns the current bands the device is using. (Note for plugin writers: returned value must not be ANY) + + + + + + The current bands, as a set of flags. + + + + + + + Set the desired mode the device may use when connecting to a mobile + network (DEPRECATED; see SetAllowedMode instead). + + + + + + The desired network mode. Only one mode may be specified, and may not be UNKNOWN. + + + + + + + Returns the current network mode of the device (DEPRECATED; does not + allow returning both the saved mode preference *and* the current access + technology of the device at the same time. See the AllowedMode + property instead). + + + + + + Returns the general network mode (ex. 2G/3G preference) of the device. + + + + + + + Get the registration status and the current operator (if registered). + + + + + + The returned information is composed of the following items in the + following order: +
    +
  • + Mobile registration status as defined in 3GPP TS 27.007 section + 10.1.19. See the MM_MODEM_GSM_NETWORK_REG_STATUS enumeration for + possible values. +
    • +
  • + Current operator code of the operator to which the mobile is + currently registered. Returned in the format "MCCMNC", where MCC + is the three-digit ITU E.212 Mobile Country Code and MNC is the + two- or three-digit GSM Mobile Network Code. If the MCC and MNC + are not known or the mobile is not registered to a mobile network, + this value should be a zero-length (blank) string. e.g. "31026" + or "310260". +
    • +
  • + Current operator name of the operator to which the mobile is + currently registered. If the operator name is not knowon or the + mobile is not registered to a mobile network, this value should + be a zero-length (blank) string. +
    • +
+ + + + + + + Set the access technologies a device is allowed to use when connecting + to a mobile network. + + + + + + The allowed mode. The device may not support all modes; see + the org.freedesktop.ModemManager.Gsm.Card.SupportedModes property for + allowed modes for each device. All devices support the "ANY" flag. + + + + + + + The allowed access technologies (eg 2G/3G preference) the device is allowed + to use when connecting to a mobile network. + + + + + + The current network access technology used by the device to communicate + with the base station. (Note to plugin writers: if the device's access + technology cannot be determined, use UNKNOWN) + + + + + + The signal quality changed. + + + + The new quality in percent, 0..100. + + + + + + + The registration status changed. + + + + Mobile registration status as defined in 3GPP TS 27.007 section + 10.1.19. + + + + + Current operator code of the operator to which the mobile is + currently registered. Returned in the format "MCCMNC", where MCC + is the three-digit ITU E.212 Mobile Country Code and MNC is the + two- or three-digit GSM Mobile Network Code. If the MCC and MNC + are not known or the mobile is not registered to a mobile network, + this value should be a zero-length (blank) string. e.g. "31026" or + "310260". + + + + + Current operator name of the operator to which the mobile is + currently registered. If the operator name is not knowon or the + mobile is not registered to a mobile network, this value should + be a zero-length (blank) string. + + + + + + + The network mode preference changed. (DEPRECATED; see documentation + for GetNetworkMode/SetNetworkMode) + + + The new network mode. + + + + + + GSM registration code as defined in 3GPP TS 27.007 section 10.1.19. + + + + Not registered, not searching for new operator to register. + + + + + Registered on home network. + + + + + Not registered, searching for new operator to register with. + + + + + Registration denied. + + + + + Unknown registration status. + + + + + Registered on a roaming network. + + + + + + + DEPRECATED; should not be used in new applications. Use + AccessTechnology, AllowedMode, and SetAllowedMode() instead. + + + Any network mode can be used + + + GPRS + + + EDGE + + + UMTS (3G) + + + HSDPA + + + Prefer 2G (GPRS or EDGE) + + + Prefer 3G (UMTS/HSDPA/HSUPA/HSPA) + + + Use only 2G (GPRS or EDGE) + + + Use only 3G (UMTS/HSDPA/HSUPA/HSPA) + + + HSUPA + + + HSPA (HSDPA + HSUPA) + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml new file mode 100644 index 0000000000..5f231b02ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml @@ -0,0 +1,159 @@ + + + + + + + Delete an SMS message. + + + + + + The index of the SMS. + + + + + + + Retrieve an SMS from the SIM card. + + + + + + The index of the SMS. + + + + + A dictionary containing SMS properties of the SMS specified by the given index. This dictionary may contain the following key/value pairs: + + number : string - Phone number (mandatory) + text : string - SMS text (mandatory, empty if data cannot be decoded) + data : byte array - SMS user data (TP-UD) (mandatory) + data-coding-scheme: uint (0..255) - SMS user data coding scheme (TP-DCS) (mandatory) + smsc : string - SMS service center number (optional) + validity : uint (0..255) - Specifies when the SMS expires in SMSC (optional) + class : uint (0..3) - Message importance and location (optional) + completed: boolean - Whether all message parts have been received or not (optional) + index : uint - Index of message (for Get and Delete) (optional) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SMS properties to save with the following key values: + + number : string - Phone number (mandatory) + text : string - SMS text (mandatory) + smsc : string - SMS service center number (optional) + validity : uint (0..255) - Specifies when the SMS expires in SMSC (optional) + class : uint (0..3) - Message importance and location (optional) + + + + + + + + + + + SMS properties to save with the following key values: + + number : string - Phone number (mandatory) + text : string - SMS text (mandatory) + smsc : string - SMS service center number (optional) + validity : uint (0..255) - Specifies when the SMS expires in SMSC (optional) + class : uint (0..3) - Message importance and location (optional) + + + + + + + + + + + + + + + + + + + + + + + + Emitted when any part of a new SMS has been received (but not for subsequent parts, if any). Not all parts may have been received and the message may not be complete; if it is, the 'complete' argument will be TRUE. + + + + Index of the new SMS. + + + + + TRUE if all message parts have been received, otherwise FALSE. + + + + + + + Emitted when the complete-ness status of an SMS message changes. An SMS may not necessarily be complete when the first part is received; this signal will be emitted when all parts have been received, even for single-part messages. + + + + The index of the SMS. + + + + + TRUE if all message parts have been received, otherwise FALSE. + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml new file mode 100644 index 0000000000..88dcdf7ee0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml @@ -0,0 +1,84 @@ + + + + + + + + Sends a USSD command string to the network initiating a USSD session. + When the request is handled by the network, the method returns the + response or an appropriate error. The network may be awaiting further + response from the ME after returning from this method and no new command + can be initiated until this one is cancelled or ended. + + + + + + The command to start the USSD session with. + + + + + The network response to the command which started the USSD session. + + + + + + + Respond to a USSD request that is either initiated by the mobile network, + or that is awaiting further input after Initiate() was called. + + + + + + The response to network-initiated USSD command, or a response to a + request for further input. + + + + + The network reply to this response to the network-initiated USSD + command. The reply may require further responses. + + + + + + + Cancel an ongoing USSD session, either mobile or network initiated. + + + + + + + + Indicates the state of any ongoing USSD session. Values may be one of + the following: "idle" (no active session), "active" (a session is active + and the mobile is waiting for a response), "user-response" (the network + is waiting for the client's response, which must be sent using Respond()). + + + + + + Contains any network-initiated request to which no USSD response is + required. When no USSD session is active, or when there is no network- + initiated request, this property will be a zero-length string. + + + + + + Contains any pending network-initiated request for a response. Client + should call Respond() with the appropriate response to this request. + When no USSD session is active, or when there is no pending + network-initiated request, this property will be a zero-length string. + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.xml new file mode 100644 index 0000000000..8ef62bfc6f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Gsm.xml @@ -0,0 +1,205 @@ + + + + + + + A bitfield describing the specific access modes and technologies + supported by a device and the access technology in-use when connected to + a mobile network. + + + Unknown or invalid mode. + + + For certain operations, allow the modem to pick any available mode. + + + GPRS + + + EDGE + + + UMTS (3G) + + + HSDPA (3G) + + + Prefer 2G (GPRS or EDGE) + + + Prefer 3G (UMTS/HSDPA/HSUPA/HSPA) + + + Use only 2G (GPRS or EDGE) + + + Use only 3G (UMTS/HSDPA/HSUPA/HSPA) + + + HSUPA (3G) + + + HSPA (3G) + + + GSM + + + GSM Compact + + + + + + A bitfield describing the specific radio bands supported by the device + and the radio bands the device is allowed to use when connecting to a + mobile network. + + + Unknown or invalid band + + + For certain operations, allow the modem to select a band automatically. + + + GSM/GPRS/EDGE 900 MHz + + + GSM/GPRS/EDGE 1800 MHz + + + GSM/GPRS/EDGE 1900 MHz + + + GSM/GPRS/EDGE 850 MHz + + + WCDMA 2100 MHz (Class I) + + + WCDMA 3GPP 1800 MHz (Class III) + + + WCDMA 3GPP AWS 1700/2100 MHz (Class IV) + + + WCDMA 3GPP UMTS 800 MHz (Class VI) + + + WCDMA 3GPP UMTS 850 MHz (Class V) + + + WCDMA 3GPP UMTS 900 MHz (Class VIII) + + + WCDMA 3GPP UMTS 1700 MHz (Class IX) + + + WCDMA 3GPP UMTS 1900 MHz (Class II) + + + WCDMA 3GPP UMTS 2600 MHz (Class VII, internal) + + + + + + Describes the device's current access mode preference; ie the specific + technology preferences the device is allowed to use when connecting to + a mobile network. + + + Any mode can be used + + + Prefer 2G (GPRS or EDGE) + + + Prefer 3G (UMTS or HSxPA) + + + Use only 2G (GPRS or EDGE) + + + Use only 3G (UMTS or HSxPA) + + + + + + Describes various access technologies that a device uses when connected + to a mobile network. + + + The access technology used is unknown + + + GSM + + + Compact GSM + + + GPRS + + + EDGE (ETSI 27.007: "GSM w/EGPRS") + + + UMTS (ETSI 27.007: "UTRAN") + + + HSDPA (ETSI 27.007: "UTRAN w/HSDPA") + + + HSUPA (ETSI 27.007: "UTRAN w/HSUPA") + + + HSPA (ETSI 27.007: "UTRAN w/HSDPA and HSUPA") + + + HSPA+ (ETSI 27.007: "UTRAN w/HSPA+") + + + + + + A bitfield describing which facilities have a lock enabled, i.e., + requires a pin or unlock code. The facilities include the + personalizations (device locks) described in 3GPP spec TS 22.022, + and the PIN and PIN2 locks, which are SIM locks. + + + No facility + + + SIM lock + + + Fixed dialing (PIN2) SIM lock + + + Device is locked to a specific SIM + + + Device is locked to first SIM inserted + + + Network personalization + + + Network subset personalization + + + Service provider personalization + + + Corporate personalization + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Location.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Location.xml new file mode 100644 index 0000000000..0abb361cd7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Location.xml @@ -0,0 +1,253 @@ + + + + + + This interface allows devices to provide location information to client + applications. Not all devices can provide this information, or even if + they do, they may not be able to provide it while a data session is + active. + + + + + Location capabilities of the device. + + + + + + TRUE if location information gathering is enabled for this device, FALSE + if it is disabled. When disabled, the device will not provide location + information. + + + + + + Enable or disable location information gathering. This method may + require the client to authenticate itself. This method may also cause + any necessary functionality of the mobile be be turned on, including + enabling the modem device itself. + + + + + + TRUE to enable location information gathering, FALSE to disable. + + + + + When enabling location information gathering, this argument controls + whether the device emits signals with new location information or not. + When signals are emitted, any client application (including malicious + ones!) can listen for location updates unless D-Bus permissions + restrict these signals from certain users. If further security is + desired, this argument can be set to FALSE to disable location + updates via D-Bus signals and require applications to call + authenticated APIs (like GetLocation) to get location information. + This argument is ignored when disabling location information + gathering. + + + + + + + Return current location information, if any. This method may require + the client to authenticate itself. + + + + + + Dict of available location information when location information + gathering is enabled. If the modem supports multiple location types + it may return more than one here. + + + + + + + TRUE if location updates will be emitted via D-Bus signals, FALSE + if location updates will not be emitted. See the Enable method for + more information. + + + + + + Dict of available location information when location information + gathering is enabled. If the modem supports multiple location types + it may return more than one here. Note that if the device was told + not to emit updated location information when location information + gathering was initially enabled, this property may not return + any location information for security reasons. + + + + + + A mapping from location type to type-specific location information. + + + + Identifies the type and format of the associated location information. + Contrary to the value description, this is not a bitfield but uses the + same values as the MM_MODEM_LOCATION_CAPABILITIES bitfield. + + + + + Contains type-specific location information. See the documentation for + each type for a description of its data format. + + + + + + +

Unknown or no capabilties.

 + + + +

For capability reporting, indicates the device is capable of + providing GPS NMEA-format location information.

+ +

For location reporting, devices supporting this capability return + a string containing one or more NMEA sentences (D-Bus signature 's'). + The manager will cache the most recent NMEA sentence of each type for + a period of time not less than 30 seconds. When reporting multiple + NMEA sentences, sentences shall be separated by an ASCII Carriage + Return and Line Feed (<CR><LF>) sequence. +

+

+ For example, if the device sends a $GPRMC sentence immediately + followed by a $GPGGA sentence, the reported location string would be + (where of course the <CR><LF> is replaced with the actual + ASCII CR (0x0D) and LF (0x0A) control characters): + 

+              $GPRMC,134523.92,V,,,,,,,030136,,,N*73<CR><LF>$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45
+
+ If the device sends a new $GPRMC three seconds later, the new $GPRMC + replaces the previously received $GPRMC sentence, and the updated + string would be: + 
+              $GPRMC,134526.92,V,,,,,,,030136,,,N*76<CR><LF>$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45
+
+ If the device then sends a $GPGSA sentence about 5 seconds later, the + $GPGSA sentence is added to the string (since no $GPGSA sentence was + previously received in this session), the updated string would be: + 
+              $GPRMC,134526.92,V,,,,,,,030136,,,N*76<CR><LF>$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45<CR><LF>$GPGSA,A,1,,,,,,,,,,,,,1.1,0.5,1.0*34
+
+ The manager may discard any cached sentences older than 30 seconds. +

+

This allows clients to read the latest positioning data as soon as + possible after they start, even if the device is not providing + frequent location data updates. +

+ + + + +

For capability reporting, indicates the device is capable of + providing GSM Location Area Code/Cell ID location information.

+ +

For location reporting, devices supporting this + capability return a string in the format "MCC,MNC,LAC,CI" (without the + quotes of course) where the following applies:

+
    +
  • + MCC is the three-digit ITU E.212 Mobile Country Code of the + network provider to which the mobile is currently registered. + This value should be the same MCC as reported by the + org.freedesktop.Modem.Gsm.Network.GetRegistrationInfo() method's + returned "operator code" argument. + e.g. "310" +
    • +
  • + MNC is the two- or three-digit GSM Mobile Network Code of the + network provider to which the mobile is currently registered. + This value should be the same MCC as reported by the + org.freedesktop.Modem.Gsm.Network.GetRegistrationInfo() method's + returned "operator code" argument. + e.g. "26" or "260" +
    • +
  • + LAC is the two-byte Location Area Code of the base station with + which the mobile is registered, in upper-case hexadecimal format + without leading zeros, as specified in 3GPP TS 27.007 section + 10.1.19. e.g. "84CD". +
    • +
  • + CI is the two- or four-byte Cell Identifier with which the mobile + is registered, in upper-case hexadecimal format without leading + zeros, as specified in 3GPP TS 27.007. e.g. "2BAF" or "D30156". +
    • +
+

The entire string may only be composed of the ASCII digits [0-9], + the alphabetical characters [A-F], and the comma (,) character. No + other characters are allowed. For example: "310,260,8BE3,2BAF" or + "250,40,CE00,1CEAD8F0".

+ +

If any of these four items (MCC,MNC,LAC,CI) is unknown or the + mobile is not registered with a network, then the GSM_LAC_CI location + information item should not be provided as a returned value from the + GetLocation() method or in the Location property.

+ + + + +

For capability reporting, indicates the device is capable of + providing raw GPS information using a series of defined key/value + pairs.

+ +

For location reporting, devices supporting this + capability return a D-Bus dict (signature a{sv}) mapping well-known + keys to values with defined formats. The allowed key/value pairs + and their formats are:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KeyValue TypeValue contentsExample
latitudedLatitude in Decimal Degrees (positive numbers mean N quadrasphere, negative mean S quadrasphere)38.889722 (ie, 38d 53' 22" N)
longitudedLongitude in Decimal Degrees (positive numbers mean E quadrasphere, negative mean W quadrasphere)-77.008889 (ie, 77d 0' 32" W)
altitudedAltitude above sea level in meters33.5
horiz-velocitydHorizontal velocity in meters-per-second.5
vert-velocitydVertical velocity in meters-per-second.01
+

The 'latitude' and 'longitude' keys are required; other keys are + optional.

+ + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Simple.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Simple.xml new file mode 100644 index 0000000000..f17b6c90c7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Simple.xml @@ -0,0 +1,58 @@ + + + + + + + + Do everything needed to connect the modem. + + + + + + Dictionary of properties needed to get the modem connected. + Each implementation is free to add it's own specific key-value pairs. The predefined + common ones are: + + 'pin' : string + 'network_id' : string + 'band' : uint + 'network_mode' : uint + 'apn' : string + 'number' : string + + + + + + + Get the modem status. + + + + + + Dictionary of properties. + Each implementation is free to add it's own specific key-value pairs. The predefined + common ones are: + + 'state' : uint (always) + 'signal_quality' : uint (state >= registered) + 'operator_code' : string (state >= registered) + 'operator_name' : string (state >= registered) + 'band' : uint (state >= registered) + 'network_mode' : uint (state >= registered) + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Time.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Time.xml new file mode 100644 index 0000000000..cfdb9a381e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.Time.xml @@ -0,0 +1,56 @@ + + + + + + This interface allows clients to receive network time and timezone + updates broadcast by mobile networks. + + + + + The timezone data provided by the network. It may include one of more + of the following fields: + + 'offset': offset of the timezone from UTC, in minutes (including DST, + if applicable). + 'dst_offset': amount of 'offset' that is due to DST, in minutes. + 'leap_seconds': number of leap seconds included in the network time. + + + + + + Gets the current network time. + + This method will only work if the modem tracks, or can request, the + current network time; it will not attempt to use previously-received + network time updates on the host to guess the current network time. + + + + + If the network time is known, a string containing a date and time in + ISO 8601 format. + + If the network time is unknown, the empty string. + + + + + + + Sent when the network time is updated. + + + + If the network time is known, a string containing a date and time in + ISO 8601 format. + + If the network time is unknown, the empty string. + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.xml new file mode 100644 index 0000000000..c38ecd2a95 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.Modem.xml @@ -0,0 +1,247 @@ + + + + + + + + Enable the device. Initializes the modem. + + + + + + True to enable the device, False to disable. + + + + + + + Dial in. + + + + + + The number to use for dialing. + + + + + + + Disconnect modem. + + + + + + + + Request the IP4 configuration from the device. + Note that it'll only be supported for IPMethod MM_MODEM_IP_METHOD_STATIC. + + + + + Structure containing IP4 address, DNS1, DNS2, DNS3. + The DNS list is padded with 0's if there's less than 3 DNS servers. + + + + + + Get the card information (manufacturer, modem, version). + + + + + + Structure containing manufacturer, model, and version (revision) of the card. + + + + + + + Clear non-persistent configuration and state, and return the device to + a newly-powered-on state. This command may power-cycle the device. + + + + + + + + Clear the modem's configuration (including persistent configuration and + state), and return the device to a factory-default state. This command + may or may not power-cycle the device. + + + + + Carrier-supplied code required to reset the modem. Ignored if not required. + + + + + + The modem's state (see the State property) changed. + + + + Old state. + + + + + New state. + + + + + Reason for this state change. + + + + + + + The modem port to use for IP configuration and traffic. + + + + + + A best-effort device identifier based on various device information like + model name, firmware revision, USB/PCI/PCMCIA IDs, and other properties. + This ID is not guaranteed to be unique and may be shared between + identical devices with the same firmware, but is intended to be + "unique enough" for use as a casual device identifier for various + user experience operations. This is not the device's IMEI or ESN since + those may not be available before unlocking the device via a PIN. + + + + + + The physical modem device reference (ie, USB, PCI, PCMCIA device), which + may be dependent upon the operating system. In Linux for example, this + points to a sysfs path of the usb_device object. + + + + + + The driver handling the device. + + + + + + The modem type. + + + + + + TRUE if the modem is enabled (ie, powered and usable), FALSE if it is disabled. + + + + + + The identity of the device. This will be the IMEI number for + GSM devices and the hex-format ESN/MEID for CDMA devices. + + + + + + Empty if the device is usable without an unlock code or has already + been unlocked. If the device needs to be unlocked before becoming usable this + property contains the specific unlock code required.  Valid unlock code values + are "" (blank), "sim-pin", "sim-puk", "ph-sim-pin", "ph-fsim-pin", + "ph-fsim-puk", "sim-pin2", "sim-puk2", "ph-net-pin", "ph-net-puk", + "ph-netsub-pin", "ph-netsub-puk", "ph-sp-pin", "ph-sp-puk", "ph-corp-pin", and + "ph-corp-puk". + + + + + + The number of unlock retries remaining for the unlock code given by the + property UnlockRequired, or 999 if the device does not support reporting + unlock retries. If UnlockRequired is blank, this property gives the + number of tries allowed for changing or disabling sim-pin. + + + + + + The IP configuration method. + + + + + + + State of the modem. + + + + + + + A GSM device. + + + + + A CDMA device. + + + + + + + + Use PPP to get the address. + + + + + Static configuration, the modem will provide IP information. + + + + + Use DHCP + + + + + + + + Reason unknown or not reportable. + + + + + State change was requested by an interface user. + + + + + State change was caused by a system suspend. + + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.xml new file mode 100644 index 0000000000..347aedf47a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/files/org.freedesktop.ModemManager.xml @@ -0,0 +1,61 @@ + + + + + + + + Get the list of modem devices. + + + + + List of object paths of modem devices known to the system. + + + + + + + Start a new scan for connected modem devices. + + + + + + + + + Set logging verbosity. + + + + One of [ERR, WARN, INFO, DEBUG]. + + + + + + + A device was added to the system. + + + + The object path of the newly added device. + + + + + + + A device was removed from the system, and is no longer available. + + + + The object path of the device that was just removed. + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/modemmanager-classic-interfaces-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/modemmanager-classic-interfaces-0.0.1.ebuild new file mode 100644 index 0000000000..26612a2989 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/modemmanager-classic-interfaces/modemmanager-classic-interfaces-0.0.1.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# Headers so we can build apps (like cromo) that depend on the old MM +# interface (org.freedesktop.ModemManager.*) even after we've switched +# to mm-next (org.freedesktop.ModemManager1.*) + +EAPI=4 + +DESCRIPTION="DBus interface descriptions and headers for ModemManager v0.5" +HOMEPAGE="http://www.chromium.org/" +#SRC_URI not defined because we get our source locally + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="! net-libs/neon migration finishes. + +SLOT="0" +KEYWORDS="amd64 arm x86" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/Manifest new file mode 100644 index 0000000000..f3290f97a4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/Manifest @@ -0,0 +1,6 @@ +DIST openssh-5.2p1+x509-6.2.1.diff.gz 153887 RMD160 3642946adfc122f28fb80518719040dddacf84ea SHA1 e48447e4335c543f4b702b3e3d0e41d6d9f7f6aa SHA256 9a745634eaf450fb2c0f9dcc31f3021dcd70d6bbdba0ae5b6952f2dfcb21ee55 +DIST openssh-5.2p1-gsskex-all-20090726.patch 90959 RMD160 45763e73aa65181d56aafed9ab7dd217150769f2 SHA1 64058c69fb866a8ab0233d454f3bb8e94a0b9db7 SHA256 6eb297d6fa74be3323c5e4f53df5b6e1f4edf6bf394e3e707c075846886e18e7 +DIST openssh-5.2p1-hpn13v6.diff.gz 33540 RMD160 d647d3b0547e4d698c616f5ed6643b3ddbcced95 SHA1 9683d5feb3f7e302ef836901af5366df6c425815 SHA256 90a395037a826a8ebcff68be8e46ddce1f89fd776c312c0e10e73cb703ed21bd +DIST openssh-5.2p1.tar.gz 1016612 RMD160 7c53f342034b16e9faa9f5a09ef46390420722eb SHA1 8273a0237db98179fbdc412207ff8eb14ff3d6de SHA256 4023710c37d0b3d79e6299cb79b6de2a31db7d581fe59e775a5351784034ecae +DIST openssh-5.2pkcs11-0.26.tar.bz2 18642 RMD160 07093fb2ad47247b2f028fae4fe1b80edf4ddaf8 SHA1 755793398e1b04ee6c15458a69ce4ad68d2abee0 SHA256 9655f118c614f76cfdd3164b5c0e3e430f20a4ce16c65df0dc1b594648cf1c07 +DIST openssh-lpk-5.2p1-0.3.11.patch.gz 18116 RMD160 2ff9bdff19e0854a96063be1e0589fa3f85da0d7 SHA1 33b36cf94f68a80fca497da110529ce69d62fbb0 SHA256 450b56a989767aa65a974213e8f7e9d0ee9d08522247db7b787730e53685bebd diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-3.9_p1-opensc.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-3.9_p1-opensc.patch new file mode 100644 index 0000000000..c81dcc9dfe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-3.9_p1-opensc.patch @@ -0,0 +1,130 @@ +http://bugs.gentoo.org/43593 +http://bugzilla.mindrot.org/show_bug.cgi?id=608 + +Index: scard-opensc.c +=================================================================== +RCS file: /cvs/openssh/scard-opensc.c,v +retrieving revision 1.12 +--- scard-opensc.c ++++ scard-opensc.c +@@ -38,6 +38,8 @@ + #include "readpass.h" + #include "scard.h" + ++int ask_for_pin=0; ++ + #if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE) + #define USE_ENGINE + #define RSA_get_default_method RSA_get_default_openssl_method +@@ -119,6 +121,7 @@ + struct sc_pkcs15_prkey_info *key; + struct sc_pkcs15_object *pin_obj; + struct sc_pkcs15_pin_info *pin; ++ char *passphrase = NULL; + + priv = (struct sc_priv_data *) RSA_get_app_data(rsa); + if (priv == NULL) +@@ -156,24 +159,47 @@ + goto err; + } + pin = pin_obj->data; ++ ++ if (sc_pin) ++ passphrase = sc_pin; ++ else if (ask_for_pin) { ++ /* we need a pin but don't have one => ask for the pin */ ++ char prompt[64]; ++ ++ snprintf(prompt, sizeof(prompt), "Enter PIN for %s: ", ++ key_obj->label ? key_obj->label : "smartcard key"); ++ passphrase = read_passphrase(prompt, 0); ++ if (!passphrase || !strcmp(passphrase, "")) ++ goto err; ++ } else ++ /* no pin => error */ ++ goto err; ++ + r = sc_lock(card); + if (r) { + error("Unable to lock smartcard: %s", sc_strerror(r)); + goto err; + } +- if (sc_pin != NULL) { +- r = sc_pkcs15_verify_pin(p15card, pin, sc_pin, +- strlen(sc_pin)); +- if (r) { +- sc_unlock(card); +- error("PIN code verification failed: %s", +- sc_strerror(r)); +- goto err; +- } ++ r = sc_pkcs15_verify_pin(p15card, pin, passphrase, ++ strlen(passphrase)); ++ if (r) { ++ sc_unlock(card); ++ error("PIN code verification failed: %s", ++ sc_strerror(r)); ++ goto err; + } ++ + *key_obj_out = key_obj; ++ if (!sc_pin) { ++ memset(passphrase, 0, strlen(passphrase)); ++ xfree(passphrase); ++ } + return 0; + err: ++ if (!sc_pin && passphrase) { ++ memset(passphrase, 0, strlen(passphrase)); ++ xfree(passphrase); ++ } + sc_close(); + return -1; + } +Index: scard.c +=================================================================== +RCS file: /cvs/openssh/scard.c,v +retrieving revision 1.27 +--- scard.c ++++ scard.c +@@ -35,6 +35,9 @@ + #include "readpass.h" + #include "scard.h" + ++/* currently unused */ ++int ask_for_pin = 0; ++ + #if OPENSSL_VERSION_NUMBER < 0x00907000L + #define USE_ENGINE + #define RSA_get_default_method RSA_get_default_openssl_method +Index: scard.h +=================================================================== +RCS file: /cvs/openssh/scard.h,v +retrieving revision 1.10 +--- scard.h ++++ scard.h +@@ -33,6 +33,8 @@ + #define SCARD_ERROR_NOCARD -2 + #define SCARD_ERROR_APPLET -3 + ++extern int ask_for_pin; ++ + Key **sc_get_keys(const char *, const char *); + void sc_close(void); + int sc_put_key(Key *, const char *); +Index: ssh.c +=================================================================== +RCS file: /cvs/openssh/ssh.c,v +retrieving revision 1.180 +--- ssh.c ++++ ssh.c +@@ -1155,6 +1155,9 @@ + #ifdef SMARTCARD + Key **keys; + ++ if (!options.batch_mode) ++ ask_for_pin = 1; ++ + if (options.smartcard_device != NULL && + options.num_identity_files < SSH_MAX_IDENTITY_FILES && + (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) { diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch new file mode 100644 index 0000000000..20e796b5f9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch @@ -0,0 +1,54 @@ +allow ldap and hpn patches to play nice + +--- servconf.c ++++ servconf.c +@@ -116,24 +116,6 @@ + options->num_allow_groups = 0; + options->num_deny_groups = 0; + options->ciphers = NULL; +- options->macs = NULL; +- options->protocol = SSH_PROTO_UNKNOWN; +- options->gateway_ports = -1; +- options->num_subsystems = 0; +- options->max_startups_begin = -1; +- options->max_startups_rate = -1; +- options->max_startups = -1; +- options->max_authtries = -1; +- options->banner = NULL; +- options->use_dns = -1; +- options->client_alive_interval = -1; +- options->client_alive_count_max = -1; +- options->authorized_keys_file = NULL; +- options->authorized_keys_file2 = NULL; +- options->num_accept_env = 0; +- options->permit_tun = -1; +- options->num_permitted_opens = -1; +- options->adm_forced_command = NULL; + #ifdef WITH_LDAP_PUBKEY + /* XXX dirty */ + options->lpk.ld = NULL; +@@ -152,6 +134,24 @@ + options->lpk.flags = FLAG_EMPTY; + #endif + ++ options->macs = NULL; ++ options->protocol = SSH_PROTO_UNKNOWN; ++ options->gateway_ports = -1; ++ options->num_subsystems = 0; ++ options->max_startups_begin = -1; ++ options->max_startups_rate = -1; ++ options->max_startups = -1; ++ options->max_authtries = -1; ++ options->banner = NULL; ++ options->use_dns = -1; ++ options->client_alive_interval = -1; ++ options->client_alive_count_max = -1; ++ options->authorized_keys_file = NULL; ++ options->authorized_keys_file2 = NULL; ++ options->num_accept_env = 0; ++ options->permit_tun = -1; ++ options->num_permitted_opens = -1; ++ options->adm_forced_command = NULL; + } + + void diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.7_p1-GSSAPI-dns.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.7_p1-GSSAPI-dns.patch new file mode 100644 index 0000000000..c81ae5cb70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.7_p1-GSSAPI-dns.patch @@ -0,0 +1,127 @@ +http://bugs.gentoo.org/165444 +https://bugzilla.mindrot.org/show_bug.cgi?id=1008 + +Index: readconf.c +=================================================================== +RCS file: /cvs/openssh/readconf.c,v +retrieving revision 1.135 +diff -u -r1.135 readconf.c +--- readconf.c 5 Aug 2006 02:39:40 -0000 1.135 ++++ readconf.c 19 Aug 2006 11:59:52 -0000 +@@ -126,6 +126,7 @@ + oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, + oAddressFamily, oGssAuthentication, oGssDelegateCreds, ++ oGssTrustDns, + oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, + oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, + oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, +@@ -163,9 +164,11 @@ + #if defined(GSSAPI) + { "gssapiauthentication", oGssAuthentication }, + { "gssapidelegatecredentials", oGssDelegateCreds }, ++ { "gssapitrustdns", oGssTrustDns }, + #else + { "gssapiauthentication", oUnsupported }, + { "gssapidelegatecredentials", oUnsupported }, ++ { "gssapitrustdns", oUnsupported }, + #endif + { "fallbacktorsh", oDeprecated }, + { "usersh", oDeprecated }, +@@ -444,6 +447,10 @@ + intptr = &options->gss_deleg_creds; + goto parse_flag; + ++ case oGssTrustDns: ++ intptr = &options->gss_trust_dns; ++ goto parse_flag; ++ + case oBatchMode: + intptr = &options->batch_mode; + goto parse_flag; +@@ -1010,6 +1017,7 @@ + options->challenge_response_authentication = -1; + options->gss_authentication = -1; + options->gss_deleg_creds = -1; ++ options->gss_trust_dns = -1; + options->password_authentication = -1; + options->kbd_interactive_authentication = -1; + options->kbd_interactive_devices = NULL; +@@ -1100,6 +1108,8 @@ + options->gss_authentication = 0; + if (options->gss_deleg_creds == -1) + options->gss_deleg_creds = 0; ++ if (options->gss_trust_dns == -1) ++ options->gss_trust_dns = 0; + if (options->password_authentication == -1) + options->password_authentication = 1; + if (options->kbd_interactive_authentication == -1) +Index: readconf.h +=================================================================== +RCS file: /cvs/openssh/readconf.h,v +retrieving revision 1.63 +diff -u -r1.63 readconf.h +--- readconf.h 5 Aug 2006 02:39:40 -0000 1.63 ++++ readconf.h 19 Aug 2006 11:59:52 -0000 +@@ -45,6 +45,7 @@ + /* Try S/Key or TIS, authentication. */ + int gss_authentication; /* Try GSS authentication */ + int gss_deleg_creds; /* Delegate GSS credentials */ ++ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ + int password_authentication; /* Try password + * authentication. */ + int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ +Index: ssh_config.5 +=================================================================== +RCS file: /cvs/openssh/ssh_config.5,v +retrieving revision 1.97 +diff -u -r1.97 ssh_config.5 +--- ssh_config.5 5 Aug 2006 01:34:51 -0000 1.97 ++++ ssh_config.5 19 Aug 2006 11:59:53 -0000 +@@ -483,7 +483,16 @@ + Forward (delegate) credentials to the server. + The default is + .Dq no . +-Note that this option applies to protocol version 2 only. ++Note that this option applies to protocol version 2 connections using GSSAPI. ++.It Cm GSSAPITrustDns ++Set to ++.Dq yes to indicate that the DNS is trusted to securely canonicalize ++the name of the host being connected to. If ++.Dq no, the hostname entered on the ++command line will be passed untouched to the GSSAPI library. ++The default is ++.Dq no . ++This option only applies to protocol version 2 connections using GSSAPI. + .It Cm HashKnownHosts + Indicates that + .Xr ssh 1 +Index: sshconnect2.c +=================================================================== +RCS file: /cvs/openssh/sshconnect2.c,v +retrieving revision 1.151 +diff -u -r1.151 sshconnect2.c +--- sshconnect2.c 18 Aug 2006 14:33:34 -0000 1.151 ++++ sshconnect2.c 19 Aug 2006 11:59:53 -0000 +@@ -499,6 +499,12 @@ + static u_int mech = 0; + OM_uint32 min; + int ok = 0; ++ const char *gss_host; ++ ++ if (options.gss_trust_dns) ++ gss_host = get_canonical_hostname(1); ++ else ++ gss_host = authctxt->host; + + /* Try one GSSAPI method at a time, rather than sending them all at + * once. */ +@@ -511,7 +517,7 @@ + /* My DER encoding requires length<128 */ + if (gss_supported->elements[mech].length < 128 && + ssh_gssapi_check_mechanism(&gssctxt, +- &gss_supported->elements[mech], authctxt->host)) { ++ &gss_supported->elements[mech], gss_host)) { + ok = 1; /* Mechanism works */ + } else { + mech++; diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.7p1-selinux.diff b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.7p1-selinux.diff new file mode 100644 index 0000000000..f1c5c8723a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.7p1-selinux.diff @@ -0,0 +1,11 @@ +diff -purN openssh-4.7p1.orig/configure.ac openssh-4.7p1/configure.ac +--- openssh-4.7p1.orig/configure.ac 2007-08-10 00:36:12.000000000 -0400 ++++ openssh-4.7p1/configure.ac 2008-03-31 19:38:54.548935620 -0400 +@@ -3211,6 +3211,7 @@ AC_ARG_WITH(selinux, + AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], + AC_MSG_ERROR(SELinux support requires libselinux library)) + SSHDLIBS="$SSHDLIBS $LIBSELINUX" ++ LIBS="$LIBS $LIBSELINUX" + AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + LIBS="$save_LIBS" + fi ] diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.9_p1-x509-hpn-glue.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.9_p1-x509-hpn-glue.patch new file mode 100644 index 0000000000..a024b71400 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-4.9_p1-x509-hpn-glue.patch @@ -0,0 +1,91 @@ +move things around so hpn applies cleanly when using X509 + +--- servconf.c ++++ servconf.c +@@ -106,6 +106,17 @@ + options->log_level = SYSLOG_LEVEL_NOT_SET; + options->rhosts_rsa_authentication = -1; + options->hostbased_authentication = -1; ++ options->hostbased_algorithms = NULL; ++ options->pubkey_algorithms = NULL; ++ ssh_x509flags_initialize(&options->x509flags, 1); ++#ifndef SSH_X509STORE_DISABLED ++ ssh_x509store_initialize(&options->ca); ++#endif /*ndef SSH_X509STORE_DISABLED*/ ++#ifdef SSH_OCSP_ENABLED ++ options->va.type = -1; ++ options->va.certificate_file = NULL; ++ options->va.responder_url = NULL; ++#endif /*def SSH_OCSP_ENABLED*/ + options->hostbased_uses_name_from_packet_only = -1; + options->rsa_authentication = -1; + options->pubkey_authentication = -1; +@@ -147,18 +158,6 @@ + options->num_permitted_opens = -1; + options->adm_forced_command = NULL; + options->chroot_directory = NULL; +- +- options->hostbased_algorithms = NULL; +- options->pubkey_algorithms = NULL; +- ssh_x509flags_initialize(&options->x509flags, 1); +-#ifndef SSH_X509STORE_DISABLED +- ssh_x509store_initialize(&options->ca); +-#endif /*ndef SSH_X509STORE_DISABLED*/ +-#ifdef SSH_OCSP_ENABLED +- options->va.type = -1; +- options->va.certificate_file = NULL; +- options->va.responder_url = NULL; +-#endif /*def SSH_OCSP_ENABLED*/ + } + + void +@@ -329,6 +329,16 @@ + /* Portable-specific options */ + sUsePAM, + /* Standard Options */ ++ sHostbasedAlgorithms, ++ sPubkeyAlgorithms, ++ sX509KeyAlgorithm, ++ sAllowedClientCertPurpose, ++ sKeyAllowSelfIssued, sMandatoryCRL, ++ sCACertificateFile, sCACertificatePath, ++ sCARevocationFile, sCARevocationPath, ++ sCAldapVersion, sCAldapURL, ++ sVAType, sVACertificateFile, ++ sVAOCSPResponderURL, + sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, + sPermitRootLogin, sLogFacility, sLogLevel, + sRhostsRSAAuthentication, sRSAAuthentication, +@@ -351,16 +361,6 @@ + sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, + sMatch, sPermitOpen, sForceCommand, + sUsePrivilegeSeparation, +- sHostbasedAlgorithms, +- sPubkeyAlgorithms, +- sX509KeyAlgorithm, +- sAllowedClientCertPurpose, +- sKeyAllowSelfIssued, sMandatoryCRL, +- sCACertificateFile, sCACertificatePath, +- sCARevocationFile, sCARevocationPath, +- sCAldapVersion, sCAldapURL, +- sVAType, sVACertificateFile, +- sVAOCSPResponderURL, + sDeprecated, sUnsupported + } ServerOpCodes; + +--- Makefile.in ++++ Makefile.in +@@ -44,11 +44,12 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ ++CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ + LIBS=@LIBS@ + SSHDLIBS=@SSHDLIBS@ + LIBEDIT=@LIBEDIT@ + LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ ++CPPFLAGS += @LDAP_CPPFLAGS@ + AR=@AR@ + AWK=@AWK@ + RANLIB=@RANLIB@ diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch new file mode 100644 index 0000000000..cc986fcce7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch @@ -0,0 +1,21 @@ +a simple 'int main(){}' function won't generate references to SSP functions +when using -fstack-protector which means systems that dont have SSP support +wont get properly detected as lacking support. instead, create a big buffer +on the stack and use it as that seems to do the trick. + +https://bugzilla.mindrot.org/show_bug.cgi?id=1538 +https://bugs.gentoo.org/244776 + +--- openssh-5.1p1/configure.ac ++++ openssh-5.1p1/configure.ac +@@ -145,8 +145,8 @@ int main(void){return 0;} + AC_MSG_CHECKING(if $t works) + AC_RUN_IFELSE( + [AC_LANG_SOURCE([ +-#include +-int main(void){exit(0);} ++#include ++int main(void){char foo[[1024]];return sprintf(foo, "moo cow") == 7;} + ])], + [ AC_MSG_RESULT(yes) + break ], diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-escaped-banner.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-escaped-banner.patch new file mode 100644 index 0000000000..440772245d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-escaped-banner.patch @@ -0,0 +1,18 @@ +don't escape the banner output + +http://bugs.gentoo.org/244222 +https://bugzilla.mindrot.org/show_bug.cgi?id=1533 + +fix by Michał Górny + +--- sshconnect2.c ++++ sshconnect2.c +@@ -415,7 +415,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt) + if (len > 65536) + len = 65536; + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ +- strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL); ++ strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL|VIS_NOSLASH); + fprintf(stderr, "%s", msg); + xfree(msg); + } diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch new file mode 100644 index 0000000000..e6e22e865d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch @@ -0,0 +1,55 @@ +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.1p1+lpk/servconf.c openssh-5.1p1+lpk+glue/servconf.c +--- openssh-5.1p1+lpk/servconf.c 2008-08-23 14:37:18.000000000 -0700 ++++ openssh-5.1p1+lpk+glue/servconf.c 2008-08-23 14:52:19.000000000 -0700 +@@ -111,6 +111,25 @@ + options->num_allow_groups = 0; + options->num_deny_groups = 0; + options->ciphers = NULL; ++#ifdef WITH_LDAP_PUBKEY ++ /* XXX dirty */ ++ options->lpk.ld = NULL; ++ options->lpk.on = -1; ++ options->lpk.servers = NULL; ++ options->lpk.u_basedn = NULL; ++ options->lpk.g_basedn = NULL; ++ options->lpk.binddn = NULL; ++ options->lpk.bindpw = NULL; ++ options->lpk.sgroup = NULL; ++ options->lpk.filter = NULL; ++ options->lpk.fgroup = NULL; ++ options->lpk.l_conf = NULL; ++ options->lpk.tls = -1; ++ options->lpk.b_timeout.tv_sec = -1; ++ options->lpk.s_timeout.tv_sec = -1; ++ options->lpk.flags = FLAG_EMPTY; ++#endif ++ + options->macs = NULL; + options->protocol = SSH_PROTO_UNKNOWN; + options->gateway_ports = -1; +@@ -131,25 +150,6 @@ + options->num_permitted_opens = -1; + options->adm_forced_command = NULL; + options->chroot_directory = NULL; +-#ifdef WITH_LDAP_PUBKEY +- /* XXX dirty */ +- options->lpk.ld = NULL; +- options->lpk.on = -1; +- options->lpk.servers = NULL; +- options->lpk.u_basedn = NULL; +- options->lpk.g_basedn = NULL; +- options->lpk.binddn = NULL; +- options->lpk.bindpw = NULL; +- options->lpk.sgroup = NULL; +- options->lpk.filter = NULL; +- options->lpk.fgroup = NULL; +- options->lpk.l_conf = NULL; +- options->lpk.tls = -1; +- options->lpk.b_timeout.tv_sec = -1; +- options->lpk.s_timeout.tv_sec = -1; +- options->lpk.flags = FLAG_EMPTY; +-#endif +- + } + + void diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-null-banner.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-null-banner.patch new file mode 100644 index 0000000000..79e5a6c264 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-null-banner.patch @@ -0,0 +1,35 @@ +apply fixes from upstream for empty banner + +https://bugzilla.mindrot.org/show_bug.cgi?id=1496 +http://bugs.gentoo.org/244222 + +---------------------------- +revision 1.168 +date: 2008/10/03 23:56:28; author: deraadt; state: Exp; lines: +3 -3 +Repair strnvis() buffersize of 4*n+1, with termination gauranteed by the +function. +spotted by des@freebsd, who commited an incorrect fix to the freebsd tree +and (as is fairly typical) did not report the problem to us. But this fix +is correct. +ok djm +---------------------------- +revision 1.167 +date: 2008/07/31 14:48:28; author: markus; state: Exp; lines: +2 -2 +don't allocate space for empty banners; report t8m at centrum.cz; ok deraadt +--- src/usr.bin/ssh/sshconnect2.c 2008/07/17 09:48:00 1.166 ++++ src/usr.bin/ssh/sshconnect2.c 2008/10/04 00:56:28 1.168 +@@ -377,11 +377,11 @@ input_userauth_banner(int type, u_int32_t seq, void *c + debug3("input_userauth_banner"); + raw = packet_get_string(&len); + lang = packet_get_string(NULL); +- if (options.log_level >= SYSLOG_LEVEL_INFO) { ++ if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) { + if (len > 65536) + len = 65536; +- msg = xmalloc(len * 4); /* max expansion from strnvis() */ +- strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); ++ msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ ++ strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL); + fprintf(stderr, "%s", msg); + xfree(msg); + } diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch new file mode 100644 index 0000000000..b572c2a46e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch @@ -0,0 +1,14 @@ +need strsep() prototype for 64bit systems + +http://bugs.gentoo.org/258795 + +--- a/auth2-pubkey.c ++++ b/auth2-pubkey.c +@@ -54,6 +54,7 @@ + #endif + #include "monitor_wrap.h" + #include "ssh-x509.h" ++#include + #include "misc.h" + + /* import */ diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch new file mode 100644 index 0000000000..85f87737e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch @@ -0,0 +1,96 @@ +Move things around so hpn applies cleanly when using X509. + +Forward-Ported-from: files/openssh-4.9_p1-x509-hpn-glue.patch +Signed-off-by: Robin H. Johnson + +diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/Makefile.in openssh-5.1p1+x509-hpn-glue/Makefile.in +--- openssh-5.1p1+x509/Makefile.in 2008-08-23 14:12:53.000000000 -0700 ++++ openssh-5.1p1+x509-hpn-glue/Makefile.in 2008-08-23 14:13:51.000000000 -0700 +@@ -44,11 +44,12 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ ++CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ + LIBS=@LIBS@ + SSHDLIBS=@SSHDLIBS@ + LIBEDIT=@LIBEDIT@ + LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ ++CPPFLAGS += @LDAP_CPPFLAGS@ + AR=@AR@ + AWK=@AWK@ + RANLIB=@RANLIB@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/servconf.c openssh-5.1p1+x509-hpn-glue/servconf.c +--- openssh-5.1p1+x509/servconf.c 2008-08-23 14:12:53.000000000 -0700 ++++ openssh-5.1p1+x509-hpn-glue/servconf.c 2008-08-23 14:23:56.000000000 -0700 +@@ -108,6 +108,17 @@ + options->log_level = SYSLOG_LEVEL_NOT_SET; + options->rhosts_rsa_authentication = -1; + options->hostbased_authentication = -1; ++ options->hostbased_algorithms = NULL; ++ options->pubkey_algorithms = NULL; ++ ssh_x509flags_initialize(&options->x509flags, 1); ++#ifndef SSH_X509STORE_DISABLED ++ ssh_x509store_initialize(&options->ca); ++#endif /*ndef SSH_X509STORE_DISABLED*/ ++#ifdef SSH_OCSP_ENABLED ++ options->va.type = -1; ++ options->va.certificate_file = NULL; ++ options->va.responder_url = NULL; ++#endif /*def SSH_OCSP_ENABLED*/ + options->hostbased_uses_name_from_packet_only = -1; + options->rsa_authentication = -1; + options->pubkey_authentication = -1; +@@ -151,18 +162,6 @@ + options->num_permitted_opens = -1; + options->adm_forced_command = NULL; + options->chroot_directory = NULL; +- +- options->hostbased_algorithms = NULL; +- options->pubkey_algorithms = NULL; +- ssh_x509flags_initialize(&options->x509flags, 1); +-#ifndef SSH_X509STORE_DISABLED +- ssh_x509store_initialize(&options->ca); +-#endif /*ndef SSH_X509STORE_DISABLED*/ +-#ifdef SSH_OCSP_ENABLED +- options->va.type = -1; +- options->va.certificate_file = NULL; +- options->va.responder_url = NULL; +-#endif /*def SSH_OCSP_ENABLED*/ + } + + void +@@ -338,6 +337,16 @@ + /* Portable-specific options */ + sUsePAM, + /* Standard Options */ ++ sHostbasedAlgorithms, ++ sPubkeyAlgorithms, ++ sX509KeyAlgorithm, ++ sAllowedClientCertPurpose, ++ sKeyAllowSelfIssued, sMandatoryCRL, ++ sCACertificateFile, sCACertificatePath, ++ sCARevocationFile, sCARevocationPath, ++ sCAldapVersion, sCAldapURL, ++ sVAType, sVACertificateFile, ++ sVAOCSPResponderURL, + sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, + sPermitRootLogin, sLogFacility, sLogLevel, + sRhostsRSAAuthentication, sRSAAuthentication, +@@ -360,16 +369,6 @@ + sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, + sMatch, sPermitOpen, sForceCommand, sChrootDirectory, + sUsePrivilegeSeparation, sAllowAgentForwarding, +- sHostbasedAlgorithms, +- sPubkeyAlgorithms, +- sX509KeyAlgorithm, +- sAllowedClientCertPurpose, +- sKeyAllowSelfIssued, sMandatoryCRL, +- sCACertificateFile, sCACertificatePath, +- sCARevocationFile, sCARevocationPath, +- sCAldapVersion, sCAldapURL, +- sVAType, sVACertificateFile, +- sVAOCSPResponderURL, + sDeprecated, sUnsupported + } ServerOpCodes; + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-autoconf.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-autoconf.patch new file mode 100644 index 0000000000..24ad7a9cf4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-autoconf.patch @@ -0,0 +1,15 @@ +workaround problems with autoconf-2.63 + +http://lists.gnu.org/archive/html/autoconf/2009-04/msg00007.html + +--- a/configure.ac ++++ b/configure.ac +@@ -3603,7 +3603,7 @@ + #include + struct spwd sp; + ],[ sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; ], +- [ sp_expire_available=yes ], [] ++ [ sp_expire_available=yes ], [:] + ) + + if test "x$sp_expire_available" = "xyes" ; then diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-gsskex-fix.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-gsskex-fix.patch new file mode 100644 index 0000000000..8112d6252f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-gsskex-fix.patch @@ -0,0 +1,16 @@ +--- clientloop.c ++++ clientloop.c +@@ -1434,11 +1434,13 @@ + if (!rekeying) { + channel_after_select(readset, writeset); + ++#ifdef GSSAPI + if (options.gss_renewal_rekey && + ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { + debug("credentials updated - forcing rekey"); + need_rekeying = 1; + } ++#endif + + if (need_rekeying || packet_need_rekeying()) { + debug("need rekeying"); diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-ssh-keysign-readconf.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-ssh-keysign-readconf.patch new file mode 100644 index 0000000000..43f4297e6a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-ssh-keysign-readconf.patch @@ -0,0 +1,15 @@ +fix from newer versions for parallel build failures + +http://crosbug.com/31285 + +--- Makefile.in ++++ Makefile.in +@@ -149,7 +149,7 @@ + ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o + $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + +-ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o ++ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o + $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + + ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-x509-hpn-glue.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-x509-hpn-glue.patch new file mode 100644 index 0000000000..9428b74f3c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2_p1-x509-hpn-glue.patch @@ -0,0 +1,91 @@ +Move things around so hpn applies cleanly when using X509. + +--- openssh-5.2p1+x509/Makefile.in ++++ openssh-5.2p1+x509/Makefile.in +@@ -44,11 +44,12 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ ++CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ + LIBS=@LIBS@ + SSHDLIBS=@SSHDLIBS@ + LIBEDIT=@LIBEDIT@ + LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ ++CPPFLAGS += @LDAP_CPPFLAGS@ + AR=@AR@ + AWK=@AWK@ + RANLIB=@RANLIB@ +--- openssh-5.2p1+x509/servconf.c ++++ openssh-5.2p1+x509/servconf.c +@@ -108,6 +108,17 @@ + options->log_level = SYSLOG_LEVEL_NOT_SET; + options->rhosts_rsa_authentication = -1; + options->hostbased_authentication = -1; ++ options->hostbased_algorithms = NULL; ++ options->pubkey_algorithms = NULL; ++ ssh_x509flags_initialize(&options->x509flags, 1); ++#ifndef SSH_X509STORE_DISABLED ++ ssh_x509store_initialize(&options->ca); ++#endif /*ndef SSH_X509STORE_DISABLED*/ ++#ifdef SSH_OCSP_ENABLED ++ options->va.type = -1; ++ options->va.certificate_file = NULL; ++ options->va.responder_url = NULL; ++#endif /*def SSH_OCSP_ENABLED*/ + options->hostbased_uses_name_from_packet_only = -1; + options->rsa_authentication = -1; + options->pubkey_authentication = -1; +@@ -152,18 +163,6 @@ + options->adm_forced_command = NULL; + options->chroot_directory = NULL; + options->zero_knowledge_password_authentication = -1; +- +- options->hostbased_algorithms = NULL; +- options->pubkey_algorithms = NULL; +- ssh_x509flags_initialize(&options->x509flags, 1); +-#ifndef SSH_X509STORE_DISABLED +- ssh_x509store_initialize(&options->ca); +-#endif /*ndef SSH_X509STORE_DISABLED*/ +-#ifdef SSH_OCSP_ENABLED +- options->va.type = -1; +- options->va.certificate_file = NULL; +- options->va.responder_url = NULL; +-#endif /*def SSH_OCSP_ENABLED*/ + } + + void +@@ -341,6 +340,16 @@ + /* Portable-specific options */ + sUsePAM, + /* Standard Options */ ++ sHostbasedAlgorithms, ++ sPubkeyAlgorithms, ++ sX509KeyAlgorithm, ++ sAllowedClientCertPurpose, ++ sKeyAllowSelfIssued, sMandatoryCRL, ++ sCACertificateFile, sCACertificatePath, ++ sCARevocationFile, sCARevocationPath, ++ sCAldapVersion, sCAldapURL, ++ sVAType, sVACertificateFile, ++ sVAOCSPResponderURL, + sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, + sPermitRootLogin, sLogFacility, sLogLevel, + sRhostsRSAAuthentication, sRSAAuthentication, +@@ -364,16 +373,6 @@ + sMatch, sPermitOpen, sForceCommand, sChrootDirectory, + sUsePrivilegeSeparation, sAllowAgentForwarding, + sZeroKnowledgePasswordAuthentication, +- sHostbasedAlgorithms, +- sPubkeyAlgorithms, +- sX509KeyAlgorithm, +- sAllowedClientCertPurpose, +- sKeyAllowSelfIssued, sMandatoryCRL, +- sCACertificateFile, sCACertificatePath, +- sCARevocationFile, sCARevocationPath, +- sCAldapVersion, sCAldapURL, +- sVAType, sVACertificateFile, +- sVAOCSPResponderURL, + sDeprecated, sUnsupported + } ServerOpCodes; + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff new file mode 100644 index 0000000000..346d527198 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff @@ -0,0 +1,10 @@ +--- ldapauth.c.orig 2009-04-18 18:06:38.000000000 +0200 ++++ ldapauth.c 2009-04-18 18:06:11.000000000 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "ldapauth.h" + #include "log.h" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.3_p1-pkcs11-hpn-glue.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.3_p1-pkcs11-hpn-glue.patch new file mode 100644 index 0000000000..0aee2e8490 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-5.3_p1-pkcs11-hpn-glue.patch @@ -0,0 +1,15 @@ +diff -Nuar openssh-5.3p1/Makefile.in openssh-5.3p1.pkcs-hpn-glue/Makefile.in +--- openssh-5.3p1/Makefile.in 2009-10-10 22:52:10.081356354 -0700 ++++ openssh-5.3p1.pkcs-hpn-glue/Makefile.in 2009-10-10 22:55:47.158418049 -0700 +@@ -64,10 +64,10 @@ + + LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ + canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ +- pkcs11.o \ + cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ + compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ + log.o match.o md-sha256.o moduli.o nchan.o packet.o \ ++ pkcs11.o \ + readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ + atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ + monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.confd b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.confd new file mode 100644 index 0000000000..28952b4a28 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.confd @@ -0,0 +1,21 @@ +# /etc/conf.d/sshd: config file for /etc/init.d/sshd + +# Where is your sshd_config file stored? + +SSHD_CONFDIR="/etc/ssh" + + +# Any random options you want to pass to sshd. +# See the sshd(8) manpage for more info. + +SSHD_OPTS="" + + +# Pid file to use (needs to be absolute path). + +#SSHD_PIDFILE="/var/run/sshd.pid" + + +# Path to the sshd binary (needs to be absolute path). + +#SSHD_BINARY="/usr/sbin/sshd" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.pam b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.pam new file mode 100644 index 0000000000..5114940251 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 + +auth required pam_stack.so service=system-auth +auth required pam_shells.so +auth required pam_nologin.so +account required pam_stack.so service=system-auth +password required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.pam_include.2 b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.pam_include.2 new file mode 100644 index 0000000000..b801aaafa0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.pam_include.2 @@ -0,0 +1,4 @@ +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.rc6 b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.rc6 new file mode 100644 index 0000000000..2e0b44229f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/sshd.rc6 @@ -0,0 +1,81 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.27 2009/08/12 08:09:52 idl0r Exp $ + +opts="${opts} reload checkconfig gen_keys" + +depend() { + use logger dns + need net +} + +SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh} +SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid} +SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd} + +checkconfig() { + if [ ! -d /var/empty ] ; then + mkdir -p /var/empty || return 1 + fi + + if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then + eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd" + eerror "There is a sample file in /usr/share/doc/openssh" + return 1 + fi + + gen_keys || return 1 + + "${SSHD_BINARY}" -t ${myopts} || return 1 +} + +gen_keys() { + if [ ! -e "${SSHD_CONFDIR}"/ssh_host_key ] ; then + einfo "Generating Hostkey..." + /usr/bin/ssh-keygen -t rsa1 -f "${SSHD_CONFDIR}"/ssh_host_key -N '' || return 1 + fi + if [ ! -e "${SSHD_CONFDIR}"/ssh_host_dsa_key ] ; then + einfo "Generating DSA-Hostkey..." + /usr/bin/ssh-keygen -d -f "${SSHD_CONFDIR}"/ssh_host_dsa_key -N '' || return 1 + fi + if [ ! -e "${SSHD_CONFDIR}"/ssh_host_rsa_key ] ; then + einfo "Generating RSA-Hostkey..." + /usr/bin/ssh-keygen -t rsa -f "${SSHD_CONFDIR}"/ssh_host_rsa_key -N '' || return 1 + fi + return 0 +} + +start() { + local myopts="" + [ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \ + && myopts="${myopts} -o PidFile=${SSHD_PIDFILE}" + [ "${SSHD_CONFDIR}" != "/etc/ssh" ] \ + && myopts="${myopts} -f ${SSHD_CONFDIR}/sshd_config" + + checkconfig || return 1 + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec "${SSHD_BINARY}" \ + --pidfile "${SSHD_PIDFILE}" \ + -- ${myopts} ${SSHD_OPTS} + eend $? +} + +stop() { + if [ "${RC_CMD}" = "restart" ] ; then + checkconfig || return 1 + fi + + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --exec "${SSHD_BINARY}" \ + --pidfile "${SSHD_PIDFILE}" --quiet + eend $? +} + +reload() { + checkconfig || return 1 + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --stop --signal HUP --oknodo \ + --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}" + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-5.2_p1-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-5.2_p1-r10.ebuild new file mode 120000 index 0000000000..6d42c03126 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-5.2_p1-r10.ebuild @@ -0,0 +1 @@ +openssh-5.2_p1-r3.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-5.2_p1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-5.2_p1-r3.ebuild new file mode 100644 index 0000000000..efcb2d80a3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-5.2_p1-r3.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r3.ebuild,v 1.7 2009/10/11 20:21:40 nixnut Exp $ + +inherit eutils flag-o-matic multilib autotools pam useradd + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_/} + +HPN_PATCH="${PARCH}-hpn13v6.diff.gz" +LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.11.patch.gz" +PKCS11_PATCH="${PARCH/p1}pkcs11-0.26.tar.bz2" +X509_VER="6.2.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="http://www.openssh.org/" +# HPN appears twice as sometimes Gentoo has a custom version of it. +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch + ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )} + ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} + ${PKCS11_PATCH:+pkcs11? ( http://alon.barlev.googlepages.com/${PKCS11_PATCH} )} + ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="hpn kerberos ldap libedit pam pkcs11 selinux skey smartcard static tcpd X X509" + +RDEPEND="pam? ( virtual/pam ) + kerberos? ( virtual/krb5 ) + selinux? ( >=sys-libs/libselinux-1.28 ) + skey? ( >=sys-auth/skey-1.1.5-r1 ) + ldap? ( net-nds/openldap ) + libedit? ( dev-libs/libedit ) + >=dev-libs/openssl-0.9.6d + >=sys-libs/zlib-1.2.3 + smartcard? ( dev-libs/opensc ) + pkcs11? ( dev-libs/pkcs11-helper ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + X? ( x11-apps/xauth ) + userland_GNU? ( sys-apps/shadow )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + virtual/os-headers + sys-devel/autoconf" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 )" +PROVIDE="virtual/ssh" + +S=${WORKDIR}/${PARCH} + +pkg_setup() { + # this sucks, but i'd rather have people unable to `emerge -u openssh` + # than not be able to log in to their server any more + maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; } + local fail=" + $(maybe_fail ldap LDAP_PATCH) + $(maybe_fail pkcs11 PKCS11_PATCH) + $(maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + fi +} + +src_unpack() { + unpack ${PARCH}.tar.gz + cd "${S}" + + sed -i \ + -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ + pathnames.h || die + + if use pkcs11 ; then + cd "${WORKDIR}" + unpack "${PKCS11_PATCH}" + cd "${S}" + EPATCH_OPTS="-p1" epatch "${WORKDIR}"/*pkcs11*/{1,2,4}* + use X509 && EPATCH_OPTS="-R" epatch "${WORKDIR}"/*pkcs11*/1000_all_log.patch + fi + use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hpn-glue.patch + use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch + if ! use X509 ; then + if [[ -n ${LDAP_PATCH} ]] && use ldap ; then + # The patch for bug 210110 64-bit stuff is now included. + epatch "${DISTDIR}"/${LDAP_PATCH} + epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654 + fi + epatch "${DISTDIR}"/openssh-5.2p1-gsskex-all-20090726.patch #115553 #216932 #279488 + epatch "${FILESDIR}"/${P}-gsskex-fix.patch + else + use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap" + fi + #epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex + [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} + epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665 + epatch "${FILESDIR}"/${P}-autoconf.patch + epatch "${FILESDIR}"/${P}-ssh-keysign-readconf.patch + + # in 5.2p1, the AES-CTR multithreaded variant is temporarily broken, and + # causes random hangs when combined with the -f switch of ssh. + # To avoid this, we change the internal table to use the non-multithread + # version for the meantime. + sed -i \ + -e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \ + cipher.c || die + + sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die + + # Disable PATH reset, trust what portage gives us. bug 254615 + sed -i -e 's:^PATH=/:#PATH=/:' configure || die + + eautoreconf +} + +static_use_with() { + local flag=$1 + if use static && use ${flag} ; then + ewarn "Disabling '${flag}' support because of USE='static'" + # rebuild args so that we invert the first one (USE flag) + # but otherwise leave everything else working so we can + # just leverage use_with + shift + [[ -z $1 ]] && flag="${flag} ${flag}" + set -- !${flag} "$@" + fi + use_with "$@" +} + +src_compile() { + export CFLAGS + CFLAGS+=" -fno-strict-aliasing" + + addwrite /dev/ptmx + addpredict /etc/skey/skeykeys #skey configure code triggers this + + local myconf="" + use static && append-ldflags -static + + econf \ + --with-ldflags="${LDFLAGS}" \ + --disable-strip \ + --sysconfdir=/etc/ssh \ + --libexecdir=/usr/$(get_libdir)/misc \ + --datadir=/usr/share/openssh \ + --with-privsep-path=/var/empty \ + --with-privsep-user=sshd \ + --with-md5-passwords \ + --with-ssl-engine \ + $(static_use_with pam) \ + $(static_use_with kerberos kerberos5 /usr) \ + ${LDAP_PATCH:+$(use ldap && use_with ldap)} \ + $(use_with libedit) \ + ${PKCS11_PATCH:+$(use pkcs11 && static_use_with pkcs11)} \ + $(use_with selinux) \ + $(use_with skey) \ + $(use_with smartcard opensc) \ + $(use_with tcpd tcp-wrappers) \ + ${myconf} \ + || die "bad configure" + emake || die "compile problem" +} + +src_install() { + emake install-nokeys DESTDIR="${D}" || die + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + + newconfd "${FILESDIR}"/sshd.confd sshd + keepdir /var/empty + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + if use pam ; then + sed -i \ + -e "/^#UsePAM /s:.*:UsePAM yes:" \ + -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ + -e "/^#PrintMotd /s:.*:PrintMotd no:" \ + -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ + "${D}"/etc/ssh/sshd_config || die "sed of configuration file failed" + fi + + # This instruction is from the HPN webpage, + # Used for the server logging functionality + if [[ -n ${HPN_PATCH} ]] && use hpn; then + keepdir /var/empty/dev + fi + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + diropts -m 0700 + dodir /etc/skel/.ssh +} + +src_test() { + local t tests skipped failed passed shell + tests="interop-tests compat-tests" + skipped="" + shell=$(getent passwd ${UID} | cut -d: -f7) + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite" + elog "requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped="${skipped} tests" + else + tests="${tests} tests" + fi + for t in ${tests} ; do + # Some tests read from stdin ... + emake -k -j1 ${t} & /dev/null + + ewarn "Remember to merge your config files in /etc/ssh/ and then" + ewarn "reload sshd: '/etc/init.d/sshd reload'." + if use pam ; then + echo + ewarn "Please be aware users need a valid shell in /etc/passwd" + ewarn "in order to be allowed to login." + fi + if use pkcs11 ; then + echo + einfo "For PKCS#11 you should also emerge one of the askpass softwares" + einfo "Example: net-misc/x11-ssh-askpass" + fi + # This instruction is from the HPN webpage, + # Used for the server logging functionality + if [[ -n ${HPN_PATCH} ]] && use hpn; then + echo + einfo "For the HPN server logging patch, you must ensure that" + einfo "your syslog application also listens at /var/empty/dev/log." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/files/iv_plat.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/files/iv_plat.patch new file mode 100644 index 0000000000..8f46f98dd4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/files/iv_plat.patch @@ -0,0 +1,30 @@ +--- ssl.c.orig 2012-04-02 14:49:21.093698637 -0700 ++++ ssl.c 2012-04-02 14:48:50.663277244 -0700 +@@ -3912,11 +3912,14 @@ + struct env_set *es = session->opt->es; + struct env_item *e; + struct buffer out = alloc_buf_gc (512*3, &gc); ++ const char *iv_plat, *iv_plat_rel; + + /* push version */ + buf_printf (&out, "IV_VER=%s\n", PACKAGE_VERSION); + + /* push platform */ ++ iv_plat = getenv("IV_PLAT"); ++ if (iv_plat == NULL) { + #if defined(TARGET_LINUX) + buf_printf (&out, "IV_PLAT=linux\n"); + #elif defined(TARGET_SOLARIS) +@@ -3932,6 +3935,12 @@ + #elif defined(WIN32) + buf_printf (&out, "IV_PLAT=win\n"); + #endif ++ } else ++ buf_printf (&out, "IV_PLAT=%s\n", iv_plat); ++ ++ iv_plat_rel = getenv("IV_PLAT_REL"); ++ if (iv_plat_rel != NULL) ++ buf_printf (&out, "IV_PLAT_REL=%s\n", iv_plat_rel); + + /* push mac addr */ + { diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/files/pkcs11-slot.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/files/pkcs11-slot.patch new file mode 100644 index 0000000000..5d6cb1aa1b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/files/pkcs11-slot.patch @@ -0,0 +1,145 @@ +diff -u openvpn-2.1.12.orig/pkcs11.c openvpn-2.1.12/pkcs11.c +--- openvpn-2.1.12.orig/pkcs11.c 2011-03-17 12:57:45.000000000 -0700 ++++ openvpn-2.1.12/pkcs11.c 2011-10-10 09:36:55.000000000 -0700 +@@ -602,6 +602,115 @@ + return success; + } + ++static CK_RV ++_hexToBinary( ++ unsigned char * const target, ++ const char * const source, ++ size_t * const p_target_size ++) { ++ size_t target_max_size = *p_target_size; ++ const char *p; ++ char buf[3] = { 0, 0, 0 }; ++ int i; ++ ++ i = 0; ++ *p_target_size = 0; ++ for (p = source; *p != '\0' && *p_target_size < target_max_size; p++) { ++ if (!isxdigit (*p)) ++ continue; ++ buf[i%2] = *p; ++ if ((i%2) == 1) { ++ unsigned v; ++ if (sscanf (buf, "%x", &v) != 1) ++ v = 0; ++ target[*p_target_size] = v & 0xff; ++ (*p_target_size)++; ++ } ++ i++; ++ } ++ return (*p == '\0' ? CKR_OK : CKR_ATTRIBUTE_VALUE_INVALID); ++} ++ ++static CK_RV ++get_certificate_id( ++ pkcs11h_certificate_id_t *p_certificate_id, ++ const char * const pkcs11_id ++) { ++ pkcs11h_certificate_id_list_t user_certificates = NULL; ++ pkcs11h_certificate_id_list_t current = NULL; ++ char *cka_id = NULL; ++ size_t cka_id_size; ++ CK_RV rv; ++ ++ rv = pkcs11h_certificate_deserializeCertificateId ( ++ p_certificate_id, ++ pkcs11_id ++ ); ++ if (rv == CKR_OK) ++ return rv; ++ if (rv != CKR_ATTRIBUTE_VALUE_INVALID) { ++ msg (M_WARN, "PKCS#11: Cannot deserialize id %ld-'%s'", rv, pkcs11h_getMessage (rv)); ++ return rv; ++ } ++ ++ /* ++ * The specified certificate id lacks the token id, search the ++ * cert list for first matching id. ++ */ ++ cka_id_size = strlen(pkcs11_id)/2; ++ if ( ++ (cka_id = (char *)malloc (cka_id_size)) == NULL || ++ (rv = _hexToBinary (cka_id, pkcs11_id, &cka_id_size)) != CKR_OK ++ ) { ++ msg (M_FATAL, "PKCS#11: get_certificate_id: Cannot convert id %ld-'%s'", rv, pkcs11h_getMessage (rv)); ++ goto cleanup; ++ } ++ ++ if ( ++ (rv = pkcs11h_certificate_enumCertificateIds ( ++ PKCS11H_ENUM_METHOD_CACHE_EXIST, ++ NULL, ++ PKCS11H_PROMPT_MASK_ALLOW_ALL, ++ NULL, ++ &user_certificates ++ )) != CKR_OK ++ ) { ++ msg (M_FATAL, "PKCS#11: get_certificate_id: Cannot enumerate certificates %ld-'%s'", rv, pkcs11h_getMessage (rv)); ++ goto cleanup; ++ } ++ ++ rv = CKR_ATTRIBUTE_VALUE_INVALID; ++ for (current = user_certificates;current != NULL; current = current->next) { ++ pkcs11h_certificate_id_t cid = current->certificate_id; ++ ++ if ( ++ cka_id_size == cid->attrCKA_ID_size && ++ memcmp( ++ cka_id, ++ cid->attrCKA_ID, ++ cid->attrCKA_ID_size ++ ) == 0 ++ ) { ++ rv = pkcs11h_certificate_duplicateCertificateId( ++ p_certificate_id, ++ cid ++ ); ++ break; ++ } ++ } ++ ++cleanup: ++ if (user_certificates != NULL) { ++ pkcs11h_certificate_freeCertificateIdList (user_certificates); ++ user_certificates = NULL; ++ } ++ if (cka_id != NULL) { ++ free (cka_id); ++ cka_id = NULL; ++ } ++ return rv; ++} ++ + int + SSL_CTX_use_pkcs11 ( + SSL_CTX * const ssl_ctx, +@@ -653,23 +762,21 @@ + } + + if ( +- (rv = pkcs11h_certificate_deserializeCertificateId ( ++ (rv = get_certificate_id ( + &certificate_id, + id_resp.password + )) != CKR_OK + ) { +- msg (M_WARN, "PKCS#11: Cannot deserialize id %ld-'%s'", rv, pkcs11h_getMessage (rv)); + goto cleanup; + } + } + else { + if ( +- (rv = pkcs11h_certificate_deserializeCertificateId ( ++ (rv = get_certificate_id ( + &certificate_id, + pkcs11_id + )) != CKR_OK + ) { +- msg (M_WARN, "PKCS#11: Cannot deserialize id %ld-'%s'", rv, pkcs11h_getMessage (rv)); + goto cleanup; + } + } diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/metadata.xml new file mode 100644 index 0000000000..046745ad58 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/metadata.xml @@ -0,0 +1,18 @@ + + + + no-herd + + cedk@gentoo.org + Cédric Krier + + OpenVPN is an easy-to-use, robust and highly +configurable VPN daemon which can be used to securely link two or more +networks using an encrypted tunnel. + + Apply eurephia patch + Enabled iproute2 support instead of net-tools + Enables openvpn to save passwords + Enable PKCS#11 smartcard support + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/openvpn-2.1.12-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/openvpn-2.1.12-r2.ebuild new file mode 120000 index 0000000000..27a2e81266 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/openvpn-2.1.12-r2.ebuild @@ -0,0 +1 @@ +openvpn-2.1.12.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/openvpn-2.1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/openvpn-2.1.12.ebuild new file mode 100644 index 0000000000..e4fec1252c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openvpn/openvpn-2.1.12.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.4.ebuild,v 1.8 2011/03/21 08:22:40 xarthisius Exp $ + +EAPI=2 + +inherit eutils multilib toolchain-funcs autotools flag-o-matic + +DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes." +SRC_URI="http://swupdate.openvpn.org/as/as-openvpn-core/build/${P}.tar.gz" +HOMEPAGE="http://openvpn.net/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="eurephia examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 userland_BSD" + +DEPEND=">=dev-libs/lzo-1.07 + kernel_linux? ( + iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) + ) + !minimal? ( pam? ( virtual/pam ) ) + selinux? ( sec-policy/selinux-openvpn ) + ssl? ( >=dev-libs/openssl-0.9.6 ) + pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i \ + -e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \ + -e "s/-shared/-shared \${LDFLAGS}/" \ + plugin/*/Makefile || die "sed failed" + epatch "${FILESDIR}"/pkcs11-slot.patch + epatch "${FILESDIR}"/iv_plat.patch +} + +src_configure() { + # basic.h defines a type 'bool' that conflicts with the altivec + # keyword bool which has to be fixed upstream, see bugs #293840 + # and #297854. + # For now, filter out -maltivec on ppc and append -mno-altivec, as + # -maltivec is enabled implicitly by -mcpu and similar flags. + (use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec + + econf \ + $(use_enable passwordsave password-save) \ + $(use_enable pkcs11) \ + $(use_enable ssl) \ + $(use_enable ssl crypto) \ + $(use_enable iproute2) +} + +src_compile() { + + if use static ; then + sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed" + fi + + emake || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" +} + +pkg_postinst() { + # Add openvpn user so openvpn servers can drop privs + # Clients should run as root so they can change ip addresses, + # dns information and other such things. + enewgroup openvpn + enewuser openvpn "" "" "" openvpn +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/Manifest new file mode 100644 index 0000000000..d842f7f111 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/Manifest @@ -0,0 +1 @@ +DIST strongswan-4.6.4.tar.bz2 3504672 RMD160 51406171d60e51866d7b3afd89c1c2c9e3884de1 SHA1 a0bb51ace911dbfb8d4a9560e150b0661ea6220c SHA256 f372b4cc3d6c8a50a0b262e02e6a7fad43f91cc5a80cbd9432eb3c48ab2d4c69 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/ipsec b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/ipsec new file mode 100644 index 0000000000..42cde4f38d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/ipsec @@ -0,0 +1,33 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need logger net +} + +start() { + ebegin "Starting ${IPSECD}" + ipsec start + eend $? +} + +stop() { + ebegin "Stopping ${IPSECD}" + ipsec stop + eend $? +} + +restart() { + ebegin "Restarting ${IPSECD}" + svc_stop + sleep 2 + svc_start + eend $? +} + +status() { + ebegin "${IPSECD} Status (verbose):" + ipsec statusall + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/strongswan-4.6.4-ignore-peer-id-check.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/strongswan-4.6.4-ignore-peer-id-check.patch new file mode 100644 index 0000000000..5a56447b6f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/strongswan-4.6.4-ignore-peer-id-check.patch @@ -0,0 +1,302 @@ +diff -rupN strongswan-4.6.4/src/pluto/ipsec_doi.c strongswan-4.6.4.patched/src/pluto/ipsec_doi.c +--- strongswan-4.6.4/src/pluto/ipsec_doi.c 2011-10-16 08:19:04.000000000 -0700 ++++ strongswan-4.6.4.patched/src/pluto/ipsec_doi.c 2012-06-05 22:27:58.208664827 -0700 +@@ -112,6 +112,8 @@ enum endpoint { + EP_REMOTE = 1 << 1, + }; + ++extern bool ignore_peer_id_check; ++ + /* create output HDR as replica of input HDR */ + void echo_hdr(struct msg_digest *md, bool enc, u_int8_t np) + { +@@ -2429,7 +2431,15 @@ static bool switch_connection(struct msg + loglog(RC_LOG_SERIOUS, + "we require peer to have ID '%Y', but peer declares '%Y'", + c->spd.that.id, peer); +- return FALSE; ++ if (ignore_peer_id_check) ++ { ++ loglog(RC_LOG_SERIOUS, ++ "ignore peer ID mismatch"); ++ } ++ else ++ { ++ return FALSE; ++ } + } + + if (c->spd.that.ca) +diff -rupN strongswan-4.6.4/src/pluto/plutomain.c strongswan-4.6.4.patched/src/pluto/plutomain.c +--- strongswan-4.6.4/src/pluto/plutomain.c 2012-02-06 09:05:46.000000000 -0800 ++++ strongswan-4.6.4.patched/src/pluto/plutomain.c 2012-06-05 22:27:58.208664827 -0700 +@@ -256,6 +256,8 @@ bool pkcs11_keep_state = FALSE; + /* by default pluto does not allow pkcs11 proxy access via whack */ + bool pkcs11_proxy = FALSE; + ++bool ignore_peer_id_check = FALSE; ++ + /* argument string to pass to PKCS#11 module. + * Not used for compliant modules, just for NSS softoken + */ +@@ -339,6 +341,7 @@ int main(int argc, char **argv) + { "disable_port_floating", no_argument, NULL, '4' }, + { "debug-natt", no_argument, NULL, '5' }, + { "virtual_private", required_argument, NULL, '6' }, ++ { "ignorepeeridcheck", no_argument, NULL, '7' }, + #ifdef DEBUG + { "debug-none", no_argument, NULL, 'N' }, + { "debug-all", no_argument, NULL, 'A' }, +@@ -539,6 +542,9 @@ int main(int argc, char **argv) + case '6': /* --virtual_private */ + virtual_private = optarg; + continue; ++ case '7': /* --ignorepeeridcheck */ ++ ignore_peer_id_check = TRUE; ++ continue; + + default: + #ifdef DEBUG +diff -rupN strongswan-4.6.4/src/starter/args.c strongswan-4.6.4.patched/src/starter/args.c +--- strongswan-4.6.4/src/starter/args.c 2012-05-30 09:17:15.000000000 -0700 ++++ strongswan-4.6.4.patched/src/starter/args.c 2012-06-05 22:27:58.208664827 -0700 +@@ -189,6 +189,7 @@ static const token_info_t token_info[] = + { ARG_STR, offsetof(starter_config_t, setup.pkcs11initargs), NULL }, + { ARG_ENUM, offsetof(starter_config_t, setup.pkcs11keepstate), LST_bool }, + { ARG_ENUM, offsetof(starter_config_t, setup.pkcs11proxy), LST_bool }, ++ { ARG_ENUM, offsetof(starter_config_t, setup.ignorepeeridcheck), LST_bool }, + + /* KLIPS keywords */ + { ARG_LST, offsetof(starter_config_t, setup.klipsdebug), LST_klipsdebug }, +diff -rupN strongswan-4.6.4/src/starter/confread.h strongswan-4.6.4.patched/src/starter/confread.h +--- strongswan-4.6.4/src/starter/confread.h 2012-05-30 09:17:15.000000000 -0700 ++++ strongswan-4.6.4.patched/src/starter/confread.h 2012-06-05 22:27:58.208664827 -0700 +@@ -210,6 +210,7 @@ struct starter_config { + char *pkcs11initargs; + bool pkcs11keepstate; + bool pkcs11proxy; ++ bool ignorepeeridcheck; + + /* KLIPS keywords */ + char **klipsdebug; +diff -rupN strongswan-4.6.4/src/starter/invokepluto.c strongswan-4.6.4.patched/src/starter/invokepluto.c +--- strongswan-4.6.4/src/starter/invokepluto.c 2012-02-06 09:05:46.000000000 -0800 ++++ strongswan-4.6.4.patched/src/starter/invokepluto.c 2012-06-05 22:27:58.208664827 -0700 +@@ -238,6 +238,10 @@ starter_start_pluto (starter_config_t *c + { + arg[argc++] = "--pkcs11proxy"; + } ++ if (cfg->setup.ignorepeeridcheck) ++ { ++ arg[argc++] = "--ignorepeeridcheck"; ++ } + + if (_pluto_pid) + { +diff -rupN strongswan-4.6.4/src/starter/keywords.c strongswan-4.6.4.patched/src/starter/keywords.c +--- strongswan-4.6.4/src/starter/keywords.c 2012-05-30 09:20:52.000000000 -0700 ++++ strongswan-4.6.4.patched/src/starter/keywords.c 2012-06-05 22:27:58.208664827 -0700 +@@ -54,7 +54,7 @@ struct kw_entry { + kw_token_t token; + }; + +-#define TOTAL_KEYWORDS 131 ++#define TOTAL_KEYWORDS 132 + #define MIN_WORD_LENGTH 3 + #define MAX_WORD_LENGTH 17 + #define MIN_HASH_VALUE 9 +@@ -79,15 +79,15 @@ hash (str, len) + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, +- 247, 247, 247, 247, 247, 247, 247, 247, 247, 12, ++ 247, 247, 247, 247, 247, 247, 247, 247, 247, 0, + 126, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, +- 247, 247, 247, 247, 247, 51, 247, 11, 1, 92, +- 43, 0, 6, 0, 110, 0, 247, 120, 56, 37, ++ 247, 247, 247, 247, 247, 20, 247, 11, 3, 92, ++ 43, 0, 6, 0, 110, 0, 247, 132, 56, 57, + 27, 72, 43, 1, 16, 0, 5, 75, 1, 247, +- 247, 11, 5, 247, 247, 247, 247, 247, 247, 247, ++ 247, 11, 4, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, +@@ -164,12 +164,14 @@ static const struct kw_entry wordlist[] + {"marginpackets", KW_MARGINPACKETS}, + {"leftnatip", KW_LEFTNATIP}, + {"mediated_by", KW_MEDIATED_BY}, ++ {"me_peerid", KW_ME_PEERID}, + {"ldapbase", KW_LDAPBASE}, + {"leftfirewall", KW_LEFTFIREWALL}, + {"rightfirewall", KW_RIGHTFIREWALL}, + {"crluri", KW_CRLURI}, +- {"mobike", KW_MOBIKE}, ++ {"crluri1", KW_CRLURI}, + {"rightnatip", KW_RIGHTNATIP}, ++ {"mobike", KW_MOBIKE}, + {"rightnexthop", KW_RIGHTNEXTHOP}, + {"mediation", KW_MEDIATION}, + {"leftallowany", KW_LEFTALLOWANY}, +@@ -177,14 +179,12 @@ static const struct kw_entry wordlist[] + {"overridemtu", KW_OVERRIDEMTU}, + {"aaa_identity", KW_AAA_IDENTITY}, + {"esp", KW_ESP}, +- {"crluri1", KW_CRLURI}, + {"lefthostaccess", KW_LEFTHOSTACCESS}, + {"leftsubnet", KW_LEFTSUBNET}, + {"leftid", KW_LEFTID}, + {"forceencaps", KW_FORCEENCAPS}, + {"eap", KW_EAP}, + {"nat_traversal", KW_NAT_TRAVERSAL}, +- {"me_peerid", KW_ME_PEERID}, + {"rightcert", KW_RIGHTCERT}, + {"installpolicy", KW_INSTALLPOLICY}, + {"authby", KW_AUTHBY}, +@@ -194,50 +194,50 @@ static const struct kw_entry wordlist[] + {"rightupdown", KW_RIGHTUPDOWN}, + {"keyexchange", KW_KEYEXCHANGE}, + {"ocspuri", KW_OCSPURI}, +- {"compress", KW_COMPRESS}, ++ {"ocspuri1", KW_OCSPURI}, + {"rightcertpolicy", KW_RIGHTCERTPOLICY}, + {"cacert", KW_CACERT}, + {"eap_identity", KW_EAP_IDENTITY}, + {"hidetos", KW_HIDETOS}, +- {"ike", KW_IKE}, ++ {"force_keepalive", KW_FORCE_KEEPALIVE}, + {"leftsubnetwithin", KW_LEFTSUBNETWITHIN}, + {"righthostaccess", KW_RIGHTHOSTACCESS}, + {"packetdefault", KW_PACKETDEFAULT}, + {"dpdaction", KW_DPDACTION}, +- {"ocspuri1", KW_OCSPURI}, + {"pfsgroup", KW_PFSGROUP}, + {"rightauth", KW_RIGHTAUTH}, ++ {"xauth_identity", KW_XAUTH_IDENTITY}, + {"also", KW_ALSO}, + {"leftsourceip", KW_LEFTSOURCEIP}, + {"rightid2", KW_RIGHTID2}, +- {"dumpdir", KW_DUMPDIR}, +- {"rekey", KW_REKEY}, +- {"ikelifetime", KW_IKELIFETIME}, +- {"dpdtimeout", KW_DPDTIMEOUT}, ++ {"ike", KW_IKE}, ++ {"compress", KW_COMPRESS}, + {"ldaphost", KW_LDAPHOST}, +- {"rekeyfuzz", KW_REKEYFUZZ}, + {"leftcert2", KW_LEFTCERT2}, +- {"leftikeport", KW_LEFTIKEPORT}, + {"crlcheckinterval", KW_CRLCHECKINTERVAL}, + {"plutostderrlog", KW_PLUTOSTDERRLOG}, + {"plutostart", KW_PLUTOSTART}, + {"rightauth2", KW_RIGHTAUTH2}, ++ {"rekey", KW_REKEY}, ++ {"ikelifetime", KW_IKELIFETIME}, + {"leftca2", KW_LEFTCA2}, +- {"mark", KW_MARK}, +- {"force_keepalive", KW_FORCE_KEEPALIVE}, ++ {"rekeyfuzz", KW_REKEYFUZZ}, ++ {"leftikeport", KW_LEFTIKEPORT}, ++ {"dumpdir", KW_DUMPDIR}, + {"auto", KW_AUTO}, ++ {"dpdtimeout", KW_DPDTIMEOUT}, + {"charondebug", KW_CHARONDEBUG}, + {"dpddelay", KW_DPDDELAY}, +- {"xauth_identity", KW_XAUTH_IDENTITY}, ++ {"mark", KW_MARK}, + {"charonstart", KW_CHARONSTART}, + {"fragicmp", KW_FRAGICMP}, + {"prepluto", KW_PREPLUTO}, ++ {"ignorepeeridcheck", KW_IGNOREPEERIDCHECK}, + {"closeaction", KW_CLOSEACTION}, + {"leftid2", KW_LEFTID2}, + {"plutodebug", KW_PLUTODEBUG}, + {"tfc", KW_TFC}, + {"auth", KW_AUTH}, +- {"rekeymargin", KW_REKEYMARGIN}, + {"modeconfig", KW_MODECONFIG}, + {"leftauth", KW_LEFTAUTH}, + {"xauth", KW_XAUTH}, +@@ -247,6 +247,7 @@ static const struct kw_entry wordlist[] + {"nocrsend", KW_NOCRSEND}, + {"leftauth2", KW_LEFTAUTH2}, + {"rightca2", KW_RIGHTCA2}, ++ {"rekeymargin", KW_REKEYMARGIN}, + {"rightcert2", KW_RIGHTCERT2}, + {"pkcs11module", KW_PKCS11MODULE}, + {"reauth", KW_REAUTH}, +@@ -265,24 +266,24 @@ static const short lookup[] = + 21, 22, 23, 24, 25, -1, -1, -1, 26, 27, + 28, -1, 29, -1, -1, -1, 30, -1, 31, 32, + 33, 34, 35, -1, 36, 37, -1, 38, -1, 39, +- 40, -1, -1, 41, 42, 43, -1, -1, 44, 45, +- 46, -1, 47, -1, 48, 49, 50, 51, 52, 53, +- -1, 54, 55, -1, -1, -1, 56, -1, 57, 58, +- 59, 60, -1, 61, -1, -1, 62, 63, 64, 65, +- 66, -1, 67, 68, 69, 70, -1, 71, 72, 73, +- 74, -1, 75, 76, 77, 78, 79, 80, 81, 82, +- 83, -1, 84, 85, 86, 87, 88, 89, 90, 91, +- 92, 93, 94, -1, 95, 96, 97, 98, -1, -1, +- 99, 100, -1, -1, 101, -1, 102, -1, -1, 103, +- -1, 104, 105, -1, 106, -1, -1, -1, -1, -1, +- 107, 108, -1, -1, -1, -1, -1, 109, -1, -1, +- -1, -1, 110, -1, 111, -1, -1, -1, -1, -1, +- -1, -1, -1, 112, 113, 114, -1, 115, -1, 116, ++ 40, -1, 41, 42, 43, 44, -1, -1, 45, 46, ++ 47, 48, 49, -1, 50, 51, 52, 53, 54, 55, ++ -1, -1, 56, -1, -1, -1, 57, -1, 58, 59, ++ 60, 61, -1, -1, -1, -1, 62, 63, 64, 65, ++ 66, -1, 67, 68, 69, 70, 71, -1, 72, 73, ++ 74, -1, 75, 76, 77, 78, 79, 80, -1, 81, ++ 82, 83, 84, 85, 86, 87, -1, 88, -1, 89, ++ -1, 90, -1, -1, 91, 92, 93, 94, 95, 96, ++ 97, 98, -1, -1, 99, 100, 101, -1, 102, 103, ++ -1, 104, -1, 105, 106, -1, -1, -1, -1, -1, ++ 107, 108, -1, -1, -1, -1, 109, 110, -1, -1, ++ -1, -1, 111, -1, 112, -1, -1, -1, -1, -1, ++ -1, -1, -1, 113, 114, -1, -1, 115, -1, 116, + -1, 117, -1, -1, 118, 119, -1, -1, -1, 120, + -1, -1, -1, -1, -1, 121, 122, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, 123, -1, 124, -1, +- -1, -1, -1, -1, -1, -1, 125, 126, 127, 128, +- -1, -1, 129, -1, -1, -1, 130 ++ -1, -1, -1, -1, -1, -1, 123, 124, 125, -1, ++ -1, -1, -1, -1, -1, -1, 126, 127, 128, 129, ++ -1, -1, 130, -1, -1, -1, 131 + }; + + #ifdef __GNUC__ +diff -rupN strongswan-4.6.4/src/starter/keywords.h strongswan-4.6.4.patched/src/starter/keywords.h +--- strongswan-4.6.4/src/starter/keywords.h 2012-05-30 09:17:15.000000000 -0700 ++++ strongswan-4.6.4.patched/src/starter/keywords.h 2012-06-05 22:27:58.208664827 -0700 +@@ -43,9 +43,10 @@ typedef enum { + KW_PKCS11INITARGS, + KW_PKCS11KEEPSTATE, + KW_PKCS11PROXY, ++ KW_IGNOREPEERIDCHECK, + + #define KW_PLUTO_FIRST KW_PLUTODEBUG +-#define KW_PLUTO_LAST KW_PKCS11PROXY ++#define KW_PLUTO_LAST KW_IGNOREPEERIDCHECK + + /* KLIPS keywords */ + KW_KLIPSDEBUG, +@@ -218,4 +219,3 @@ typedef enum { + } kw_token_t; + + #endif /* _KEYWORDS_H_ */ +- +diff -rupN strongswan-4.6.4/src/starter/keywords.txt strongswan-4.6.4.patched/src/starter/keywords.txt +--- strongswan-4.6.4/src/starter/keywords.txt 2012-05-30 09:17:15.000000000 -0700 ++++ strongswan-4.6.4.patched/src/starter/keywords.txt 2012-06-05 22:27:58.208664827 -0700 +@@ -56,6 +56,7 @@ pkcs11module, KW_PKCS11MODULE + pkcs11initargs, KW_PKCS11INITARGS + pkcs11keepstate, KW_PKCS11KEEPSTATE + pkcs11proxy, KW_PKCS11PROXY ++ignorepeeridcheck, KW_IGNOREPEERIDCHECK + keyexchange, KW_KEYEXCHANGE + type, KW_TYPE + pfs, KW_PFS diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/strongswan-4.6.4-initgroups.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/strongswan-4.6.4-initgroups.patch new file mode 100644 index 0000000000..375159e59f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/files/strongswan-4.6.4-initgroups.patch @@ -0,0 +1,14 @@ +diff -rupN strongswan-4.6.4/src/pluto/plutomain.c strongswan-4.6.4.patched/src/pluto/plutomain.c +--- strongswan-4.6.4/src/pluto/plutomain.c 2012-02-06 09:05:46.000000000 -0800 ++++ strongswan-4.6.4.patched/src/pluto/plutomain.c 2012-06-05 22:24:41.335822876 -0700 +@@ -726,7 +726,9 @@ int main(int argc, char **argv) + char buf[1024]; + + if (getpwnam_r(IPSEC_USER, &passwd, buf, sizeof(buf), &pwp) != 0 || +- pwp == NULL || setuid(pwp->pw_uid) != 0) ++ pwp == NULL || ++ initgroups(pwp->pw_name, pwp->pw_gid) != 0 || ++ setuid(pwp->pw_uid) != 0) + { + plog("unable to change daemon user"); + abort(); diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/strongswan-4.6.4-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/strongswan-4.6.4-r2.ebuild new file mode 100644 index 0000000000..e845be2dd1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/strongswan/strongswan-4.6.4-r2.ebuild @@ -0,0 +1,289 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.6.4.ebuild,v 1.1 2012/05/31 16:30:53 gurligebis Exp $ + +EAPI=2 +inherit eutils linux-info + +DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" +HOMEPAGE="http://www.strongswan.org/" +SRC_URI="http://download.strongswan.org/${P}.tar.bz2" + +LICENSE="GPL-2 RSA-MD5 RSA-PKCS11 DES" +SLOT="0" +KEYWORDS="arm amd64 ~ppc ~sparc x86" +# TODO(simonjam): Figure out why +openssl broke certificate support. Until then, +# openssl is disabled unlike upstream. +# See http://codereview.chromium.org/6833010 and http://crosbug.com/12695 for details. +IUSE="+caps cisco curl debug dhcp eap farp gcrypt ldap +ikev1 +ikev2 mysql nat-transport +non-root openssl +smartcard sqlite" + +COMMON_DEPEND="!net-misc/openswan + >=dev-libs/gmp-4.1.5 + gcrypt? ( dev-libs/libgcrypt ) + caps? ( sys-libs/libcap ) + curl? ( net-misc/curl ) + ldap? ( net-nds/openldap ) + smartcard? ( dev-libs/opensc ) + openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) + mysql? ( virtual/mysql ) + sqlite? ( >=dev-db/sqlite-3.3.1 )" +DEPEND="${COMMON_DEPEND} + virtual/linux-sources + sys-kernel/linux-headers" +RDEPEND="${COMMON_DEPEND} + virtual/logger" + +UGID="ipsec" + +pkg_setup() { + linux-info_pkg_setup + elog "Linux kernel version: ${KV_FULL}" + + if ! kernel_is -ge 2 6 16; then + eerror + eerror "This ebuild currently only supports ${PN} with the" + eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16." + eerror + fi + + if use nat-transport; then + ewarn + ewarn "You have enabled NAT Traversal for transport mode with the IKEv1" + ewarn "protocol. Please double check if you really require this feature" + ewarn "as it is potentially insecure and usually only required in certain" + ewarn "situations when interoperating with Windows using L2TP/IPsec." + ewarn + fi + + if kernel_is -lt 2 6 34; then + ewarn + ewarn "IMPORTANT KERNEL NOTES: Please read carefully..." + ewarn + + if kernel_is -lt 2 6 29; then + ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to" + ewarn "include all required IPv6 modules even if you just intend" + ewarn "to run on IPv4 only." + ewarn + ewarn "This has been fixed with kernels >= 2.6.29." + ewarn + fi + + if kernel_is -lt 2 6 33; then + ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards" + ewarn "compliant implementation for SHA-2 HMAC support in ESP and" + ewarn "miss SHA384 and SHA512 HMAC support altogether." + ewarn + ewarn "If you need any of those features, please use kernel >= 2.6.33." + ewarn + fi + + if kernel_is -lt 2 6 34; then + ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only" + ewarn "ESP cipher is only included in kernels >= 2.6.34." + ewarn + ewarn "If you need it, please use kernel >= 2.6.34." + ewarn + fi + fi +} + +src_prepare() { + # Initialize the supplementary group access list when pluto starts. + # See http://crosbug.com/16252 for details. + epatch "${FILESDIR}/${P}-initgroups.patch" || die + # Provide an option to ignore peer ID check in pluto. + # See http://crosbug.com/24476 for details. + epatch "${FILESDIR}/${P}-ignore-peer-id-check.patch" || die +} + +src_configure() { + local myconf="" + + if use non-root; then + myconf="${myconf} --with-user=${UGID} --with-group=${UGID}" + fi + + # If a user has already enabled db support, those plugins will + # most likely be desired as well. Besides they don't impose new + # dependencies and come at no cost (except for space). + if use mysql || use sqlite; then + myconf="${myconf} --enable-attr-sql --enable-sql" + fi + + # strongSwan builds and installs static libs by default which are + # useless to the user (and to strongSwan for that matter) because no + # header files or alike get installed... so disabling them is safe. + # + # On Chromium OS, we use --disable-xauth-vid to prevent strongswan + # from sending a XAUTH vendor ID during ISAKMP phase 1 exchange. + # See http://crosbug.com/25675 for details. + econf \ + --disable-static \ + --disable-xauth-vid \ + $(use_with caps capabilities libcap) \ + $(use_enable curl) \ + $(use_enable ldap) \ + $(use_enable smartcard) \ + $(use_enable cisco cisco-quirks) \ + $(use_enable debug leak-detective) \ + $(use_enable eap eap-sim) \ + $(use_enable eap eap-sim-file) \ + $(use_enable eap eap-simaka-sql) \ + $(use_enable eap eap-simaka-pseudonym) \ + $(use_enable eap eap-simaka-reauth) \ + $(use_enable eap eap-identity) \ + $(use_enable eap eap-md5) \ + $(use_enable eap eap-gtc) \ + $(use_enable eap eap-aka) \ + $(use_enable eap eap-aka-3gpp2) \ + $(use_enable eap eap-mschapv2) \ + $(use_enable eap eap-radius) \ + $(use_enable nat-transport) \ + $(use_enable openssl) \ + $(use_enable gcrypt) \ + $(use_enable mysql) \ + $(use_enable sqlite) \ + $(use_enable ikev1 pluto) \ + $(use_enable ikev2 charon) \ + $(use_enable dhcp) \ + $(use_enable farp) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + doinitd "${FILESDIR}"/ipsec + + local dir_ugid + if use non-root; then + fowners ${UGID}:${UGID} \ + /etc/ipsec.conf \ + /etc/ipsec.secrets \ + /etc/strongswan.conf + + dir_ugid="${UGID}" + else + dir_ugid="root" + fi + + diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid} + dodir /etc/ipsec.d \ + /etc/ipsec.d/aacerts \ + /etc/ipsec.d/acerts \ + /etc/ipsec.d/cacerts \ + /etc/ipsec.d/certs \ + /etc/ipsec.d/crls \ + /etc/ipsec.d/ocspcerts \ + /etc/ipsec.d/private \ + /etc/ipsec.d/reqs + + # Replace various IPsec files with symbolic links to runtime generated + # files (by l2tpipsec_vpn) on the stateful partition of Chromium OS. + rm -f "${D}"/etc/ipsec.conf "${D}"/etc/ipsec.secrets "{$D}"/etc/ipsec.d/cacerts/cacert.der + dosym /mnt/stateful_partition/etc/ipsec.conf /etc/ipsec.conf || die + dosym /mnt/stateful_partition/etc/ipsec.secrets /etc/ipsec.secrets || die + dosym /mnt/stateful_partition/etc/cacert.der /etc/ipsec.d/cacerts/cacert.der || die + + dodoc CREDITS NEWS README TODO || die + + # shared libs are used only internally and there are no static libs, + # so it's safe to get rid of the .la files + find "${D}" -name '*.la' -delete || die "Failed to remove .la files." +} + +pkg_preinst() { + has_version "= 2.6.16." + eerror + die "Please install a recent 2.6 kernel." + fi + + if use nat-transport; then + ewarn + ewarn "You have enabled NAT Traversal for transport mode with the IKEv1" + ewarn "protocol. Please double check if you really require this feature" + ewarn "as it is potentially insecure and usually only required in certain" + ewarn "situations when interoperating with Windows using L2TP/IPsec." + ewarn + fi + + if kernel_is -lt 2 6 34; then + ewarn + ewarn "IMPORTANT KERNEL NOTES: Please read carefully..." + ewarn + + if kernel_is -lt 2 6 29; then + ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to" + ewarn "include all required IPv6 modules even if you just intend" + ewarn "to run on IPv4 only." + ewarn + ewarn "This has been fixed with kernels >= 2.6.29." + ewarn + fi + + if kernel_is -lt 2 6 33; then + ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards" + ewarn "compliant implementation for SHA-2 HMAC support in ESP and" + ewarn "miss SHA384 and SHA512 HMAC support altogether." + ewarn + ewarn "If you need any of those features, please use kernel >= 2.6.33." + ewarn + fi + + if kernel_is -lt 2 6 34; then + ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only" + ewarn "ESP cipher is only included in kernels >= 2.6.34." + ewarn + ewarn "If you need it, please use kernel >= 2.6.34." + ewarn + fi + fi + + if use non-root; then + enewgroup ${UGID} + enewuser ${UGID} -1 -1 -1 ${UGID} + fi +} + +src_configure() { + local myconf="" + + if use non-root; then + myconf="${myconf} --with-user=${UGID} --with-group=${UGID}" + fi + + # If a user has already enabled db support, those plugins will + # most likely be desired as well. Besides they don't impose new + # dependencies and come at no cost (except for space). + if use mysql || use sqlite; then + myconf="${myconf} --enable-attr-sql --enable-sql" + fi + + # strongSwan builds and installs static libs by default which are + # useless to the user (and to strongSwan for that matter) because no + # header files or alike get installed... so disabling them is safe. + econf \ + --disable-static \ + $(use_with caps capabilities libcap) \ + $(use_enable curl) \ + $(use_enable ldap) \ + $(use_enable smartcard) \ + $(use_enable cisco cisco-quirks) \ + $(use_enable debug leak-detective) \ + $(use_enable eap eap-sim) \ + $(use_enable eap eap-sim-file) \ + $(use_enable eap eap-simaka-sql) \ + $(use_enable eap eap-simaka-pseudonym) \ + $(use_enable eap eap-simaka-reauth) \ + $(use_enable eap eap-identity) \ + $(use_enable eap eap-md5) \ + $(use_enable eap eap-gtc) \ + $(use_enable eap eap-aka) \ + $(use_enable eap eap-aka-3gpp2) \ + $(use_enable eap eap-mschapv2) \ + $(use_enable eap eap-radius) \ + $(use_enable nat-transport) \ + $(use_enable openssl) \ + $(use_enable gcrypt) \ + $(use_enable mysql) \ + $(use_enable sqlite) \ + $(use_enable ikev1 pluto) \ + $(use_enable ikev2 charon) \ + $(use_enable dhcp) \ + $(use_enable farp) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + doinitd "${FILESDIR}"/ipsec + + local dir_ugid + if use non-root; then + fowners ${UGID}:${UGID} \ + /etc/ipsec.conf \ + /etc/ipsec.secrets \ + /etc/strongswan.conf + + dir_ugid="${UGID}" + else + dir_ugid="root" + fi + + diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid} + dodir /etc/ipsec.d \ + /etc/ipsec.d/aacerts \ + /etc/ipsec.d/acerts \ + /etc/ipsec.d/cacerts \ + /etc/ipsec.d/certs \ + /etc/ipsec.d/crls \ + /etc/ipsec.d/ocspcerts \ + /etc/ipsec.d/private \ + /etc/ipsec.d/reqs + + dodoc CREDITS NEWS README TODO || die + + # shared libs are used only internally and there are no static libs, + # so it's safe to get rid of the .la files + find "${D}" -name '*.la' -delete || die "Failed to remove .la files." +} + +pkg_preinst() { + has_version " tor-0.2.1.22.ebuild: + Marked ppc stable for bug #301701. + + 01 Feb 2010; Markus Meier tor-0.2.1.22.ebuild: + amd64 stable, bug #301701 + + 30 Jan 2010; Raúl Porcel tor-0.2.1.22.ebuild: + sparc stable wrt #301701 + + 22 Jan 2010; Brent Baude tor-0.2.1.22.ebuild: + Marking tor-0.2.1.22 ppc64 for bug 301701 + + 22 Jan 2010; Christian Faulhammer tor-0.2.1.22.ebuild: + stable x86, bug 301701 + +*tor-0.2.1.22 (22 Jan 2010) + + 22 Jan 2010; Christian Faulhammer +tor-0.2.1.22.ebuild: + version bump for security bug 301701 + +*tor-0.2.1.21 (16 Jan 2010) + + 16 Jan 2010; Christian Faulhammer +tor-0.2.1.21.ebuild: + version bump, bug 301169 by Tim O'Kelly + + 27 Dec 2009; Christian Faulhammer + -files/tor-0.2.0.30-logrotate.patch, + -files/tor-0.2.0.33-no-internal-libevent.patch, -tor-0.2.0.35.ebuild, + -tor-0.2.1.19.ebuild, -tor-0.2.1.19-r1.ebuild: + clean up + + 26 Dec 2009; Raúl Porcel tor-0.2.1.19-r2.ebuild: + sparc stable wrt #294297 + + 08 Dec 2009; Brent Baude tor-0.2.1.19-r2.ebuild: + Marking tor-0.2.1.19-r2 ppc64 for bug 294297 + +*tor-0.2.1.20-r1 (06 Dec 2009) + + 06 Dec 2009; Christian Faulhammer -tor-0.2.1.20.ebuild, + +tor-0.2.1.20-r1.ebuild: + reintroduce OpenSSL patch for bug 292661 + +*tor-0.2.1.20 (02 Dec 2009) + + 02 Dec 2009; Christian Faulhammer +tor-0.2.1.20.ebuild: + version bump + + 25 Nov 2009; Markus Meier tor-0.2.1.19-r2.ebuild: + amd64 stable, bug #294297 + + 24 Nov 2009; Christian Faulhammer + tor-0.2.1.19-r2.ebuild: + stable x86, bug 294297 + + 21 Nov 2009; nixnut tor-0.2.1.19-r2.ebuild: + ppc stable #292022 + +*tor-0.2.1.19-r2 (12 Nov 2009) + + 12 Nov 2009; Christian Faulhammer + +tor-0.2.1.19-r2.ebuild, +files/tor-0.2.1.19-openssl.patch: + fix bug 2926611, patch discovered by Aidan Marks + + 07 Sep 2009; Christian Faulhammer files/tor.initd-r4: + respect CONFFILE variable in start calls, reported by Iome in bug 283524 + +*tor-0.2.1.19-r1 (17 Aug 2009) + + 17 Aug 2009; Christian Faulhammer + +tor-0.2.1.19-r1.ebuild, +files/tor-0.2.1.19-logrotate.patch: + fix logrotate support as provided by Martin von Gagern in bug 281439 + + 06 Aug 2009; Christian Faulhammer + -tor-0.2.1.16_rc.ebuild: + clean up release candidate + +*tor-0.2.1.19 (06 Aug 2009) + + 06 Aug 2009; Christian Faulhammer +tor-0.2.1.19.ebuild: + version bump + + 14 Jul 2009; Christian Faulhammer -tor-0.2.0.34.ebuild: + remove vulnerable version + + 12 Jul 2009; Joseph Jezak tor-0.2.0.35.ebuild: + Marked ppc stable for bug #275628. + + 30 Jun 2009; Brent Baude tor-0.2.0.35.ebuild: + Marking tor-0.2.0.35 ppc64 for bug 275628 + + 30 Jun 2009; Raúl Porcel tor-0.2.0.35.ebuild: + sparc stable wrt #275628 + + 29 Jun 2009; Christian Faulhammer tor-0.2.0.34.ebuild, + tor-0.2.0.35.ebuild, tor-0.2.1.16_rc.ebuild: + fix HOMEPAGE entries + + 29 Jun 2009; Markus Meier tor-0.2.0.35.ebuild: + amd64 stable, bug #275628 + +*tor-0.2.1.16_rc (29 Jun 2009) + + 29 Jun 2009; Christian Faulhammer + -tor-0.2.1.15_rc.ebuild, +tor-0.2.1.16_rc.ebuild: + extend version bump for security bug 275628 and remove one vulnerable + version + +*tor-0.2.0.35 (28 Jun 2009) + + 28 Jun 2009; Christian Faulhammer +tor-0.2.0.35.ebuild: + version bump for security bug 275628, directly stable for x86 + + 17 Jun 2009; Christian Faulhammer + tor-0.2.1.15_rc.ebuild: + remove all occurences of USE=bundledlibevent + +*tor-0.2.1.15_rc (17 Jun 2009) + + 17 Jun 2009; Christian Faulhammer + +tor-0.2.1.15_rc.ebuild: + add release candidate for 0.2.1 series + + 12 Jun 2009; Christian Faulhammer + files/torrc.sample-0.1.2.6.patch, +tor-0.2.0.34.ebuild, + -tor-0.2.0.34-r2.ebuild, +files/tor.initd-r4, -files/tor.initd-r6: + revert all my changes for bug 268396 as they will break badly with + Baselayout 1, see bug 272527 + +*tor-0.2.0.34-r2 (03 Jun 2009) + + 03 Jun 2009; Christian Faulhammer -files/tor.initd-r5, + +files/tor.initd-r6, -tor-0.2.0.34-r1.ebuild, +tor-0.2.0.34-r2.ebuild: + revision bump to make it compatible with Baselayout 1, as reported by + Stanislav Cymbalov in bug 272404 + +*tor-0.2.0.34-r1 (03 Jun 2009) + + 03 Jun 2009; Christian Faulhammer + files/torrc.sample-0.1.2.6.patch, -files/tor.initd-r4, + +files/tor.initd-r5, -tor-0.2.0.34.ebuild, +tor-0.2.0.34-r1.ebuild: + Really respect limits from /etc/limits.d/ by some tweaks: moving user + context switch from torrc to init script, including verification of config + file in the latter; fixes bug 268396 by W. Elschner + + 19 Feb 2009; nixnut tor-0.2.0.34.ebuild: + ppc stable + + 18 Feb 2009; Christian Faulhammer -tor-0.2.0.33.ebuild: + clean up vulnerable versions + + 15 Feb 2009; Markus Meier tor-0.2.0.34.ebuild: + amd64/x86 stable, bug #258833 + + 13 Feb 2009; Brent Baude tor-0.2.0.34.ebuild: + Marking tor-0.2.0.34 ppc64 for bug 258833 + + 13 Feb 2009; Ferris McCormick tor-0.2.0.34.ebuild: + Sparc stable --- Security Bug #258833 --- tests good. + +*tor-0.2.0.34 (13 Feb 2009) + + 13 Feb 2009; Christian Faulhammer +tor-0.2.0.34.ebuild: + version bump for security bug 258833, reported by Jesse Adelman + + 08 Feb 2009; Christian Faulhammer tor-0.2.0.33.ebuild: + kill logrotate USE flag as requested by bangert on bug 258188 + + 05 Feb 2009; Christian Faulhammer + +files/tor-0.2.0.33-no-internal-libevent.patch, metadata.xml, + tor-0.2.0.33.ebuild: + make use of bundled libevent async DNS part optional via USE=flag, this + should fix bug 206969 + + 26 Jan 2009; Christian Faulhammer -tor-0.2.0.32.ebuild, + -tor-0.2.0.32-r1.ebuild: + clean up + + 25 Jan 2009; Markus Meier tor-0.2.0.33.ebuild: + amd64/x86 stable, bug #256078 + + 24 Jan 2009; Tobias Scherbaum tor-0.2.0.33.ebuild: + ppc stable, bug #256078 + + 24 Jan 2009; Ferris McCormick tor-0.2.0.33.ebuild: + Sparc stable, Security Bug #256078. + + 24 Jan 2009; Brent Baude tor-0.2.0.33.ebuild: + Marking tor-0.2.0.33 ppc64 for bug 256078 + +*tor-0.2.0.33 (24 Jan 2009) + + 24 Jan 2009; Christian Faulhammer +tor-0.2.0.33.ebuild: + version bump for security bug 256078 + +*tor-0.2.0.32-r1 (21 Dec 2008) + + 21 Dec 2008; Christian Faulhammer +files/tor.conf, + +tor-0.2.0.32-r1.ebuild: + install limits file so tor can open more files on the system than normally + allowed, this fixes bug 251171 reported by candrews AT integralblue DOT + com + + 10 Dec 2008; Christian Faulhammer + -files/tor-0.2.0.31-sparc.patch, -tor-0.2.0.31-r1.ebuild: + clean up + + 09 Dec 2008; Friedrich Oslage tor-0.2.0.32.ebuild: + Stable on sparc, security bug #250018 + + 08 Dec 2008; Brent Baude tor-0.2.0.32.ebuild: + Marking tor-0.2.0.32 ppc64 for bug 250018 + + 08 Dec 2008; Markus Meier tor-0.2.0.32.ebuild: + x86 stable, bug #250018 + + 07 Dec 2008; Tobias Scherbaum tor-0.2.0.32.ebuild: + ppc stable, bug #250018 + + 07 Dec 2008; Richard Freeman tor-0.2.0.32.ebuild: + amd64 stable - 250018 + +*tor-0.2.0.32 (06 Dec 2008) + + 06 Dec 2008; Christian Faulhammer +tor-0.2.0.32.ebuild: + version bump for security bug 250018 + + 28 Nov 2008; Christian Faulhammer metadata.xml: + Change my email address + + 22 Nov 2008; Christian Faulhammer + -tor-0.2.0.30-r1.ebuild, -tor-0.2.0.31.ebuild, tor-0.2.0.31-r1.ebuild: + clean up and add stable KEYWORDS for -r1 + + 22 Nov 2008; Markus Meier tor-0.2.0.31.ebuild: + amd64 stable, bug #244679 + + 14 Nov 2008; Ferris McCormick tor-0.2.0.31.ebuild, + tor-0.2.0.31-r1.ebuild: + Address sparc alignment problems reported in Bug #246483 --- this fixes them + but is untested on anything else. + +*tor-0.2.0.31-r1 (14 Nov 2008) + + 14 Nov 2008; Ferris McCormick + +files/tor-0.2.0.31-sparc.patch, +tor-0.2.0.31-r1.ebuild: + Add new version to address sparc alignment problem, Bug #246483 which see + for details. + + 01 Nov 2008; nixnut tor-0.2.0.31.ebuild: + Stable on ppc wrt bug 244679 + + 30 Oct 2008; Raúl Porcel tor-0.2.0.31.ebuild: + x86 stable #244679 + + 28 Oct 2008; Ferris McCormick tor-0.2.0.31.ebuild: + Sparc stable, Bug #244679. + + 27 Oct 2008; Brent Baude tor-0.2.0.31.ebuild: + stable ppc64, bug 244679 + +*tor-0.2.0.31 (26 Sep 2008) + + 26 Sep 2008; Christian Faulhammer +tor-0.2.0.31.ebuild: + version bump for bug 238787 + + 06 Sep 2008; Christian Faulhammer files/tor.initd-r4: + remove bashisms from init file, as reported in bug 236857 by Martin Väth + + + 06 Sep 2008; Christian Faulhammer -files/tor.initd-r3, + -files/tor.logrotate.patch, -tor-0.1.2.19-r2.ebuild, -tor-0.2.0.30.ebuild: + clean up + + 06 Sep 2008; Raúl Porcel tor-0.2.0.30-r1.ebuild: + x86 stable wrt #236536 + + 06 Sep 2008; Brent Baude tor-0.2.0.30-r1.ebuild: + stable ppc64, bug 236536 + + 06 Sep 2008; Richard Freeman tor-0.2.0.30-r1.ebuild: + amd64 stable - 236536 + + 04 Sep 2008; Brent Baude tor-0.2.0.30-r1.ebuild: + stable ppc, bug 236536 + + 03 Sep 2008; Ferris McCormick tor-0.2.0.30-r1.ebuild: + Sparc stable --- Bug #236536 --- test suite passes. + +*tor-0.2.0.30-r1 (03 Sep 2008) + + 03 Sep 2008; Christian Faulhammer +files/tor.initd-r4, + +tor-0.2.0.30-r1.ebuild: + update init script to prevent runtime failures as reported in bug 235208 + +*tor-0.2.0.30 (03 Aug 2008) + + 03 Aug 2008; Christian Faulhammer + +files/tor-0.2.0.30-logrotate.patch, +tor-0.2.0.30.ebuild: + version bump for bug 233612 by puchu + + 29 May 2008; Christian Faulhammer -tor-0.1.2.19.ebuild: + clean up + + 29 May 2008; Raúl Porcel tor-0.1.2.19-r2.ebuild: + sparc stable wrt #223705, thanks to Friedrich Oslage for testing + + 28 May 2008; Peter Volkov tor-0.1.2.19-r2.ebuild: + amd64 stable, bug #223705. + + 27 May 2008; Markus Rothe tor-0.1.2.19-r2.ebuild: + Stable on ppc64; bug #223705 + + 26 May 2008; nixnut tor-0.1.2.19-r2.ebuild: + Stable on ppc wrt bug 223705 + + 26 May 2008; Christian Faulhammer + tor-0.1.2.19-r2.ebuild: + stable x86, bug 223705 + +*tor-0.1.2.19-r2 (29 Apr 2008) + + 29 Apr 2008; Christian Faulhammer + -tor-0.1.2.19-r1.ebuild, +tor-0.1.2.19-r2.ebuild: + logrotate should now really work again + +*tor-0.1.2.19-r1 (25 Apr 2008) + + 25 Apr 2008; Christian Faulhammer + +tor-0.1.2.19-r1.ebuild: + create the logrotate file with the correct permissions as pointed out on bug + 216298 by Serge Koksharov + + 05 Mar 2008; Christian Faulhammer -tor-0.1.2.18.ebuild: + clean up + + 04 Mar 2008; Richard Freeman tor-0.1.2.19.ebuild: + amd64 stable - 211021 + + 04 Mar 2008; Brent Baude tor-0.1.2.19.ebuild: + stable ppc64, bug 211021 + + 03 Mar 2008; Raúl Porcel tor-0.1.2.19.ebuild: + sparc stable wrt #211021 + + 02 Mar 2008; nixnut tor-0.1.2.19.ebuild: + Stable on ppc wrt bug 211021 + + 01 Mar 2008; Christian Faulhammer metadata.xml: + adding myself to metadata.xml + + 01 Mar 2008; Christian Faulhammer tor-0.1.2.19.ebuild: + stable x86, bug 211021 + + 07 Feb 2008; Christian Faulhammer -files/tor.initd-r2, + -tor-0.1.2.17.ebuild: + clean up + + 07 Feb 2008; Raúl Porcel tor-0.1.2.18.ebuild: + sparc stable wrt #208336 + + 06 Feb 2008; nixnut tor-0.1.2.18.ebuild: + stable on ppc wrt bug #208336 + + 02 Feb 2008; Richard Freeman tor-0.1.2.18.ebuild: + amd64 stable - #208336 + + 31 Jan 2008; Brent Baude tor-0.1.2.18.ebuild: + Marking tor-0.1.2.18 ppc64 stable for bug 208336 + + 31 Jan 2008; Christian Faulhammer tor-0.1.2.18.ebuild: + stable x86, bug 208336 + +*tor-0.1.2.19 (31 Jan 2008) + + 31 Jan 2008; Christian Faulhammer +tor-0.1.2.19.ebuild: + version bump + +*tor-0.1.2.18 (03 Jan 2008) + + 03 Jan 2008; Christian Faulhammer -tor-0.1.2.16.ebuild, + -tor-0.1.2.16-r1.ebuild, +tor-0.1.2.18.ebuild: + version bump (bug 199818) and clean up + + 03 Sep 2007; Tobias Scherbaum tor-0.1.2.17.ebuild: + ppc stable, bug #190968 + + 02 Sep 2007; Jose Luis Rivero tor-0.1.2.17.ebuild: + Stable on sparc wrt security bug #190968 + + 02 Sep 2007; Markus Rothe tor-0.1.2.17.ebuild: + Stable on ppc64; bug #190968 + + 02 Sep 2007; Christoph Mende tor-0.1.2.17.ebuild: + Stable on amd64 wrt security bug #190968 + +*tor-0.1.2.17 (02 Sep 2007) + + 02 Sep 2007; Christian Faulhammer +tor-0.1.2.17.ebuild: + version bump and stable x86, security bug 190968 + + 29 Aug 2007; Gustavo Felisberto files/tor.initd-r3: + Adding correct init script. + +*tor-0.1.2.16-r1 (28 Aug 2007) + + 28 Aug 2007; Gustavo Felisberto + -files/torrc.sample-0.1.0.16.patch, -files/torrc.sample-0.1.1.23.patch, + -files/tor.confd, -files/tor.initd, -files/tor.initd-r1, + +files/tor.initd-r3, -tor-0.1.1.23.ebuild, -tor-0.1.1.26.ebuild, + -tor-0.1.2.14.ebuild, +tor-0.1.2.16-r1.ebuild: + Removed older versions and dangled files. Fixed bug with init with + baselayout-2 closes 189724. Thanks to Christian Faulhammer (opfer) for the + fix. + + 09 Aug 2007; Robert Buchholz tor-0.1.2.16.ebuild: + Stable on amd64 (bug #186644) + + 06 Aug 2007; Gustavo Zacarias tor-0.1.2.16.ebuild: + Stable on sparc wrt security #186644 + + 04 Aug 2007; Markus Rothe tor-0.1.2.16.ebuild: + Stable on ppc64; bug #186644 + + 04 Aug 2007; Tobias Scherbaum tor-0.1.2.16.ebuild: + ppc stable, bug #186644 + + 03 Aug 2007; Christian Faulhammer tor-0.1.2.16.ebuild: + stable x86, security bug 186644 + +*tor-0.1.2.16 (03 Aug 2007) + + 03 Aug 2007; Christian Faulhammer +tor-0.1.2.16.ebuild: + version bump, for security bug 186644 + + 02 Jun 2007; René Nussbaumer tor-0.1.2.14.ebuild: + Stable on ppc. See bug #180139. + + 31 May 2007; Christoph Mende tor-0.1.2.14.ebuild: + Stable on amd64 wrt security bug 180139 + + 31 May 2007; Brent Baude tor-0.1.2.14.ebuild: + Marking tor-0.1.2.14 ppc64 stable for bug#180139 + + 31 May 2007; Gustavo Zacarias tor-0.1.2.14.ebuild: + Stable on sparc wrt security #180139 + + 31 May 2007; Christian Faulhammer tor-0.1.2.14.ebuild: + stable x86, security bug 180139 + +*tor-0.1.2.14 (31 May 2007) + + 31 May 2007; -tor-0.1.0.18.ebuild, + -tor-0.1.0.18-r1.ebuild, -tor-0.1.2.13.ebuild, +tor-0.1.2.14.ebuild: + Bumped 0.1.2.13 to 0.1.2.14, removed older versions. Fixed #178975 with idea + from Remy Blank + + 15 May 2007; tor-0.1.0.18.ebuild, + tor-0.1.0.18-r1.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.26.ebuild, + tor-0.1.2.13.ebuild: + Added keepdir. Close Bug #177590. + + 15 May 2007; tor-0.1.1.23.ebuild, + tor-0.1.1.26.ebuild: + Fixed missing RDEP's. Close Bug #174185. + +*tor-0.1.2.13 (15 May 2007) + + 15 May 2007; +files/tor.initd-r2, + -tor-0.1.2.6_alpha.ebuild, +tor-0.1.2.13.ebuild: + Removed alpha 1.2 release and added a bump. Help from all in bug #176018, + specially jakub, was very much apretiated. + + 29 Apr 2007; Torsten Veller tor-0.1.1.23.ebuild, + tor-0.1.1.26.ebuild, tor-0.1.2.6_alpha.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) + +*tor-0.1.2.6_alpha (27 Jan 2007) + + 27 Jan 2007; Gustavo Felisberto ; + +files/torrc.sample-0.1.2.6.patch, +tor-0.1.2.6_alpha.ebuild: + Added alpha release of tor at request from Flameeyes. It seems tork needs + it. As always, if it is masked and you install and destroy your system dont + come complain alot. + +*tor-0.1.1.26 (18 Dec 2006) + + 18 Dec 2006; Gustavo Felisberto ; + -tor-0.1.1.24.ebuild, +tor-0.1.1.26.ebuild: + Bumped to 0.1.1.26 and removed older version. + +*tor-0.1.0.18-r1 (22 Oct 2006) + + 22 Oct 2006; Gustavo Felisberto ; + tor-0.1.0.18.ebuild, +tor-0.1.0.18-r1.ebuild: + Small configuration issue in the chroot. Fixes bug #139354. + + 21 Oct 2006; Gustavo Felisberto ; + tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.24.ebuild: + Added ewarn about the needed dot in the privoxy integration. Closes bug + #152137. + +*tor-0.1.1.24 (09 Oct 2006) + + 09 Oct 2006; Gustavo Felisberto ; + +tor-0.1.1.24.ebuild: + Bump from 0.1.1.23 + + 11 Sep 2006; Gustavo Felisberto ; + tor-0.1.0.18.ebuild: + Changed einfo about configuration of chroot. Removes tor from bug #140371 + + 05 Sep 2006; Gustavo Felisberto ; + -files/torrc.sample-0.1.0.14.patch, -tor-0.1.0.14-r1.ebuild, + -tor-0.1.0.16.ebuild, -tor-0.1.0.17.ebuild, -tor-0.1.1.20.ebuild, + -tor-0.1.1.22.ebuild: + Removed older version that had sec issues. + + 30 Aug 2006; Gustavo Zacarias tor-0.1.0.18.ebuild, + tor-0.1.1.23.ebuild: + Stable on sparc wrt security #145458 + + 30 Aug 2006; tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild: + stable on amd64 wrt bug 145458 + + 30 Aug 2006; Joshua Jackson tor-0.1.0.18.ebuild, + tor-0.1.1.23.ebuild: + Stable x86; security bug #145458 + + 29 Aug 2006; Markus Rothe tor-0.1.0.18.ebuild, + tor-0.1.1.23.ebuild: + Stable on ppc64; bug #145458 + + 29 Aug 2006; Tobias Scherbaum tor-0.1.0.18.ebuild, + tor-0.1.1.23.ebuild: + ppc stable, bug #145458 + +*tor-0.1.0.18 (29 Aug 2006) + + 29 Aug 2006; Gustavo Felisberto ; + +tor-0.1.0.18.ebuild: + Adding 0.1.0.18 that fixes sec issue in the 0.1.0.* series. The 0.1.1.23 is + not affected. + +*tor-0.1.1.23 (24 Aug 2006) + + 24 Aug 2006; Gustavo Felisberto ; + +files/torrc.sample-0.1.1.23.patch, +tor-0.1.1.23.ebuild: + Updated version, bump and small cosmetics. Thanks to Olivier Mondolini in + bug #144417. + + 16 Jul 2006; Diego Pettenò tor-0.1.1.22.ebuild: + Add ~x86-fbsd keyword. + +*tor-0.1.1.22 (08 Jul 2006) + + 08 Jul 2006; Gustavo Felisberto ; + +tor-0.1.1.22.ebuild: + Bump to 0.1.1.22. Closes bug # 138073. + + 05 Jun 2006; Simon Stelling tor-0.1.1.20.ebuild: + stable on amd64 wrt bug 134329 + + 01 Jun 2006; Gustavo Zacarias tor-0.1.1.20.ebuild: + Stable on sparc wrt security #134329 + + 01 Jun 2006; Tobias Scherbaum tor-0.1.1.20.ebuild: + ppc stable, bug #134329 + + 01 Jun 2006; Markus Rothe tor-0.1.1.20.ebuild: + Stable on ppc64; bug #134329 + + 01 Jun 2006; Joshua Jackson tor-0.1.1.20.ebuild: + Stable on x86; security bug #134329 + +*tor-0.1.1.20 (01 Jun 2006) + + 01 Jun 2006; Stefan Cornelius +tor-0.1.1.20.ebuild: + Bumping to version 0.1.1.20 for security bugs #134329 and #118918 + + 23 Apr 2006; Emanuele Giaquinta tor-0.1.0.14-r1.ebuild, + tor-0.1.0.16.ebuild, tor-0.1.0.17.ebuild: + Move enew{group,user} in pkg_setup. + +*tor-0.1.0.17 (28 Feb 2006) + + 28 Feb 2006; Gustavo Felisberto ; + +tor-0.1.0.17.ebuild: + Bump to 0.1.017. Credits go to Christian Mandery in bug #123530 for + reporting this. + +*tor-0.1.0.16 (04 Jan 2006) + + 04 Jan 2006; Gustavo Felisberto ; + +files/torrc.sample-0.1.0.16.patch, +files/tor.confd, +files/tor.initd-r1, + +tor-0.1.0.16.ebuild: + Adding tor 1.0.16 to portage. Arch teams please dont mark stable as the new + chroot stuff needs serious testing. + +*tor-0.1.0.14-r1 (11 Sep 2005) + + 11 Sep 2005; Gustavo Felisberto ; files/tor.initd, + -tor-0.1.0.14.ebuild, +tor-0.1.0.14-r1.ebuild: + I was having some strange issues with sending signal 2 to tor. And we do not + need a SIGINT, a SIGTERM is fine. + + 06 Sep 2005; Gustavo Felisberto ; + -files/torrc.sample.patch-00, -tor-0.0.9.10.ebuild: + Removing older version. + + 16 Aug 2005; Jason Wever tor-0.1.0.14.ebuild: + Stable on SPARC wrt security bug #102245. + + 15 Aug 2005; Michael Hanselmann tor-0.1.0.14.ebuild: + Stable on ppc. + + 15 Aug 2005; Markus Rothe tor-0.1.0.14.ebuild: + Stable on ppc64 (bug #102245) + +*tor-0.1.0.14 (14 Aug 2005) + + 14 Aug 2005; Gustavo Felisberto ; + +files/torrc.sample-0.1.0.14.patch, +tor-0.1.0.14.ebuild: + Adding new version as amd64 and x86 due to sec bug. See #102245 + + 20 Jul 2005; Herbie Hopkins tor-0.0.9.10.ebuild: + Stable on amd64. + + 22 Jun 2005; Gustavo Zacarias tor-0.0.9.10.ebuild: + Stable on sparc + + 21 Jun 2005; Michael Hanselmann tor-0.0.9.10.ebuild: + Stable on ppc (#96320). + + 21 Jun 2005; Markus Rothe tor-0.0.9.10.ebuild: + Stable on ppc64 + +*tor-0.0.9.10 (16 Jun 2005) + + 16 Jun 2005; Gustavo Felisberto ; + -tor-0.0.9.5.ebuild, -tor-0.0.9.6.ebuild, -tor-0.0.9.7.ebuild, + -tor-0.0.9.9.ebuild, +tor-0.0.9.10.ebuild: + Added version 0.9.0.10 that fixes a security bug, removed older versions + that were affected. + + 12 Jun 2005; Gustavo Felisberto ; tor-0.0.9.5.ebuild, + tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild, tor-0.0.9.9.ebuild: + New HOMEPAGE, thanks to Matteo in bug #95754. + + 18 May 2005; Markus Rothe tor-0.0.9.6.ebuild: + Stable on ppc64 + + 01 May 2005; Michael Hanselmann tor-0.0.9.5.ebuild: + Stable on ppc. + +*tor-0.0.9.9 (25 Apr 2005) + + 25 Apr 2005; Gustavo Felisberto ; tor-0.0.9.5.ebuild, + tor-0.0.9.6.ebuild, +tor-0.0.9.9.ebuild: + Removing older versions and bumping to 0.9.9 . + + 22 Apr 2005; Alin Nastac tor-0.0.9.5.ebuild, + tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild: + net-misc/tsocks -> net-proxy/tsocks + + 08 Apr 2005; Gustavo Zacarias tor-0.0.9.7.ebuild: + Keyworded ~sparc wrt #88305 + +*tor-0.0.9.7 (01 Apr 2005) + + 01 Apr 2005; Gustavo Felisberto ; +tor-0.0.9.7.ebuild: + Bumped + + 29 Mar 2005; Markus Rothe tor-0.0.9.6.ebuild: + Added ~ppc64 to KEYWORDS; bug #86993 + +*tor-0.0.9.6 (25 Mar 2005) + + 25 Mar 2005; Gustavo Felisberto ; +tor-0.0.9.6.ebuild: + Bumped to 0.0.9.6 + + 23 Mar 2005; Gustavo Felisberto ; files/tor.initd: + Changed init script to send SIGINT at shutdown. May increase the shutdown time + of servers, but will close in a more clean way. + + 25 Feb 2005; Gustavo Felisberto ; + -tor-0.0.9.4-r1.ebuild, -tor-0.0.9.4-r2.ebuild, tor-0.0.9.5.ebuild: + Marking latest as x86 and removing older versions. + +*tor-0.0.9.5 (23 Feb 2005) + + 23 Feb 2005; Gustavo Felisberto ; + tor-0.0.9.4-r2.ebuild, +tor-0.0.9.5.ebuild: + Adding version 0.0.9.5 and marking 0.0.9.4-r2 as x86. + +*tor-0.0.9.4-r2 (13 Feb 2005) + + 13 Feb 2005; Gustavo Felisberto ; files/tor.initd, + +files/torrc.sample.patch-00, -tor-0.0.8.1.ebuild, -tor-0.0.9.1.ebuild, + -tor-0.0.9.2.ebuild, +tor-0.0.9.4-r2.ebuild, -tor-0.0.9.4.ebuild: + Adding new version that properly patches the sample config and deleting older + versions. Lost the stable ppc-macos but that arch is lagging way to much. + +*tor-0.0.9.4-r1 (10 Feb 2005) + + 10 Feb 2005; Gustavo Felisberto ; +files/tor.initd, + +tor-0.0.9.4-r1.ebuild: + Using ideas in bug #75381 from Faustus and after talking + to latexer i'm commiting this version that can use a init.d script for easier + usage. + +*tor-0.0.9.4 (04 Feb 2005) + + 04 Feb 2005; Peter Johanson +tor-0.0.9.4.ebuild: + Bump. + + 09 Jan 2005; Marcus Hanwell tor-0.0.9.2.ebuild: + Marked ~amd64, closes bug 76780. + +*tor-0.0.9.2 (04 Jan 2005) + + 04 Jan 2005; Peter Johanson +tor-0.0.9.2.ebuild: + Bump. + +*tor-0.0.9.1 (16 Dec 2004) + + 16 Dec 2004; Peter Johanson +tor-0.0.9.1.ebuild: + Bump. Add tsocks dependancy, see bug #70879 + + 20 Oct 2004; Peter Johanson -tor-0.0.6.1.ebuild, + -tor-0.0.6.ebuild, -tor-0.0.7.2.ebuild, -tor-0.0.7.3.ebuild, + -tor-0.0.7.ebuild: + Remove old vulnerable versions. See bug #67756 + + 21 Oct 2004; Joseph Jezak tor-0.0.8.1.ebuild: + Keyworded ppc-macos and macos due to vulnerability in previous versions. + Removed tsocks RDEPEND at the request of latexer. See bug #67756 + +*tor-0.0.8.1 (17 Oct 2004) + + 17 Oct 2004; +tor-0.0.8.1.ebuild, -tor-0.0.8.ebuild: + Bump and remove 0.0.8 which is vulnerable to a remote DoS. See bug #67756. + +*tor-0.0.8 (06 Oct 2004) + + 06 Oct 2004; tor-0.0.6.1.ebuild, tor-0.0.6.ebuild, + tor-0.0.7.2.ebuild, tor-0.0.7.3.ebuild, tor-0.0.7.ebuild, +tor-0.0.8.ebuild: + Bump. Also fix the license as this is really under 3-clause BSD. + +*tor-0.0.7.3 (15 Aug 2004) + + 15 Aug 2004; Peter Johanson +tor-0.0.7.3.ebuild: + Bump. Only needed for servers. + + 25 Jul 2004; Lina Pezzella + Fixed Manifest. + + 24 Jul 2004; Erik Swanson tor-0.0.7.2.ebuild: + Added macos to KEYWORDS + +*tor-0.0.7.2 (15 Jul 2004) + + 15 Jul 2004; Peter Johanson +tor-0.0.7.2.ebuild: + Bump to latest version. tsocks is now a depend for everything but macos, since + tsocks no worky there. + +*tor-0.0.7 (07 Jun 2004) + + 07 Jun 2004; Peter Johanson,,, tor-0.0.2_pre27.ebuild, + tor-0.0.5.ebuild, tor-0.0.6_rc1.ebuild, tor-0.0.7.ebuild: + Bump to lates release, and remove older versions. + +*tor-0.0.6.1 (06 May 2004) + + 06 May 2004; Peter Johanson tor-0.0.6.1.ebuild: + Bump. + + 02 May 2004; Peter Johanson tor-0.0.6.ebuild: + Adding back ~ppc, as dholm wants me to keep it around for future updates. + +*tor-0.0.6 (02 May 2004) + + 02 May 2004; Peter Johanson tor-0.0.6.ebuild: + Bump to latest release. + + 30 Apr 2004; David Holm tor-0.0.6_rc1.ebuild: + Added to ~ppc. + +*tor-0.0.6_rc1 (29 Apr 2004) + + 29 Apr 2004; Peter Johanson tor-0.0.6_rc1.ebuild: + Bump to latest. Beware, this version is not backwards compatible with older + versions. + +*tor-0.0.5 (30 Mar 2004) + + 30 Mar 2004; Peter Johanson tor-0.0.2_pre21.ebuild, + tor-0.0.2_pre22.ebuild, tor-0.0.2_pre23.ebuild, tor-0.0.2_pre24.ebuild, + tor-0.0.2_pre25.ebuild, tor-0.0.5.ebuild: + Bump to latest release. Removed a bunch of the old stuff. Initscript coming + soon, i swear. + +*tor-0.0.2_pre27 (15 Mar 2004) + + 15 Mar 2004; Peter Johanson tor-0.0.2_pre27.ebuild: + Bump. + +*tor-0.0.2_pre25 (04 Mar 2004) + + 04 Mar 2004; Peter Johanson tor-0.0.2_pre25.ebuild: + Bump. Fixes a crash due to DNS stuff. + +*tor-0.0.2_pre24 (03 Mar 2004) + + 03 Mar 2004; Peter Johanson tor-0.0.2_pre24.ebuild: + Bump + +*tor-0.0.2_pre23 (29 Feb 2004) + + 29 Feb 2004; Peter Johanson tor-0.0.2_pre23.ebuild: + Bump + +*tor-0.0.2_pre22 (28 Feb 2004) + + 28 Feb 2004; Peter Johanson tor-0.0.2_pre22.ebuild: + Bump + +*tor-0.0.2_pre21 (22 Feb 2004) + + 22 Feb 2004; Peter Johanson metadata.xml, + tor-0.0.2_pre21.ebuild: + Initial Commit. Ebuild by yours truly. + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/Manifest new file mode 100644 index 0000000000..ae4f9f27ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/Manifest @@ -0,0 +1,4 @@ +DIST tor-0.2.1.19.tar.gz 2409484 RMD160 3606cc574ade12adfa8f3c7a180958865be077e8 SHA1 8a8af1354ab5b3fea58e2bbffeddc05e3dfedb17 SHA256 cb4f88ad30d6ba4c015734f3058a6e35151cff586f7708691d52d289ee78d183 +DIST tor-0.2.1.20.tar.gz 2412059 RMD160 ae4a4ab22fa9eb5c011c652ddd13033407f48e5a SHA1 bfc6c7e9ccee23abc4e97ca4ba98aa3ad7784262 SHA256 0fa268ef7904dd4e4456525285d49ed3d3ac6fd6df4686de20d9077c05ae0f60 +DIST tor-0.2.1.21.tar.gz 2408983 RMD160 da240ad348acaf88d4b13a4f441523299feecd75 SHA1 51c3a093d14b992dd6330783b38b09f8684ac89e SHA256 7e05ccebb91cbf1fa226a6e77d21901d32dd3c0f59eb9eea5a87e559962a940d +DIST tor-0.2.1.22.tar.gz 2408280 RMD160 382829f8772a16fb94883b9a88e1f3e3ff0f16a6 SHA1 bf6114592570e0a0d0d8b23de991ecc03bfc6633 SHA256 c6f9340bcbae3a033bfac215ad9e6df80e4ee814a880b9755bddfa3a266f3e18 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-0.2.1.19-logrotate.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-0.2.1.19-logrotate.patch new file mode 100644 index 0000000000..3eadcaa8f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-0.2.1.19-logrotate.patch @@ -0,0 +1,28 @@ +* Change log dir from /var/lib/log to /var/log (#281439, Martin von Gagern) +* Change user and group name from _tor to tor (#281439, Martin von Gagern) +* Avoid error if tor is not running (#178975, Gustavo Felisberto) + +References: +http://bugs.gentoo.org/281439 +http://bugs.gentoo.org/178975 + +--- tor-0.2.1.19/contrib/tor.logrotate.in ++++ tor-0.2.1.19/contrib/tor.logrotate.in +@@ -1,4 +1,4 @@ +-@LOCALSTATEDIR@/log/tor/*log { ++/var/log/tor/*.log { + daily + rotate 5 + compress +@@ -6,9 +6,9 @@ + missingok + notifempty + # you may need to change the username/groupname below +- create 0640 _tor _tor ++ create 0640 tor tor + sharedscripts + postrotate +- /etc/init.d/tor reload > /dev/null ++ /etc/init.d/tor reload > /dev/null || true + endscript + } diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-0.2.1.19-openssl.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-0.2.1.19-openssl.patch new file mode 100644 index 0000000000..73ac476329 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-0.2.1.19-openssl.patch @@ -0,0 +1,93 @@ +diff --git a/src/common/tortls.c b/src/common/tortls.c +index c6b11e9..bcc6780 100644 +--- a/src/common/tortls.c ++++ b/src/common/tortls.c +@@ -154,6 +154,7 @@ static X509* tor_tls_create_certificate(crypto_pk_env_t *rsa, + const char *cname, + const char *cname_sign, + unsigned int lifetime); ++static void tor_tls_unblock_renegotiation(tor_tls_t *tls); + + /** Global tls context. We keep it here because nobody else needs to + * touch it. */ +@@ -904,6 +905,36 @@ tor_tls_set_renegotiate_callback(tor_tls_t *tls, + #endif + } + ++/** If this version of openssl requires it, turn on renegotiation on ++ * tls. (Our protocol never requires this for security, but it's nice ++ * to use belt-and-suspenders here.) ++ */ ++static void ++tor_tls_unblock_renegotiation(tor_tls_t *tls) ++{ ++#ifdef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION ++ /* Yes, we know what we are doing here. No, we do not treat a renegotiation ++ * as authenticating any earlier-received data. */ ++ tls->ssl->s3->flags |= SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION; ++#else ++ (void)tls; ++#endif ++} ++ ++/** If this version of openssl supports it, turn off renegotiation on ++ * tls. (Our protocol never requires this for security, but it's nice ++ * to use belt-and-suspenders here.) ++ */ ++void ++tor_tls_block_renegotiation(tor_tls_t *tls) ++{ ++#ifdef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION ++ tls->ssl->s3->flags &= ~SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION; ++#else ++ (void)tls; ++#endif ++} ++ + /** Return whether this tls initiated the connect (client) or + * received it (server). */ + int +@@ -1026,6 +1057,9 @@ tor_tls_handshake(tor_tls_t *tls) + } else { + r = SSL_connect(tls->ssl); + } ++ /* We need to call this here and not earlier, since OpenSSL has a penchant ++ * for clearing its flags when you say accept or connect. */ ++ tor_tls_unblock_renegotiation(tls); + r = tor_tls_get_error(tls,r,0, "handshaking", LOG_INFO); + if (ERR_peek_error() != 0) { + tls_log_errors(tls, tls->isServer ? LOG_INFO : LOG_WARN, +diff --git a/src/common/tortls.h b/src/common/tortls.h +index d006909..871fec3 100644 +--- a/src/common/tortls.h ++++ b/src/common/tortls.h +@@ -65,6 +65,7 @@ int tor_tls_read(tor_tls_t *tls, char *cp, size_t len); + int tor_tls_write(tor_tls_t *tls, const char *cp, size_t n); + int tor_tls_handshake(tor_tls_t *tls); + int tor_tls_renegotiate(tor_tls_t *tls); ++void tor_tls_block_renegotiation(tor_tls_t *tls); + int tor_tls_shutdown(tor_tls_t *tls); + int tor_tls_get_pending_bytes(tor_tls_t *tls); + size_t tor_tls_get_forced_write_size(tor_tls_t *tls); +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index b4e8092..2a52b3f 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -844,6 +844,7 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn) + + /* Don't invoke this again. */ + tor_tls_set_renegotiate_callback(tls, NULL, NULL); ++ tor_tls_block_renegotiation(tls); + + if (connection_tls_finish_handshake(conn) < 0) { + /* XXXX_TLS double-check that it's ok to do this from inside read. */ +@@ -1087,6 +1088,7 @@ connection_tls_finish_handshake(or_connection_t *conn) + connection_or_init_conn_from_address(conn, &conn->_base.addr, + conn->_base.port, digest_rcvd, 0); + } ++ tor_tls_block_renegotiation(conn->tls); + return connection_or_set_state_open(conn); + } else { + conn->_base.state = OR_CONN_STATE_OR_HANDSHAKING; +-- +1.5.6.5 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-upstart.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-upstart.conf new file mode 100644 index 0000000000..d2d99ff2b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor-upstart.conf @@ -0,0 +1 @@ +exec /usr/bin/tor diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor.conf new file mode 100644 index 0000000000..4e4c639603 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor.conf @@ -0,0 +1,3 @@ +tor hard nofile 30000 +tor soft nofile 30000 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor.initd-r4 b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor.initd-r4 new file mode 100644 index 0000000000..24d8a9a610 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/tor.initd-r4 @@ -0,0 +1,57 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.5 2009/09/07 11:23:31 fauli Exp $ + +opts="${opts} checkconfig reload" +PIDFILE=/var/run/tor/tor.pid +CONFFILE=/etc/tor/torrc + +depend() { + need net +} + +checkconfig() { + # first check that it exists + if [ ! -f ${CONFFILE} ] ; then + eerror "You need to setup ${CONFFILE} first" + eerror "Example is in ${CONFFILE}.sample" + return 1 + fi + + # now verify whether the configuration is valid + /usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1 + if [ $? -eq 0 ] ; then + einfo "Tor configuration (${CONFFILE}) is valid." + return 0 + else + eerror "Tor configuration (${CONFFILE}) not valid." + /usr/bin/tor --verify-config -f ${CONFFILE} + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting Tor" + HOME=/var/lib/tor + start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1 + eend $? +} + +stop() { + ebegin "Stopping Tor" + start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}" + eend $? +} + +reload() { + if [ ! -f ${PIDFILE} ]; then + eerror "${SVCNAME} isn't running" + return 1 + fi + checkconfig || return 1 + ebegin "Reloading Tor configuration" + start-stop-daemon --stop --oknodo --signal HUP --pidfile ${PIDFILE} + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/torrc b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/torrc new file mode 100644 index 0000000000..dc2dea3a63 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/torrc @@ -0,0 +1,8 @@ +# +# Minimal torrc so tor will work out of the box +# +User tor +Group tor +PIDFile /var/run/tor/tor.pid +Log notice file /var/log/tor/tor.log +DataDirectory /var/lib/tor/data diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch new file mode 100644 index 0000000000..7317552c23 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch @@ -0,0 +1,30 @@ +--- src/config/torrc.sample.in.orig 2007-01-27 23:41:23.000000000 +0000 ++++ src/config/torrc.sample.in 2007-01-27 23:43:47.000000000 +0000 +@@ -18,6 +18,11 @@ + ## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or + ## /Library/Tor/torrc + ++## Default username and group the server will run as ++User tor ++Group tor ++ ++PIDFile /var/run/tor/tor.pid + + ## Replace this with "SocksPort 0" if you plan to run Tor only as a + ## server, and not make any local application connections yourself. +@@ -46,6 +51,7 @@ + #Log notice syslog + ## To send all messages to stderr: + #Log debug stderr ++Log notice file /var/log/tor/tor.log + + ## Uncomment this to start the process in the background... or use + ## --runasdaemon 1 on the command line. This is ignored on Windows; +@@ -55,6 +61,7 @@ + ## The directory for keeping all the keys/etc. By default, we store + ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. + #DataDirectory @LOCALSTATEDIR@/lib/tor ++DataDirectory /var/lib/tor/data + + ## The port on which Tor will listen for local connections from Tor + ## controller applications, as documented in control-spec.txt. diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/metadata.xml new file mode 100644 index 0000000000..ca7d7960c9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/metadata.xml @@ -0,0 +1,12 @@ + + + + no-herd + + humpback@gentoo.org + + + fauli@gentoo.org + Christian Faulhammer + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.19-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.19-r2.ebuild new file mode 100644 index 0000000000..165207afff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.19-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.19-r2.ebuild,v 1.6 2009/12/26 20:32:04 armin76 Exp $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +MY_PV=${PV/_/-} +SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="debug" + +DEPEND="dev-libs/openssl + >=dev-libs/libevent-1.2" +RDEPEND="${DEPEND} + net-proxy/tsocks" + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_prepare() { + epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch + epatch "${FILESDIR}"/${P}-logrotate.patch + epatch "${FILESDIR}"/${P}-openssl.patch + # Normally tor uses a bundled libevent fragment to provide + # asynchronous DNS requests. This is generally a bad idea, but at + # the moment the official libevent does not have the 0x20 hack, so + # anonymity is higher with the bundled variant. Remove patch as + # soon as upstream has installed the autoconf option to use + # system's libevent. This hasn't happened, so we + # have to live with the bundled libevent for this release, as the + # current version in tree won't suffice for tor to build + # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 + # for upstream's report + # Let's revisit this when libevent-2* is unmasked + # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch +} + +src_configure() { + econf $(use_enable debug) +} + +src_install() { + newinitd "${FILESDIR}"/tor.initd-r4 tor + emake DESTDIR="${D}" install || die + keepdir /var/{lib,log,run}/tor + + dodoc README ChangeLog AUTHORS ReleaseNotes \ + doc/{HACKING,TODO} \ + doc/spec/*.txt + + fperms 750 /var/lib/tor /var/log/tor + fperms 755 /var/run/tor + fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor + + insinto /etc/logrotate.d + newins contrib/tor.logrotate tor + + # allow the tor user more open files to avoid errors, see bug 251171 + insinto /etc/security/limits.d/ + doins "${FILESDIR}"/tor.conf +} + +pkg_postinst() { + elog "You must create /etc/tor/torrc, you can use the sample that is in that directory" + elog "To have privoxy and tor working together you must add:" + elog "forward-socks4a / localhost:9050 ." + elog "(notice the . at the end of the line)" + elog "to /etc/privoxy/config" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.20-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.20-r1.ebuild new file mode 100644 index 0000000000..cc9ebde653 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.20-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.20-r1.ebuild,v 1.1 2009/12/06 14:36:45 fauli Exp $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +MY_PV=${PV/_/-} +SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug" + +DEPEND="dev-libs/openssl + >=dev-libs/libevent-1.2" +RDEPEND="${DEPEND} + net-proxy/tsocks" + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_prepare() { + epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch + epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch + epatch "${FILESDIR}"/${PN}-0.2.1.19-openssl.patch + # Normally tor uses a bundled libevent fragment to provide + # asynchronous DNS requests. This is generally a bad idea, but at + # the moment the official libevent does not have the 0x20 hack, so + # anonymity is higher with the bundled variant. Remove patch as + # soon as upstream has installed the autoconf option to use + # system's libevent. This hasn't happened, so we + # have to live with the bundled libevent for this release, as the + # current version in tree won't suffice for tor to build + # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 + # for upstream's report + # Let's revisit this when libevent-2* is unmasked + # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch +} + +src_configure() { + econf $(use_enable debug) +} + +src_install() { + newinitd "${FILESDIR}"/tor.initd-r4 tor + emake DESTDIR="${D}" install || die + keepdir /var/{lib,log,run}/tor + + dodoc README ChangeLog AUTHORS ReleaseNotes \ + doc/{HACKING,TODO} \ + doc/spec/*.txt + + fperms 750 /var/lib/tor /var/log/tor + fperms 755 /var/run/tor + fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor + + insinto /etc/logrotate.d + newins contrib/tor.logrotate tor + + # allow the tor user more open files to avoid errors, see bug 251171 + insinto /etc/security/limits.d/ + doins "${FILESDIR}"/tor.conf +} + +pkg_postinst() { + elog "You must create /etc/tor/torrc, you can use the sample that is in that directory" + elog "To have privoxy and tor working together you must add:" + elog "forward-socks4a / localhost:9050 ." + elog "(notice the . at the end of the line)" + elog "to /etc/privoxy/config" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.21.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.21.ebuild new file mode 100644 index 0000000000..9522568df9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.21.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.21.ebuild,v 1.1 2010/01/16 11:14:46 fauli Exp $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +MY_PV=${PV/_/-} +SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug" + +DEPEND="dev-libs/openssl + >=dev-libs/libevent-1.2" +RDEPEND="${DEPEND} + net-proxy/tsocks" + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_prepare() { + epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch + epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch + # Normally tor uses a bundled libevent fragment to provide + # asynchronous DNS requests. This is generally a bad idea, but at + # the moment the official libevent does not have the 0x20 hack, so + # anonymity is higher with the bundled variant. Remove patch as + # soon as upstream has installed the autoconf option to use + # system's libevent. This hasn't happened, so we + # have to live with the bundled libevent for this release, as the + # current version in tree won't suffice for tor to build + # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 + # for upstream's report + # Let's revisit this when libevent-2* is unmasked + # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch +} + +src_configure() { + econf $(use_enable debug) +} + +src_install() { + newinitd "${FILESDIR}"/tor.initd-r4 tor + emake DESTDIR="${D}" install || die + keepdir /var/{lib,log,run}/tor + + dodoc README ChangeLog AUTHORS ReleaseNotes \ + doc/{HACKING,TODO} \ + doc/spec/*.txt + + fperms 750 /var/lib/tor /var/log/tor + fperms 755 /var/run/tor + fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor + + insinto /etc/logrotate.d + newins contrib/tor.logrotate tor + + # allow the tor user more open files to avoid errors, see bug 251171 + insinto /etc/security/limits.d/ + doins "${FILESDIR}"/tor.conf +} + +pkg_postinst() { + elog "You must create /etc/tor/torrc, you can use the sample that is in that directory" + elog "To have privoxy and tor working together you must add:" + elog "forward-socks4a / localhost:9050 ." + elog "(notice the . at the end of the line)" + elog "to /etc/privoxy/config" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.22.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.22.ebuild new file mode 100644 index 0000000000..65d2648868 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.22.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.22.ebuild,v 1.6 2010/02/10 04:06:42 josejx Exp $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +MY_PV=${PV/_/-} +SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="debug" + +DEPEND="dev-libs/openssl + >=dev-libs/libevent-1.2" +RDEPEND="${DEPEND} + net-proxy/tsocks" + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_prepare() { + epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch + epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch + # Normally tor uses a bundled libevent fragment to provide + # asynchronous DNS requests. This is generally a bad idea, but at + # the moment the official libevent does not have the 0x20 hack, so + # anonymity is higher with the bundled variant. Remove patch as + # soon as upstream has installed the autoconf option to use + # system's libevent. This hasn't happened, so we + # have to live with the bundled libevent for this release, as the + # current version in tree won't suffice for tor to build + # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 + # for upstream's report + # Let's revisit this when libevent-2* is unmasked + # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch +} + +src_configure() { + econf $(use_enable debug) +} + +src_install() { + newinitd "${FILESDIR}"/tor.initd-r4 tor + emake DESTDIR="${D}" install || die + keepdir /var/{lib,log,run}/tor + + dodoc README ChangeLog AUTHORS ReleaseNotes \ + doc/{HACKING,TODO} \ + doc/spec/*.txt + + fperms 750 /var/lib/tor /var/log/tor + fperms 755 /var/run/tor + fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor + + insinto /etc/logrotate.d + newins contrib/tor.logrotate tor + + # allow the tor user more open files to avoid errors, see bug 251171 + insinto /etc/security/limits.d/ + doins "${FILESDIR}"/tor.conf +} + +pkg_postinst() { + elog "You must create /etc/tor/torrc, you can use the sample that is in that directory" + elog "To have privoxy and tor working together you must add:" + elog "forward-socks4a / localhost:9050 ." + elog "(notice the . at the end of the line)" + elog "to /etc/privoxy/config" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.30.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.30.ebuild new file mode 100644 index 0000000000..b1b17c4e3a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tor/tor-0.2.1.30.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.30.ebuild,v 1.5 2011/04/02 15:42:33 armin76 Exp $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +MY_PV=${PV/_/-} +SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="debug" + +DEPEND="dev-libs/openssl + >=dev-libs/libevent-1.2" +# The tordns patch for tsocks avoids some leakage of information thus raising anonymity +RDEPEND="${DEPEND} + net-proxy/tsocks[tordns]" + +src_prepare() { + epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch + epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch + # Normally tor uses a bundled libevent fragment to provide + # asynchronous DNS requests. This is generally a bad idea, but at + # the moment the official libevent does not have the 0x20 hack, so + # anonymity is higher with the bundled variant. Remove patch as + # soon as upstream has installed the autoconf option to use + # system's libevent. This hasn't happened, so we + # have to live with the bundled libevent for this release, as the + # current version in tree won't suffice for tor to build + # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 + # for upstream's report + # Let's revisit this when libevent-2* is unmasked + # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch +} + +src_configure() { + econf $(use_enable debug) +} + +src_install() { + emake DESTDIR="${D}" install || die + keepdir /var/{lib,log,run}/tor + + dodoc README ChangeLog AUTHORS ReleaseNotes \ + doc/{HACKING,TODO} + + fperms 750 /var/lib/tor /var/log/tor + fperms 755 /var/run/tor + fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor + + insinto /etc/tor/ + doins "${FILESDIR}"/torrc + + insinto /etc/logrotate.d + newins contrib/tor.logrotate tor + + # allow the tor user more open files to avoid errors, see bug 251171 + insinto /etc/security/limits.d/ + doins "${FILESDIR}"/tor.conf + + install -D -m 644 "${FILESDIR}"/tor-upstart.conf ${D}/etc/init/tor.conf +} + +pkg_postinst() { + elog + elog "We created a configuration file for tor, /etc/tor/torrc, but you can" + elog "change it according to your needs. Use the torrc.sample that is in" + elog "that directory as a guide. Also, to have privoxy work with tor" + elog "just add the following line" + elog + elog "forward-socks4a / localhost:9050 ." + elog + elog "to /etc/privoxy/config. Notice the . at the end!" + elog +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-0.0.1-r120.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-0.0.1-r120.ebuild new file mode 100644 index 0000000000..4ec4ac883f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-0.0.1-r120.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_COMMIT="52a5bdaa8930c14ee42518354de3e5ec09911c6b" +CROS_WORKON_TREE="a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc" +CROS_WORKON_PROJECT="chromiumos/third_party/atheros" + +inherit cros-workon + +DESCRIPTION="Atheros AR300x firmware" +HOMEPAGE="http://www.atheros.com/" +LICENSE="Atheros" + +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RESTRICT="binchecks strip test" +CROS_WORKON_LOCALNAME="atheros" +DEPEND="" +RDEPEND="" + +src_install() { + src_dir="${S}"/ath3k/files/firmware + dodir /lib/firmware || die + insinto /lib/firmware + doins -r ${src_dir}/* || die \ + "failed installing from ${src_dir} to ${D}/lib/firmware" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-9999.ebuild new file mode 100644 index 0000000000..187a8ff1f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/third_party/atheros" + +inherit cros-workon + +DESCRIPTION="Atheros AR300x firmware" +HOMEPAGE="http://www.atheros.com/" +LICENSE="Atheros" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RESTRICT="binchecks strip test" +CROS_WORKON_LOCALNAME="atheros" +DEPEND="" +RDEPEND="" + +src_install() { + src_dir="${S}"/ath3k/files/firmware + dodir /lib/firmware || die + insinto /lib/firmware + doins -r ${src_dir}/* || die \ + "failed installing from ${src_dir} to ${D}/lib/firmware" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-34-r21.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-34-r21.ebuild new file mode 100644 index 0000000000..599cf82483 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-34-r21.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_COMMIT="52a5bdaa8930c14ee42518354de3e5ec09911c6b" +CROS_WORKON_TREE="a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc" +CROS_WORKON_PROJECT="chromiumos/third_party/atheros" + +inherit cros-workon + +DESCRIPTION="Atheros AR600x firmware" +HOMEPAGE="http://www.atheros.com/" +LICENSE="Atheros" + +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RESTRICT="binchecks strip test" +CROS_WORKON_LOCALNAME="atheros" +DEPEND="" +RDEPEND="" + +src_install() { + src_dir="${S}"/ath6k/files/firmware + dodir /lib/firmware || die + insinto /lib/firmware + doins -r ${src_dir}/* || die \ + "failed installing from ${src_dir} to ${D}/lib/firmware" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-9999.ebuild new file mode 100644 index 0000000000..fb8bccbc3c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/third_party/atheros" + +inherit cros-workon + +DESCRIPTION="Atheros AR600x firmware" +HOMEPAGE="http://www.atheros.com/" +LICENSE="Atheros" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RESTRICT="binchecks strip test" +CROS_WORKON_LOCALNAME="atheros" +DEPEND="" +RDEPEND="" + +src_install() { + src_dir="${S}"/ath6k/files/firmware + dodir /lib/firmware || die + insinto /lib/firmware + doins -r ${src_dir}/* || die \ + "failed installing from ${src_dir} to ${D}/lib/firmware" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/bluez-test-4.99.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/bluez-test-4.99.ebuild new file mode 100644 index 0000000000..5d7ca8f024 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/bluez-test-4.99.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.99.ebuild,v 1.7 2012/04/15 16:53:41 maekke Exp $ + +EAPI="4" +PYTHON_DEPEND="test-programs? 2" + +inherit autotools multilib eutils systemd python + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://www.bluez.org/" + +# Because of oui.txt changing from time to time without noticement, we need to supply it +# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly. +# See bugs #345263 and #349473 for reference. +OUIDATE="20120308" +SRC_URI="mirror://kernel/linux/bluetooth/bluez-${PV}.tar.xz + http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz" +S="${WORKDIR}/bluez-${PV}" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86" +IUSE="alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline" + +CDEPEND=" + >=dev-libs/glib-2.14:2 + sys-apps/dbus + >=sys-fs/udev-169 + alsa? ( + media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] + media-libs/libsndfile + ) + caps? ( >=sys-libs/libcap-ng-0.6.2 ) + cups? ( net-print/cups ) + gstreamer? ( + >=media-libs/gstreamer-0.10:0.10 + >=media-libs/gst-plugins-base-0.10:0.10 + ) + usb? ( virtual/libusb:0 ) + readline? ( sys-libs/readline ) +" +DEPEND="${CDEPEND} + >=dev-util/pkgconfig-0.20 + sys-devel/flex + test-programs? ( >=dev-libs/check-0.9.8 ) +" +RDEPEND="${CDEPEND} + !net-wireless/bluez-libs + !net-wireless/bluez-utils + consolekit? ( + || ( sys-auth/consolekit + >=sys-apps/systemd-37 ) + ) + test-programs? ( + dev-python/dbus-python + dev-python/pygobject:2 + ) +" + +DOCS=( AUTHORS ChangeLog README ) + +pkg_setup() { + if use test-programs; then + python_pkg_setup + fi +} + +src_prepare() { + # Change the default D-Bus configuration; the daemon is run as + # bluetooth, not root; we don't use the lp user, and we use the + # chronos user instead of at_console + epatch "${FILESDIR}/${PN}-dbus.patch" + + # Change the default SDP Server socket path to a sub-directory + # under /var/run, since /var/run is not writeable by the bluetooth + # user. + epatch "${FILESDIR}/${PN}-sdp-path.patch" + + # Disable initial radio power for new adapters + epatch "${FILESDIR}/${PN}-initially-powered.patch" + + # Automatic pairing support, including keyboard pairing support. + # (accepted upstream, can be dropped for next release) + epatch "${FILESDIR}/${P}-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch" + epatch "${FILESDIR}/${P}-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch" + epatch "${FILESDIR}/${P}-autopair-0003-agent-add-DisplayPinCode-method.patch" + epatch "${FILESDIR}/${P}-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch" + epatch "${FILESDIR}/${P}-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch" + epatch "${FILESDIR}/${P}-autopair-0006-Display-PIN-generated-by-plugin.patch" + epatch "${FILESDIR}/${P}-autopair-0007-doc-document-DisplayPinCode.patch" + epatch "${FILESDIR}/${P}-autopair-0008-simple-agent-add-DisplayPinCode.patch" + epatch "${FILESDIR}/${P}-autopair-0009-Add-support-for-retrying-a-bonding.patch" + epatch "${FILESDIR}/${P}-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch" + epatch "${FILESDIR}/${P}-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch" + epatch "${FILESDIR}/${P}-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch" + epatch "${FILESDIR}/${P}-autopair-0013-autopair-Add-autopair-plugin.patch" + + # Automatic pairing of dumb devices. Not yet submitted upstream + # so kept as a separate patch on top of the above series. + epatch "${FILESDIR}/${PN}-autopair.patch" + + eautoreconf + + if use cups; then + sed -i \ + -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ + Makefile.tools Makefile.in || die + fi +} + +src_configure() { + use readline || export ac_cv_header_readline_readline_h=no + + econf \ + --enable-hid2hci \ + --enable-audio \ + --enable-bccmd \ + --enable-datafiles \ + --enable-dfutool \ + --enable-input \ + --enable-network \ + --enable-serial \ + --enable-service \ + --enable-tools \ + --disable-hal \ + --localstatedir=/var \ + --with-systemdunitdir="$(systemd_get_unitdir)" \ + --with-ouifile=/usr/share/misc/oui.txt \ + $(use_enable alsa) \ + $(use_enable caps capng) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable gstreamer) \ + $(use_enable pcmcia) \ + $(use_enable test-programs test) \ + $(use_enable usb) \ + --enable-health \ + --enable-wiimote \ + --enable-dbusoob \ + --enable-autopair +} + +src_install() { + if use test-programs ; then + cd "${S}/test" + dobin simple-agent simple-endpoint simple-service + dobin monitor-bluetooth + dobin avtest gaptest hsmicro hsplay hstest ipctest l2test + dobin lmptest rctest scotest sdptest + newbin list-devices list-bluetooth-devices + rm test-textfile.{c,o} || die # bug #356529 + for b in apitest test-* ; do + newbin "${b}" "bluez-${b}" + done + insinto /usr/share/doc/${PF}/test-services + doins service-* + + dobin "${FILESDIR}/bluetooth-unpair" + dobin "${FILESDIR}/bluetooth-unpair-all" + + python_convert_shebangs -r 2 "${ED}" + cd "${S}" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair new file mode 100755 index 0000000000..f206f87593 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +import dbus +import sys + +bus = dbus.SystemBus() + +bluez = bus.get_object('org.bluez', '/') + +adapter_path = bluez.DefaultAdapter(dbus_interface='org.bluez.Manager') +adapter = bus.get_object('org.bluez', adapter_path) + +device_path = adapter.FindDevice(sys.argv[1], + dbus_interface='org.bluez.Adapter') +device = bus.get_object('org.bluez', device_path) + +adapter.RemoveDevice(device, dbus_interface='org.bluez.Adapter') diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair-all b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair-all new file mode 100755 index 0000000000..288b782e41 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair-all @@ -0,0 +1,46 @@ +#!/usr/bin/env python + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import dbus +import sys + +bus = dbus.SystemBus() + +bluez = bus.get_object('org.bluez', '/') + +adapter_path = bluez.DefaultAdapter(dbus_interface='org.bluez.Manager') +adapter = bus.get_object('org.bluez', adapter_path) + +all_the_things = """\ + . + , = , + ,, .,, + ,,. , .. ,, .,,, + ,,,, ,. ,, ,,.:,,,. + ,,,,, ,,.,, .,,,,i,,, + ,,,,,,,YtY,,,+,,R,, + , ,,,,,,V.. tY# =,I,. + ,,. ,,,,,,,V W R,;, + .,,. ,,,,: Y R=YW +,, + I; ,,,,,,,,: Y:#### =, +i.., ,,,,,,,,iX#####, , ., ,, +....t ,,,,,,,,,: :####X V,,, ,,, +i.... ,,,,,,,,,t I###+ X,,..,,,. + I.., ,,,,,,,,V =##Y, YR,,,,, + Xt .,,,,,,+,,R , BYV,,,, + ,X:,,,,,,=,,,,R. ,RYYY,,, + ,. :X,,,,V,,,,,,RYYYYYYY,,,,,,,,. + ,,,,tX,t,,,,,,,,,YYYYYYYX,,,,,,,,,. + ,,,,BB,,,,,,,,,,YYYYYYYV,,,,,,, + ,,,,,BB,,,,,,,,,XYYYYYYY,,,. + ,,,,,XI,,,,,,,,YYYYYYYY,, + ,,,,,X:,,,,,,,YYYYYYYY,,. """ +print all_the_things + +for device_path in adapter.ListDevices(dbus_interface='org.bluez.Adapter'): + device = bus.get_object('org.bluez', device_path) + + adapter.RemoveDevice(device, dbus_interface='org.bluez.Adapter') diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch new file mode 100644 index 0000000000..bce6daa8c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch @@ -0,0 +1,83 @@ +From be1631d70689cfde701e9a1642a5afad11252af7 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 10:40:25 -0800 +Subject: [PATCH 01/13] Rename AUTH_TYPE_NOTIFY to AUTH_TYPE_NOTIFY_PASSKEY + +This makes room for additional notification types to be added. +--- + src/device.c | 8 ++++---- + src/device.h | 2 +- + src/event.c | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/device.c b/src/device.c +index dfc8e59..92c13f5 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2453,7 +2453,7 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) + { + struct authentication_req *auth = device->authr; + +- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) ++ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) + agent_cancel(auth->agent); + } + +@@ -2470,7 +2470,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) + + DBG("bonding %p status 0x%02x", bonding, status); + +- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) ++ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) + agent_cancel(auth->agent); + + if (status) { +@@ -2724,7 +2724,7 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + err = agent_request_confirmation(agent, device, passkey, + confirm_cb, auth, NULL); + break; +- case AUTH_TYPE_NOTIFY: ++ case AUTH_TYPE_NOTIFY_PASSKEY: + err = agent_display_passkey(agent, device, passkey); + break; + default: +@@ -2764,7 +2764,7 @@ static void cancel_authentication(struct authentication_req *auth) + case AUTH_TYPE_PASSKEY: + ((agent_passkey_cb) auth->cb)(agent, &err, 0, device); + break; +- case AUTH_TYPE_NOTIFY: ++ case AUTH_TYPE_NOTIFY_PASSKEY: + /* User Notify doesn't require any reply */ + break; + } +diff --git a/src/device.h b/src/device.h +index 7cb9bb2..aa7f2f1 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -30,7 +30,7 @@ typedef enum { + AUTH_TYPE_PINCODE, + AUTH_TYPE_PASSKEY, + AUTH_TYPE_CONFIRM, +- AUTH_TYPE_NOTIFY, ++ AUTH_TYPE_NOTIFY_PASSKEY, + } auth_type_t; + + struct btd_device *device_create(DBusConnection *conn, +diff --git a/src/event.c b/src/event.c +index 113a2b6..95cdbdb 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -202,8 +202,8 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) + if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) + return -ENODEV; + +- return device_request_authentication(device, AUTH_TYPE_NOTIFY, passkey, +- FALSE, NULL); ++ return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, ++ passkey, FALSE, NULL); + } + + void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch new file mode 100644 index 0000000000..08de15d968 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch @@ -0,0 +1,107 @@ +From 888f24266b8ff06d7007afb5e6a38ba621750451 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 10:43:48 -0800 +Subject: [PATCH 02/13] Pass passkey by pointer rather than by value + +This allows alternate data of a different type to be passed to +device_request_authentication() for other notification types such +as those that require a PIN. +--- + src/device.c | 9 +++++---- + src/device.h | 2 +- + src/event.c | 8 ++++---- + 3 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 92c13f5..8a2ae9d 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2681,7 +2681,7 @@ done: + } + + int device_request_authentication(struct btd_device *device, auth_type_t type, +- uint32_t passkey, gboolean secure, void *cb) ++ void *data, gboolean secure, void *cb) + { + struct authentication_req *auth; + struct agent *agent; +@@ -2707,7 +2707,6 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + auth->device = device; + auth->cb = cb; + auth->type = type; +- auth->passkey = passkey; + auth->secure = secure; + device->authr = auth; + +@@ -2721,11 +2720,13 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + auth, NULL); + break; + case AUTH_TYPE_CONFIRM: +- err = agent_request_confirmation(agent, device, passkey, ++ auth->passkey = *(uint32_t *)data; ++ err = agent_request_confirmation(agent, device, auth->passkey, + confirm_cb, auth, NULL); + break; + case AUTH_TYPE_NOTIFY_PASSKEY: +- err = agent_display_passkey(agent, device, passkey); ++ auth->passkey = *(uint32_t *)data; ++ err = agent_display_passkey(agent, device, auth->passkey); + break; + default: + err = -EINVAL; +diff --git a/src/device.h b/src/device.h +index aa7f2f1..998aee7 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -83,7 +83,7 @@ gboolean device_is_creating(struct btd_device *device, const char *sender); + gboolean device_is_bonding(struct btd_device *device, const char *sender); + void device_cancel_bonding(struct btd_device *device, uint8_t status); + int device_request_authentication(struct btd_device *device, auth_type_t type, +- uint32_t passkey, gboolean secure, void *cb); ++ void *data, gboolean secure, void *cb); + void device_cancel_authentication(struct btd_device *device, gboolean aborted); + gboolean device_is_authenticating(struct btd_device *device); + gboolean device_is_authorizing(struct btd_device *device); +diff --git a/src/event.c b/src/event.c +index 95cdbdb..7d66b6d 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -130,7 +130,7 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) + return 0; + } + +- return device_request_authentication(device, AUTH_TYPE_PINCODE, 0, ++ return device_request_authentication(device, AUTH_TYPE_PINCODE, NULL, + secure, pincode_cb); + } + +@@ -179,7 +179,7 @@ int btd_event_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) + return -ENODEV; + + return device_request_authentication(device, AUTH_TYPE_CONFIRM, +- passkey, FALSE, confirm_cb); ++ &passkey, FALSE, confirm_cb); + } + + int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) +@@ -190,7 +190,7 @@ int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) + if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) + return -ENODEV; + +- return device_request_authentication(device, AUTH_TYPE_PASSKEY, 0, ++ return device_request_authentication(device, AUTH_TYPE_PASSKEY, NULL, + FALSE, passkey_cb); + } + +@@ -203,7 +203,7 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) + return -ENODEV; + + return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, +- passkey, FALSE, NULL); ++ &passkey, FALSE, NULL); + } + + void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch new file mode 100644 index 0000000000..4e14ca9962 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch @@ -0,0 +1,161 @@ +From e84af9f6ba447c540512d56ccc7326af621749bc Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 10:56:56 -0800 +Subject: [PATCH 03/13] agent: add DisplayPinCode method + +In constrast to DisplayPasskey, this sends a UTF-8 string PIN code +to the agent; also we support a callback for the case where the +Agent doesn't implement this new method so we can fallback. +--- + src/agent.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + src/agent.h | 4 ++ + 2 files changed, 115 insertions(+), 1 deletions(-) + +diff --git a/src/agent.c b/src/agent.c +index 9b942e8..23e3b43 100644 +--- a/src/agent.c ++++ b/src/agent.c +@@ -52,7 +52,8 @@ typedef enum { + AGENT_REQUEST_CONFIRMATION, + AGENT_REQUEST_PINCODE, + AGENT_REQUEST_AUTHORIZE, +- AGENT_REQUEST_CONFIRM_MODE ++ AGENT_REQUEST_CONFIRM_MODE, ++ AGENT_REQUEST_DISPLAY_PINCODE, + } agent_request_type_t; + + struct agent { +@@ -699,6 +700,115 @@ int agent_display_passkey(struct agent *agent, struct btd_device *device, + return 0; + } + ++static void display_pincode_reply(DBusPendingCall *call, void *user_data) ++{ ++ struct agent_request *req = user_data; ++ struct agent *agent = req->agent; ++ DBusMessage *message; ++ DBusError err; ++ agent_cb cb = req->cb; ++ ++ /* clear agent->request early; our callback will likely try ++ * another request */ ++ agent->request = NULL; ++ ++ /* steal_reply will always return non-NULL since the callback ++ * is only called after a reply has been received */ ++ message = dbus_pending_call_steal_reply(call); ++ ++ dbus_error_init(&err); ++ if (dbus_set_error_from_message(&err, message)) { ++ error("Agent replied with an error: %s, %s", ++ err.name, err.message); ++ ++ cb(agent, &err, req->user_data); ++ ++ if (dbus_error_has_name(&err, DBUS_ERROR_NO_REPLY)) { ++ agent_cancel(agent); ++ dbus_message_unref(message); ++ dbus_error_free(&err); ++ return; ++ } ++ ++ dbus_error_free(&err); ++ goto done; ++ } ++ ++ dbus_error_init(&err); ++ if (!dbus_message_get_args(message, &err, DBUS_TYPE_INVALID)) { ++ error("Wrong reply signature: %s", err.message); ++ cb(agent, &err, req->user_data); ++ dbus_error_free(&err); ++ goto done; ++ } ++ ++ cb(agent, NULL, req->user_data); ++done: ++ dbus_message_unref(message); ++ ++ agent_request_free(req, TRUE); ++} ++ ++static int display_pincode_request_new(struct agent_request *req, ++ const char *device_path, ++ const char *pincode) ++{ ++ struct agent *agent = req->agent; ++ ++ req->msg = dbus_message_new_method_call(agent->name, agent->path, ++ "org.bluez.Agent", "DisplayPinCode"); ++ if (req->msg == NULL) { ++ error("Couldn't allocate D-Bus message"); ++ return -ENOMEM; ++ } ++ ++ dbus_message_append_args(req->msg, ++ DBUS_TYPE_OBJECT_PATH, &device_path, ++ DBUS_TYPE_STRING, &pincode, ++ DBUS_TYPE_INVALID); ++ ++ if (dbus_connection_send_with_reply(connection, req->msg, ++ &req->call, REQUEST_TIMEOUT) == FALSE) { ++ error("D-Bus send failed"); ++ return -EIO; ++ } ++ ++ dbus_pending_call_set_notify(req->call, display_pincode_reply, ++ req, NULL); ++ ++ return 0; ++} ++ ++int agent_display_pincode(struct agent *agent, struct btd_device *device, ++ const char *pincode, agent_cb cb, ++ void *user_data, GDestroyNotify destroy) ++{ ++ struct agent_request *req; ++ const gchar *dev_path = device_get_path(device); ++ int err; ++ ++ if (agent->request) ++ return -EBUSY; ++ ++ DBG("Calling Agent.DisplayPinCode: name=%s, path=%s, pincode=%s", ++ agent->name, agent->path, pincode); ++ ++ req = agent_request_new(agent, AGENT_REQUEST_DISPLAY_PINCODE, cb, ++ user_data, destroy); ++ ++ err = display_pincode_request_new(req, dev_path, pincode); ++ if (err < 0) ++ goto failed; ++ ++ agent->request = req; ++ ++ return 0; ++ ++failed: ++ agent_request_free(req, FALSE); ++ return err; ++} ++ + uint8_t agent_get_io_capability(struct agent *agent) + { + return agent->capability; +diff --git a/src/agent.h b/src/agent.h +index f62bf3b..69ad42b 100644 +--- a/src/agent.h ++++ b/src/agent.h +@@ -64,6 +64,10 @@ int agent_request_confirmation(struct agent *agent, struct btd_device *device, + int agent_display_passkey(struct agent *agent, struct btd_device *device, + uint32_t passkey); + ++int agent_display_pincode(struct agent *agent, struct btd_device *device, ++ const char *pincode, agent_cb cb, ++ void *user_data, GDestroyNotify destroy); ++ + int agent_cancel(struct agent *agent); + + gboolean agent_is_busy(struct agent *agent, void *user_data); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch new file mode 100644 index 0000000000..d489da96f8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch @@ -0,0 +1,151 @@ +From 16583671c03b871003430e433ddf197833ea0086 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 15:16:40 -0800 +Subject: [PATCH 04/13] Add AUTH_TYPE_NOTIFY_PASSKEY to + device_request_authentication + +This new authentication type accepts a pincode and calls the +DisplayPinCode agent method, a fallback is provided so that if the +method is not implemented the older RequestPinCode method is used +instead. + +Due to this fallback, the agent_pincode_cb is used and calling +functions should send the pincode passed to the callback to the +adapter, which may differ from that generated. +--- + src/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + src/device.h | 1 + + 2 files changed, 58 insertions(+), 2 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 8a2ae9d..f32666e 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -93,6 +93,7 @@ struct authentication_req { + struct agent *agent; + struct btd_device *device; + uint32_t passkey; ++ char *pincode; + gboolean secure; + }; + +@@ -277,6 +278,8 @@ static void device_free(gpointer user_data) + + DBG("%p", device); + ++ if (device->authr) ++ g_free(device->authr->pincode); + g_free(device->authr); + g_free(device->path); + g_free(device->alias); +@@ -2453,12 +2456,15 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) + { + struct authentication_req *auth = device->authr; + +- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) ++ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY ++ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) + agent_cancel(auth->agent); + } + + static void device_auth_req_free(struct btd_device *device) + { ++ if (device->authr) ++ g_free(device->authr->pincode); + g_free(device->authr); + device->authr = NULL; + } +@@ -2470,7 +2476,8 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) + + DBG("bonding %p status 0x%02x", bonding, status); + +- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) ++ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY ++ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) + agent_cancel(auth->agent); + + if (status) { +@@ -2680,6 +2687,46 @@ done: + device->authr->agent = NULL; + } + ++static void display_pincode_cb(struct agent *agent, DBusError *err, void *data) ++{ ++ struct authentication_req *auth = data; ++ struct btd_device *device = auth->device; ++ struct btd_adapter *adapter = device_get_adapter(device); ++ struct agent *adapter_agent = adapter_get_agent(adapter); ++ ++ if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) || ++ g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) { ++ ++ /* Request a pincode if we fail to display one */ ++ if (auth->agent == adapter_agent || adapter_agent == NULL) { ++ if (agent_request_pincode(agent, device, pincode_cb, ++ auth->secure, auth, NULL) < 0) ++ goto done; ++ return; ++ } ++ ++ if (agent_display_pincode(adapter_agent, device, auth->pincode, ++ display_pincode_cb, auth, NULL) < 0) ++ goto done; ++ ++ auth->agent = adapter_agent; ++ return; ++ } ++ ++done: ++ /* No need to reply anything if the authentication already failed */ ++ if (auth->cb == NULL) ++ return; ++ ++ ((agent_pincode_cb) auth->cb)(agent, err, auth->pincode, device); ++ ++ g_free(device->authr->pincode); ++ device->authr->pincode = NULL; ++ device->authr->cb = NULL; ++ device->authr->agent = NULL; ++} ++ ++ + int device_request_authentication(struct btd_device *device, auth_type_t type, + void *data, gboolean secure, void *cb) + { +@@ -2728,6 +2775,11 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + auth->passkey = *(uint32_t *)data; + err = agent_display_passkey(agent, device, auth->passkey); + break; ++ case AUTH_TYPE_NOTIFY_PINCODE: ++ auth->pincode = g_strdup((const char *)data); ++ err = agent_display_pincode(agent, device, auth->pincode, ++ display_pincode_cb, auth, NULL); ++ break; + default: + err = -EINVAL; + } +@@ -2768,6 +2820,9 @@ static void cancel_authentication(struct authentication_req *auth) + case AUTH_TYPE_NOTIFY_PASSKEY: + /* User Notify doesn't require any reply */ + break; ++ case AUTH_TYPE_NOTIFY_PINCODE: ++ ((agent_pincode_cb) auth->cb)(agent, &err, NULL, device); ++ break; + } + + dbus_error_free(&err); +diff --git a/src/device.h b/src/device.h +index 998aee7..561865c 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -31,6 +31,7 @@ typedef enum { + AUTH_TYPE_PASSKEY, + AUTH_TYPE_CONFIRM, + AUTH_TYPE_NOTIFY_PASSKEY, ++ AUTH_TYPE_NOTIFY_PINCODE, + } auth_type_t; + + struct btd_device *device_create(DBusConnection *conn, +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch new file mode 100644 index 0000000000..d0fbd29e2b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch @@ -0,0 +1,92 @@ +From 1630cbe326460a89d5c342847b658a499484ced0 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Thu, 29 Mar 2012 14:04:14 -0700 +Subject: [PATCH 05/13] Add display parameter to plugin pincode callback + +Pass a display parameter to the plugin pincode callback, a plugin +may set this to TRUE to indicate the PIN it generates should be +displayed on the screen for entry into the remote device. +--- + plugins/wiimote.c | 2 +- + src/adapter.c | 4 ++-- + src/adapter.h | 4 ++-- + src/event.c | 3 ++- + 4 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/plugins/wiimote.c b/plugins/wiimote.c +index 1ae638b..43b6de3 100644 +--- a/plugins/wiimote.c ++++ b/plugins/wiimote.c +@@ -56,7 +56,7 @@ + */ + + static ssize_t wii_pincb(struct btd_adapter *adapter, struct btd_device *device, +- char *pinbuf) ++ char *pinbuf, gboolean *display) + { + uint16_t vendor, product; + bdaddr_t sba, dba; +diff --git a/src/adapter.c b/src/adapter.c +index acb845e..ccf7991 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -3330,7 +3330,7 @@ void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, + } + + ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, +- char *pin_buf) ++ char *pin_buf, gboolean *display) + { + GSList *l; + btd_adapter_pin_cb_t cb; +@@ -3339,7 +3339,7 @@ ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, + + for (l = adapter->pin_callbacks; l != NULL; l = g_slist_next(l)) { + cb = l->data; +- ret = cb(adapter, dev, pin_buf); ++ ret = cb(adapter, dev, pin_buf, display); + if (ret > 0) + return ret; + } +diff --git a/src/adapter.h b/src/adapter.h +index ceebb97..aa66070 100644 +--- a/src/adapter.h ++++ b/src/adapter.h +@@ -172,13 +172,13 @@ int btd_adapter_switch_offline(struct btd_adapter *adapter); + void btd_adapter_enable_auto_connect(struct btd_adapter *adapter); + + typedef ssize_t (*btd_adapter_pin_cb_t) (struct btd_adapter *adapter, +- struct btd_device *dev, char *out); ++ struct btd_device *dev, char *out, gboolean *display); + void btd_adapter_register_pin_cb(struct btd_adapter *adapter, + btd_adapter_pin_cb_t cb); + void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, + btd_adapter_pin_cb_t cb); + ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, +- char *pin_buf); ++ char *pin_buf, gboolean *display); + + typedef void (*bt_hci_result_t) (uint8_t status, gpointer user_data); + +diff --git a/src/event.c b/src/event.c +index 7d66b6d..d87b6a4 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -119,12 +119,13 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) + struct btd_device *device; + char pin[17]; + ssize_t pinlen; ++ gboolean display = FALSE; + + if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) + return -ENODEV; + + memset(pin, 0, sizeof(pin)); +- pinlen = btd_adapter_get_pin(adapter, device, pin); ++ pinlen = btd_adapter_get_pin(adapter, device, pin, &display); + if (pinlen > 0 && (!secure || pinlen == 16)) { + btd_adapter_pincode_reply(adapter, dba, pin, pinlen); + return 0; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch new file mode 100644 index 0000000000..ce3736021e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch @@ -0,0 +1,31 @@ +From 2a902f071ec21572094ce9cdf54099ad275e7904 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Thu, 29 Mar 2012 14:07:13 -0700 +Subject: [PATCH 06/13] Display PIN generated by plugin + +If a plugin pincode callback sets the display parameter to TRUE, send +the generated PIN to the agent for display using the new DisplayPinCode +agent method, including its fallback to RequestPinCode. +--- + src/event.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/event.c b/src/event.c +index d87b6a4..5b60fb3 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -127,6 +127,11 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) + memset(pin, 0, sizeof(pin)); + pinlen = btd_adapter_get_pin(adapter, device, pin, &display); + if (pinlen > 0 && (!secure || pinlen == 16)) { ++ if (display && device_is_bonding(device, NULL)) ++ return device_request_authentication(device, ++ AUTH_TYPE_NOTIFY_PINCODE, pin, ++ secure, pincode_cb); ++ + btd_adapter_pincode_reply(adapter, dba, pin, pinlen); + return 0; + } +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0007-doc-document-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0007-doc-document-DisplayPinCode.patch new file mode 100644 index 0000000000..685f1c205f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0007-doc-document-DisplayPinCode.patch @@ -0,0 +1,47 @@ +From 8a9347822f86059d015ae3893387aa971fa41ab7 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 15:25:39 -0800 +Subject: [PATCH 07/13] doc: document DisplayPinCode + +--- + doc/agent-api.txt | 24 ++++++++++++++++++++++++ + 1 files changed, 24 insertions(+), 0 deletions(-) + +diff --git a/doc/agent-api.txt b/doc/agent-api.txt +index 9ab2063..5c8d4d2 100644 +--- a/doc/agent-api.txt ++++ b/doc/agent-api.txt +@@ -61,6 +61,30 @@ Methods void Release() + so the display should be zero-padded at the start if + the value contains less than 6 digits. + ++ void DisplayPinCode(object device, string pincode) ++ ++ This method gets called when the service daemon ++ needs to display a pincode for an authentication. ++ ++ An empty reply should be returned. When the pincode ++ needs no longer to be displayed, the Cancel method ++ of the agent will be called. ++ ++ If this method is not implemented the RequestPinCode ++ method will be used instead. ++ ++ This is used during the pairing process of keyboards ++ that don't support Bluetooth 2.1 Secure Simple Pairing, ++ in contrast to DisplayPasskey which is used for those ++ that do. ++ ++ This method will only ever be called once since ++ older keyboards do not support typing notification. ++ ++ Note that the PIN will always be a 6-digit number, ++ zero-padded to 6 digits. This is for harmony with ++ the later specification. ++ + void RequestConfirmation(object device, uint32 passkey) + + This method gets called when the service daemon +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch new file mode 100644 index 0000000000..e7cd7f8b97 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch @@ -0,0 +1,28 @@ +From 4f2f55231bad4d5da2505cb674375e9bf8ac029d Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 15:25:56 -0800 +Subject: [PATCH 08/13] simple-agent: add DisplayPinCode + +--- + test/simple-agent | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/test/simple-agent b/test/simple-agent +index af84815..38d0235 100755 +--- a/test/simple-agent ++++ b/test/simple-agent +@@ -52,6 +52,11 @@ class Agent(dbus.service.Object): + print "DisplayPasskey (%s, %06d)" % (device, passkey) + + @dbus.service.method("org.bluez.Agent", ++ in_signature="os", out_signature="") ++ def DisplayPinCode(self, device, pincode): ++ print "DisplayPinCode (%s, %s)" % (device, pincode) ++ ++ @dbus.service.method("org.bluez.Agent", + in_signature="ou", out_signature="") + def RequestConfirmation(self, device, passkey): + print "RequestConfirmation (%s, %06d)" % (device, passkey) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch new file mode 100644 index 0000000000..26b2aa7143 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch @@ -0,0 +1,90 @@ +From 0cd8c8427019cfd7e1c69fb6a5b4261863716d56 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:34:01 -0800 +Subject: [PATCH 09/13] Add support for retrying a bonding + +In order to retry a bonding we need a timer that will perform the +retry, we need to stash the status and capability of the bonding +request so it can use them again, and in the case of a retrying +bonding attempt we need to not tear down the temporary D-Bus device +object on the adapter. +--- + src/adapter.c | 2 +- + src/device.c | 14 ++++++++++++++ + src/device.h | 1 + + 3 files changed, 16 insertions(+), 1 deletions(-) + +diff --git a/src/adapter.c b/src/adapter.c +index ccf7991..f065a5d 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -2989,7 +2989,7 @@ void adapter_remove_connection(struct btd_adapter *adapter, + if (device_is_authenticating(device)) + device_cancel_authentication(device, TRUE); + +- if (device_is_temporary(device)) { ++ if (device_is_temporary(device) && !device_is_retrying(device)) { + const char *path = device_get_path(device); + + DBG("Removing temporary device %s", path); +diff --git a/src/device.c b/src/device.c +index f32666e..9d4517f 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -85,6 +85,9 @@ struct bonding_req { + DBusMessage *msg; + guint listener_id; + struct btd_device *device; ++ uint8_t capability; ++ uint8_t status; ++ guint retry_timer; + }; + + struct authentication_req { +@@ -2295,6 +2298,9 @@ static void bonding_request_free(struct bonding_req *bonding) + if (bonding->conn) + dbus_connection_unref(bonding->conn); + ++ if (bonding->retry_timer) ++ g_source_remove(bonding->retry_timer); ++ + device = bonding->device; + g_free(bonding); + +@@ -2367,6 +2373,7 @@ proceed: + + bonding->conn = dbus_connection_ref(conn); + bonding->msg = dbus_message_ref(msg); ++ bonding->capability = capability; + + return bonding; + } +@@ -2469,6 +2476,13 @@ static void device_auth_req_free(struct btd_device *device) + device->authr = NULL; + } + ++gboolean device_is_retrying(struct btd_device *device) ++{ ++ struct bonding_req *bonding = device->bonding; ++ ++ return bonding && bonding->retry_timer != 0; ++} ++ + void device_bonding_complete(struct btd_device *device, uint8_t status) + { + struct bonding_req *bonding = device->bonding; +diff --git a/src/device.h b/src/device.h +index 561865c..b957ad6 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -75,6 +75,7 @@ void device_set_temporary(struct btd_device *device, gboolean temporary); + void device_set_bonded(struct btd_device *device, gboolean bonded); + void device_set_auto_connect(struct btd_device *device, gboolean enable); + gboolean device_is_connected(struct btd_device *device); ++gboolean device_is_retrying(struct btd_device *device); + DBusMessage *device_create_bonding(struct btd_device *device, + DBusConnection *conn, DBusMessage *msg, + const char *agent_path, uint8_t capability); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch new file mode 100644 index 0000000000..6b76a4b84f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch @@ -0,0 +1,81 @@ +From 83c36231418f9deff7ba16ceb0ead5d63e177a04 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:30:53 -0800 +Subject: [PATCH 10/13] plugin: Add bonding callback support for plugins + +Allow plugins to register a bonding callback on a device, this will be +called on completion or cancellation of a bonding attempt on that +device and allow retrying of the bonding attempt. + +These callbacks will only be called once, in the case of retrying the +callback must be registered again separately from another callback +(e.g. the pincode callback). +--- + src/device.c | 17 +++++++++++++++++ + src/device.h | 8 ++++++++ + 2 files changed, 25 insertions(+), 0 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 9d4517f..9a62eef 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -144,6 +144,7 @@ struct btd_device { + GSList *primaries; /* List of primary services */ + GSList *drivers; /* List of device drivers */ + GSList *watches; /* List of disconnect_data */ ++ GSList *bonding_callbacks; /* List of bonding callbacks */ + gboolean temporary; + struct agent *agent; + guint disconn_timer; +@@ -264,6 +265,8 @@ static void device_free(gpointer user_data) + g_slist_free_full(device->attios, g_free); + g_slist_free_full(device->attios_offline, g_free); + ++ g_slist_free(device->bonding_callbacks); ++ + att_cleanup(device); + + if (device->tmp_records) +@@ -2476,6 +2479,20 @@ static void device_auth_req_free(struct btd_device *device) + device->authr = NULL; + } + ++void btd_device_register_bonding_cb(struct btd_device *device, ++ btd_device_bonding_cb_t cb) ++{ ++ device->bonding_callbacks = g_slist_prepend( ++ device->bonding_callbacks, cb); ++} ++ ++void btd_device_unregister_bonding_cb(struct btd_device *device, ++ btd_device_bonding_cb_t cb) ++{ ++ device->bonding_callbacks = g_slist_remove( ++ device->bonding_callbacks, cb); ++} ++ + gboolean device_is_retrying(struct btd_device *device) + { + struct bonding_req *bonding = device->bonding; +diff --git a/src/device.h b/src/device.h +index b957ad6..ce8675b 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -103,6 +103,14 @@ guint device_add_disconnect_watch(struct btd_device *device, + void device_remove_disconnect_watch(struct btd_device *device, guint id); + void device_set_class(struct btd_device *device, uint32_t value); + ++typedef gboolean (*btd_device_bonding_cb_t) (struct btd_device *device, ++ gboolean complete, uint8_t status); ++ ++void btd_device_register_bonding_cb(struct btd_device *dev, ++ btd_device_bonding_cb_t cb); ++void btd_device_unregister_bonding_cb(struct btd_device *dev, ++ btd_device_bonding_cb_t cb); ++ + #define BTD_UUIDS(args...) ((const char *[]) { args, NULL } ) + + struct btd_device_driver { +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch new file mode 100644 index 0000000000..913365ef0d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch @@ -0,0 +1,79 @@ +From f3d2851b74fe790896f819efbc694e288d54d819 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:35:30 -0800 +Subject: [PATCH 11/13] bonding: retry if callback returns TRUE + +When a bonding completes, pass the status to any plugin bonding +callbacks; if any return TRUE than set a timer to retry the bonding +after an appropriate backoff period. +--- + src/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 46 insertions(+), 0 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 9a62eef..4ad5aa0 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2493,6 +2493,44 @@ void btd_device_unregister_bonding_cb(struct btd_device *device, + device->bonding_callbacks, cb); + } + ++static gboolean device_bonding_retry(gpointer data) ++{ ++ struct btd_device *device = data; ++ struct btd_adapter *adapter = device_get_adapter(device); ++ struct bonding_req *bonding = device->bonding; ++ int err; ++ ++ if (!bonding) ++ return FALSE; ++ ++ DBG("retrying bonding"); ++ err = adapter_create_bonding(adapter, &device->bdaddr, ++ device->type, bonding->capability); ++ if (err < 0) ++ device_bonding_complete(device, bonding->status); ++ ++ bonding->retry_timer = 0; ++ return FALSE; ++} ++ ++static gboolean device_bonding_get_retry(struct btd_device *device, ++ uint8_t status) ++{ ++ GSList *l; ++ btd_device_bonding_cb_t cb; ++ gboolean retry = FALSE; ++ ++ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { ++ cb = l->data; ++ retry |= cb(device, TRUE, status); ++ } ++ ++ g_slist_free(device->bonding_callbacks); ++ device->bonding_callbacks = NULL; ++ ++ return retry; ++} ++ + gboolean device_is_retrying(struct btd_device *device) + { + struct bonding_req *bonding = device->bonding; +@@ -2507,6 +2545,14 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) + + DBG("bonding %p status 0x%02x", bonding, status); + ++ if (device_bonding_get_retry(device, status) && status) { ++ DBG("backing off and retrying"); ++ bonding->status = status; ++ bonding->retry_timer = g_timeout_add(3000, ++ device_bonding_retry, device); ++ return; ++ } ++ + if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY + || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) + agent_cancel(auth->agent); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch new file mode 100644 index 0000000000..a766a09795 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch @@ -0,0 +1,41 @@ +From 82ef8f4b96d62e18b5a191f6aaa9d79140ca64a4 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:36:44 -0800 +Subject: [PATCH 12/13] bonding: call plugin callback on cancellation + +Call the plugin callbacks when a bonding request is cancelled. +--- + src/device.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 4ad5aa0..ea0d1fb 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2648,6 +2648,8 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) + struct bonding_req *bonding = device->bonding; + DBusMessage *reply; + char addr[18]; ++ GSList *l; ++ btd_device_bonding_cb_t cb; + + if (!bonding) + return; +@@ -2655,6 +2657,14 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) + ba2str(&device->bdaddr, addr); + DBG("Canceling bonding request for %s", addr); + ++ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { ++ cb = l->data; ++ cb(device, FALSE, 0); ++ } ++ ++ g_slist_free(device->bonding_callbacks); ++ device->bonding_callbacks = NULL; ++ + if (device->authr) + device_cancel_authentication(device, FALSE); + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0013-autopair-Add-autopair-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0013-autopair-Add-autopair-plugin.patch new file mode 100644 index 0000000000..81a5f3f8cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0013-autopair-Add-autopair-plugin.patch @@ -0,0 +1,274 @@ +From 2236069d7d5bf54ae53470c13929cba90e020710 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Thu, 5 Apr 2012 15:42:12 -0700 +Subject: [PATCH 13/13] autopair: Add autopair plugin. + +--- + Makefile.am | 5 + + acinclude.m4 | 6 ++ + plugins/autopair.c | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 218 insertions(+), 0 deletions(-) + create mode 100644 plugins/autopair.c + +diff --git a/Makefile.am b/Makefile.am +index bd587eb..0e9129c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -278,6 +278,11 @@ builtin_modules += dbusoob + builtin_sources += plugins/dbusoob.c + endif + ++if AUTOPAIRPLUGIN ++builtin_modules += autopair ++builtin_sources += plugins/autopair.c ++endif ++ + if MAINTAINER_MODE + plugin_LTLIBRARIES += plugins/external-dummy.la + plugins_external_dummy_la_SOURCES = plugins/external-dummy.c +diff --git a/acinclude.m4 b/acinclude.m4 +index b0f790c..4c1849a 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -220,6 +220,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + dbusoob_enable=no + wiimote_enable=no + thermometer_enable=no ++ autopair_enable=no + + AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [ + optimization_enable=${enableval} +@@ -364,6 +365,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + wiimote_enable=${enableval} + ]) + ++ AC_ARG_ENABLE(autopair, AC_HELP_STRING([--enable-autopair], [compile with autopairing plugin]), [ ++ autopair_enable=${enableval} ++ ]) ++ + AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [Use HAL to determine adapter class]), [ + hal_enable=${enableval} + ]) +@@ -429,4 +434,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes") + AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes") + AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes") ++ AM_CONDITIONAL(AUTOPAIRPLUGIN, test "${autopair_enable}" = "yes") + ]) +diff --git a/plugins/autopair.c b/plugins/autopair.c +new file mode 100644 +index 0000000..58047b1 +--- /dev/null ++++ b/plugins/autopair.c +@@ -0,0 +1,208 @@ ++/* ++ * ++ * BlueZ - Bluetooth protocol stack for Linux ++ * ++ * Copyright (C) 2012 Google Inc. ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++ ++#include "glib-compat.h" ++#include "plugin.h" ++#include "adapter.h" ++#include "device.h" ++#include "storage.h" ++#include "textfile.h" ++#include "log.h" ++ ++/* ++ * Plugin to handle automatic pairing of devices with reduced user ++ * interaction, including implementing the recommendation of the HID spec ++ * for keyboard devices. ++ * ++ * The plugin works by intercepting the PIN request for devices; if the ++ * device is a keyboard a random six-digit numeric PIN is generated and ++ * returned, flagged for displaying using DisplayPinCode. ++ * ++ * Bonding callbacks are also added for the device, so should the pairing ++ * attempt fail with the PIN from this plugin, a blacklist entry is added ++ * and pairing retried. On the second pass this plugin will ignore the ++ * device due to the blacklist and the user will be prompted for a PIN ++ * instead. ++ */ ++ ++static GSList *blacklist = NULL; ++ ++static void autopair_blacklist_device(struct btd_device *device) ++{ ++ bdaddr_t *ba; ++ ++ ba = g_new0(bdaddr_t, 1); ++ device_get_address(device, ba, NULL); ++ blacklist = g_slist_prepend(blacklist, ba); ++} ++ ++ ++static GSList *attempting = NULL; ++ ++static gboolean autopair_bondingcb(struct btd_device *device, ++ gboolean complete, uint8_t status) ++{ ++ GSList *match; ++ ++ match = g_slist_find(attempting, device); ++ if (!match) ++ return FALSE; ++ ++ attempting = g_slist_remove_link(attempting, match); ++ btd_device_unref(device); ++ ++ if (complete && status != 0) { ++ /* failed: blacklist and retry with the user's agent */ ++ autopair_blacklist_device(device); ++ return TRUE; ++ } else { ++ /* successful or cancelled pair */ ++ return FALSE; ++ } ++} ++ ++static gboolean autopair_attempt(struct btd_device *device) ++{ ++ if (g_slist_find(attempting, device)) ++ return FALSE; ++ ++ btd_device_register_bonding_cb(device, autopair_bondingcb); ++ attempting = g_slist_prepend(attempting, btd_device_ref(device)); ++ ++ return TRUE; ++} ++ ++static void autopair_cancel_all(void) ++{ ++ GSList *l; ++ struct btd_device *device; ++ ++ for (l = attempting; l != NULL; l = g_slist_next(l)) { ++ device = l->data; ++ btd_device_unregister_bonding_cb(device, autopair_bondingcb); ++ btd_device_unref(device); ++ } ++ ++ g_slist_free(attempting); ++ attempting = NULL; ++} ++ ++static ssize_t autopair_pincb(struct btd_adapter *adapter, ++ struct btd_device *device, ++ char *pinbuf, gboolean *display) ++{ ++ char addr[18]; ++ bdaddr_t local, peer; ++ uint32_t class; ++ ++ if (!device_is_bonding(device, NULL)) ++ return 0; ++ ++ adapter_get_address(adapter, &local); ++ ++ device_get_address(device, &peer, NULL); ++ ba2str(&peer, addr); ++ ++ read_remote_class(&local, &peer, &class); ++ ++ DBG("device %s 0x%x", addr, class); ++ ++ if (g_slist_find_custom(blacklist, &peer, (GCompareFunc) bacmp)) { ++ DBG("prior autopair failed"); ++ return 0; ++ } ++ ++ switch ((class & 0x1f00) >> 8) { ++ case 0x05: ++ switch ((class & 0xc0) >> 6) { ++ case 0x01: ++ case 0x03: ++ if (autopair_attempt(device)) { ++ char pinstr[7]; ++ srand(time(NULL)); ++ snprintf(pinstr, sizeof pinstr, "%06d", ++ rand() % 1000000); ++ *display = TRUE; ++ memcpy(pinbuf, pinstr, 6); ++ return 6; ++ } ++ break; ++ } ++ break; ++ } ++ ++ return 0; ++} ++ ++ ++static int autopair_probe(struct btd_adapter *adapter) ++{ ++ btd_adapter_register_pin_cb(adapter, autopair_pincb); ++ ++ return 0; ++} ++ ++static void autopair_remove(struct btd_adapter *adapter) ++{ ++ btd_adapter_unregister_pin_cb(adapter, autopair_pincb); ++} ++ ++static struct btd_adapter_driver autopair_driver = { ++ .name = "autopair", ++ .probe = autopair_probe, ++ .remove = autopair_remove, ++}; ++ ++static int autopair_init(void) ++{ ++ return btd_register_adapter_driver(&autopair_driver); ++} ++ ++static void autopair_exit(void) ++{ ++ btd_unregister_adapter_driver(&autopair_driver); ++ ++ autopair_cancel_all(); ++ ++ g_slist_free_full(blacklist, g_free); ++} ++ ++BLUETOOTH_PLUGIN_DEFINE(autopair, VERSION, ++ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, autopair_init, autopair_exit) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-autopair.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-autopair.patch new file mode 100644 index 0000000000..e9126a34e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-autopair.patch @@ -0,0 +1,62 @@ +From 36358d4a7b3471f5a124a95fec9ed0e4871299e0 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Wed, 18 Apr 2012 15:53:55 -0700 +Subject: [PATCH 14/14] autopair: use 0000 as PIN for dumb devices + +Android tries 0000 for a set of audio devices, so follow suit and +do the same even though most audio devices support SSP these days. + +BUG=chromium-os:25211 +TEST=verified with audio devices after 'hciconfig hci0 sspmode 0' +--- + plugins/autopair.c | 26 +++++++++++++++++++++++--- + 1 files changed, 23 insertions(+), 3 deletions(-) + +diff --git a/plugins/autopair.c b/plugins/autopair.c +index 05de3ff..5b773c5 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -150,10 +150,24 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + } + + switch ((class & 0x1f00) >> 8) { +- case 0x05: ++ case 0x04: // Audio/Video ++ switch ((class & 0xfc) >> 2) { ++ case 0x01: // Wearable Headset Device ++ case 0x02: // Hands-free Device ++ case 0x06: // Headphones ++ case 0x07: // Portable Audio ++ case 0x0a: // HiFi Audio Device ++ if (autopair_attempt(device)) { ++ memcpy(pinbuf, "0000", 4); ++ return 4; ++ } ++ break; ++ } ++ break; ++ case 0x05: // Peripheral + switch ((class & 0xc0) >> 6) { +- case 0x01: +- case 0x03: ++ case 0x01: // Keyboard ++ case 0x03: // Combo keyboard/pointing device + if (autopair_attempt(device)) { + char pinstr[7]; + srand(time(NULL)); +@@ -164,6 +178,12 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + return 6; + } + break; ++ case 0x02: // Pointing device ++ if (autopair_attempt(device)) { ++ memcpy(pinbuf, "0000", 4); ++ return 4; ++ } ++ break; + } + break; + } +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-dbus.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-dbus.patch new file mode 100644 index 0000000000..5ae911de9c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-dbus.patch @@ -0,0 +1,28 @@ +diff --git a/src/bluetooth.conf b/src/bluetooth.conf +index 664dbd9..3263112 100644 +--- a/src/bluetooth.conf ++++ b/src/bluetooth.conf +@@ -7,7 +7,7 @@ + + + +- ++ + + + +@@ -18,13 +18,7 @@ + + + +- +- +- +- +- +- ++ + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-initially-powered.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-initially-powered.patch new file mode 100644 index 0000000000..8526997b55 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-initially-powered.patch @@ -0,0 +1,13 @@ +diff --git a/src/main.conf b/src/main.conf +index 321f622..f6784fb 100644 +--- a/src/main.conf ++++ b/src/main.conf +@@ -38,7 +38,7 @@ AutoConnectTimeout = 60 + + # What value should be assumed for the adapter Powered property when + # SetProperty(Powered, ...) hasn't been called yet. Defaults to true +-InitiallyPowered = true ++InitiallyPowered = false + + # Remember the previously stored Powered state when initializing adapters + RememberPowered = true diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-sdp-path.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-sdp-path.patch new file mode 100644 index 0000000000..6dac6bf83c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-sdp-path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/sdp.h b/lib/sdp.h +index 2fe74d5..e559a5c 100644 +--- a/lib/sdp.h ++++ b/lib/sdp.h +@@ -34,7 +34,7 @@ extern "C" { + #include + #include + +-#define SDP_UNIX_PATH "/var/run/sdp" ++#define SDP_UNIX_PATH "/var/run/bluetooth/sdp" + #define SDP_RESPONSE_TIMEOUT 20 + #define SDP_REQ_BUFFER_SIZE 2048 + #define SDP_RSP_BUFFER_SIZE 65535 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/Manifest new file mode 100644 index 0000000000..c14bb107a2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/Manifest @@ -0,0 +1 @@ +DIST bluez-4.62.tar.gz 974796 RMD160 64518ccc246ddaefa596815eaec2e0d6abbe7b3a SHA1 ed3074464994360ea858789175d0e7440567d97c SHA256 f63203cbbd5be7d9986d5df42c7a96c3edb7442d99539fbe9c7964243b286792 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62-r103.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62-r103.ebuild new file mode 120000 index 0000000000..7dce9f866c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62-r103.ebuild @@ -0,0 +1 @@ +bluez-4.62.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62.ebuild new file mode 100644 index 0000000000..406d62480e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.62.ebuild,v 1.1 2010/03/08 14:35:09 pacho Exp $ + +EAPI="2" + +inherit autotools multilib eutils + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://bluez.sourceforge.net/" +SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz" +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm x86" + +IUSE="alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb" + +CDEPEND="alsa? ( + media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] + ) + caps? ( >=sys-libs/libcap-ng-0.6.2 ) + gstreamer? ( + >=media-libs/gstreamer-0.10 + >=media-libs/gst-plugins-base-0.10 ) + usb? ( dev-libs/libusb ) + cups? ( net-print/cups ) + sys-fs/udev + dev-libs/glib + sys-apps/dbus + media-libs/libsndfile + >=dev-libs/libnl-1.1 + !net-wireless/bluez-libs + !net-wireless/bluez-utils" +DEPEND="sys-devel/flex + >=dev-util/pkgconfig-0.20 + ${CDEPEND}" +RDEPEND="${CDEPEND} + consolekit? ( sys-auth/pambase[consolekit] ) + test-programs? ( + dev-python/dbus-python + dev-python/pygobject )" + +src_prepare() { + if use cups; then + epatch "${FILESDIR}/4.60/cups-location.patch" + fi + + # Fix alsa files location + epatch "${FILESDIR}/${PN}-alsa_location.patch" + + # Incorporate ATH3k support + epatch "${FILESDIR}/${PN}-ath3k.patch" + + # Allow user chronos to send requests + epatch "${FILESDIR}/${PN}-chronos.patch" + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable caps capng) \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-service \ + $(use_enable gstreamer) \ + $(use_enable alsa) \ + $(use_enable usb) \ + --enable-netlink \ + --enable-tools \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + $(use_enable old-daemons hidd) \ + $(use_enable old-daemons pand) \ + $(use_enable old-daemons dund) \ + $(use_enable cups) \ + $(use_enable test-programs test) \ + --enable-udevrules \ + --enable-configfiles \ + $(use_enable pcmcia) \ + $(use_enable debug) \ + --localstatedir=/var +} + +src_compile() { + # TODO: Re-enable parallel-make when dependency issue with generated headers + # is fixed. See http://crosbug.com/15028 + emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog README || die + + if use test-programs ; then + cd "${S}/test" + dobin simple-agent simple-service monitor-bluetooth + newbin list-devices list-bluetooth-devices + for b in apitest hsmicro hsplay test-* ; do + newbin "${b}" "bluez-${b}" + done + insinto /usr/share/doc/${PF}/test-services + doins service-* + + cd "${S}" + fi + + if use old-daemons; then + newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die + newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die + fi + + insinto /etc/bluetooth + doins \ + input/input.conf \ + audio/audio.conf \ + network/network.conf \ + serial/serial.conf \ + || die + + insinto /etc/udev/rules.d/ + newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die + exeinto /$(get_libdir)/udev/ + newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die + + newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || die + newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die +} + +pkg_postinst() { + udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth + + elog + elog "To use dial up networking you must install net-dialup/ppp." + elog + elog "For a password agent, there is for example net-wireless/bluez-gnome" + elog "for gnome and net-wireless/kdebluetooth for kde. You can also give a" + elog "try to net-wireless/blueman" + elog + elog "Use the old-daemons use flag to get the old daemons like hidd" + elog "installed. Please note that the init script doesn't stop the old" + elog "daemons after you update it so it's recommended to run:" + elog " /etc/init.d/bluetooth stop" + elog "before updating your configuration files or you can manually kill" + elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth." + + if use consolekit; then + elog "" + elog "If you want to use rfcomm as a normal user, you need to add the user" + elog "to the uucp group." + else + elog "" + elog "Since you have the consolekit use flag disabled, you will only be able to run" + elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as " + elog "a regular user, you need to enable the consolekit use flag for this package." + fi + + if use old-daemons; then + elog "" + elog "The hidd init script was installed because you have the old-daemons" + elog "use flag on. It is not started by default via udev so please add it" + elog "to the required runlevels using rc-update add hidd. If" + elog "you need init scripts for the other daemons, please file requests" + elog "to https://bugs.gentoo.org." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.97-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.97-r11.ebuild new file mode 100644 index 0000000000..0e457d4cdd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.97-r11.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r1.ebuild,v 1.1 2011/12/31 21:09:18 pacho Exp $ + +EAPI="4" +PYTHON_DEPEND="test-programs? 2" + +inherit autotools multilib eutils systemd python + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://www.bluez.org/" + +# Because of oui.txt changing from time to time without noticement, we need to supply it +# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly. +# See bugs #345263 and #349473 for reference. +OUIDATE="20111231" +SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz + http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86" +IUSE="alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb" + +CDEPEND=" + >=dev-libs/glib-2.14:2 + sys-apps/dbus + >=sys-fs/udev-169 + alsa? ( + media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] + media-libs/libsndfile + ) + caps? ( >=sys-libs/libcap-ng-0.6.2 ) + cups? ( net-print/cups ) + gstreamer? ( + >=media-libs/gstreamer-0.10:0.10 + >=media-libs/gst-plugins-base-0.10:0.10 + ) + usb? ( dev-libs/libusb:1 ) +" +DEPEND="${CDEPEND} + >=dev-util/pkgconfig-0.20 + >=dev-libs/check-0.9.8 + sys-devel/flex +" +RDEPEND="${CDEPEND} + !net-wireless/bluez-libs + !net-wireless/bluez-utils + consolekit? ( + || ( sys-auth/consolekit + >=sys-apps/systemd-37 ) + ) + test-programs? ( + dev-python/dbus-python + dev-python/pygobject:2 + ) +" + +DOCS=( AUTHORS ChangeLog README ) + +pkg_setup() { + if use test-programs; then + python_pkg_setup + fi +} + +src_prepare() { + # Change the default D-Bus configuration; the daemon is run as + # bluetooth, not root; we don't use the lp user, and we use the + # chronos user instead of at_console + epatch "${FILESDIR}/${PN}-4.97-dbus.patch" + + # Change the default SDP Server socket path to a sub-directory + # under /var/run, since /var/run is not writeable by the bluetooth + # user. + epatch "${FILESDIR}/${PN}-4.97-sdp-path.patch" + + # Disable initial radio power for new adapters + epatch "${FILESDIR}/${PN}-4.97-initially-powered.patch" + + # Automatic pairing support, including keyboard pairing support + # (in upstream review) + epatch "${FILESDIR}/${PN}-4.97-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0003-agent-add-DisplayPinCode-method.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0006-Display-PIN-generated-by-plugin.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0007-doc-document-DisplayPinCode.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0008-simple-agent-add-DisplayPinCode.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0009-Add-support-for-retrying-a-bonding.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch" + epatch "${FILESDIR}/${PN}-4.97-autopair-0013-autopair-Add-autopair-plugin.patch" + + if use cups; then + sed -i \ + -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ + Makefile.tools Makefile.in || die + fi +} + +src_configure() { + econf \ + --enable-hid2hci \ + --enable-audio \ + --enable-bccmd \ + --enable-datafiles \ + --enable-dfutool \ + --enable-input \ + --enable-network \ + --enable-serial \ + --enable-service \ + --enable-tools \ + --disable-hal \ + --localstatedir=/var \ + --with-systemdunitdir="$(systemd_get_unitdir)" \ + --with-ouifile=/usr/share/misc/oui.txt \ + $(use_enable alsa) \ + $(use_enable caps capng) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable gstreamer) \ + $(use_enable pcmcia) \ + $(use_enable test-programs test) \ + $(use_enable usb) \ + --enable-health \ + --enable-maemo6 \ + --enable-pnat \ + --enable-wiimote \ + --enable-dbusoob \ + --enable-autopair +} + +src_install() { + default + + if use test-programs ; then + cd "${S}/test" + dobin simple-agent simple-service monitor-bluetooth + newbin list-devices list-bluetooth-devices + rm test-textfile.{c,o} || die # bug #356529 + for b in apitest hsmicro hsplay test-* ; do + newbin "${b}" "bluez-${b}" + done + insinto /usr/share/doc/${PF}/test-services + doins service-* + + python_convert_shebangs -r 2 "${ED}" + cd "${S}" + fi + + insinto /etc/bluetooth + doins \ + input/input.conf \ + audio/audio.conf \ + network/network.conf \ + serial/serial.conf + + newinitd "${FILESDIR}/rfcomm-init.d" rfcomm + newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm + + insinto /etc/init + newins "${FILESDIR}/${PN}-upstart.conf" bluetoothd.conf + + # Install oui.txt as requested in bug #283791 and approved by upstream + insinto /usr/share/misc + newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt + + fowners bluetooth:bluetooth /var/lib/bluetooth + + rm "${D}/lib/udev/rules.d/97-bluetooth.rules" + + find "${D}" -name "*.la" -delete +} + +pkg_postinst() { + if ! has_version "net-dialup/ppp"; then + elog "To use dial up networking you must install net-dialup/ppp." + fi + + if use consolekit; then + elog "If you want to use rfcomm as a normal user, you need to add the user" + elog "to the uucp group." + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.99-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.99-r6.ebuild new file mode 100644 index 0000000000..c0e2b0788d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.99-r6.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.99.ebuild,v 1.7 2012/04/15 16:53:41 maekke Exp $ + +EAPI="4" +PYTHON_DEPEND="test-programs? 2" + +inherit autotools multilib eutils systemd python + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://www.bluez.org/" + +# Because of oui.txt changing from time to time without noticement, we need to supply it +# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly. +# See bugs #345263 and #349473 for reference. +OUIDATE="20120308" +SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz + http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86" +IUSE="alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline" + +CDEPEND=" + >=dev-libs/glib-2.14:2 + sys-apps/dbus + >=sys-fs/udev-169 + alsa? ( + media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] + media-libs/libsndfile + ) + caps? ( >=sys-libs/libcap-ng-0.6.2 ) + cups? ( net-print/cups ) + gstreamer? ( + >=media-libs/gstreamer-0.10:0.10 + >=media-libs/gst-plugins-base-0.10:0.10 + ) + usb? ( virtual/libusb:0 ) + readline? ( sys-libs/readline ) +" +DEPEND="${CDEPEND} + >=dev-util/pkgconfig-0.20 + sys-devel/flex + test-programs? ( >=dev-libs/check-0.9.8 ) +" +RDEPEND="${CDEPEND} + !net-wireless/bluez-libs + !net-wireless/bluez-utils + consolekit? ( + || ( sys-auth/consolekit + >=sys-apps/systemd-37 ) + ) + test-programs? ( + dev-python/dbus-python + dev-python/pygobject:2 + ) +" + +DOCS=( AUTHORS ChangeLog README ) + +pkg_setup() { + if use test-programs; then + python_pkg_setup + fi +} + +src_prepare() { + # Change the default D-Bus configuration; the daemon is run as + # bluetooth, not root; we don't use the lp user, and we use the + # chronos user instead of at_console + epatch "${FILESDIR}/${PN}-dbus.patch" + + # Change the default SDP Server socket path to a sub-directory + # under /var/run, since /var/run is not writeable by the bluetooth + # user. + epatch "${FILESDIR}/${PN}-sdp-path.patch" + + # Disable initial radio power for new adapters + epatch "${FILESDIR}/${PN}-initially-powered.patch" + + # Automatic pairing support, including keyboard pairing support. + # (accepted upstream, can be dropped for next release) + epatch "${FILESDIR}/${P}-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch" + epatch "${FILESDIR}/${P}-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch" + epatch "${FILESDIR}/${P}-autopair-0003-agent-add-DisplayPinCode-method.patch" + epatch "${FILESDIR}/${P}-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch" + epatch "${FILESDIR}/${P}-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch" + epatch "${FILESDIR}/${P}-autopair-0006-Display-PIN-generated-by-plugin.patch" + epatch "${FILESDIR}/${P}-autopair-0007-doc-document-DisplayPinCode.patch" + epatch "${FILESDIR}/${P}-autopair-0008-simple-agent-add-DisplayPinCode.patch" + epatch "${FILESDIR}/${P}-autopair-0009-Add-support-for-retrying-a-bonding.patch" + epatch "${FILESDIR}/${P}-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch" + epatch "${FILESDIR}/${P}-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch" + epatch "${FILESDIR}/${P}-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch" + epatch "${FILESDIR}/${P}-autopair-0013-autopair-Add-autopair-plugin.patch" + + # Automatic pairing of dumb devices. Not yet submitted upstream + # so kept as a separate patch on top of the above series. + epatch "${FILESDIR}/${PN}-autopair.patch" + + # Playstation3 Controller pairing plugin, retrieved from + # linux-bluetooth mailing list (posted 2012-04-18). + epatch "${FILESDIR}/${P}-ps3-0001.patch" + epatch "${FILESDIR}/${P}-ps3-0002.patch" + epatch "${FILESDIR}/${P}-ps3-0003.patch" + + # Fix EIR parsing causing class of devices to be lost, retrieved + # from GIT head. + epatch "${FILESDIR}/${P}-eir-Fix-incorrect-eir_has_data_type-parsing.patch" + epatch "${FILESDIR}/${P}-eir-Fix-incorrect-eir_length-parsing.patch" + + eautoreconf + + if use cups; then + sed -i \ + -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ + Makefile.tools Makefile.in || die + fi +} + +src_configure() { + use readline || export ac_cv_header_readline_readline_h=no + + econf \ + --enable-audio \ + --enable-bccmd \ + --enable-datafiles \ + --enable-dfutool \ + --enable-input \ + --enable-network \ + --enable-serial \ + --enable-service \ + --enable-tools \ + --disable-hal \ + --localstatedir=/var \ + --with-systemdunitdir="$(systemd_get_unitdir)" \ + --with-ouifile=/usr/share/misc/oui.txt \ + $(use_enable alsa) \ + $(use_enable caps capng) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable gstreamer) \ + $(use_enable pcmcia) \ + $(use_enable test-programs test) \ + $(use_enable usb) \ + --enable-health \ + --enable-wiimote \ + --enable-dbusoob \ + --enable-autopair \ + --enable-playstation_peripheral +} + +src_install() { + default + + if use test-programs ; then + cd "${S}/test" + dobin simple-agent simple-service monitor-bluetooth + newbin list-devices list-bluetooth-devices + rm test-textfile.{c,o} || die # bug #356529 + for b in apitest hsmicro hsplay test-* ; do + newbin "${b}" "bluez-${b}" + done + insinto /usr/share/doc/${PF}/test-services + doins service-* + + python_convert_shebangs -r 2 "${ED}" + cd "${S}" + fi + + insinto /etc/bluetooth + doins \ + input/input.conf \ + audio/audio.conf \ + network/network.conf \ + serial/serial.conf + + newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth + newinitd "${FILESDIR}/rfcomm-init.d" rfcomm + newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm + + insinto /etc/init + newins "${FILESDIR}/${PN}-upstart.conf" bluetoothd.conf + + insinto /lib/udev/rules.d + newins "${FILESDIR}/${PN}-ps3-gamepad.rules" "99-ps3-gamepad.rules" + + # Install oui.txt as requested in bug #283791 and approved by upstream + insinto /usr/share/misc + newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt + + fowners bluetooth:bluetooth /var/lib/bluetooth + + rm "${D}/lib/udev/rules.d/97-bluetooth.rules" + + find "${D}" -name "*.la" -delete +} + +pkg_postinst() { + udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth + + if ! has_version "net-dialup/ppp"; then + elog "To use dial up networking you must install net-dialup/ppp." + fi + + if use consolekit; then + elog "If you want to use rfcomm as a normal user, you need to add the user" + elog "to the uucp group." + else + elog "Since you have the consolekit use flag disabled, you will only be able to run" + elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as " + elog "a regular user, you need to enable the consolekit use flag for this package or" + elog "to add the user to the plugdev group." + fi + + if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then + elog "You will need to add bluetooth service to default runlevel" + elog "for getting your devices detected from startup without needing" + elog "to reconnect them. For that please run:" + elog "'rc-update add bluetooth default'" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/conf.d-hidd b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/conf.d-hidd new file mode 100644 index 0000000000..1677ef0f35 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/conf.d-hidd @@ -0,0 +1,5 @@ +# Bluetooth hidd daemon configuraton file + +# Arguments to hidd +HIDD_OPTIONS="--encrypt" + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/cups-location.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/cups-location.patch new file mode 100644 index 0000000000..e0ddc02006 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/cups-location.patch @@ -0,0 +1,18 @@ +? cups/.deps +? cups/Makefile +? cups/Makefile.in +Index: cups/Makefile.am +=================================================================== +RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v +retrieving revision 1.9 +diff -u -r1.9 Makefile.am +--- cups/Makefile.am 20 Aug 2006 02:21:03 -0000 1.9 ++++ cups/Makefile.am 1 Jun 2007 15:47:14 -0000 +@@ -1,6 +1,6 @@ + + if CUPS +-cupsdir = $(libdir)/cups/backend ++cupsdir = `cups-config --serverbin`/backend + + cups_PROGRAMS = bluetooth + else diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/init.d-hidd b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/init.d-hidd new file mode 100644 index 0000000000..9e61281a48 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/init.d-hidd @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.18/init.d-hidd,v 1.1 2008/11/28 21:21:35 dev-zero Exp $ + +depend() { + need bluetooth +} + +start() { + ebegin "Starting hidd" + start-stop-daemon --start --quiet \ + --exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server + local result="$?" + local service="/etc/bluetooth/input.service" + if [ "${result}" != "0" ] && grep -q "Autostart=true" ${service}; then + eerror "You have Autostart=true in ${service}." + eerror "Change this to false if you want to use hidd." + fi + eend ${result} +} + +stop() { + ebegin "Stopping hidd" + hidd --killall + start-stop-daemon --stop --quiet --exec /usr/bin/hidd + eend $? +} + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.31-as_needed.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.31-as_needed.patch new file mode 100644 index 0000000000..99b8ce4c23 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.31-as_needed.patch @@ -0,0 +1,31 @@ +diff -Naur bluez-4.31.orig/common/Makefile.am bluez-4.31/common/Makefile.am +--- bluez-4.31.orig/common/Makefile.am 2009-02-27 22:57:29.515330134 +0100 ++++ bluez-4.31/common/Makefile.am 2009-02-27 22:58:11.249328307 +0100 +@@ -4,6 +4,8 @@ + libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c logging.h logging.c \ + glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c btio.h btio.c + ++libhelper_a_LIBADD = @BLUEZ_LIBS@ ++ + noinst_PROGRAMS = test_textfile + + test_textfile_LDADD = libhelper.a +diff -Naur bluez-4.31.orig/test/Makefile.am bluez-4.31/test/Makefile.am +--- bluez-4.31.orig/test/Makefile.am 2009-02-27 22:57:29.518659538 +0100 ++++ bluez-4.31/test/Makefile.am 2009-02-27 23:07:09.294597176 +0100 +@@ -23,13 +23,13 @@ + + bdaddr_SOURCES = bdaddr.c + +-bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a ++bdaddr_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@ + + lmptest_LDADD = @BLUEZ_LIBS@ + + agent_LDADD = @DBUS_LIBS@ + +-btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a ++btiotest_LDADD = @GLIB_LIBS@ $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@ + + noinst_MANS = bdaddr.8 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.34-conditional_libsbc.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.34-conditional_libsbc.patch new file mode 100644 index 0000000000..e4924c79be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.34-conditional_libsbc.patch @@ -0,0 +1,39 @@ +The configure stuff is a inconsequent: +- even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la + which doesn't get build without alsa or gstreamer. Making this conditional helps. +- ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty, + making the build conditional helps again. +--- acinclude.m4.orig 2009-04-06 16:26:14.570780241 +0200 ++++ acinclude.m4 2009-04-06 16:26:59.540779148 +0200 +@@ -330,8 +330,10 @@ + AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus']) + AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la']) + +- AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) +- AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) ++ if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then ++ AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) ++ AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) ++ fi + + AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") + AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes") +--- audio/Makefile.am.orig 2009-04-06 16:47:21.240681272 +0200 ++++ audio/Makefile.am 2009-04-06 17:42:27.240597715 +0200 +@@ -60,10 +60,16 @@ + + libipc_la_SOURCES = ipc.h ipc.c + ++if AUDIOPLUGIN ++if SBC ++ + noinst_PROGRAMS = ipctest + + ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@ + ++endif ++endif ++ + AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \ + @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-conf.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-conf.d new file mode 100644 index 0000000000..b0cc744415 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-conf.d @@ -0,0 +1,7 @@ +# Bluetooth configuraton file + +# Bind rfcomm devices (allowed values are "true" and "false") +RFCOMM_ENABLE=true + +# Config file for rfcomm +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-init.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-init.d new file mode 100644 index 0000000000..111902aaeb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-init.d @@ -0,0 +1,31 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.60/bluetooth-init.d,v 1.1 2010/02/01 19:47:46 pacho Exp $ + +depend() { + after coldplug + need dbus localmount +} + +start() { + ebegin "Starting Bluetooth" + + udevadm trigger --subsystem-match=bluetooth + eend $? + + if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then + if [ -f "${RFCOMM_CONFIG}" ]; then + ebegin " Starting rfcomm" + /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all + eend $? + else + ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists" + fi + fi +} + +stop() { + ebegin "Shutting down Bluetooth" + eend 0 +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluetooth-init.d-r1 b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluetooth-init.d-r1 new file mode 100644 index 0000000000..9280f93bac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluetooth-init.d-r1 @@ -0,0 +1,19 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r1,v 1.1 2012/01/09 23:01:55 pacho Exp $ + +depend() { + after coldplug + need dbus localmount hostname +} + +start() { + ebegin "Udev coldplug of bluetooth devices" + udevadm trigger --subsystem-match=bluetooth --action=add + eend $? +} + +stop() { + return 0 +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.rules b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.rules new file mode 100644 index 0000000000..b3ccd5bbba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.rules @@ -0,0 +1,5 @@ +# Start/Stop bluetooth service on device insertion. Gentoo specific. +SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="bluetooth.sh" + +# So that normal users can dial out. +SUBSYSTEM=="tty", SUBSYSTEMS=="bluetooth", GROUP="uucp" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.script b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.script new file mode 100644 index 0000000000..a532e2652c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.script @@ -0,0 +1,28 @@ +#!/bin/sh +# +# bluetooth.sh: udev external RUN script +# +# Copyright: +# 2005-2006 Henrik Brix Andersen +# 2007 Petteri Räty +# 2008 Tiziano Müller +# Distributed under the terms of the GNU General Public License v2 + +script=/etc/init.d/bluetooth + +# Find out where sysfs is mounted. Exit if not available +sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'` +if [ "$sysfs" = "" ]; then + echo "sysfs is required" + exit 1 +fi + +if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then + if $script --quiet status; then + IN_HOTPLUG=1 $script --quiet stop + fi +else + if ! $script --quiet status; then + IN_HOTPLUG=1 $script --quiet start + fi +fi diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.67-udev.script b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.67-udev.script new file mode 100644 index 0000000000..b176611d9d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.67-udev.script @@ -0,0 +1,21 @@ +#!/bin/sh +# +# bluetooth.sh: udev external RUN script +# +# Copyright: +# 2005-2006 Henrik Brix Andersen +# 2007 Petteri Räty +# 2008 Tiziano Müller +# 2011 Pacho Ramos +# Distributed under the terms of the GNU General Public License v2 + +# Find out where sysfs is mounted. Exit if not available +sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'` +if [ "$sysfs" = "" ]; then + echo "sysfs is required" + exit 1 +fi + +if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then + udevadm trigger --subsystem-match=bluetooth --action=add +fi diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch new file mode 100644 index 0000000000..bce6daa8c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch @@ -0,0 +1,83 @@ +From be1631d70689cfde701e9a1642a5afad11252af7 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 10:40:25 -0800 +Subject: [PATCH 01/13] Rename AUTH_TYPE_NOTIFY to AUTH_TYPE_NOTIFY_PASSKEY + +This makes room for additional notification types to be added. +--- + src/device.c | 8 ++++---- + src/device.h | 2 +- + src/event.c | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/device.c b/src/device.c +index dfc8e59..92c13f5 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2453,7 +2453,7 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) + { + struct authentication_req *auth = device->authr; + +- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) ++ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) + agent_cancel(auth->agent); + } + +@@ -2470,7 +2470,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) + + DBG("bonding %p status 0x%02x", bonding, status); + +- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) ++ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) + agent_cancel(auth->agent); + + if (status) { +@@ -2724,7 +2724,7 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + err = agent_request_confirmation(agent, device, passkey, + confirm_cb, auth, NULL); + break; +- case AUTH_TYPE_NOTIFY: ++ case AUTH_TYPE_NOTIFY_PASSKEY: + err = agent_display_passkey(agent, device, passkey); + break; + default: +@@ -2764,7 +2764,7 @@ static void cancel_authentication(struct authentication_req *auth) + case AUTH_TYPE_PASSKEY: + ((agent_passkey_cb) auth->cb)(agent, &err, 0, device); + break; +- case AUTH_TYPE_NOTIFY: ++ case AUTH_TYPE_NOTIFY_PASSKEY: + /* User Notify doesn't require any reply */ + break; + } +diff --git a/src/device.h b/src/device.h +index 7cb9bb2..aa7f2f1 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -30,7 +30,7 @@ typedef enum { + AUTH_TYPE_PINCODE, + AUTH_TYPE_PASSKEY, + AUTH_TYPE_CONFIRM, +- AUTH_TYPE_NOTIFY, ++ AUTH_TYPE_NOTIFY_PASSKEY, + } auth_type_t; + + struct btd_device *device_create(DBusConnection *conn, +diff --git a/src/event.c b/src/event.c +index 113a2b6..95cdbdb 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -202,8 +202,8 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) + if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) + return -ENODEV; + +- return device_request_authentication(device, AUTH_TYPE_NOTIFY, passkey, +- FALSE, NULL); ++ return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, ++ passkey, FALSE, NULL); + } + + void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch new file mode 100644 index 0000000000..08de15d968 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch @@ -0,0 +1,107 @@ +From 888f24266b8ff06d7007afb5e6a38ba621750451 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 10:43:48 -0800 +Subject: [PATCH 02/13] Pass passkey by pointer rather than by value + +This allows alternate data of a different type to be passed to +device_request_authentication() for other notification types such +as those that require a PIN. +--- + src/device.c | 9 +++++---- + src/device.h | 2 +- + src/event.c | 8 ++++---- + 3 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 92c13f5..8a2ae9d 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2681,7 +2681,7 @@ done: + } + + int device_request_authentication(struct btd_device *device, auth_type_t type, +- uint32_t passkey, gboolean secure, void *cb) ++ void *data, gboolean secure, void *cb) + { + struct authentication_req *auth; + struct agent *agent; +@@ -2707,7 +2707,6 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + auth->device = device; + auth->cb = cb; + auth->type = type; +- auth->passkey = passkey; + auth->secure = secure; + device->authr = auth; + +@@ -2721,11 +2720,13 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + auth, NULL); + break; + case AUTH_TYPE_CONFIRM: +- err = agent_request_confirmation(agent, device, passkey, ++ auth->passkey = *(uint32_t *)data; ++ err = agent_request_confirmation(agent, device, auth->passkey, + confirm_cb, auth, NULL); + break; + case AUTH_TYPE_NOTIFY_PASSKEY: +- err = agent_display_passkey(agent, device, passkey); ++ auth->passkey = *(uint32_t *)data; ++ err = agent_display_passkey(agent, device, auth->passkey); + break; + default: + err = -EINVAL; +diff --git a/src/device.h b/src/device.h +index aa7f2f1..998aee7 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -83,7 +83,7 @@ gboolean device_is_creating(struct btd_device *device, const char *sender); + gboolean device_is_bonding(struct btd_device *device, const char *sender); + void device_cancel_bonding(struct btd_device *device, uint8_t status); + int device_request_authentication(struct btd_device *device, auth_type_t type, +- uint32_t passkey, gboolean secure, void *cb); ++ void *data, gboolean secure, void *cb); + void device_cancel_authentication(struct btd_device *device, gboolean aborted); + gboolean device_is_authenticating(struct btd_device *device); + gboolean device_is_authorizing(struct btd_device *device); +diff --git a/src/event.c b/src/event.c +index 95cdbdb..7d66b6d 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -130,7 +130,7 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) + return 0; + } + +- return device_request_authentication(device, AUTH_TYPE_PINCODE, 0, ++ return device_request_authentication(device, AUTH_TYPE_PINCODE, NULL, + secure, pincode_cb); + } + +@@ -179,7 +179,7 @@ int btd_event_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) + return -ENODEV; + + return device_request_authentication(device, AUTH_TYPE_CONFIRM, +- passkey, FALSE, confirm_cb); ++ &passkey, FALSE, confirm_cb); + } + + int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) +@@ -190,7 +190,7 @@ int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) + if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) + return -ENODEV; + +- return device_request_authentication(device, AUTH_TYPE_PASSKEY, 0, ++ return device_request_authentication(device, AUTH_TYPE_PASSKEY, NULL, + FALSE, passkey_cb); + } + +@@ -203,7 +203,7 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) + return -ENODEV; + + return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, +- passkey, FALSE, NULL); ++ &passkey, FALSE, NULL); + } + + void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch new file mode 100644 index 0000000000..4e14ca9962 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch @@ -0,0 +1,161 @@ +From e84af9f6ba447c540512d56ccc7326af621749bc Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 10:56:56 -0800 +Subject: [PATCH 03/13] agent: add DisplayPinCode method + +In constrast to DisplayPasskey, this sends a UTF-8 string PIN code +to the agent; also we support a callback for the case where the +Agent doesn't implement this new method so we can fallback. +--- + src/agent.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + src/agent.h | 4 ++ + 2 files changed, 115 insertions(+), 1 deletions(-) + +diff --git a/src/agent.c b/src/agent.c +index 9b942e8..23e3b43 100644 +--- a/src/agent.c ++++ b/src/agent.c +@@ -52,7 +52,8 @@ typedef enum { + AGENT_REQUEST_CONFIRMATION, + AGENT_REQUEST_PINCODE, + AGENT_REQUEST_AUTHORIZE, +- AGENT_REQUEST_CONFIRM_MODE ++ AGENT_REQUEST_CONFIRM_MODE, ++ AGENT_REQUEST_DISPLAY_PINCODE, + } agent_request_type_t; + + struct agent { +@@ -699,6 +700,115 @@ int agent_display_passkey(struct agent *agent, struct btd_device *device, + return 0; + } + ++static void display_pincode_reply(DBusPendingCall *call, void *user_data) ++{ ++ struct agent_request *req = user_data; ++ struct agent *agent = req->agent; ++ DBusMessage *message; ++ DBusError err; ++ agent_cb cb = req->cb; ++ ++ /* clear agent->request early; our callback will likely try ++ * another request */ ++ agent->request = NULL; ++ ++ /* steal_reply will always return non-NULL since the callback ++ * is only called after a reply has been received */ ++ message = dbus_pending_call_steal_reply(call); ++ ++ dbus_error_init(&err); ++ if (dbus_set_error_from_message(&err, message)) { ++ error("Agent replied with an error: %s, %s", ++ err.name, err.message); ++ ++ cb(agent, &err, req->user_data); ++ ++ if (dbus_error_has_name(&err, DBUS_ERROR_NO_REPLY)) { ++ agent_cancel(agent); ++ dbus_message_unref(message); ++ dbus_error_free(&err); ++ return; ++ } ++ ++ dbus_error_free(&err); ++ goto done; ++ } ++ ++ dbus_error_init(&err); ++ if (!dbus_message_get_args(message, &err, DBUS_TYPE_INVALID)) { ++ error("Wrong reply signature: %s", err.message); ++ cb(agent, &err, req->user_data); ++ dbus_error_free(&err); ++ goto done; ++ } ++ ++ cb(agent, NULL, req->user_data); ++done: ++ dbus_message_unref(message); ++ ++ agent_request_free(req, TRUE); ++} ++ ++static int display_pincode_request_new(struct agent_request *req, ++ const char *device_path, ++ const char *pincode) ++{ ++ struct agent *agent = req->agent; ++ ++ req->msg = dbus_message_new_method_call(agent->name, agent->path, ++ "org.bluez.Agent", "DisplayPinCode"); ++ if (req->msg == NULL) { ++ error("Couldn't allocate D-Bus message"); ++ return -ENOMEM; ++ } ++ ++ dbus_message_append_args(req->msg, ++ DBUS_TYPE_OBJECT_PATH, &device_path, ++ DBUS_TYPE_STRING, &pincode, ++ DBUS_TYPE_INVALID); ++ ++ if (dbus_connection_send_with_reply(connection, req->msg, ++ &req->call, REQUEST_TIMEOUT) == FALSE) { ++ error("D-Bus send failed"); ++ return -EIO; ++ } ++ ++ dbus_pending_call_set_notify(req->call, display_pincode_reply, ++ req, NULL); ++ ++ return 0; ++} ++ ++int agent_display_pincode(struct agent *agent, struct btd_device *device, ++ const char *pincode, agent_cb cb, ++ void *user_data, GDestroyNotify destroy) ++{ ++ struct agent_request *req; ++ const gchar *dev_path = device_get_path(device); ++ int err; ++ ++ if (agent->request) ++ return -EBUSY; ++ ++ DBG("Calling Agent.DisplayPinCode: name=%s, path=%s, pincode=%s", ++ agent->name, agent->path, pincode); ++ ++ req = agent_request_new(agent, AGENT_REQUEST_DISPLAY_PINCODE, cb, ++ user_data, destroy); ++ ++ err = display_pincode_request_new(req, dev_path, pincode); ++ if (err < 0) ++ goto failed; ++ ++ agent->request = req; ++ ++ return 0; ++ ++failed: ++ agent_request_free(req, FALSE); ++ return err; ++} ++ + uint8_t agent_get_io_capability(struct agent *agent) + { + return agent->capability; +diff --git a/src/agent.h b/src/agent.h +index f62bf3b..69ad42b 100644 +--- a/src/agent.h ++++ b/src/agent.h +@@ -64,6 +64,10 @@ int agent_request_confirmation(struct agent *agent, struct btd_device *device, + int agent_display_passkey(struct agent *agent, struct btd_device *device, + uint32_t passkey); + ++int agent_display_pincode(struct agent *agent, struct btd_device *device, ++ const char *pincode, agent_cb cb, ++ void *user_data, GDestroyNotify destroy); ++ + int agent_cancel(struct agent *agent); + + gboolean agent_is_busy(struct agent *agent, void *user_data); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch new file mode 100644 index 0000000000..d489da96f8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch @@ -0,0 +1,151 @@ +From 16583671c03b871003430e433ddf197833ea0086 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 15:16:40 -0800 +Subject: [PATCH 04/13] Add AUTH_TYPE_NOTIFY_PASSKEY to + device_request_authentication + +This new authentication type accepts a pincode and calls the +DisplayPinCode agent method, a fallback is provided so that if the +method is not implemented the older RequestPinCode method is used +instead. + +Due to this fallback, the agent_pincode_cb is used and calling +functions should send the pincode passed to the callback to the +adapter, which may differ from that generated. +--- + src/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + src/device.h | 1 + + 2 files changed, 58 insertions(+), 2 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 8a2ae9d..f32666e 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -93,6 +93,7 @@ struct authentication_req { + struct agent *agent; + struct btd_device *device; + uint32_t passkey; ++ char *pincode; + gboolean secure; + }; + +@@ -277,6 +278,8 @@ static void device_free(gpointer user_data) + + DBG("%p", device); + ++ if (device->authr) ++ g_free(device->authr->pincode); + g_free(device->authr); + g_free(device->path); + g_free(device->alias); +@@ -2453,12 +2456,15 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) + { + struct authentication_req *auth = device->authr; + +- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) ++ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY ++ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) + agent_cancel(auth->agent); + } + + static void device_auth_req_free(struct btd_device *device) + { ++ if (device->authr) ++ g_free(device->authr->pincode); + g_free(device->authr); + device->authr = NULL; + } +@@ -2470,7 +2476,8 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) + + DBG("bonding %p status 0x%02x", bonding, status); + +- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) ++ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY ++ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) + agent_cancel(auth->agent); + + if (status) { +@@ -2680,6 +2687,46 @@ done: + device->authr->agent = NULL; + } + ++static void display_pincode_cb(struct agent *agent, DBusError *err, void *data) ++{ ++ struct authentication_req *auth = data; ++ struct btd_device *device = auth->device; ++ struct btd_adapter *adapter = device_get_adapter(device); ++ struct agent *adapter_agent = adapter_get_agent(adapter); ++ ++ if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) || ++ g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) { ++ ++ /* Request a pincode if we fail to display one */ ++ if (auth->agent == adapter_agent || adapter_agent == NULL) { ++ if (agent_request_pincode(agent, device, pincode_cb, ++ auth->secure, auth, NULL) < 0) ++ goto done; ++ return; ++ } ++ ++ if (agent_display_pincode(adapter_agent, device, auth->pincode, ++ display_pincode_cb, auth, NULL) < 0) ++ goto done; ++ ++ auth->agent = adapter_agent; ++ return; ++ } ++ ++done: ++ /* No need to reply anything if the authentication already failed */ ++ if (auth->cb == NULL) ++ return; ++ ++ ((agent_pincode_cb) auth->cb)(agent, err, auth->pincode, device); ++ ++ g_free(device->authr->pincode); ++ device->authr->pincode = NULL; ++ device->authr->cb = NULL; ++ device->authr->agent = NULL; ++} ++ ++ + int device_request_authentication(struct btd_device *device, auth_type_t type, + void *data, gboolean secure, void *cb) + { +@@ -2728,6 +2775,11 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, + auth->passkey = *(uint32_t *)data; + err = agent_display_passkey(agent, device, auth->passkey); + break; ++ case AUTH_TYPE_NOTIFY_PINCODE: ++ auth->pincode = g_strdup((const char *)data); ++ err = agent_display_pincode(agent, device, auth->pincode, ++ display_pincode_cb, auth, NULL); ++ break; + default: + err = -EINVAL; + } +@@ -2768,6 +2820,9 @@ static void cancel_authentication(struct authentication_req *auth) + case AUTH_TYPE_NOTIFY_PASSKEY: + /* User Notify doesn't require any reply */ + break; ++ case AUTH_TYPE_NOTIFY_PINCODE: ++ ((agent_pincode_cb) auth->cb)(agent, &err, NULL, device); ++ break; + } + + dbus_error_free(&err); +diff --git a/src/device.h b/src/device.h +index 998aee7..561865c 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -31,6 +31,7 @@ typedef enum { + AUTH_TYPE_PASSKEY, + AUTH_TYPE_CONFIRM, + AUTH_TYPE_NOTIFY_PASSKEY, ++ AUTH_TYPE_NOTIFY_PINCODE, + } auth_type_t; + + struct btd_device *device_create(DBusConnection *conn, +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch new file mode 100644 index 0000000000..d0fbd29e2b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch @@ -0,0 +1,92 @@ +From 1630cbe326460a89d5c342847b658a499484ced0 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Thu, 29 Mar 2012 14:04:14 -0700 +Subject: [PATCH 05/13] Add display parameter to plugin pincode callback + +Pass a display parameter to the plugin pincode callback, a plugin +may set this to TRUE to indicate the PIN it generates should be +displayed on the screen for entry into the remote device. +--- + plugins/wiimote.c | 2 +- + src/adapter.c | 4 ++-- + src/adapter.h | 4 ++-- + src/event.c | 3 ++- + 4 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/plugins/wiimote.c b/plugins/wiimote.c +index 1ae638b..43b6de3 100644 +--- a/plugins/wiimote.c ++++ b/plugins/wiimote.c +@@ -56,7 +56,7 @@ + */ + + static ssize_t wii_pincb(struct btd_adapter *adapter, struct btd_device *device, +- char *pinbuf) ++ char *pinbuf, gboolean *display) + { + uint16_t vendor, product; + bdaddr_t sba, dba; +diff --git a/src/adapter.c b/src/adapter.c +index acb845e..ccf7991 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -3330,7 +3330,7 @@ void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, + } + + ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, +- char *pin_buf) ++ char *pin_buf, gboolean *display) + { + GSList *l; + btd_adapter_pin_cb_t cb; +@@ -3339,7 +3339,7 @@ ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, + + for (l = adapter->pin_callbacks; l != NULL; l = g_slist_next(l)) { + cb = l->data; +- ret = cb(adapter, dev, pin_buf); ++ ret = cb(adapter, dev, pin_buf, display); + if (ret > 0) + return ret; + } +diff --git a/src/adapter.h b/src/adapter.h +index ceebb97..aa66070 100644 +--- a/src/adapter.h ++++ b/src/adapter.h +@@ -172,13 +172,13 @@ int btd_adapter_switch_offline(struct btd_adapter *adapter); + void btd_adapter_enable_auto_connect(struct btd_adapter *adapter); + + typedef ssize_t (*btd_adapter_pin_cb_t) (struct btd_adapter *adapter, +- struct btd_device *dev, char *out); ++ struct btd_device *dev, char *out, gboolean *display); + void btd_adapter_register_pin_cb(struct btd_adapter *adapter, + btd_adapter_pin_cb_t cb); + void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, + btd_adapter_pin_cb_t cb); + ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, +- char *pin_buf); ++ char *pin_buf, gboolean *display); + + typedef void (*bt_hci_result_t) (uint8_t status, gpointer user_data); + +diff --git a/src/event.c b/src/event.c +index 7d66b6d..d87b6a4 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -119,12 +119,13 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) + struct btd_device *device; + char pin[17]; + ssize_t pinlen; ++ gboolean display = FALSE; + + if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) + return -ENODEV; + + memset(pin, 0, sizeof(pin)); +- pinlen = btd_adapter_get_pin(adapter, device, pin); ++ pinlen = btd_adapter_get_pin(adapter, device, pin, &display); + if (pinlen > 0 && (!secure || pinlen == 16)) { + btd_adapter_pincode_reply(adapter, dba, pin, pinlen); + return 0; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch new file mode 100644 index 0000000000..ce3736021e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch @@ -0,0 +1,31 @@ +From 2a902f071ec21572094ce9cdf54099ad275e7904 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Thu, 29 Mar 2012 14:07:13 -0700 +Subject: [PATCH 06/13] Display PIN generated by plugin + +If a plugin pincode callback sets the display parameter to TRUE, send +the generated PIN to the agent for display using the new DisplayPinCode +agent method, including its fallback to RequestPinCode. +--- + src/event.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/event.c b/src/event.c +index d87b6a4..5b60fb3 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -127,6 +127,11 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) + memset(pin, 0, sizeof(pin)); + pinlen = btd_adapter_get_pin(adapter, device, pin, &display); + if (pinlen > 0 && (!secure || pinlen == 16)) { ++ if (display && device_is_bonding(device, NULL)) ++ return device_request_authentication(device, ++ AUTH_TYPE_NOTIFY_PINCODE, pin, ++ secure, pincode_cb); ++ + btd_adapter_pincode_reply(adapter, dba, pin, pinlen); + return 0; + } +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0007-doc-document-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0007-doc-document-DisplayPinCode.patch new file mode 100644 index 0000000000..685f1c205f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0007-doc-document-DisplayPinCode.patch @@ -0,0 +1,47 @@ +From 8a9347822f86059d015ae3893387aa971fa41ab7 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 15:25:39 -0800 +Subject: [PATCH 07/13] doc: document DisplayPinCode + +--- + doc/agent-api.txt | 24 ++++++++++++++++++++++++ + 1 files changed, 24 insertions(+), 0 deletions(-) + +diff --git a/doc/agent-api.txt b/doc/agent-api.txt +index 9ab2063..5c8d4d2 100644 +--- a/doc/agent-api.txt ++++ b/doc/agent-api.txt +@@ -61,6 +61,30 @@ Methods void Release() + so the display should be zero-padded at the start if + the value contains less than 6 digits. + ++ void DisplayPinCode(object device, string pincode) ++ ++ This method gets called when the service daemon ++ needs to display a pincode for an authentication. ++ ++ An empty reply should be returned. When the pincode ++ needs no longer to be displayed, the Cancel method ++ of the agent will be called. ++ ++ If this method is not implemented the RequestPinCode ++ method will be used instead. ++ ++ This is used during the pairing process of keyboards ++ that don't support Bluetooth 2.1 Secure Simple Pairing, ++ in contrast to DisplayPasskey which is used for those ++ that do. ++ ++ This method will only ever be called once since ++ older keyboards do not support typing notification. ++ ++ Note that the PIN will always be a 6-digit number, ++ zero-padded to 6 digits. This is for harmony with ++ the later specification. ++ + void RequestConfirmation(object device, uint32 passkey) + + This method gets called when the service daemon +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch new file mode 100644 index 0000000000..e7cd7f8b97 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch @@ -0,0 +1,28 @@ +From 4f2f55231bad4d5da2505cb674375e9bf8ac029d Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Mon, 23 Jan 2012 15:25:56 -0800 +Subject: [PATCH 08/13] simple-agent: add DisplayPinCode + +--- + test/simple-agent | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/test/simple-agent b/test/simple-agent +index af84815..38d0235 100755 +--- a/test/simple-agent ++++ b/test/simple-agent +@@ -52,6 +52,11 @@ class Agent(dbus.service.Object): + print "DisplayPasskey (%s, %06d)" % (device, passkey) + + @dbus.service.method("org.bluez.Agent", ++ in_signature="os", out_signature="") ++ def DisplayPinCode(self, device, pincode): ++ print "DisplayPinCode (%s, %s)" % (device, pincode) ++ ++ @dbus.service.method("org.bluez.Agent", + in_signature="ou", out_signature="") + def RequestConfirmation(self, device, passkey): + print "RequestConfirmation (%s, %06d)" % (device, passkey) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch new file mode 100644 index 0000000000..26b2aa7143 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch @@ -0,0 +1,90 @@ +From 0cd8c8427019cfd7e1c69fb6a5b4261863716d56 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:34:01 -0800 +Subject: [PATCH 09/13] Add support for retrying a bonding + +In order to retry a bonding we need a timer that will perform the +retry, we need to stash the status and capability of the bonding +request so it can use them again, and in the case of a retrying +bonding attempt we need to not tear down the temporary D-Bus device +object on the adapter. +--- + src/adapter.c | 2 +- + src/device.c | 14 ++++++++++++++ + src/device.h | 1 + + 3 files changed, 16 insertions(+), 1 deletions(-) + +diff --git a/src/adapter.c b/src/adapter.c +index ccf7991..f065a5d 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -2989,7 +2989,7 @@ void adapter_remove_connection(struct btd_adapter *adapter, + if (device_is_authenticating(device)) + device_cancel_authentication(device, TRUE); + +- if (device_is_temporary(device)) { ++ if (device_is_temporary(device) && !device_is_retrying(device)) { + const char *path = device_get_path(device); + + DBG("Removing temporary device %s", path); +diff --git a/src/device.c b/src/device.c +index f32666e..9d4517f 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -85,6 +85,9 @@ struct bonding_req { + DBusMessage *msg; + guint listener_id; + struct btd_device *device; ++ uint8_t capability; ++ uint8_t status; ++ guint retry_timer; + }; + + struct authentication_req { +@@ -2295,6 +2298,9 @@ static void bonding_request_free(struct bonding_req *bonding) + if (bonding->conn) + dbus_connection_unref(bonding->conn); + ++ if (bonding->retry_timer) ++ g_source_remove(bonding->retry_timer); ++ + device = bonding->device; + g_free(bonding); + +@@ -2367,6 +2373,7 @@ proceed: + + bonding->conn = dbus_connection_ref(conn); + bonding->msg = dbus_message_ref(msg); ++ bonding->capability = capability; + + return bonding; + } +@@ -2469,6 +2476,13 @@ static void device_auth_req_free(struct btd_device *device) + device->authr = NULL; + } + ++gboolean device_is_retrying(struct btd_device *device) ++{ ++ struct bonding_req *bonding = device->bonding; ++ ++ return bonding && bonding->retry_timer != 0; ++} ++ + void device_bonding_complete(struct btd_device *device, uint8_t status) + { + struct bonding_req *bonding = device->bonding; +diff --git a/src/device.h b/src/device.h +index 561865c..b957ad6 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -75,6 +75,7 @@ void device_set_temporary(struct btd_device *device, gboolean temporary); + void device_set_bonded(struct btd_device *device, gboolean bonded); + void device_set_auto_connect(struct btd_device *device, gboolean enable); + gboolean device_is_connected(struct btd_device *device); ++gboolean device_is_retrying(struct btd_device *device); + DBusMessage *device_create_bonding(struct btd_device *device, + DBusConnection *conn, DBusMessage *msg, + const char *agent_path, uint8_t capability); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch new file mode 100644 index 0000000000..6b76a4b84f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch @@ -0,0 +1,81 @@ +From 83c36231418f9deff7ba16ceb0ead5d63e177a04 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:30:53 -0800 +Subject: [PATCH 10/13] plugin: Add bonding callback support for plugins + +Allow plugins to register a bonding callback on a device, this will be +called on completion or cancellation of a bonding attempt on that +device and allow retrying of the bonding attempt. + +These callbacks will only be called once, in the case of retrying the +callback must be registered again separately from another callback +(e.g. the pincode callback). +--- + src/device.c | 17 +++++++++++++++++ + src/device.h | 8 ++++++++ + 2 files changed, 25 insertions(+), 0 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 9d4517f..9a62eef 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -144,6 +144,7 @@ struct btd_device { + GSList *primaries; /* List of primary services */ + GSList *drivers; /* List of device drivers */ + GSList *watches; /* List of disconnect_data */ ++ GSList *bonding_callbacks; /* List of bonding callbacks */ + gboolean temporary; + struct agent *agent; + guint disconn_timer; +@@ -264,6 +265,8 @@ static void device_free(gpointer user_data) + g_slist_free_full(device->attios, g_free); + g_slist_free_full(device->attios_offline, g_free); + ++ g_slist_free(device->bonding_callbacks); ++ + att_cleanup(device); + + if (device->tmp_records) +@@ -2476,6 +2479,20 @@ static void device_auth_req_free(struct btd_device *device) + device->authr = NULL; + } + ++void btd_device_register_bonding_cb(struct btd_device *device, ++ btd_device_bonding_cb_t cb) ++{ ++ device->bonding_callbacks = g_slist_prepend( ++ device->bonding_callbacks, cb); ++} ++ ++void btd_device_unregister_bonding_cb(struct btd_device *device, ++ btd_device_bonding_cb_t cb) ++{ ++ device->bonding_callbacks = g_slist_remove( ++ device->bonding_callbacks, cb); ++} ++ + gboolean device_is_retrying(struct btd_device *device) + { + struct bonding_req *bonding = device->bonding; +diff --git a/src/device.h b/src/device.h +index b957ad6..ce8675b 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -103,6 +103,14 @@ guint device_add_disconnect_watch(struct btd_device *device, + void device_remove_disconnect_watch(struct btd_device *device, guint id); + void device_set_class(struct btd_device *device, uint32_t value); + ++typedef gboolean (*btd_device_bonding_cb_t) (struct btd_device *device, ++ gboolean complete, uint8_t status); ++ ++void btd_device_register_bonding_cb(struct btd_device *dev, ++ btd_device_bonding_cb_t cb); ++void btd_device_unregister_bonding_cb(struct btd_device *dev, ++ btd_device_bonding_cb_t cb); ++ + #define BTD_UUIDS(args...) ((const char *[]) { args, NULL } ) + + struct btd_device_driver { +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch new file mode 100644 index 0000000000..913365ef0d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch @@ -0,0 +1,79 @@ +From f3d2851b74fe790896f819efbc694e288d54d819 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:35:30 -0800 +Subject: [PATCH 11/13] bonding: retry if callback returns TRUE + +When a bonding completes, pass the status to any plugin bonding +callbacks; if any return TRUE than set a timer to retry the bonding +after an appropriate backoff period. +--- + src/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 46 insertions(+), 0 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 9a62eef..4ad5aa0 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2493,6 +2493,44 @@ void btd_device_unregister_bonding_cb(struct btd_device *device, + device->bonding_callbacks, cb); + } + ++static gboolean device_bonding_retry(gpointer data) ++{ ++ struct btd_device *device = data; ++ struct btd_adapter *adapter = device_get_adapter(device); ++ struct bonding_req *bonding = device->bonding; ++ int err; ++ ++ if (!bonding) ++ return FALSE; ++ ++ DBG("retrying bonding"); ++ err = adapter_create_bonding(adapter, &device->bdaddr, ++ device->type, bonding->capability); ++ if (err < 0) ++ device_bonding_complete(device, bonding->status); ++ ++ bonding->retry_timer = 0; ++ return FALSE; ++} ++ ++static gboolean device_bonding_get_retry(struct btd_device *device, ++ uint8_t status) ++{ ++ GSList *l; ++ btd_device_bonding_cb_t cb; ++ gboolean retry = FALSE; ++ ++ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { ++ cb = l->data; ++ retry |= cb(device, TRUE, status); ++ } ++ ++ g_slist_free(device->bonding_callbacks); ++ device->bonding_callbacks = NULL; ++ ++ return retry; ++} ++ + gboolean device_is_retrying(struct btd_device *device) + { + struct bonding_req *bonding = device->bonding; +@@ -2507,6 +2545,14 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) + + DBG("bonding %p status 0x%02x", bonding, status); + ++ if (device_bonding_get_retry(device, status) && status) { ++ DBG("backing off and retrying"); ++ bonding->status = status; ++ bonding->retry_timer = g_timeout_add(3000, ++ device_bonding_retry, device); ++ return; ++ } ++ + if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY + || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) + agent_cancel(auth->agent); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch new file mode 100644 index 0000000000..a766a09795 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch @@ -0,0 +1,41 @@ +From 82ef8f4b96d62e18b5a191f6aaa9d79140ca64a4 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 24 Jan 2012 10:36:44 -0800 +Subject: [PATCH 12/13] bonding: call plugin callback on cancellation + +Call the plugin callbacks when a bonding request is cancelled. +--- + src/device.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 4ad5aa0..ea0d1fb 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2648,6 +2648,8 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) + struct bonding_req *bonding = device->bonding; + DBusMessage *reply; + char addr[18]; ++ GSList *l; ++ btd_device_bonding_cb_t cb; + + if (!bonding) + return; +@@ -2655,6 +2657,14 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) + ba2str(&device->bdaddr, addr); + DBG("Canceling bonding request for %s", addr); + ++ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { ++ cb = l->data; ++ cb(device, FALSE, 0); ++ } ++ ++ g_slist_free(device->bonding_callbacks); ++ device->bonding_callbacks = NULL; ++ + if (device->authr) + device_cancel_authentication(device, FALSE); + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0013-autopair-Add-autopair-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0013-autopair-Add-autopair-plugin.patch new file mode 100644 index 0000000000..81a5f3f8cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0013-autopair-Add-autopair-plugin.patch @@ -0,0 +1,274 @@ +From 2236069d7d5bf54ae53470c13929cba90e020710 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Thu, 5 Apr 2012 15:42:12 -0700 +Subject: [PATCH 13/13] autopair: Add autopair plugin. + +--- + Makefile.am | 5 + + acinclude.m4 | 6 ++ + plugins/autopair.c | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 218 insertions(+), 0 deletions(-) + create mode 100644 plugins/autopair.c + +diff --git a/Makefile.am b/Makefile.am +index bd587eb..0e9129c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -278,6 +278,11 @@ builtin_modules += dbusoob + builtin_sources += plugins/dbusoob.c + endif + ++if AUTOPAIRPLUGIN ++builtin_modules += autopair ++builtin_sources += plugins/autopair.c ++endif ++ + if MAINTAINER_MODE + plugin_LTLIBRARIES += plugins/external-dummy.la + plugins_external_dummy_la_SOURCES = plugins/external-dummy.c +diff --git a/acinclude.m4 b/acinclude.m4 +index b0f790c..4c1849a 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -220,6 +220,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + dbusoob_enable=no + wiimote_enable=no + thermometer_enable=no ++ autopair_enable=no + + AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [ + optimization_enable=${enableval} +@@ -364,6 +365,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + wiimote_enable=${enableval} + ]) + ++ AC_ARG_ENABLE(autopair, AC_HELP_STRING([--enable-autopair], [compile with autopairing plugin]), [ ++ autopair_enable=${enableval} ++ ]) ++ + AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [Use HAL to determine adapter class]), [ + hal_enable=${enableval} + ]) +@@ -429,4 +434,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes") + AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes") + AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes") ++ AM_CONDITIONAL(AUTOPAIRPLUGIN, test "${autopair_enable}" = "yes") + ]) +diff --git a/plugins/autopair.c b/plugins/autopair.c +new file mode 100644 +index 0000000..58047b1 +--- /dev/null ++++ b/plugins/autopair.c +@@ -0,0 +1,208 @@ ++/* ++ * ++ * BlueZ - Bluetooth protocol stack for Linux ++ * ++ * Copyright (C) 2012 Google Inc. ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++ ++#include "glib-compat.h" ++#include "plugin.h" ++#include "adapter.h" ++#include "device.h" ++#include "storage.h" ++#include "textfile.h" ++#include "log.h" ++ ++/* ++ * Plugin to handle automatic pairing of devices with reduced user ++ * interaction, including implementing the recommendation of the HID spec ++ * for keyboard devices. ++ * ++ * The plugin works by intercepting the PIN request for devices; if the ++ * device is a keyboard a random six-digit numeric PIN is generated and ++ * returned, flagged for displaying using DisplayPinCode. ++ * ++ * Bonding callbacks are also added for the device, so should the pairing ++ * attempt fail with the PIN from this plugin, a blacklist entry is added ++ * and pairing retried. On the second pass this plugin will ignore the ++ * device due to the blacklist and the user will be prompted for a PIN ++ * instead. ++ */ ++ ++static GSList *blacklist = NULL; ++ ++static void autopair_blacklist_device(struct btd_device *device) ++{ ++ bdaddr_t *ba; ++ ++ ba = g_new0(bdaddr_t, 1); ++ device_get_address(device, ba, NULL); ++ blacklist = g_slist_prepend(blacklist, ba); ++} ++ ++ ++static GSList *attempting = NULL; ++ ++static gboolean autopair_bondingcb(struct btd_device *device, ++ gboolean complete, uint8_t status) ++{ ++ GSList *match; ++ ++ match = g_slist_find(attempting, device); ++ if (!match) ++ return FALSE; ++ ++ attempting = g_slist_remove_link(attempting, match); ++ btd_device_unref(device); ++ ++ if (complete && status != 0) { ++ /* failed: blacklist and retry with the user's agent */ ++ autopair_blacklist_device(device); ++ return TRUE; ++ } else { ++ /* successful or cancelled pair */ ++ return FALSE; ++ } ++} ++ ++static gboolean autopair_attempt(struct btd_device *device) ++{ ++ if (g_slist_find(attempting, device)) ++ return FALSE; ++ ++ btd_device_register_bonding_cb(device, autopair_bondingcb); ++ attempting = g_slist_prepend(attempting, btd_device_ref(device)); ++ ++ return TRUE; ++} ++ ++static void autopair_cancel_all(void) ++{ ++ GSList *l; ++ struct btd_device *device; ++ ++ for (l = attempting; l != NULL; l = g_slist_next(l)) { ++ device = l->data; ++ btd_device_unregister_bonding_cb(device, autopair_bondingcb); ++ btd_device_unref(device); ++ } ++ ++ g_slist_free(attempting); ++ attempting = NULL; ++} ++ ++static ssize_t autopair_pincb(struct btd_adapter *adapter, ++ struct btd_device *device, ++ char *pinbuf, gboolean *display) ++{ ++ char addr[18]; ++ bdaddr_t local, peer; ++ uint32_t class; ++ ++ if (!device_is_bonding(device, NULL)) ++ return 0; ++ ++ adapter_get_address(adapter, &local); ++ ++ device_get_address(device, &peer, NULL); ++ ba2str(&peer, addr); ++ ++ read_remote_class(&local, &peer, &class); ++ ++ DBG("device %s 0x%x", addr, class); ++ ++ if (g_slist_find_custom(blacklist, &peer, (GCompareFunc) bacmp)) { ++ DBG("prior autopair failed"); ++ return 0; ++ } ++ ++ switch ((class & 0x1f00) >> 8) { ++ case 0x05: ++ switch ((class & 0xc0) >> 6) { ++ case 0x01: ++ case 0x03: ++ if (autopair_attempt(device)) { ++ char pinstr[7]; ++ srand(time(NULL)); ++ snprintf(pinstr, sizeof pinstr, "%06d", ++ rand() % 1000000); ++ *display = TRUE; ++ memcpy(pinbuf, pinstr, 6); ++ return 6; ++ } ++ break; ++ } ++ break; ++ } ++ ++ return 0; ++} ++ ++ ++static int autopair_probe(struct btd_adapter *adapter) ++{ ++ btd_adapter_register_pin_cb(adapter, autopair_pincb); ++ ++ return 0; ++} ++ ++static void autopair_remove(struct btd_adapter *adapter) ++{ ++ btd_adapter_unregister_pin_cb(adapter, autopair_pincb); ++} ++ ++static struct btd_adapter_driver autopair_driver = { ++ .name = "autopair", ++ .probe = autopair_probe, ++ .remove = autopair_remove, ++}; ++ ++static int autopair_init(void) ++{ ++ return btd_register_adapter_driver(&autopair_driver); ++} ++ ++static void autopair_exit(void) ++{ ++ btd_unregister_adapter_driver(&autopair_driver); ++ ++ autopair_cancel_all(); ++ ++ g_slist_free_full(blacklist, g_free); ++} ++ ++BLUETOOTH_PLUGIN_DEFINE(autopair, VERSION, ++ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, autopair_init, autopair_exit) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_has_data_type-parsing.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_has_data_type-parsing.patch new file mode 100644 index 0000000000..55eafa89da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_has_data_type-parsing.patch @@ -0,0 +1,30 @@ +From c86e19ef02a7faf845b399a50f4aa0b23b003fcf Mon Sep 17 00:00:00 2001 +From: Syam Sidhardhan +Date: Mon, 16 Apr 2012 18:31:38 +0530 +Subject: [PATCH 1/2] eir: Fix incorrect eir_has_data_type() parsing + +Updating the "parsed" variable twice inside the for loop, leads to +incorrect parsing. +--- + src/eir.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/eir.c b/src/eir.c +index 419f444..4dfadea 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -337,9 +337,9 @@ void eir_create(const char *name, int8_t tx_power, uint16_t did_vendor, + gboolean eir_has_data_type(uint8_t *data, size_t len, uint8_t type) + { + uint8_t field_len; +- size_t parsed; ++ size_t parsed = 0; + +- for (parsed = 0; parsed < len - 1; parsed += field_len) { ++ while (parsed < len - 1) { + field_len = data[0]; + + if (field_len == 0) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_length-parsing.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_length-parsing.patch new file mode 100644 index 0000000000..a6b6aa041d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_length-parsing.patch @@ -0,0 +1,42 @@ +From 8dbaea685b5a0e155c1433d054ead4ce332c3570 Mon Sep 17 00:00:00 2001 +From: Syam Sidhardhan +Date: Mon, 16 Apr 2012 18:31:37 +0530 +Subject: [PATCH 2/2] eir: Fix incorrect eir_length() parsing + +Issue: +The COD value displayed via dbus during inquiry is wrong. +This is because of the incorrect return length of the eir_length(), +which leads to appending the COD at wrong location. + +Analysis: +After appending the COD at the end of the eir data, we can see +there are some '00' present in the eir field length in the eir file. +XX:XX:XX:XX:XX:XX 07095359414D5043020A040B0312111F110C110E110311 +0000000000000000000000040D000142 + +Fix: +Corrected the length calculation in eir_length(), which is determining, +which position the COD should append +--- + src/eir.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/eir.c b/src/eir.c +index 4dfadea..923d7be 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -373,9 +373,9 @@ size_t eir_append_data(uint8_t *eir, size_t eir_len, uint8_t type, + size_t eir_length(uint8_t *eir, size_t maxlen) + { + uint8_t field_len; +- size_t parsed, length; ++ size_t parsed = 0, length = 0; + +- for (parsed = 0, length = 0; parsed < maxlen - 1; parsed += field_len) { ++ while (parsed < maxlen - 1) { + field_len = eir[0]; + + if (field_len == 0) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0001.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0001.patch new file mode 100644 index 0000000000..6dabe63d07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0001.patch @@ -0,0 +1,72 @@ +From: Antonio Ospite +Subject: [PATCH BlueZ v2 1/3] manager: add a btd_manager_get_default_adapter_address_str() call +Date: Wed, 18 Apr 2012 11:38:09 +0200 + +Add a new btd_* call to get the default adapter address as a string, +meant to be used by _external_ plugins, this is to avoid to make public +these symbols: + + manager_get_default_adapter + adapter_get_address + bt_malloc + ba2str +--- + +Alternatively a version without the _str prefix can be used which +returns a bdaddr_t, but I have to make ba2str a global symbol so I can +make the conversion to string in the plugin itself. + +Let me know how do you like that. + + + src/manager.c | 21 +++++++++++++++++++++ + src/manager.h | 1 + + 2 files changed, 22 insertions(+) + +diff --git a/src/manager.c b/src/manager.c +index 6244516..fbd5ef8 100644 +--- a/src/manager.c ++++ b/src/manager.c +@@ -270,6 +270,27 @@ struct btd_adapter *manager_get_default_adapter(void) + return manager_find_adapter_by_id(default_adapter_id); + } + ++char *btd_manager_get_default_adapter_address_str(void) ++{ ++ struct btd_adapter *adapter; ++ bdaddr_t adapter_bdaddr; ++ char *str; ++ ++ adapter = manager_get_default_adapter(); ++ if (adapter == NULL) { ++ return NULL; ++ } ++ ++ adapter_get_address(adapter, &adapter_bdaddr); ++ ++ str = bt_malloc(18); ++ if (str == NULL) ++ return NULL; ++ ++ ba2str(&adapter_bdaddr, str); ++ return str; ++} ++ + static void manager_remove_adapter(struct btd_adapter *adapter) + { + uint16_t dev_id = adapter_get_dev_id(adapter); +diff --git a/src/manager.h b/src/manager.h +index 264cd25..7df882e 100644 +--- a/src/manager.h ++++ b/src/manager.h +@@ -36,6 +36,7 @@ const char *manager_get_base_path(void); + struct btd_adapter *manager_find_adapter(const bdaddr_t *sba); + struct btd_adapter *manager_find_adapter_by_id(int id); + struct btd_adapter *manager_get_default_adapter(void); ++char *btd_manager_get_default_adapter_address_str(void); + void manager_foreach_adapter(adapter_cb func, gpointer user_data); + GSList *manager_get_adapters(void); + struct btd_adapter *btd_manager_register_adapter(int id, gboolean up); +-- +1.7.10 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0002.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0002.patch new file mode 100644 index 0000000000..5132f2490c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0002.patch @@ -0,0 +1,144 @@ +From: Antonio Ospite +Subject: [PATCH BlueZ v2 2/3] device: add a btd_device_set_trusted() call +Date: Wed, 18 Apr 2012 11:38:10 +0200 + +Add a new btd_* call to set a device as trusted, meant to be used by +_external_ plugins, this avoid making public these symbols: + + record_from_string + store_record + sdp_record_free + str2ba + str2ba + store_device_id + write_trust + dbus_bus_get + manager_find_adapter + adapter_get_device + dbus_connection_unref +--- + +If BlueZ can pull the required parameters itself from trusted devices this can +be simplified, if not then the name should be fixed to make clearer what the +function does. + + src/device.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/device.h | 9 +++++++ + 2 files changed, 83 insertions(+) + +diff --git a/src/device.c b/src/device.c +index ea6fec2..6e434c1 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -49,6 +49,7 @@ + #include "att.h" + #include "hcid.h" + #include "adapter.h" ++#include "manager.h" + #include "gattrib.h" + #include "attio.h" + #include "device.h" +@@ -2948,6 +2949,80 @@ GSList *btd_device_get_primaries(struct btd_device *device) + return device->primaries; + } + ++int btd_device_set_trusted(const char *adapter_address, ++ const char *device_address, ++ char *name, ++ uint16_t vendor_id_source, ++ uint16_t vendor_id, ++ uint16_t product_id, ++ uint16_t version_id, ++ const char *uuid, ++ const char *sdp_record) ++{ ++ struct btd_adapter *adapter; ++ struct btd_device *device; ++ DBusConnection *conn; ++ bdaddr_t src; ++ bdaddr_t dst; ++ sdp_record_t *record; ++ int ret = 0; ++ ++ record = record_from_string(sdp_record); ++ if (record == NULL) { ++ ret = -ENODEV; ++ goto out; ++ } ++ ret = store_record(adapter_address, device_address, record); ++ sdp_record_free(record); ++ if (ret < 0) ++ goto out; ++ ++ str2ba(adapter_address, &src); ++ str2ba(device_address, &dst); ++ ++ /* Set the device id */ ++ store_device_id(adapter_address, device_address, vendor_id_source, vendor_id, ++ product_id, version_id); ++ /* Don't write a profile here, ++ * it will be updated when the device connects */ ++ ++ write_trust(adapter_address, device_address, "[all]", TRUE); ++ ++ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); ++ if (conn == NULL) { ++ DBG("Failed to get on the bus"); ++ ret = -EPERM; ++ goto out; ++ } ++ ++ adapter = manager_find_adapter(&src); ++ if (adapter == NULL) { ++ DBG("Failed to get the adapter"); ++ ret = -EPERM; ++ goto out_dbus_unref; ++ } ++ ++ /* This is needed: adapter_find_device() wouldn't need a Dbus ++ * connection but it would not be enough as it only searches for ++ * already existing devices, while adapter_get_device() will create a ++ * new device if necessary. ++ */ ++ device = adapter_get_device(conn, adapter, device_address); ++ if (device == NULL) { ++ DBG("Failed to get the device"); ++ ret = -ENODEV; ++ goto out_dbus_unref; ++ } ++ ++ device_set_temporary(device, FALSE); ++ btd_device_add_uuid(device, uuid); ++ ++out_dbus_unref: ++ dbus_connection_unref(conn); ++out: ++ return ret; ++} ++ + void btd_device_add_uuid(struct btd_device *device, const char *uuid) + { + GSList *uuid_list; +diff --git a/src/device.h b/src/device.h +index 690c64d..1011e3e 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -57,6 +57,15 @@ void device_register_services(DBusConnection *conn, struct btd_device *device, + GSList *prim_list, int psm); + GSList *device_services_from_record(struct btd_device *device, + GSList *profiles); ++int btd_device_set_trusted(const char *adapter_address, ++ const char *device_address, ++ char *name, ++ uint16_t vendor_id_source, ++ uint16_t vendor_id, ++ uint16_t product_id, ++ uint16_t version_id, ++ const char *uuid, ++ const char *sdp_record); + void btd_device_add_uuid(struct btd_device *device, const char *uuid); + struct btd_adapter *device_get_adapter(struct btd_device *device); + void device_get_address(struct btd_device *device, bdaddr_t *bdaddr, +-- +1.7.10 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0003.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0003.patch new file mode 100644 index 0000000000..45d95c9653 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0003.patch @@ -0,0 +1,760 @@ +From: Antonio Ospite +Subject: [PATCH BlueZ v2 3/3] Add playstation-peripheral plugin: USB pairing and LEDs settings +Date: Wed, 18 Apr 2012 11:38:11 +0200 + +Add a plugin which handles the connection of a Playstation peripheral, +when a new hidraw device is connected the plugin: + + - Filters udev events, and select the Playstation peripheral + - Sets the Master bluetooth address in the peripheral (USB pairing) + - Sets LEDs to match the joystick system number if needed + (for USB and BT) + - Adds the device to the database of the current default + adapter (BT association) + +Signed-off-by: Bastien Nocera +Signed-off-by: Antonio Ospite +--- + +For the first review round plugins/playstation-peripheral.c is the most +interesting file, in particular the handle_device_plug() and +peripheral_pair() functions. + + Makefile.am | 7 + + acinclude.m4 | 10 + + plugins/playstation-peripheral-hid.c | 263 ++++++++++++++++++++++++ + plugins/playstation-peripheral-hid.h | 10 + + plugins/playstation-peripheral.c | 376 ++++++++++++++++++++++++++++++++++ + 5 files changed, 666 insertions(+) + create mode 100644 plugins/playstation-peripheral-hid.c + create mode 100644 plugins/playstation-peripheral-hid.h + create mode 100644 plugins/playstation-peripheral.c + +diff --git a/Makefile.am b/Makefile.am +index 62705f6..61c7a07 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -267,6 +267,13 @@ builtin_modules += dbusoob + builtin_sources += plugins/autopair.c + endif + ++if PLAYSTATION_PERIPHERAL_PLUGIN ++plugin_LTLIBRARIES += plugins/playstation-peripheral.la ++plugins_playstation_peripheral_la_SOURCES = plugins/playstation-peripheral.c plugins/playstation-peripheral-hid.c ++plugins_playstation_peripheral_la_LDFLAGS = -module -avoid-version -no-undefined @UDEV_LIBS@ ++plugins_playstation_peripheral_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ @GLIB_CFLAGS@ @UDEV_CFLAGS@ ++endif ++ + if MAINTAINER_MODE + plugin_LTLIBRARIES += plugins/external-dummy.la + plugins_external_dummy_la_SOURCES = plugins/external-dummy.c +diff --git a/acinclude.m4 b/acinclude.m4 +index dcf9a48..06efe2a 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -176,6 +176,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + sndfile_enable=${sndfile_found} + hal_enable=no + usb_enable=${usb_found} ++ playstation_peripheral_enable=${udev_found} + alsa_enable=${alsa_found} + gstreamer_enable=${gstreamer_found} + audio_enable=yes +@@ -265,6 +266,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + usb_enable=${enableval} + ]) + ++ AC_ARG_ENABLE(playstation_peripheral, AC_HELP_STRING([--enable-playstation-peripheral], [enable playstation-peripheral plugin]), [ ++ playstation_peripheral_enable=${enableval} ++ ]) ++ + AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [ + tools_enable=${enableval} + ]) +@@ -360,6 +365,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.]) + fi + ++ if (test "${playstation_peripheral_enable}" = "yes" && test "${udev_found}" = "yes"); then ++ AC_DEFINE(HAVE_PLAYSTATION_PERIPHERAL_PLUGIN, 1, [Define to 1 if you have playstation-peripheral plugin.]) ++ fi ++ + AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") + AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes") + AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" || +@@ -392,4 +401,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes") + AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes") + AM_CONDITIONAL(AUTOPAIRPLUGIN, test "${autopair_enable}" = "yes") ++ AM_CONDITIONAL(PLAYSTATION_PERIPHERAL_PLUGIN, test "${playstation_peripheral_enable}" = "yes" && test "${udev_found}" = "yes") + ]) +diff --git a/plugins/playstation-peripheral-hid.c b/plugins/playstation-peripheral-hid.c +new file mode 100644 +index 0000000..9c5e530 +--- /dev/null ++++ b/plugins/playstation-peripheral-hid.c +@@ -0,0 +1,263 @@ ++/* ++ * playstation peripheral plugin: lowlevel hid functions ++ * ++ * Copyright (C) 2011 Antonio Ospite ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "log.h" ++#include "playstation-peripheral-hid.h" ++ ++/* Fallback definitions to compile with older headers */ ++#ifndef HIDIOCGFEATURE ++#define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len) ++#endif ++ ++#ifndef HIDIOCSFEATURE ++#define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len) ++#endif ++ ++#define BDADDR_STR_SIZE 18 /* strlen("00:00:00:00:00:00") + 1 */ ++ ++#define LED_1 (0x01 << 1) ++#define LED_2 (0x01 << 2) ++#define LED_3 (0x01 << 3) ++#define LED_4 (0x01 << 4) ++ ++#define LED_STATUS_OFF 0 ++#define LED_STATUS_ON 1 ++ ++/* Usb cable pairing section */ ++static unsigned char *get_feature_report(int fd, uint8_t report_number, ++ unsigned int len) ++{ ++ unsigned char *buf; ++ int ret; ++ ++ buf = calloc(len, sizeof(*buf)); ++ if (buf == NULL) { ++ error("%s:%s() calloc failed", __FILE__, __func__); ++ return NULL; ++ } ++ ++ buf[0] = report_number; ++ ++ ret = ioctl(fd, HIDIOCGFEATURE(len), buf); ++ if (ret < 0) { ++ error("%s:%s() HIDIOCGFEATURE ret = %d", ++ __FILE__, __func__, ret); ++ free(buf); ++ return NULL; ++ } ++ ++ return buf; ++} ++ ++static int set_feature_report(int fd, uint8_t *report, int len) ++{ ++ int ret; ++ ++ ret = ioctl(fd, HIDIOCSFEATURE(len), report); ++ if (ret < 0) ++ error("%s:%s() HIDIOCSFEATURE failed, ret = %d", ++ __FILE__, __func__, ret); ++ ++ return ret; ++} ++ ++char *sixaxis_get_device_bdaddr(int fd) ++{ ++ unsigned char *buf; ++ char *address; ++ ++ buf = get_feature_report(fd, 0xf2, 18); ++ if (buf == NULL) { ++ error("%s:%s() cannot get feature report", __FILE__, __func__); ++ return NULL; ++ } ++ ++ address = calloc(BDADDR_STR_SIZE, sizeof(*address)); ++ if (address == NULL) { ++ error("%s:%s() calloc failed", __FILE__, __func__); ++ free(buf); ++ return NULL; ++ } ++ ++ snprintf(address, BDADDR_STR_SIZE, ++ "%02X:%02X:%02X:%02X:%02X:%02X", ++ buf[4], buf[5], buf[6], buf[7], buf[8], buf[9]); ++ ++ free(buf); ++ return address; ++} ++ ++char *sixaxis_get_master_bdaddr(int fd) ++{ ++ unsigned char *buf; ++ char *address; ++ ++ buf = get_feature_report(fd, 0xf5, 8); ++ if (buf == NULL) { ++ error("%s:%s() cannot get feature report", __FILE__, __func__); ++ return NULL; ++ } ++ ++ address = calloc(BDADDR_STR_SIZE, sizeof(*address)); ++ if (address == NULL) { ++ error("%s:%s() calloc failed", __FILE__, __func__); ++ free(buf); ++ return NULL; ++ } ++ ++ snprintf(address, BDADDR_STR_SIZE, ++ "%02X:%02X:%02X:%02X:%02X:%02X", ++ buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); ++ ++ free(buf); ++ return address; ++} ++ ++int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr) ++{ ++ uint8_t *report; ++ uint8_t addr[6]; ++ int ret; ++ ++ ret = sscanf(adapter_bdaddr, ++ "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", ++ &addr[0], &addr[1], &addr[2], ++ &addr[3], &addr[4], &addr[5]); ++ if (ret != 6) { ++ error("%s:%s() Parsing the bt address failed", ++ __FILE__, __func__); ++ return -EINVAL; ++ } ++ ++ report = malloc(8); ++ if (report == NULL) { ++ error("%s:%s() malloc failed", __FILE__, __func__); ++ return -ENOMEM; ++ } ++ ++ report[0] = 0xf5; ++ report[1] = 0x01; ++ ++ report[2] = addr[0]; ++ report[3] = addr[1]; ++ report[4] = addr[2]; ++ report[5] = addr[3]; ++ report[6] = addr[4]; ++ report[7] = addr[5]; ++ ++ ret = set_feature_report(fd, report, 8); ++ if (ret < 0) { ++ error("%s:%s() cannot set feature report", ++ __FILE__, __func__); ++ goto out; ++ } ++ ++ DBG("New Master Bluetooth address: %s", adapter_bdaddr); ++ ++out: ++ free(report); ++ return ret; ++} ++ ++ ++/* Led setting section */ ++static int set_leds(int fd, unsigned char leds_status[4]) ++{ ++ int ret; ++ ++ /* ++ * the total time the led is active (0xff means forever) ++ * | duty_length: how long a cycle is in deciseconds: ++ * | | (0 means "blink very fast") ++ * | | ??? (Maybe a phase shift or duty_length multiplier?) ++ * | | | % of duty_length led is off (0xff means 100%) ++ * | | | | % of duty_length led is on (0xff is 100%) ++ * | | | | | ++ * 0xff, 0x27, 0x10, 0x00, 0x32, ++ */ ++ unsigned char leds_report[] = { ++ 0x01, ++ 0x00, 0x00, 0x00, 0x00, 0x00, /* rumble values TBD */ ++ 0x00, 0x00, 0x00, 0x00, 0x1e, /* LED_1=0x02, LED_2=0x04 ... */ ++ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_4 */ ++ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_3 */ ++ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_2 */ ++ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_1 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, ++ }; ++ ++ int leds = 0; ++ if (leds_status[0]) ++ leds |= LED_1; ++ if (leds_status[1]) ++ leds |= LED_2; ++ if (leds_status[2]) ++ leds |= LED_3; ++ if (leds_status[3]) ++ leds |= LED_4; ++ ++ leds_report[10] = leds; ++ ++ ret = write(fd, leds_report, sizeof(leds_report)); ++ if (ret < (ssize_t) sizeof(leds_report)) ++ error("%s:%s() Unable to write to hidraw device", ++ __FILE__, __func__); ++ ++ return ret; ++} ++ ++int set_controller_number(int fd, unsigned int n) ++{ ++ unsigned char leds_status[4] = {0, 0, 0, 0}; ++ ++ switch (n) { ++ case 0: ++ break; ++ case 1: ++ case 2: ++ case 3: ++ case 4: ++ leds_status[n - 1] = LED_STATUS_ON; ++ break; ++ case 5: ++ case 6: ++ case 7: ++ leds_status[4 - 1] = LED_STATUS_ON; ++ leds_status[n - 4 - 1] = LED_STATUS_ON; ++ break; ++ default: ++ error("%s:%s() Only 7 controllers supported for now", ++ __FILE__, __func__); ++ return -1; ++ } ++ ++ return set_leds(fd, leds_status); ++} +diff --git a/plugins/playstation-peripheral-hid.h b/plugins/playstation-peripheral-hid.h +new file mode 100644 +index 0000000..ade8fa0 +--- /dev/null ++++ b/plugins/playstation-peripheral-hid.h +@@ -0,0 +1,10 @@ ++#ifndef __PLAYSTATION_PERIPHERAL_HID_H ++#define __PLAYSTATION_PERIPHERAL_HID_H ++ ++char *sixaxis_get_device_bdaddr(int fd); ++char *sixaxis_get_master_bdaddr(int fd); ++int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr); ++ ++int set_controller_number(int fd, unsigned int n); ++ ++#endif /* __PLAYSTATION_PERIPHERAL_HID_H */ +diff --git a/plugins/playstation-peripheral.c b/plugins/playstation-peripheral.c +new file mode 100644 +index 0000000..90d69ee +--- /dev/null ++++ b/plugins/playstation-peripheral.c +@@ -0,0 +1,376 @@ ++/* ++ * playstation peripheral plugin: support for Playstation peripherals ++ * ++ * Copyright (C) 2009 Bastien Nocera ++ * Copyright (C) 2011 Antonio Ospite ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++/* ++ * In the following this terminology is used: ++ * ++ * - peripheral: a Playstation peripheral (Sixaxis, DS3, headset, etc.) ++ * - controller: an input peripheral ++ * - adapter: the bluetooth dongle on the host system. ++ * - adapter_bdaddr: the bdaddr of the bluetooth adapter. ++ * - device_bdaddr: the bdaddr of the Playstation peripheral. ++ * - master_bdaddr: the bdaddr of the adapter to be configured into the ++ * Playstation peripheral ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE 1 ++#include ++ ++#include "plugin.h" ++#include "log.h" ++#include "adapter.h" ++#include "device.h" ++#include "manager.h" ++#include "storage.h" ++#include "sdp_lib.h" ++ ++#include "playstation-peripheral-hid.h" ++ ++struct playstation_peripheral { ++ uint16_t vendor_id; ++ uint16_t product_id; ++ char *name; ++ char *sdp_record; ++ char *uuid; ++ ++ /* device specific callbacks to get master/device bdaddr and set ++ * master bdaddr ++ */ ++ char * (*get_device_bdaddr)(int); ++ char * (*get_master_bdaddr)(int); ++ int (*set_master_bdaddr) (int, char *); ++}; ++ ++static struct playstation_peripheral peripherals[] = { ++ { ++ .vendor_id = 0x054c, ++ .product_id = 0x0268, ++ .name = "PLAYSTATION(R)3 Controller", ++ .sdp_record = "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800", ++ .uuid = "00001124-0000-1000-8000-00805f9b34fb", ++ .get_device_bdaddr = sixaxis_get_device_bdaddr, ++ .get_master_bdaddr = sixaxis_get_master_bdaddr, ++ .set_master_bdaddr = sixaxis_set_master_bdaddr, ++ }, ++}; ++ ++static struct udev *ctx; ++static struct udev_monitor *monitor; ++static guint watch_id; ++ ++static int create_peripheral_association(const char *adapter_address, ++ const char *device_address, ++ struct playstation_peripheral *peripheral) ++{ ++ int ret = 0; ++ ++ ret = btd_device_set_trusted(adapter_address, device_address, ++ peripheral->name, ++ 0x0002, /* VersionIDSource = USB Implementer's Forum */ ++ peripheral->vendor_id, ++ peripheral->product_id, ++ 0, /* version is hardcoded to 0 for now */ ++ peripheral->uuid, ++ peripheral->sdp_record); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static int peripheral_pair(int fd, char *adapter_bdaddr, ++ struct playstation_peripheral *peripheral) ++{ ++ char *device_bdaddr; ++ char *master_bdaddr; ++ int ret = 0; ++ ++ master_bdaddr = peripheral->get_master_bdaddr(fd); ++ if (master_bdaddr == NULL) { ++ DBG("Failed to get the Old master Bluetooth address from the device"); ++ return -EPERM; ++ } ++ ++ /* Only set the master bdaddr when needed, this is how the PS3 does ++ * it, perhaps to avoid unnecessary writes to some eeprom. ++ */ ++ if (g_strcmp0(master_bdaddr, adapter_bdaddr) != 0) { ++ DBG("Old master Bluetooth address was: %s", master_bdaddr); ++ ret = peripheral->set_master_bdaddr(fd, adapter_bdaddr); ++ if (ret < 0) { ++ DBG("Failed to set the master Bluetooth address"); ++ free(master_bdaddr); ++ return ret; ++ } ++ } ++ ++ device_bdaddr = peripheral->get_device_bdaddr(fd); ++ if (device_bdaddr == NULL) { ++ DBG("Failed to get the Bluetooth address from the device"); ++ free(master_bdaddr); ++ return -EPERM; ++ } ++ ++ DBG("Device bdaddr %s", device_bdaddr); ++ ++ ret = create_peripheral_association(adapter_bdaddr, device_bdaddr, peripheral); ++ ++ free(device_bdaddr); ++ free(master_bdaddr); ++ return ret; ++} ++ ++static inline struct playstation_peripheral *find_playstation_peripheral(const char *hid_id) ++{ ++ unsigned int array_size = sizeof(peripherals)/sizeof(peripherals[0]); ++ unsigned int i; ++ int ret; ++ uint16_t protocol; ++ uint16_t vendor_id; ++ uint16_t product_id; ++ ++ ret = sscanf(hid_id, "%hx:%hx:%hx", &protocol, &vendor_id, &product_id); ++ if (ret != 3) { ++ error("%s:%s() Parsing HID_ID failed", ++ __FILE__, __func__); ++ return NULL; ++ } ++ ++ for (i = 0; i < array_size; i++) { ++ if (peripherals[i].vendor_id == vendor_id && ++ peripherals[i].product_id == product_id) ++ return &peripherals[i]; ++ } ++ ++ return NULL; ++} ++ ++static inline int is_usb_peripheral(const char *hid_id) ++{ ++ int ret; ++ uint16_t protocol; ++ uint16_t vendor_id; ++ uint16_t product_id; ++ ++ ret = sscanf(hid_id, "%hx:%hx:%hx", &protocol, &vendor_id, &product_id); ++ if (ret != 3) { ++ error("%s:%s() Parsing HID_ID failed", ++ __FILE__, __func__); ++ return 0; ++ } ++ ++ DBG("%hx:%hx:%hx", protocol, vendor_id, product_id); ++ return (protocol == 3); ++} ++ ++static void handle_device_plug(struct udev_device *udevice) ++{ ++ struct udev_device *hid_parent; ++ struct udev_enumerate *enumerate; ++ struct udev_list_entry *devices, *dev_list_entry; ++ const char *hid_id; ++ const char *hid_phys; ++ const char *hidraw_node; ++ unsigned char is_usb = FALSE; ++ int js_num = 0; ++ int fd; ++ struct playstation_peripheral *peripheral; ++ ++ hid_parent = udev_device_get_parent_with_subsystem_devtype(udevice, ++ "hid", NULL); ++ if (!hid_parent) { ++ error("%s:%s() cannot get parent hid device", ++ __FILE__, __func__); ++ return; ++ } ++ ++ hid_id = udev_device_get_property_value(hid_parent, "HID_ID"); ++ DBG("HID_ID: %s", hid_id); ++ ++ peripheral = find_playstation_peripheral(hid_id); ++ if (!peripheral) { ++ error("No supported peripheral found"); ++ return; ++ } ++ ++ DBG("Found a Playstation peripheral: %s", peripheral->name); ++ ++ hidraw_node = udev_device_get_devnode(udevice); ++ ++ /* looking for joysticks */ ++ hid_phys = udev_device_get_property_value(hid_parent, "HID_PHYS"); ++ ++ enumerate = udev_enumerate_new(udev_device_get_udev(udevice)); ++ udev_enumerate_add_match_sysname(enumerate, "js*"); ++ udev_enumerate_scan_devices(enumerate); ++ ++ devices = udev_enumerate_get_list_entry(enumerate); ++ udev_list_entry_foreach(dev_list_entry, devices) { ++ const char *devname; ++ struct udev_device *js_dev; ++ struct udev_device *input_parent; ++ const char *input_phys; ++ ++ devname = udev_list_entry_get_name(dev_list_entry); ++ js_dev = udev_device_new_from_syspath(udev_device_get_udev(udevice), ++ devname); ++ ++ input_parent = udev_device_get_parent_with_subsystem_devtype(js_dev, ++ "input", NULL); ++ if (!input_parent) { ++ error("%s:%s() cannot get parent input device.", ++ __FILE__, __func__); ++ continue; ++ } ++ ++ /* check this is the joystick relative to ++ * the hidraw device above */ ++ input_phys = udev_device_get_sysattr_value(input_parent, ++ "phys"); ++ if (g_strcmp0(input_phys, hid_phys) == 0) { ++ js_num = atoi(udev_device_get_sysnum(js_dev)) + 1; ++ DBG("joypad device_num: %d", js_num); ++ DBG("hidraw_node: %s", hidraw_node); ++ } ++ ++ udev_device_unref(js_dev); ++ } ++ ++ udev_enumerate_unref(enumerate); ++ ++ fd = open(hidraw_node, O_RDWR); ++ if (fd < 0) { ++ error("%s:%s() hidraw open", __FILE__, __func__); ++ return; ++ } ++ ++ is_usb = is_usb_peripheral(hid_id); ++ if (is_usb) { ++ char *adapter_bdaddr; ++ ++ adapter_bdaddr = btd_manager_get_default_adapter_address_str(); ++ if (adapter_bdaddr == NULL) { ++ error("No adapters, exiting"); ++ return; ++ } ++ ++ DBG("Adapter bdaddr %s", adapter_bdaddr); ++ ++ peripheral_pair(fd, adapter_bdaddr, peripheral); ++ free(adapter_bdaddr); ++ } ++ ++ if (js_num > 0) ++ set_controller_number(fd, js_num); ++ ++ close(fd); ++} ++ ++static gboolean device_event_idle(struct udev_device *udevice) ++{ ++ handle_device_plug(udevice); ++ udev_device_unref(udevice); ++ return FALSE; ++} ++ ++static gboolean monitor_event(GIOChannel *source, GIOCondition condition, ++ gpointer data) ++{ ++ struct udev_device *udevice; ++ ++ udevice = udev_monitor_receive_device(monitor); ++ if (udevice == NULL) ++ goto out; ++ if (g_strcmp0(udev_device_get_action(udevice), "add") != 0) { ++ udev_device_unref(udevice); ++ goto out; ++ } ++ ++ /* Give UDEV some time to load kernel modules */ ++ g_timeout_add_seconds(1, (GSourceFunc) device_event_idle, udevice); ++ ++out: ++ return TRUE; ++} ++ ++static int playstation_peripheral_init(void) ++{ ++ GIOChannel *channel; ++ ++ DBG("Setup Playstation peripheral plugin"); ++ ++ ctx = udev_new(); ++ monitor = udev_monitor_new_from_netlink(ctx, "udev"); ++ if (monitor == NULL) { ++ error("%s:%s() Could not get udev monitor", ++ __FILE__, __func__); ++ return -1; ++ } ++ ++ /* Listen for newly connected hidraw interfaces */ ++ udev_monitor_filter_add_match_subsystem_devtype(monitor, ++ "hidraw", NULL); ++ udev_monitor_enable_receiving(monitor); ++ ++ channel = g_io_channel_unix_new(udev_monitor_get_fd(monitor)); ++ watch_id = g_io_add_watch(channel, G_IO_IN, monitor_event, NULL); ++ g_io_channel_unref(channel); ++ ++ return 0; ++} ++ ++static void playstation_peripheral_exit(void) ++{ ++ DBG("Cleanup Playstation peripheral plugin"); ++ ++ if (watch_id != 0) { ++ g_source_remove(watch_id); ++ watch_id = 0; ++ } ++ if (monitor != NULL) { ++ udev_monitor_unref(monitor); ++ monitor = NULL; ++ } ++ if (ctx != NULL) { ++ udev_unref(ctx); ++ ctx = NULL; ++ } ++} ++ ++BLUETOOTH_PLUGIN_DEFINE(playstation_peripheral, VERSION, ++ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, ++ playstation_peripheral_init, ++ playstation_peripheral_exit) +-- +1.7.10 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-alsa_location.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-alsa_location.patch new file mode 100644 index 0000000000..4d0712c671 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-alsa_location.patch @@ -0,0 +1,16 @@ +bluez installs stuff into /etc/alsa, which is wrong since the +correct location (also stated in alsa-lib configure.in) is +/usr/share/alsa instead +Upstream report: +http://permalink.gmane.org/gmane.linux.bluez.kernel/4739 +--- Makefile.am~ 2010-02-12 20:26:48.000000000 +0100 ++++ Makefile.am 2010-03-05 10:17:15.000000000 +0100 +@@ -241,7 +241,7 @@ + audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ + + if CONFIGFILES +-alsaconfdir = $(sysconfdir)/alsa ++alsaconfdir = $(datadir)/alsa + + alsaconf_DATA = audio/bluetooth.conf + endif diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ath3k.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ath3k.patch new file mode 100644 index 0000000000..e33e36cc04 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ath3k.patch @@ -0,0 +1,1428 @@ +From 6c059a8f484120082506f0842226e0bf8c411984 Mon Sep 17 00:00:00 2001 +From: Chandrika +Date: Tue, 11 May 2010 13:26:08 +0530 +Subject: [PATCH v2] hciattach support for Atheros AR300x Bluetooth Chip + Signed-off-by: Suraj + +--- + Makefile.tools | 1 + + tools/hciattach.8 | 6 + + tools/hciattach.c | 166 +++++++- + tools/hciattach.h | 2 + + tools/hciattach_ar3k.c | 1174 ++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1347 insertions(+), 2 deletions(-) + create mode 100755 tools/hciattach_ar3k.c + +diff --git a/Makefile.tools b/Makefile.tools +index 2735d68..48cf097 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -23,6 +23,7 @@ tools_l2ping_LDADD = lib/libbluetooth.la + tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \ + tools/hciattach_st.c \ + tools/hciattach_ti.c \ ++ tools/hciattach_ar3k.c \ + tools/hciattach_tialt.c + tools_hciattach_LDADD = lib/libbluetooth.la + +diff --git a/tools/hciattach.8 b/tools/hciattach.8 +index f750222..ef943ea 100644 +--- a/tools/hciattach.8 ++++ b/tools/hciattach.8 +@@ -49,6 +49,12 @@ specific identifier. Currently supported types are + .B any + Unspecified HCI_UART interface, no vendor specific options + .TP ++.B ar3kalt ++Atheros AR300x based serial bluetooth device with power management disabled ++.TP ++.B ar3k ++Atheros AR300x based serial bluetooth device ++.TP + .B ericsson + Ericsson based modules + .TP +diff --git a/tools/hciattach.c b/tools/hciattach.c +index 364c5ff..c2be73e 100644 +--- a/tools/hciattach.c ++++ b/tools/hciattach.c +@@ -652,8 +652,162 @@ static int csr(int fd, struct uart_t *u, struct termios *ti) + return 0; + } + +-/* +- * Silicon Wave specific initialization ++/* ++ * Atheros AR3xxx specific initialization code with power management disabled. ++ * Suraj Sumangala ++ */ ++static int ar3kpost(int fd, struct uart_t *u, struct termios *ti) ++{ ++ int dev_id, dd; ++ struct timespec tm = {0, 50000}; ++ int status = 0; ++ ++ ++ dev_id = ioctl(fd, HCIUARTGETDEVICE, 0); ++ if (dev_id < 0) { ++ perror("cannot get device id"); ++ return -1; ++ } ++ ++ ++ dd = hci_open_dev(dev_id); ++ if (dd < 0) { ++ perror("HCI device open failed"); ++ return -1; ++ } ++ ++ sleep(2); ++ ++ /* send vendor specific command with Sleep feature disabled */ ++ hci_send_cmd(dd, OGF_VENDOR_CMD, 0x04, 1, &status); ++ ++ nanosleep(&tm, NULL); ++ hci_close_dev(dd); ++ ++ return 0; ++ ++} ++/* ++ * Atheros AR3xxx specific initialization post callback ++ * with power management enabled ++ * Suraj Sumangala ++ */ ++static int ar3kpmpost(int fd, struct uart_t *u, struct termios *ti) ++{ ++ int dev_id, dd; ++ struct timespec tm = {0, 50000}; ++ int status = 1; ++ ++ ++ dev_id = ioctl(fd, HCIUARTGETDEVICE, 0); ++ if (dev_id < 0) { ++ perror("cannot get device id"); ++ return -1; ++ } ++ ++ ++ dd = hci_open_dev(dev_id); ++ if (dd < 0) { ++ perror("HCI device open failed"); ++ return -1; ++ } ++ ++ sleep(2); ++ ++ /* send vendor specific command with Sleep feature Enabled */ ++ if (hci_send_cmd(dd, OGF_VENDOR_CMD, 0x04, 1, &status) < 0) ++ perror("sleep enable command not sent"); ++ ++ nanosleep(&tm, NULL); ++ hci_close_dev(dd); ++ ++ return 0; ++} ++/* ++ * Atheros AR3xxx specific initialization ++ * Suraj Sumangala ++ */ ++static int ar3kinit(int fd, struct uart_t *u, struct termios *ti) ++{ ++ struct timespec tm = { 0, 500000 }; ++ unsigned char cmd[14], rsp[100]; ++ int r; ++ int baud; ++ ++ /* Download PS and patch */ ++ r = ath_ps_download(fd); ++ if (r < 0) { ++ perror("Failed to Download configuration"); ++ return -1; ++ } ++ ++ /* Write BDADDR if user has provided any */ ++ if (u->bdaddr != NULL) { ++ /* Set BD_ADDR */ ++ memset(cmd, 0, sizeof(cmd)); ++ memset(rsp, 0, sizeof(rsp)); ++ cmd[0] = HCI_COMMAND_PKT; ++ cmd[1] = 0x0B; ++ cmd[2] = 0xfc; ++ cmd[3] = 0x0A; ++ cmd[4] = 0x01; ++ cmd[5] = 0x01; ++ cmd[6] = 0x00; ++ cmd[7] = 0x06; ++ str2ba(u->bdaddr, (bdaddr_t *) (cmd + 8)); ++ ++ /* Send command */ ++ if (write(fd, cmd, 14) != 14) { ++ fprintf(stderr, "Failed to write BD_ADDR command\n"); ++ return -1; ++ } ++ ++ /* Read reply */ ++ if (read_hci_event(fd, rsp, 10) < 0) { ++ fprintf(stderr, "Failed to set BD_ADDR\n"); ++ return -1; ++ } ++ } ++ ++ /* Send HCI Reset to write the configuration */ ++ cmd[0] = HCI_COMMAND_PKT; ++ cmd[1] = 0x03; ++ cmd[2] = 0x0c; ++ cmd[3] = 0x00; ++ /* Send reset command */ ++ r = write(fd, cmd, 4); ++ ++ if (r != 4) ++ return -1; ++ ++ nanosleep(&tm, NULL); ++ if (read_hci_event(fd, rsp, sizeof(rsp)) < 0) ++ return -1; ++ ++ /* Set baud rate command, ++ * set controller baud rate to user specified value */ ++ cmd[0] = HCI_COMMAND_PKT; ++ cmd[1] = 0x0C; ++ cmd[2] = 0xfc; ++ cmd[3] = 0x02; ++ baud = u->speed/100; ++ cmd[4] = (char)baud; ++ cmd[5] = (char)(baud >> 8); ++ ++ if (write(fd, cmd, 6) != 6) { ++ perror("Failed to write init command"); ++ return -1; ++ } ++ ++ /* Wait for the command complete event for Baud rate change Command */ ++ nanosleep(&tm, NULL); ++ if (read_hci_event(fd, rsp, sizeof(rsp)) < 0) ++ return -1; ++ ++ return 0; ++} ++/* ++ * Silicon Wave specific initialization + * Thomas Moser + */ + static int swave(int fd, struct uart_t *u, struct termios *ti) +@@ -1071,6 +1225,14 @@ struct uart_t uart[] = { + /* Broadcom BCM2035 */ + { "bcm2035", 0x0A5C, 0x2035, HCI_UART_H4, 115200, 460800, FLOW_CTL, NULL, bcm2035 }, + ++ /* ATHEROS AR300x */ ++ { "ar3kalt", 0x0000, 0x0000, HCI_UART_ATH, ++ 115200, 115200, FLOW_CTL, NULL, ar3kinit, ar3kpost }, ++ ++ { "ar3k", 0x0000, 0x0000, HCI_UART_ATH, ++ 115200, 115200, FLOW_CTL, NULL, ar3kinit, ar3kpmpost }, ++ ++ + { NULL, 0 } + }; + +diff --git a/tools/hciattach.h b/tools/hciattach.h +index 867563b..5b68668 100644 +--- a/tools/hciattach.h ++++ b/tools/hciattach.h +@@ -36,6 +36,7 @@ + #define HCI_UART_3WIRE 2 + #define HCI_UART_H4DS 3 + #define HCI_UART_LL 4 ++#define HCI_UART_ATH 5 + + int read_hci_event(int fd, unsigned char* buf, int size); + int set_speed(int fd, struct termios *ti, int speed); +@@ -45,3 +46,4 @@ int texas_post(int fd, struct termios *ti); + int texasalt_init(int fd, int speed, struct termios *ti); + int stlc2500_init(int fd, bdaddr_t *bdaddr); + int bgb2xx_init(int dd, bdaddr_t *bdaddr); ++int ath_ps_download(int fd); +diff --git a/tools/hciattach_ar3k.c b/tools/hciattach_ar3k.c +new file mode 100755 +index 0000000..20562ba +--- /dev/null ++++ b/tools/hciattach_ar3k.c +@@ -0,0 +1,1174 @@ ++/* ++ * Copyright (c) 2009-2010 Atheros Communications Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "hciattach.h" ++ ++#define FALSE 0 ++#define TRUE 1 ++ ++/* The maximum number of bytes possible in a patch entry */ ++#define MAX_PATCH_SIZE 20000 ++ ++/* Maximum HCI packets that will be formed from the Patch file */ ++#define MAX_NUM_PATCH_ENTRY ((MAX_PATCH_SIZE/MAX_BYTE_LENGTH) + 1) ++ ++#define DEV_REGISTER 0x4FFC ++ ++#define FW_PATH "/lib/firmware/ar3k/" ++ ++#define PS_ASIC_FILE "PS_ASIC.pst" ++#define PS_FPGA_FILE "PS_FPGA.pst" ++#define PATCH_FILE "RamPatch.txt" ++#define BDADDR_FILE "ar3kbdaddr.pst" ++ ++#define HCI_CMD_HEADER_LEN 7 ++ ++/* PS command types */ ++#define PS_RESET 2 ++#define PS_WRITE 1 ++#define WRITE_PATCH 8 ++#define PS_VERIFY_CRC 9 ++#define ENABLE_PATCH 11 ++ ++/* PS configuration entry time */ ++#define PS_TYPE_HEX 0 ++#define PS_TYPE_DEC 1 ++ ++#define PS_RESET_PARAM_LEN 6 ++#define PS_RESET_CMD_LEN (PS_RESET_PARAM_LEN +\ ++ HCI_CMD_HEADER_LEN) ++ ++#define NUM_WAKEUP_RETRY 10 ++ ++ ++#define RAM_PS_REGION (1<<0) ++#define RAM_PATCH_REGION (1<<1) ++ ++#define RAMPS_MAX_PS_TAGS_PER_FILE 50 ++#define PS_MAX_LEN 500 ++#define LINE_SIZE_MAX (PS_MAX_LEN * 2) ++ ++#define BYTES_OF_PS_DATA_PER_LINE 16 ++#define MAX_BYTE_LENGTH 244 ++ ++#define skip_space(str) while (*(str) == (' ')) ((str)++) ++ ++#define IS_BETWEEN(x, lower, upper) (((lower) <= (x)) && ((x) <= (upper))) ++ ++#define tohexval(c) (isdigit(c) ? ((c) - '0') : \ ++ (IS_BETWEEN((c), 'A', 'Z') ? \ ++ ((c) - 'A' + 10) : ((c) - 'a' + 10))) ++ ++#define stringtohex(str) (((uint8_t)(tohexval((str)[0]) << 4)) |\ ++ ((uint8_t)tohexval((str)[1]))) ++ ++#define set_pst_format(pst, type, array_val) ((pst)->data_type = (type),\ ++ (pst)->is_array = (array_val)) ++ ++struct ps_tag_entry { ++ uint32_t tag_id; ++ uint32_t tag_len; ++ uint8_t *tag_data; ++}; ++ ++struct ps_ram_patch { ++ int16_t Len; ++ uint8_t *Data; ++}; ++struct ps_data_format { ++ unsigned char data_type; ++ unsigned char is_array; ++}; ++ ++struct ps_cmd_packet { ++ uint8_t *Hcipacket; ++ int packetLen; ++}; ++ ++struct st_read_status { ++ unsigned section; ++ unsigned line_count; ++ unsigned char_cnt; ++ unsigned byte_count; ++}; ++ ++struct ps_tag_entry ps_tag_entry[RAMPS_MAX_PS_TAGS_PER_FILE]; ++struct ps_ram_patch ram_patch[MAX_NUM_PATCH_ENTRY]; ++ ++static void load_hci_header(uint8_t *hci_ps_cmd, ++ uint8_t opcode, ++ int length, ++ int index) ++{ ++ hci_ps_cmd[0] = 0x0B; ++ hci_ps_cmd[1] = 0xFC; ++ hci_ps_cmd[2] = length + 4; ++ hci_ps_cmd[3] = opcode; ++ hci_ps_cmd[4] = (index & 0xFF); ++ hci_ps_cmd[5] = ((index >> 8) & 0xFF); ++ hci_ps_cmd[6] = length; ++} ++ ++static int ath_create_ps_command(uint8_t opcode, ++ uint32_t param_1, ++ struct ps_cmd_packet *ps_patch_packet, ++ uint32_t *index) ++{ ++ uint8_t *hci_ps_cmd; ++ int i; ++ ++ switch (opcode) { ++ case WRITE_PATCH: ++ ++ for (i = 0; i < param_1; i++) { ++ ++ /* Allocate command buffer */ ++ hci_ps_cmd = (uint8_t *) malloc(ram_patch[i].Len + ++ HCI_CMD_HEADER_LEN); ++ ++ if (!hci_ps_cmd) ++ return -ENOMEM; ++ ++ /* Update commands to buffer */ ++ load_hci_header(hci_ps_cmd, ++ opcode, ++ ram_patch[i].Len, ++ i); ++ memcpy(&hci_ps_cmd[HCI_CMD_HEADER_LEN], ++ ram_patch[i].Data, ++ ram_patch[i].Len); ++ ++ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; ++ ps_patch_packet[*index].packetLen = ram_patch[i].Len + ++ HCI_CMD_HEADER_LEN; ++ ++ (*index)++; ++ } ++ break; ++ ++ case ENABLE_PATCH: ++ ++ hci_ps_cmd = (uint8_t *) malloc(HCI_CMD_HEADER_LEN); ++ ++ if (!hci_ps_cmd) ++ return -ENOMEM; ++ ++ load_hci_header(hci_ps_cmd, opcode, 0, 0x00); ++ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; ++ ps_patch_packet[*index].packetLen = HCI_CMD_HEADER_LEN; ++ ++ (*index)++; ++ ++ break; ++ ++ case PS_RESET: ++ ++ hci_ps_cmd = (uint8_t *) malloc(PS_RESET_CMD_LEN); ++ ++ if (!hci_ps_cmd) ++ return -ENOMEM; ++ ++ load_hci_header(hci_ps_cmd, opcode, PS_RESET_PARAM_LEN, 0x00); ++ hci_ps_cmd[7] = 0x00; ++ hci_ps_cmd[PS_RESET_CMD_LEN - 2] = (param_1 & 0xFF); ++ hci_ps_cmd[PS_RESET_CMD_LEN - 1] = ((param_1 >> 8) & 0xFF); ++ ++ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; ++ ps_patch_packet[*index].packetLen = PS_RESET_CMD_LEN; ++ ++ (*index)++; ++ ++ break; ++ ++ case PS_WRITE: ++ for (i = 0; i < param_1; i++) { ++ hci_ps_cmd = ++ (uint8_t *) malloc(ps_tag_entry[i].tag_len + ++ HCI_CMD_HEADER_LEN); ++ if (!hci_ps_cmd) ++ return -ENOMEM; ++ ++ load_hci_header(hci_ps_cmd, ++ opcode, ++ ps_tag_entry[i].tag_len, ++ ps_tag_entry[i].tag_id); ++ ++ memcpy(&hci_ps_cmd[HCI_CMD_HEADER_LEN], ++ ps_tag_entry[i].tag_data, ++ ps_tag_entry[i].tag_len); ++ ++ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; ++ ++ ps_patch_packet[*index].packetLen = ++ ps_tag_entry[i].tag_len + HCI_CMD_HEADER_LEN; ++ ++ (*index)++; ++ } ++ break; ++ ++ default: ++ break; ++ } ++ ++ return 0; ++} ++ ++static int get_ps_type(char *line, ++ int eol_index, ++ unsigned char *type, ++ unsigned char *sub_type) ++{ ++ ++ switch (eol_index) { ++ case 1: ++ return 0; ++ break; ++ ++ case 2: ++ (*type) = toupper(line[1]); ++ break; ++ ++ case 3: ++ if (line[2] == ':') ++ (*type) = toupper(line[1]); ++ else if (line[1] == ':') ++ (*sub_type) = toupper(line[2]); ++ else ++ return -1; ++ ++ break; ++ ++ case 4: ++ if (line[2] != ':') ++ return -1; ++ (*type) = toupper(line[1]); ++ (*sub_type) = toupper(line[3]); ++ break; ++ ++ case -1: ++ return -1; ++ break; ++ } ++ return 0; ++} ++ ++static int get_input_data_format(char *line, struct ps_data_format *pst_format) ++{ ++ unsigned char type, sub_type; ++ int eol_index, sep_index; ++ int i; ++ ++ type = '\0'; ++ sub_type = '\0'; ++ eol_index = -1; ++ sep_index = -1; ++ ++ /* The default values */ ++ set_pst_format(pst_format, PS_TYPE_HEX, TRUE); ++ ++ if (line[0] != '[') { ++ ++ set_pst_format(pst_format, PS_TYPE_HEX, TRUE); ++ return 0; ++ } ++ ++ for (i = 1; i < 5; i++) { ++ if (line[i] == ']') { ++ eol_index = i; ++ break; ++ } ++ } ++ ++ if (get_ps_type(line, eol_index, &type, &sub_type) < 0) ++ return -1; ++ ++ /* By default Hex array type is assumed */ ++ if (type == '\0' && sub_type == '\0') ++ set_pst_format(pst_format, PS_TYPE_HEX, TRUE); ++ ++ /* Check is data type is of array */ ++ if (type == 'A' || sub_type == 'A') ++ pst_format->is_array = TRUE; ++ ++ if (type == 'S' || sub_type == 'S') ++ pst_format->is_array = FALSE; ++ ++ switch (type) { ++ case 'D': ++ case 'B': ++ pst_format->data_type = PS_TYPE_DEC; ++ break; ++ ++ default: ++ pst_format->data_type = PS_TYPE_HEX; ++ break; ++ } ++ ++ line += (eol_index + 1); ++ ++ return 0; ++ ++} ++ ++static unsigned int read_data_in_section(char *line, ++ struct ps_data_format format_info) ++{ ++ char *token_ptr = line; ++ ++ if (token_ptr[0] == '[') { ++ ++ while (token_ptr[0] != ']' && token_ptr[0] != '\0') ++ token_ptr++; ++ ++ if (token_ptr[0] == '\0') ++ return 0x0FFF; ++ ++ token_ptr++; ++ } ++ ++ if (format_info.data_type == PS_TYPE_HEX) { ++ ++ if (format_info.is_array == TRUE) ++ return 0x0FFF; ++ else ++ return strtol(token_ptr, NULL, 16); ++ } else ++ return 0x0FFF; ++ ++ return 0x0FFF; ++} ++static int ath_parse_file(FILE *stream) ++{ ++ char *buffer; ++ char *line; ++ uint8_t tag_cnt; ++ int16_t byte_count; ++ uint32_t pos; ++ int read_count; ++ int num_ps_entry; ++ struct ps_data_format stps_data_format; ++ struct st_read_status read_status = { ++ 0, 0, 0, 0 ++ }; ++ ++ pos = 0; ++ buffer = NULL; ++ tag_cnt = 0; ++ byte_count = 0; ++ ++ if (!stream) { ++ perror("Could not open config file .\n"); ++ return -1; ++ } ++ ++ buffer = malloc(LINE_SIZE_MAX + 1); ++ ++ if (!buffer) ++ return -ENOMEM; ++ ++ do { ++ line = fgets(buffer, LINE_SIZE_MAX, stream); ++ ++ if (!line) ++ break; ++ ++ skip_space(line); ++ ++ if ((line[0] == '/') && (line[1] == '/')) ++ continue; ++ ++ if ((line[0] == '#')) { ++ ++ if (read_status.section != 0) { ++ perror("error\n"); ++ ++ if (buffer != NULL) ++ free(buffer); ++ ++ return -1; ++ ++ } else { ++ read_status.section = 1; ++ continue; ++ } ++ } ++ ++ if ((line[0] == '/') && (line[1] == '*')) { ++ ++ read_status.section = 0; ++ ++ continue; ++ } ++ ++ if (read_status.section == 1) { ++ skip_space(line); ++ ++ if (get_input_data_format( ++ line, &stps_data_format) < 0) { ++ ++ if (buffer != NULL) ++ free(buffer); ++ return -1; ++ } ++ ps_tag_entry[tag_cnt].tag_id = ++ read_data_in_section(line, stps_data_format); ++ read_status.section = 2; ++ ++ } else if (read_status.section == 2) { ++ ++ if (get_input_data_format( ++ line, &stps_data_format) < 0) { ++ ++ if (buffer != NULL) ++ free(buffer); ++ return -1; ++ } ++ ++ byte_count = ++ read_data_in_section(line, stps_data_format); ++ ++ read_status.section = 2; ++ if (byte_count > LINE_SIZE_MAX / 2) { ++ if (buffer != NULL) ++ free(buffer); ++ ++ return -1; ++ } ++ ++ ps_tag_entry[tag_cnt].tag_len = byte_count; ++ ps_tag_entry[tag_cnt].tag_data = (uint8_t *) ++ malloc(byte_count); ++ ++ read_status.section = 3; ++ read_status.line_count = 0; ++ ++ } else if (read_status.section == 3) { ++ ++ if (read_status.line_count == 0) { ++ if (get_input_data_format( ++ line, &stps_data_format) < 0) { ++ if (buffer != NULL) ++ free(buffer); ++ return -1; ++ } ++ } ++ ++ skip_space(line); ++ read_status.char_cnt = 0; ++ ++ if (line[read_status.char_cnt] == '[') { ++ ++ while (line[read_status.char_cnt] != ']' && ++ line[read_status.char_cnt] != '\0') ++ read_status.char_cnt++; ++ ++ if (line[read_status.char_cnt] == ']') ++ read_status.char_cnt++; ++ else ++ read_status.char_cnt = 0; ++ ++ } ++ ++ read_count = (byte_count > BYTES_OF_PS_DATA_PER_LINE) ++ ? BYTES_OF_PS_DATA_PER_LINE : byte_count; ++ ++ if (stps_data_format.data_type == PS_TYPE_HEX && ++ stps_data_format.is_array == TRUE) { ++ ++ while (read_count > 0) { ++ ++ ps_tag_entry[tag_cnt].tag_data ++ [read_status.byte_count] = ++ stringtohex( ++ &line[read_status.char_cnt]); ++ ++ ps_tag_entry[tag_cnt].tag_data ++ [read_status.byte_count + 1] = ++ stringtohex( ++ &line[read_status.char_cnt + 3]); ++ ++ read_status.char_cnt += 6; ++ read_status.byte_count += 2; ++ read_count -= 2; ++ ++ } ++ ++ if (byte_count > BYTES_OF_PS_DATA_PER_LINE) ++ byte_count -= ++ BYTES_OF_PS_DATA_PER_LINE; ++ else ++ byte_count = 0; ++ } ++ ++ read_status.line_count++; ++ ++ if (byte_count == 0) { ++ read_status.section = 0; ++ read_status.char_cnt = 0; ++ read_status.line_count = 0; ++ read_status.byte_count = 0; ++ } else ++ read_status.char_cnt = 0; ++ ++ if ((read_status.section == 0) && ++ (++tag_cnt == RAMPS_MAX_PS_TAGS_PER_FILE)) { ++ if (buffer != NULL) ++ free(buffer); ++ return -1; ++ } ++ ++ } ++ ++ } while (line); ++ ++ num_ps_entry = tag_cnt; ++ ++ if (tag_cnt > RAMPS_MAX_PS_TAGS_PER_FILE) { ++ if (buffer != NULL) ++ free(buffer); ++ return -1; ++ } ++ ++ if (buffer != NULL) ++ free(buffer); ++ ++ return num_ps_entry; ++} ++ ++static int parse_patch_file(FILE *stream) ++{ ++ char byte[3]; ++ char line[MAX_BYTE_LENGTH + 1]; ++ int byte_cnt, byte_cnt_org; ++ int patch_index; ++ int i, k; ++ int data; ++ int patch_count = 0; ++ ++ byte[2] = '\0'; ++ ++ while (fgets(line, MAX_BYTE_LENGTH, stream)) { ++ if (strlen(line) <= 1 || !isxdigit(line[0])) ++ continue; ++ else ++ break; ++ } ++ ++ byte_cnt = strtol(line, NULL, 16); ++ byte_cnt_org = byte_cnt; ++ ++ while (byte_cnt > MAX_BYTE_LENGTH) { ++ ++ /* Handle case when the number of patch buffer is ++ * more than the 20K */ ++ if (MAX_NUM_PATCH_ENTRY == patch_count) { ++ for (i = 0; i < patch_count; i++) ++ free(ram_patch[i].Data); ++ return -ENOMEM; ++ } ++ ram_patch[patch_count].Len = MAX_BYTE_LENGTH; ++ ram_patch[patch_count].Data = ++ (uint8_t *) malloc(MAX_BYTE_LENGTH); ++ ++ if (!ram_patch[patch_count].Data) ++ return -ENOMEM; ++ ++ patch_count++; ++ byte_cnt = byte_cnt - MAX_BYTE_LENGTH; ++ } ++ ++ ram_patch[patch_count].Len = (byte_cnt & 0xFF); ++ ++ if (byte_cnt != 0) { ++ ram_patch[patch_count].Data = (uint8_t *) malloc(byte_cnt); ++ ++ if (!ram_patch[patch_count].Data) ++ return -ENOMEM; ++ patch_count++; ++ } ++ ++ while (byte_cnt_org > MAX_BYTE_LENGTH) { ++ ++ k = 0; ++ for (i = 0; i < MAX_BYTE_LENGTH * 2; i += 2) { ++ if (!fgets(byte, 3, stream)) ++ return -1; ++ data = strtoul(&byte[0], NULL, 16); ++ ram_patch[patch_index].Data[k] = (data & 0xFF); ++ ++ k++; ++ } ++ ++ patch_index++; ++ ++ byte_cnt_org = byte_cnt_org - MAX_BYTE_LENGTH; ++ } ++ ++ if (patch_index == 0) ++ patch_index++; ++ ++ for (k = 0; k < byte_cnt_org; k++) { ++ ++ if (!fgets(byte, 3, stream)) ++ return -1; ++ ++ data = strtoul(byte, NULL, 16); ++ ram_patch[patch_index].Data[k] = (data & 0xFF); ++ } ++ ++ return patch_count; ++} ++ ++static int ath_parse_ps(FILE *stream, int *total_tag_len) ++{ ++ int num_ps_tags; ++ int i; ++ unsigned char bdaddr_present = 0; ++ ++ ++ if (NULL != stream) ++ num_ps_tags = ath_parse_file(stream); ++ ++ if (num_ps_tags < 0) ++ return -1; ++ ++ if (num_ps_tags == 0) ++ *total_tag_len = 10; ++ else { ++ ++ for (i = 0; i < num_ps_tags; i++) { ++ ++ if (ps_tag_entry[i].tag_id == 1) ++ bdaddr_present = 1; ++ if (ps_tag_entry[i].tag_len % 2 == 1) ++ *total_tag_len = *total_tag_len ++ + ps_tag_entry[i].tag_len + 1; ++ else ++ *total_tag_len = ++ *total_tag_len + ps_tag_entry[i].tag_len; ++ ++ } ++ } ++ if (num_ps_tags > 0 && !bdaddr_present) ++ *total_tag_len = *total_tag_len + 10; ++ ++ *total_tag_len = *total_tag_len + 10 + (num_ps_tags * 4); ++ ++ return num_ps_tags; ++} ++ ++static int ath_create_cmd_list(struct ps_cmd_packet **hci_packet_list, ++ uint32_t *num_packets, ++ int tag_count, ++ int patch_count, ++ int total_tag_len) ++{ ++ uint8_t count; ++ uint32_t num_cmd_entry = 0; ++ ++ *num_packets = 0; ++ ++ ++ if (patch_count || tag_count) { ++ ++ /* PS Reset Packet + Patch List + PS List */ ++ num_cmd_entry += (1 + patch_count + tag_count); ++ if (patch_count > 0) ++ num_cmd_entry++; /* Patch Enable Command */ ++ ++ (*hci_packet_list) = ++ malloc(sizeof(struct ps_cmd_packet) * num_cmd_entry); ++ ++ if (!(*hci_packet_list)) ++ return -ENOMEM; ++ ++ if (patch_count > 0) { ++ ++ if (ath_create_ps_command(WRITE_PATCH, patch_count, ++ *hci_packet_list, num_packets) < 0) ++ return -1; ++ if (ath_create_ps_command(ENABLE_PATCH, 0, ++ *hci_packet_list, num_packets) < 0) ++ return -1; ++ ++ } ++ ++ if (ath_create_ps_command(PS_RESET, total_tag_len, ++ *hci_packet_list, num_packets) < 0) ++ return -1; ++ ++ if (tag_count > 0) ++ ath_create_ps_command(PS_WRITE, tag_count, ++ *hci_packet_list, num_packets); ++ } ++ ++ for (count = 0; count < patch_count; count++) ++ free(ram_patch[patch_count].Data); ++ ++ for (count = 0; count < tag_count; count++) ++ free(ps_tag_entry[count].tag_data); ++ ++ return *num_packets; ++} ++ ++static int ath_free_command_list(struct ps_cmd_packet **hci_packet_list, ++ uint32_t num_packets) ++{ ++ int i; ++ ++ if (*hci_packet_list == NULL) ++ return -1; ++ ++ for (i = 0; i < num_packets; i++) ++ free((*hci_packet_list)[i].Hcipacket); ++ ++ free(*hci_packet_list); ++ ++ return 0; ++} ++ ++/* ++ * This API is used to send the HCI command to controller and return ++ * with a HCI Command Complete event. ++ */ ++static int send_hci_cmd_wait_event(int dev, ++ uint8_t *hci_command, ++ int cmd_length, ++ uint8_t **event, uint8_t **buffer_to_free) ++{ ++ int r; ++ uint8_t *hci_event; ++ uint8_t pkt_type = 0x01; ++ ++ if (cmd_length == 0) ++ return -1; ++ ++ if (write(dev, &pkt_type, 1) != 1) ++ return -1; ++ ++ if (write(dev, (unsigned char *)hci_command, cmd_length) != cmd_length) ++ return -1; ++ ++ hci_event = (uint8_t *) malloc(100); ++ ++ if (!hci_event) ++ return -ENOMEM; ++ ++ r = read_hci_event(dev, (unsigned char *)hci_event, 100); ++ ++ if (r > 0) { ++ *event = hci_event; ++ *buffer_to_free = hci_event; ++ } else { ++ ++ /* Did not get an event from controller. return error */ ++ free(hci_event); ++ *buffer_to_free = NULL; ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static int read_ps_event(uint8_t *data) ++{ ++ ++ if (data[5] == 0xFC && data[6] == 0x00) { ++ switch (data[4]) { ++ case 0x0B:/* CRC Check */ ++ case 0x0C:/* Change Baudrate */ ++ case 0x04:/* Enable sleep */ ++ return 0; ++ break; ++ default: ++ return -1; ++ break; ++ } ++ } ++ ++ return -1; ++} ++ ++static int get_ps_file_name(int devtype, int rom_version, char *path) ++{ ++ char *filename; ++ int status = 0; ++ ++ if (devtype == 0xdeadc0de) { ++ filename = PS_ASIC_FILE; ++ status = 1; ++ } else { ++ filename = PS_FPGA_FILE; ++ status = 0; ++ } ++ ++ sprintf(path, "%s%x/%s", FW_PATH, rom_version, filename); ++ ++ return status; ++} ++ ++static int get_patch_file_name(int dev_type, int rom_version, ++ int build_version, char *path) ++{ ++ ++ if ((dev_type != 0) && ++ (dev_type != 0xdeadc0de) && ++ (rom_version == 0x99999999) && ++ (build_version == 1)) ++ path[0] = '\0'; ++ else ++ sprintf(path, "%s%x/%s", FW_PATH, rom_version, PATCH_FILE); ++ ++ return 0; ++} ++static int get_ar3k_crc(int dev, int tag_count, int patch_count) ++{ ++ uint8_t hci_cmd[7]; ++ uint8_t *event; ++ uint8_t *buffer_to_free = NULL; ++ int retval = 1; ++ int crc; ++ ++ ++ if (patch_count > 0) ++ crc |= RAM_PATCH_REGION; ++ if (tag_count > 0) ++ crc |= RAM_PS_REGION; ++ ++ load_hci_header(hci_cmd, PS_VERIFY_CRC, 0, crc); ++ ++ if (send_hci_cmd_wait_event(dev, hci_cmd, ++ sizeof(hci_cmd), &event, ++ &buffer_to_free) == 0) { ++ if (read_ps_event(event) == 0) ++ retval = -1; ++ ++ if (buffer_to_free != NULL) ++ free(buffer_to_free); ++ } ++ ++ return retval; ++} ++static int get_device_type(int dev, uint32_t *code) ++{ ++ uint8_t hci_cmd[] = { ++ 0x05, 0xfc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x04 ++ }; ++ uint8_t *event; ++ uint8_t *buffer_to_free = NULL; ++ uint32_t reg; ++ ++ int result = -1; ++ *code = 0; ++ ++ hci_cmd[3] = (uint8_t) (DEV_REGISTER & 0xFF); ++ hci_cmd[4] = (uint8_t) ((DEV_REGISTER >> 8) & 0xFF); ++ hci_cmd[5] = (uint8_t) ((DEV_REGISTER >> 16) & 0xFF); ++ hci_cmd[6] = (uint8_t) ((DEV_REGISTER >> 24) & 0xFF); ++ ++ if (send_hci_cmd_wait_event(dev, hci_cmd, ++ sizeof(hci_cmd), &event, ++ &buffer_to_free) == 0) { ++ if (event[5] == 0xFC && event[6] == 0x00) { ++ ++ switch (event[4]) { ++ case 0x05: ++ reg = event[10]; ++ reg = ((reg << 8) | event[9]); ++ reg = ((reg << 8) | event[8]); ++ reg = ((reg << 8) | event[7]); ++ *code = reg; ++ result = 0; ++ ++ break; ++ ++ case 0x06: ++ break; ++ } ++ } ++ } ++ ++ if (buffer_to_free != NULL) ++ free(buffer_to_free); ++ ++ return result; ++} ++ ++static int read_ar3k_version(int pConfig, int *rom_version, int *build_version) ++{ ++ uint8_t hci_cmd[] = {0x1E, 0xfc, 0x00}; ++ uint8_t *event; ++ uint8_t *buffer_to_free = NULL; ++ int result = -1; ++ ++ if (send_hci_cmd_wait_event(pConfig, ++ hci_cmd, ++ sizeof(hci_cmd), ++ &event, ++ &buffer_to_free) == 0) { ++ if (event[5] == 0xFC && event[6] == 0x00 && event[4] == 0x1E) { ++ (*rom_version) = event[10]; ++ (*rom_version) = (((*rom_version) << 8) | event[9]); ++ (*rom_version) = (((*rom_version) << 8) | event[8]); ++ (*rom_version) = (((*rom_version) << 8) | event[7]); ++ ++ (*build_version) = event[14]; ++ (*build_version) = (((*build_version) << 8) | ++ event[13]); ++ (*build_version) = (((*build_version) << 8) | ++ event[12]); ++ (*build_version) = (((*build_version) << 8) | ++ event[11]); ++ ++ result = 1; ++ ++ } ++ if (buffer_to_free != NULL) ++ free(buffer_to_free); ++ } ++ ++ ++ ++ return result; ++} ++ ++static int str2bdaddr(char *str_bdaddr, char *bdaddr) ++{ ++ char bdbyte[3]; ++ char *str_byte = str_bdaddr; ++ int i, j; ++ unsigned char colon_present = 0; ++ ++ if (strstr(str_bdaddr, ":") != NULL) ++ colon_present = 1; ++ ++ bdbyte[2] = '\0'; ++ ++ for (i = 0, j = 5; i < 6; i++, j--) { ++ ++ bdbyte[0] = str_byte[0]; ++ bdbyte[1] = str_byte[1]; ++ bdaddr[j] = strtol(bdbyte, NULL, 16); ++ ++ if (colon_present == 1) ++ str_byte += 3; ++ else ++ str_byte += 2; ++ } ++ return 0; ++} ++ ++static int write_bdaddr(int pConfig, char *bdaddr) ++{ ++ uint8_t bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01, ++ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++ }; ++ uint8_t *event; ++ uint8_t *buffer_to_free = NULL; ++ int result = -1; ++ ++ str2bdaddr(bdaddr, (char *)&bdaddr_cmd[7]); ++ ++ if (send_hci_cmd_wait_event(pConfig, ++ bdaddr_cmd, ++ sizeof(bdaddr_cmd), ++ &event, ++ &buffer_to_free) == 0) { ++ ++ if (event[5] == 0xFC && event[6] == 0x00) { ++ if (event[4] == 0x0B) ++ result = 0; ++ } ++ ++ } else ++ perror("Write failed\n"); ++ ++ if (buffer_to_free != NULL) ++ free(buffer_to_free); ++ ++ return result; ++} ++ ++int ath_ps_download(int hdev) ++{ ++ int i; ++ int status = 0; ++ int tag_count = 0; ++ int patch_count = 0; ++ int total_tag_len = 0; ++ int rom_version = 0, build_version = 0; ++ ++ struct ps_cmd_packet *hci_cmd_list; /* List storing the commands */ ++ uint32_t num_cmds; ++ uint8_t *event; ++ uint8_t *buffer_to_free; ++ uint32_t dev_type; ++ ++ char patch_file_name[PATH_MAX]; ++ char ps_file_name[PATH_MAX]; ++ char bdaddr_file_name[PATH_MAX]; ++ ++ FILE *stream; ++ char bdaddr[21]; ++ ++ hci_cmd_list = NULL; ++ ++ do { ++ /* ++ * Verfiy firmware version. depending on it select the PS ++ * config file to download. ++ */ ++ if (get_device_type(hdev, &dev_type) == -1) { ++ status = -1; ++ break; ++ } ++ if (read_ar3k_version(hdev, ++ &rom_version, ++ &build_version) == -1) { ++ status = -1; ++ break; ++ } ++ ++ get_ps_file_name(dev_type, rom_version, ps_file_name); ++ ++ get_patch_file_name(dev_type, rom_version, build_version, ++ patch_file_name); ++ ++ /* Read the PS file to a dynamically allocated buffer */ ++ stream = fopen(ps_file_name, "r"); ++ if (stream == NULL) { ++ perror("firmware file open error\n"); ++ status = -1; ++ break; ++ } ++ tag_count = ath_parse_ps(stream, &total_tag_len); ++ ++ fclose(stream); ++ ++ if (tag_count == -1) { ++ status = -1; ++ break; ++ } ++ ++ /* ++ * It is not necessary that Patch file be available, ++ * continue with PS Operations if. ++ * failed. ++ */ ++ if (patch_file_name[0] == '\0') ++ status = 0; ++ stream = fopen(patch_file_name, "r"); ++ if (stream == NULL) ++ status = 0; ++ else { ++ /* parse and store the Patch file contents to ++ * a global variables ++ */ ++ patch_count = parse_patch_file(stream); ++ ++ fclose(stream); ++ ++ if (patch_count < 0) { ++ status = -1; ++ break; ++ } ++ } ++ ++ /* ++ * Send the CRC packet, ++ * Continue with the PS operations ++ * only if the CRC check failed ++ */ ++ if (get_ar3k_crc(hdev, tag_count, patch_count) < 0) { ++ status = 0; ++ break; ++ } ++ ++ /* Create an HCI command list ++ * from the parsed PS and patch information ++ */ ++ ath_create_cmd_list(&hci_cmd_list, ++ &num_cmds, ++ tag_count, ++ patch_count, ++ total_tag_len); ++ ++ for (i = 0; i < num_cmds; i++) { ++ ++ if (send_hci_cmd_wait_event ++ (hdev, hci_cmd_list[i].Hcipacket, ++ hci_cmd_list[i].packetLen, &event, ++ &buffer_to_free) == 0) { ++ ++ if (read_ps_event(event) < 0) { ++ ++ /* Exit if the status is not success */ ++ if (buffer_to_free != NULL) ++ free(buffer_to_free); ++ ++ status = -1; ++ break; ++ } ++ if (buffer_to_free != NULL) ++ free(buffer_to_free); ++ } else { ++ status = 0; ++ break; ++ } ++ } ++ /* Read the PS file to a dynamically allocated buffer */ ++ sprintf(bdaddr_file_name, "%s%x/%s", ++ FW_PATH, ++ rom_version, ++ BDADDR_FILE); ++ ++ stream = fopen(bdaddr_file_name, "r"); ++ ++ if (stream == NULL) { ++ status = 0; ++ break; ++ } ++ ++ if (fgets(bdaddr, 20, stream) != NULL) ++ status = write_bdaddr(hdev, bdaddr); ++ ++ fclose(stream); ++ ++ } while (FALSE); ++ ++ if (hci_cmd_list != NULL) ++ ath_free_command_list(&hci_cmd_list, num_cmds); ++ ++ return status; ++} +-- +1.7.0.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-autopair.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-autopair.patch new file mode 100644 index 0000000000..e9126a34e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-autopair.patch @@ -0,0 +1,62 @@ +From 36358d4a7b3471f5a124a95fec9ed0e4871299e0 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Wed, 18 Apr 2012 15:53:55 -0700 +Subject: [PATCH 14/14] autopair: use 0000 as PIN for dumb devices + +Android tries 0000 for a set of audio devices, so follow suit and +do the same even though most audio devices support SSP these days. + +BUG=chromium-os:25211 +TEST=verified with audio devices after 'hciconfig hci0 sspmode 0' +--- + plugins/autopair.c | 26 +++++++++++++++++++++++--- + 1 files changed, 23 insertions(+), 3 deletions(-) + +diff --git a/plugins/autopair.c b/plugins/autopair.c +index 05de3ff..5b773c5 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -150,10 +150,24 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + } + + switch ((class & 0x1f00) >> 8) { +- case 0x05: ++ case 0x04: // Audio/Video ++ switch ((class & 0xfc) >> 2) { ++ case 0x01: // Wearable Headset Device ++ case 0x02: // Hands-free Device ++ case 0x06: // Headphones ++ case 0x07: // Portable Audio ++ case 0x0a: // HiFi Audio Device ++ if (autopair_attempt(device)) { ++ memcpy(pinbuf, "0000", 4); ++ return 4; ++ } ++ break; ++ } ++ break; ++ case 0x05: // Peripheral + switch ((class & 0xc0) >> 6) { +- case 0x01: +- case 0x03: ++ case 0x01: // Keyboard ++ case 0x03: // Combo keyboard/pointing device + if (autopair_attempt(device)) { + char pinstr[7]; + srand(time(NULL)); +@@ -164,6 +178,12 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + return 6; + } + break; ++ case 0x02: // Pointing device ++ if (autopair_attempt(device)) { ++ memcpy(pinbuf, "0000", 4); ++ return 4; ++ } ++ break; + } + break; + } +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-dbus.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-dbus.patch new file mode 100644 index 0000000000..24b56b75c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-dbus.patch @@ -0,0 +1,31 @@ +diff --git a/src/bluetooth.conf b/src/bluetooth.conf +index 664dbd9..3263112 100644 +--- a/src/bluetooth.conf ++++ b/src/bluetooth.conf +@@ -7,7 +7,11 @@ + + + + ++ ++ ++ ++ + + + +@@ -18,13 +22,7 @@ + + + +- +- +- +- +- +- ++ + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-initially-powered.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-initially-powered.patch new file mode 100644 index 0000000000..8526997b55 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-initially-powered.patch @@ -0,0 +1,13 @@ +diff --git a/src/main.conf b/src/main.conf +index 321f622..f6784fb 100644 +--- a/src/main.conf ++++ b/src/main.conf +@@ -38,7 +38,7 @@ AutoConnectTimeout = 60 + + # What value should be assumed for the adapter Powered property when + # SetProperty(Powered, ...) hasn't been called yet. Defaults to true +-InitiallyPowered = true ++InitiallyPowered = false + + # Remember the previously stored Powered state when initializing adapters + RememberPowered = true diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-plugdev.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-plugdev.patch new file mode 100755 index 0000000000..726838a513 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-plugdev.patch @@ -0,0 +1,14 @@ +diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf +--- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100 ++++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200 +@@ -17,6 +17,10 @@ + + + ++ ++ ++ ++ + + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ps3-gamepad.rules b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ps3-gamepad.rules new file mode 100644 index 0000000000..288f086931 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ps3-gamepad.rules @@ -0,0 +1,12 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Match the PS3 Controller RAW HID device when plugged in via USB, +# place in the bluetooth group so bluetoothd can set pairing information. +SUBSYSTEM=="hidraw", SUBSYSTEMS=="usb", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0268", GROUP="bluetooth", MODE="0660" + +# Match the PS3 Controller RAW HID device when connected via Bluetooth, +# place in the bluetooth group so bluetoothd can update pairing information +# and stop the lights from flashing. +SUBSYSTEM=="hidraw", SUBSYSTEMS=="hid", KERNELS=="*:054C:0268.*", GROUP="bluetooth", MODE="0660" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-sdp-path.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-sdp-path.patch new file mode 100644 index 0000000000..6dac6bf83c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-sdp-path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/sdp.h b/lib/sdp.h +index 2fe74d5..e559a5c 100644 +--- a/lib/sdp.h ++++ b/lib/sdp.h +@@ -34,7 +34,7 @@ extern "C" { + #include + #include + +-#define SDP_UNIX_PATH "/var/run/sdp" ++#define SDP_UNIX_PATH "/var/run/bluetooth/sdp" + #define SDP_RESPONSE_TIMEOUT 20 + #define SDP_REQ_BUFFER_SIZE 2048 + #define SDP_RSP_BUFFER_SIZE 65535 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-upstart.conf b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-upstart.conf new file mode 100644 index 0000000000..b635f9b31a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-upstart.conf @@ -0,0 +1,26 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Start the bluetooth daemon" +author "chromium-os-dev@chromium.org" + +start on starting system-services +stop on stopping system-services + +env BLUETOOTH_LIBDIR=/var/lib/bluetooth +env BLUETOOTH_RUNDIR=/var/run/bluetooth + +pre-start script + mkdir -p -m 0750 ${BLUETOOTH_LIBDIR} ${BLUETOOTH_RUNDIR} + chown -R bluetooth:bluetooth ${BLUETOOTH_LIBDIR} ${BLUETOOTH_RUNDIR} +end script + +respawn + +script + ulimit -l unlimited + exec /sbin/minijail0 -u bluetooth -g bluetooth \ + -c 3500 -- \ + /usr/sbin/bluetoothd --nodetach +end script diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-conf.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-conf.d new file mode 100644 index 0000000000..d87acdb282 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-conf.d @@ -0,0 +1,5 @@ +# Bind rfcomm devices (allowed values are "true" and "false") +RFCOMM_ENABLE=true + +# Config file for rfcomm +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-init.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-init.d new file mode 100644 index 0000000000..d3b819e1ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-init.d @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.1 2011/12/31 21:09:18 pacho Exp $ + +depend() { + after coldplug + need dbus localmount hostname +} + +start() { + if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then + if [ -f "${RFCOMM_CONFIG}" ]; then + ebegin "Starting rfcomm" + /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all + eend $? + else + ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists" + fi + fi +} + +stop() { + ebegin "Shutting down rfcomm" + /usr/bin/rfcomm release all + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/metadata.xml new file mode 100644 index 0000000000..a9fb95ffdb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/metadata.xml @@ -0,0 +1,28 @@ + + + + mobile + pda + + dev-zero@gentoo.org + + + betelgeuse@gentoo.org + + + pacho@gentoo.org + + Taking care of this until Petteri and Tiziano have + enough time for maintaing bluez. + + + + Use sys-auth/pambase[consolekit] to + determine access to bluetooth devices based on whether a user is + logged in locally or remotely + Install old daemons like hidd and sdpd that are + deprecated by the new Service framework + Install tools for testing of + various Bluetooth functions + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/Manifest new file mode 100644 index 0000000000..b1fb4e18dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/Manifest @@ -0,0 +1 @@ +DIST crda-1.1.1.tar.bz2 21666 RMD160 035e381f6276dacd06afc05fbfefdbbf7e768091 SHA1 73643b3f49b34c4150df4abb793a36792cc68fb7 SHA256 59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/crda-1.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/crda-1.1.1.ebuild new file mode 100644 index 0000000000..70468d83f8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/crda-1.1.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.1.ebuild,v 1.1 2010/01/26 17:02:57 chainsaw Exp $ + +EAPI="2" + +inherit toolchain-funcs multilib + +DESCRIPTION="Central Regulatory Domain Agent for wireless networks." +HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" +SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2" +LICENSE="as-is" +SLOT="0" + +KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" +IUSE="" +RDEPEND="dev-libs/libgcrypt + dev-libs/libnl:0 + net-wireless/wireless-regdb" +DEPEND="${RDEPEND} + dev-python/m2crypto" + +src_prepare() { + ##Make sure we install the rules where udev rules go... + sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || \ + die "Makefile sed failed" + + # install version that also handles "add" events + cp -f "${FILESDIR}"/regulatory.rules "${S}"/udev || \ + die "Failed to install new regulatory.rules" + + # Make sure we hit the correct pkg-config wrapper + sed -i \ + -e "s:\:$(tc-getPKG_CONFIG):" \ + "${S}"/Makefile || die +} + +src_compile() { + # + # NB: crda assumes regdbdump built for the target can run on + # the build host which doesn't work; use all_noverify as + # a WAR + emake CC="$(tc-getCC)" all_noverify || die "Compilation failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/files/regulatory.rules b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/files/regulatory.rules new file mode 100644 index 0000000000..fa4d756e0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/files/regulatory.rules @@ -0,0 +1,5 @@ +# Runs CRDA for kernel wireless regulatory events. +# For more information see: +# http://wireless.kernel.org/en/developers/Regulatory/CRDA + +KERNEL=="regulatory*", ACTION=="add|change", SUBSYSTEM=="platform", RUN+="/sbin/crda" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-0.0.1-r25.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-0.0.1-r25.ebuild new file mode 100644 index 0000000000..ea7aa46ac5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-0.0.1-r25.ebuild @@ -0,0 +1,56 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="24b2d89de0aa91ba968ead7bcb92450280255806" +CROS_WORKON_TREE="3dc85a711e8560caa66ff457623c985d8256abe2" +CROS_WORKON_PROJECT="chromiumos/third_party/gdmwimax" + +inherit cros-workon + +DESCRIPTION="GCT GDM7205 WiMAX SDK" +HOMEPAGE="http://www.gctsemi.com/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_prepare() { + # Create build configuration file. + cat > .config <<-EOF + CONFIG_DM_INTERFACE=y + CONFIG_DM_NET_DEVICE=eth0 + CONFIG_LOG_FILE_BUF_SIZE=0x80000 + CONFIG_ENABLE_BW_SWITCHING_FOR_KT=n + CONFIG_ENABLE_SERVICE_FLOW=n + CONFIG_WIMAX2=n + EOF +} + +src_compile() { + # Do not fortify source. See crosbug.com/p/10133 for details. + append-flags -U_FORTIFY_SOURCE + tc-export AR CC + emake -C sdk + emake -C cm +} + +src_install() { + # Install SDK library. + dolib sdk/libgdmwimax.a + + # Install SDK headers. + insinto /usr/include/gct + doins sdk/{gctapi.h,gcttype.h,WiMaxType.h} + + # Install connection manager executable and configuration file. + exeinto /opt/gct + doexe cm/cm + insinto /opt/gct + doins cm/cm.conf + + # Install firmware. + insinto /lib/firmware/gdm72xx + doins firmware/gdmuimg.bin +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-9999.ebuild new file mode 100644 index 0000000000..488042ea81 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-9999.ebuild @@ -0,0 +1,54 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/gdmwimax" + +inherit cros-workon + +DESCRIPTION="GCT GDM7205 WiMAX SDK" +HOMEPAGE="http://www.gctsemi.com/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +src_prepare() { + # Create build configuration file. + cat > .config <<-EOF + CONFIG_DM_INTERFACE=y + CONFIG_DM_NET_DEVICE=eth0 + CONFIG_LOG_FILE_BUF_SIZE=0x80000 + CONFIG_ENABLE_BW_SWITCHING_FOR_KT=n + CONFIG_ENABLE_SERVICE_FLOW=n + CONFIG_WIMAX2=n + EOF +} + +src_compile() { + # Do not fortify source. See crosbug.com/p/10133 for details. + append-flags -U_FORTIFY_SOURCE + tc-export AR CC + emake -C sdk + emake -C cm +} + +src_install() { + # Install SDK library. + dolib sdk/libgdmwimax.a + + # Install SDK headers. + insinto /usr/include/gct + doins sdk/{gctapi.h,gcttype.h,WiMaxType.h} + + # Install connection manager executable and configuration file. + exeinto /opt/gct + doexe cm/cm + insinto /opt/gct + doins cm/cm.conf + + # Install firmware. + insinto /lib/firmware/gdm72xx + doins firmware/gdmuimg.bin +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-0.7.2-r51.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-0.7.2-r51.ebuild new file mode 100644 index 0000000000..12de66916d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-0.7.2-r51.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.7.1.ebuild,v 1.1 2010/01/24 20:49:34 gurligebis Exp $ + +EAPI="2" +CROS_WORKON_COMMIT="728b68f811a2b0b12ea57c2e5386bee7e36f0bf9" +CROS_WORKON_TREE="6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5" +CROS_WORKON_PROJECT="chromiumos/third_party/hostap" +CROS_WORKON_LOCALNAME="wpa_supplicant" + +inherit toolchain-funcs eutils cros-workon + +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="http://hostap.epitest.fi" +#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" + +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="ipv6 logwatch madwifi +ssl +wps" + +DEPEND="ssl? ( dev-libs/openssl ) + dev-libs/libnl:0 + madwifi? ( || + ( >net-wireless/madwifi-ng-tools-0.9.3 + net-wireless/madwifi-old ) )" +RDEPEND="${DEPEND}" + +MY_S="${WORKDIR}/${P}/hostapd" + +src_prepare() { + cd ${MY_S} + sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ + "${MY_S}/hostapd.conf" +} + +src_configure() { + local CONFIG="${MY_S}/.config" + + # toolchain setup + echo "CC = $(tc-getCC)" > ${CONFIG} + + # EAP authentication methods + echo "CONFIG_EAP=y" >> ${CONFIG} + echo "CONFIG_EAP_MD5=y" >> ${CONFIG} + + if use ssl; then + # SSL authentication methods + echo "CONFIG_EAP_TLS=y" >> ${CONFIG} + echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} + echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} + fi + + if use wps; then + # Enable Wi-Fi Protected Setup + echo "CONFIG_WPS=y" >> ${CONFIG} + echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} + einfo "Enabling Wi-Fi Protected Setup support" + fi + + echo "CONFIG_EAP_GTC=y" >> ${CONFIG} + echo "CONFIG_EAP_SIM=y" >> ${CONFIG} + echo "CONFIG_EAP_AKA=y" >> ${CONFIG} + echo "CONFIG_EAP_PAX=y" >> ${CONFIG} + echo "CONFIG_EAP_PSK=y" >> ${CONFIG} + echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} + echo "CONFIG_IEEE80211W=y" >> ${CONFIG} + + einfo "Enabling drivers: " + + if use madwifi; then + # Add include path for madwifi-driver headers + einfo " Madwifi driver enabled" + echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG} + echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG} + else + einfo " Madwifi driver disabled" + fi + + einfo " nl80211 driver enabled" + echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} + + # misc + echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} + echo "CONFIG_IEEE80211N=y" >> ${CONFIG} + + if use ipv6; then + # IPv6 support + echo "CONFIG_IPV6=y" >> ${CONFIG} + fi + + echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} + echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} + + # TODO: Add support for BSD drivers + + default_src_configure +} + +src_compile() { + default_src_compile + + emake -C hostapd || die "emake failed" + + if use ssl; then + cd ${MY_S} + emake nt_password_hash || die "emake nt_password_hash failed" + emake hlr_auc_gw || die "emake hlr_auc_gw failed" + fi +} + +src_install() { + cd ${MY_S} + dosbin hostapd + dobin hostapd_cli + + use ssl && dobin nt_password_hash + use ssl && dobin hlr_auc_gw + + doman hostapd.8 hostapd_cli.1 + + dodoc ChangeLog README + if use wps; then + dodoc README-WPS + fi + + docinto examples + dodoc wired.conf + + if use logwatch; then + insinto /etc/log.d/conf/services/ + doins logwatch/hostapd.conf + + exeinto /etc/log.d/scripts/services/ + doexe logwatch/hostapd + fi +} + +pkg_postinst() { + einfo + einfo "In order to use ${PN} you need to set up your wireless card" + einfo "for master mode in /etc/conf.d/net and then start" + einfo "/etc/init.d/hostapd." + einfo + einfo "Example configuration:" + einfo + einfo "config_wlan0=( \"192.168.1.1/24\" )" + einfo "channel_wlan0=\"6\"" + einfo "essid_wlan0=\"test\"" + einfo "mode_wlan0=\"master\"" + einfo + if use madwifi; then + einfo "This package compiles against the headers installed by" + einfo "madwifi-old, madwifi-ng or madwifi-ng-tools." + einfo "You should remerge ${PN} after upgrading these packages." + einfo + einfo "Since you are using the madwifi-ng driver, you should disable or" + einfo "comment out wme_enabled from hostapd.conf, since it will" + einfo "cause problems otherwise (see bug #260377" + fi + #if [ -e "${KV_DIR}"/net/mac80211 ]; then + # einfo "This package now compiles against the headers installed by" + # einfo "the kernel source for the mac80211 driver. You should " + # einfo "re-emerge ${PN} after upgrading your kernel source." + #fi + + if use wps; then + einfo "You have enabled Wi-Fi Protected Setup support, please" + einfo "read the README-WPS file in /usr/share/doc/${P}" + einfo "for info on how to use WPS" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-9999.ebuild new file mode 100644 index 0000000000..d466ba7874 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-9999.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.7.1.ebuild,v 1.1 2010/01/24 20:49:34 gurligebis Exp $ + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/third_party/hostap" +CROS_WORKON_LOCALNAME="wpa_supplicant" + +inherit toolchain-funcs eutils cros-workon + +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="http://hostap.epitest.fi" +#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" + +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="ipv6 logwatch madwifi +ssl +wps" + +DEPEND="ssl? ( dev-libs/openssl ) + dev-libs/libnl:0 + madwifi? ( || + ( >net-wireless/madwifi-ng-tools-0.9.3 + net-wireless/madwifi-old ) )" +RDEPEND="${DEPEND}" + +MY_S="${WORKDIR}/${P}/hostapd" + +src_prepare() { + cd ${MY_S} + sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ + "${MY_S}/hostapd.conf" +} + +src_configure() { + local CONFIG="${MY_S}/.config" + + # toolchain setup + echo "CC = $(tc-getCC)" > ${CONFIG} + + # EAP authentication methods + echo "CONFIG_EAP=y" >> ${CONFIG} + echo "CONFIG_EAP_MD5=y" >> ${CONFIG} + + if use ssl; then + # SSL authentication methods + echo "CONFIG_EAP_TLS=y" >> ${CONFIG} + echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} + echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} + fi + + if use wps; then + # Enable Wi-Fi Protected Setup + echo "CONFIG_WPS=y" >> ${CONFIG} + echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} + einfo "Enabling Wi-Fi Protected Setup support" + fi + + echo "CONFIG_EAP_GTC=y" >> ${CONFIG} + echo "CONFIG_EAP_SIM=y" >> ${CONFIG} + echo "CONFIG_EAP_AKA=y" >> ${CONFIG} + echo "CONFIG_EAP_PAX=y" >> ${CONFIG} + echo "CONFIG_EAP_PSK=y" >> ${CONFIG} + echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} + echo "CONFIG_IEEE80211W=y" >> ${CONFIG} + + einfo "Enabling drivers: " + + if use madwifi; then + # Add include path for madwifi-driver headers + einfo " Madwifi driver enabled" + echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG} + echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG} + else + einfo " Madwifi driver disabled" + fi + + einfo " nl80211 driver enabled" + echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} + + # misc + echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} + echo "CONFIG_IEEE80211N=y" >> ${CONFIG} + + if use ipv6; then + # IPv6 support + echo "CONFIG_IPV6=y" >> ${CONFIG} + fi + + echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} + echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} + + # TODO: Add support for BSD drivers + + default_src_configure +} + +src_compile() { + default_src_compile + + emake -C hostapd || die "emake failed" + + if use ssl; then + cd ${MY_S} + emake nt_password_hash || die "emake nt_password_hash failed" + emake hlr_auc_gw || die "emake hlr_auc_gw failed" + fi +} + +src_install() { + cd ${MY_S} + dosbin hostapd + dobin hostapd_cli + + use ssl && dobin nt_password_hash + use ssl && dobin hlr_auc_gw + + doman hostapd.8 hostapd_cli.1 + + dodoc ChangeLog README + if use wps; then + dodoc README-WPS + fi + + docinto examples + dodoc wired.conf + + if use logwatch; then + insinto /etc/log.d/conf/services/ + doins logwatch/hostapd.conf + + exeinto /etc/log.d/scripts/services/ + doexe logwatch/hostapd + fi +} + +pkg_postinst() { + einfo + einfo "In order to use ${PN} you need to set up your wireless card" + einfo "for master mode in /etc/conf.d/net and then start" + einfo "/etc/init.d/hostapd." + einfo + einfo "Example configuration:" + einfo + einfo "config_wlan0=( \"192.168.1.1/24\" )" + einfo "channel_wlan0=\"6\"" + einfo "essid_wlan0=\"test\"" + einfo "mode_wlan0=\"master\"" + einfo + if use madwifi; then + einfo "This package compiles against the headers installed by" + einfo "madwifi-old, madwifi-ng or madwifi-ng-tools." + einfo "You should remerge ${PN} after upgrading these packages." + einfo + einfo "Since you are using the madwifi-ng driver, you should disable or" + einfo "comment out wme_enabled from hostapd.conf, since it will" + einfo "cause problems otherwise (see bug #260377" + fi + #if [ -e "${KV_DIR}"/net/mac80211 ]; then + # einfo "This package now compiles against the headers installed by" + # einfo "the kernel source for the mac80211 driver. You should " + # einfo "re-emerge ${PN} after upgrading your kernel source." + #fi + + if use wps; then + einfo "You have enabled Wi-Fi Protected Setup support, please" + einfo "read the README-WPS file in /usr/share/doc/${P}" + einfo "for info on how to use WPS" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/Manifest new file mode 100644 index 0000000000..0b780ac174 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/Manifest @@ -0,0 +1 @@ +DIST iw-0.9.22.tar.bz2 50526 RMD160 bfc65cb72f1dbd73674b5207577882500c7ac253 SHA1 a91226daab473d1aa0b6586c61f1c62db9618b7d SHA256 138ce4dc827d8b0af55fe1c444e749b985c1540d791b27922aad880d12908bb1 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-beacon-loss.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-beacon-loss.patch new file mode 100644 index 0000000000..a9ab24ba23 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-beacon-loss.patch @@ -0,0 +1,53 @@ +diff -ur iw-3.1-orig/nl80211.h iw-3.1/nl80211.h +--- iw-3.1-orig/nl80211.h 2012-01-05 14:11:08.008100900 -0800 ++++ iw-3.1/nl80211.h 2012-01-05 14:22:20.009073676 -0800 +@@ -1437,6 +1437,8 @@ + * @NL80211_STA_INFO_BSS_PARAM: current station's view of BSS, nested attribute + * containing info as possible, see &enum nl80211_sta_bss_param + * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected ++ * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update. ++ * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32) + * @__NL80211_STA_INFO_AFTER_LAST: internal + * @NL80211_STA_INFO_MAX: highest possible station info attribute + */ +@@ -1458,6 +1460,8 @@ + NL80211_STA_INFO_RX_BITRATE, + NL80211_STA_INFO_BSS_PARAM, + NL80211_STA_INFO_CONNECTED_TIME, ++ NL80211_STA_INFO_STA_FLAGS, ++ NL80211_STA_INFO_BEACON_LOSS, + + /* keep last */ + __NL80211_STA_INFO_AFTER_LAST, +diff -ur iw-3.1-orig/station.c iw-3.1/station.c +--- iw-3.1-orig/station.c 2011-09-05 03:21:59.000000000 -0700 ++++ iw-3.1/station.c 2012-01-05 14:13:18.030228076 -0800 +@@ -50,6 +50,8 @@ + [NL80211_STA_INFO_PLINK_STATE] = { .type = NLA_U8 }, + [NL80211_STA_INFO_TX_RETRIES] = { .type = NLA_U32 }, + [NL80211_STA_INFO_TX_FAILED] = { .type = NLA_U32 }, ++ [NL80211_STA_INFO_CONNECTED_TIME] = { .type = NLA_U32 }, ++ [NL80211_STA_INFO_BEACON_LOSS] = { .type = NLA_U32 }, + }; + + static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { +@@ -83,6 +85,9 @@ + if_indextoname(nla_get_u32(tb[NL80211_ATTR_IFINDEX]), dev); + printf("Station %s (on %s)", mac_addr, dev); + ++ if (sinfo[NL80211_STA_INFO_CONNECTED_TIME]) ++ printf("\n\tconnected time:\t%u", ++ nla_get_u32(sinfo[NL80211_STA_INFO_CONNECTED_TIME])); + if (sinfo[NL80211_STA_INFO_INACTIVE_TIME]) + printf("\n\tinactive time:\t%u ms", + nla_get_u32(sinfo[NL80211_STA_INFO_INACTIVE_TIME])); +@@ -104,6 +109,9 @@ + if (sinfo[NL80211_STA_INFO_TX_FAILED]) + printf("\n\ttx failed:\t%u", + nla_get_u32(sinfo[NL80211_STA_INFO_TX_FAILED])); ++ if (sinfo[NL80211_STA_INFO_BEACON_LOSS]) ++ printf("\n\tbeacon loss:\t%u", ++ nla_get_u32(sinfo[NL80211_STA_INFO_BEACON_LOSS])); + if (sinfo[NL80211_STA_INFO_SIGNAL]) + printf("\n\tsignal: \t%d dBm", + (int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL])); diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-nl80211.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-nl80211.patch new file mode 100644 index 0000000000..514039e8cb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-nl80211.patch @@ -0,0 +1,28 @@ +diff -u iw-3.1.orig/nl80211.h iw-3.1/nl80211.h +--- iw-3.1.orig/nl80211.h 2011-10-19 16:37:30.000000000 -0700 ++++ iw-3.1/nl80211.h 2011-10-19 16:40:08.000000000 -0700 +@@ -1201,6 +1201,8 @@ + NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX, + NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX, + ++ NL80211_ATTR_SCAN_FLAGS, ++ + NL80211_ATTR_SUPPORT_MESH_AUTH, + NL80211_ATTR_STA_PLINK_STATE, + +@@ -1212,6 +1214,15 @@ + NL80211_ATTR_INTERFACE_COMBINATIONS, + NL80211_ATTR_SOFTWARE_IFTYPES, + ++ NL80211_ATTR_HIDDEN_SSID, ++ ++ NL80211_ATTR_IE_PROBE_RESP, ++ NL80211_ATTR_IE_ASSOC_RESP, ++ ++ NL80211_ATTR_ROAM_SUPPORT, ++ ++ NL80211_ATTR_PMKSA_CANDIDATE, ++ + NL80211_ATTR_REKEY_DATA, + + NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS, diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-nl80211.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-nl80211.patch new file mode 100644 index 0000000000..b6f1531e36 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-nl80211.patch @@ -0,0 +1,12 @@ +diff -ru iw-3.6.org//nl80211.h iw-3.6/nl80211.h +--- iw-3.6.org//nl80211.h 2012-09-24 10:48:35.589737190 -0700 ++++ iw-3.6/nl80211.h 2012-09-24 10:48:57.519902011 -0700 +@@ -1438,6 +1438,8 @@ + NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX, + NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX, + ++ NL80211_ATTR_SCAN_FLAGS, ++ + NL80211_ATTR_SUPPORT_MESH_AUTH, + NL80211_ATTR_STA_PLINK_STATE, + diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-scan.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-scan.patch new file mode 100644 index 0000000000..0e455d375e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-scan.patch @@ -0,0 +1,96 @@ +diff -u iw-3.6.orig//nl80211.h iw-3.6/nl80211.h +--- iw-3.6.orig//nl80211.h 2012-09-24 11:20:29.524118445 -0700 ++++ iw-3.6/nl80211.h 2012-09-24 11:20:38.254184112 -0700 +@@ -3025,4 +3025,18 @@ + NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U = 1<<3, + }; + ++/** ++ * enum nl80211_scan_flags - scan request control flags ++ * ++ * Scan request control flags are used to control the handling ++ * of NL80211_CMD_TRIGGER_SCAN, requests. ++ * ++ * @NL80211_SCAN_FLAG_TX_ABORT: abort scan if tx collides ++ * @NL80211_SCAN_FLAG_FLUSH: flush bss cache before scan ++ */ ++enum nl80211_scan_flags { ++ NL80211_SCAN_FLAG_TX_ABORT = 1<<0, ++ NL80211_SCAN_FLAG_FLUSH = 1<<1, ++}; ++ + #endif /* __LINUX_NL80211_H */ +diff -u iw-3.6.orig//scan.c iw-3.6/scan.c +--- iw-3.6.orig//scan.c 2012-09-24 11:20:29.524118445 -0700 ++++ iw-3.6/scan.c 2012-09-24 11:20:34.704157409 -0700 +@@ -73,6 +73,7 @@ + bool passive = false, have_ssids = false, have_freqs = false; + size_t tmp; + unsigned char *ies; ++ int flags = 0; + + ssids = nlmsg_alloc(); + if (!ssids) +@@ -102,6 +103,14 @@ + parse = DONE; + passive = true; + break; ++ } else if (strcmp(argv[i], "txabort") == 0) { ++ parse = DONE; ++ flags |= NL80211_SCAN_FLAG_TX_ABORT; ++ break; ++ } else if (strcmp(argv[i], "flush") == 0) { ++ parse = DONE; ++ flags |= NL80211_SCAN_FLAG_FLUSH; ++ break; + } + case DONE: + return 1; +@@ -136,6 +145,8 @@ + + if (have_freqs) + nla_put_nested(msg, NL80211_ATTR_SCAN_FREQUENCIES, freqs); ++ if (flags) ++ NLA_PUT_U32(msg, NL80211_ATTR_SCAN_FLAGS, flags); + + err = 0; + nla_put_failure: +@@ -1287,14 +1298,11 @@ + }; + int trig_argc, dump_argc, err; + +- if (argc >= 3 && !strcmp(argv[2], "-u")) { +- dump_argc = 4; +- dump_argv[3] = "-u"; +- } else if (argc >= 3 && !strcmp(argv[2], "-b")) { +- dump_argc = 4; +- dump_argv[3] = "-b"; +- } else +- dump_argc = 3; ++ dump_argc = 3; ++ if (argc >= 3 && !strcmp(argv[2], "-u")) ++ dump_argv[dump_argc++] = "-u"; ++ else if (argc >= 3 && !strcmp(argv[2], "-b")) ++ dump_argv[dump_argc++] = "-b"; + + trig_argc = 3 + (argc - 2) + (3 - dump_argc); + trig_argv = calloc(trig_argc, sizeof(*trig_argv)); +@@ -1344,7 +1352,7 @@ + dump_argv[0] = argv[0]; + return handle_cmd(state, id, dump_argc, dump_argv); + } +-TOPLEVEL(scan, "[-u] [freq *] [ies ] [ssid *|passive]", 0, 0, ++TOPLEVEL(scan, "[-u] [freq *] [ies ] [ssid *|passive|txabort|flush]", 0, 0, + CIB_NETDEV, handle_scan_combined, + "Scan on the given frequencies and probe for the given SSIDs\n" + "(or wildcard if not given) unless passive scanning is requested.\n" +@@ -1354,7 +1362,8 @@ + NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump, + "Dump the current scan results. If -u is specified, print unknown\n" + "data in scan results."); +-COMMAND(scan, trigger, "[freq *] [ies ] [ssid *|passive]", ++COMMAND(scan, trigger, "[freq *] [ies ] [ssid *|passive|txabort|flush]", + NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan, + "Trigger a scan on the given frequencies with probing for the given\n" ++ + "SSIDs (or wildcard if not given) unless passive scanning is requested."); diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-0.9.22.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-0.9.22.ebuild new file mode 100644 index 0000000000..e7f0130028 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-0.9.22.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-0.9.17.ebuild,v 1.5 2010/02/23 18:53:43 armin76 Exp $ + +inherit toolchain-funcs + +DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" +HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" +SRC_URI="http://wireless.kernel.org/download/${PN}/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=dev-libs/libnl-1.1" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +CC=$(tc-getCC) +LD=$(tc-getLD) + +src_install() { + emake install DESTDIR="${D}" || die "Failed to install" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.0.ebuild new file mode 100644 index 0000000000..e7f0130028 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-0.9.17.ebuild,v 1.5 2010/02/23 18:53:43 armin76 Exp $ + +inherit toolchain-funcs + +DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" +HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" +SRC_URI="http://wireless.kernel.org/download/${PN}/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=dev-libs/libnl-1.1" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +CC=$(tc-getCC) +LD=$(tc-getLD) + +src_install() { + emake install DESTDIR="${D}" || die "Failed to install" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1-r1.ebuild new file mode 120000 index 0000000000..135f7a4409 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1-r1.ebuild @@ -0,0 +1 @@ +iw-3.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1.ebuild new file mode 100644 index 0000000000..45aa9af516 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.1.ebuild,v 1.3 2011/10/27 16:03:02 jer Exp $ + +EAPI="2" + +inherit toolchain-funcs eutils + +DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" +HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" +SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=dev-libs/libnl-1.1" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}/${P}-nl80211.patch" + epatch "${FILESDIR}/${P}-beacon-loss.patch" + tc-export CC LD +} + +src_install() { + emake install DESTDIR="${D}" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6-r1.ebuild new file mode 120000 index 0000000000..d2dcd633bb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6-r1.ebuild @@ -0,0 +1 @@ +iw-3.6.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6.ebuild new file mode 100644 index 0000000000..657bb41c37 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.1.ebuild,v 1.3 2011/10/27 16:03:02 jer Exp $ + +EAPI="2" + +inherit toolchain-funcs eutils + +DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" +HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" +SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=dev-libs/libnl-1.1" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}/${P}-nl80211.patch" + epatch "${FILESDIR}/${P}-scan.patch" + tc-export CC LD +} + +src_install() { + emake install DESTDIR="${D}" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/iwl2000-ucode-18.168.6.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/iwl2000-ucode-18.168.6.1.ebuild new file mode 100644 index 0000000000..e50908a796 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/iwl2000-ucode-18.168.6.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +MY_PN="iwlwifi-2000-ucode" + +DESCRIPTION="Intel (R) Centrino Wireless-N 2200 ucode" +HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" +SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" + +LICENSE="ipw3945" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +RDEPEND="" + +DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { :; } + +src_install() { + insinto /lib/firmware + doins "${S}/iwlwifi-2000-6.ucode" || die + + dodoc README* || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/Manifest new file mode 100644 index 0000000000..03fb6e067f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/Manifest @@ -0,0 +1 @@ +DIST iwlwifi-3945-ucode-15.32.2.9.tgz 66635 RMD160 1caf86f5c6dc7ba3f40a86faef95c82dbeab9837 SHA1 0e53846a25b9ec5f6f56559f6cc0778227e5564c SHA256 536206a1f7881ab63cc38180af0dc05186e0588449b2f603415873bae8014e2d diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/iwl3945-ucode-15.32.2.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/iwl3945-ucode-15.32.2.9-r1.ebuild new file mode 100644 index 0000000000..028e806944 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/iwl3945-ucode-15.32.2.9-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ + +MY_PN="iwlwifi-3945-ucode" + +DESCRIPTION="Intel (R) PRO/Wireless 3945ABG/BG Network Connection" +HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" +SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" + +LICENSE="ipw3945" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +RDEPEND="" + +DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { :; } + +src_install() { + insinto /lib/firmware + doins "${S}/iwlwifi-3945-2.ucode" || die + + dodoc README* || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/Manifest new file mode 100644 index 0000000000..33778fd7cb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/Manifest @@ -0,0 +1 @@ +DIST iwlwifi-4965-ucode-228.61.2.24.tgz 81309 RMD160 df063ef6cd017f26ca71d8d169a09a52a2e1e1a0 SHA1 1d67aabf37a8693cb57a2559597e4674e08823b9 SHA256 b550e12dbbbba0601a306eb5bf287c703b1a32a61782fc08076483c8d870aad8 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/iwl4965-ucode-228.61.2.24-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/iwl4965-ucode-228.61.2.24-r1.ebuild new file mode 100644 index 0000000000..c8a63b07c8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/iwl4965-ucode-228.61.2.24-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ + +MY_PN="iwlwifi-4965-ucode" + +DESCRIPTION="Intel (R) Wireless WiFi 4965AGN ucode" +HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" +SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" + +LICENSE="ipw3945" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +RDEPEND="" + +DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { :; } + +src_install() { + insinto /lib/firmware + doins "${S}/iwlwifi-4965-2.ucode" || die + + dodoc README* || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/Manifest new file mode 100644 index 0000000000..8a4dffc78d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/Manifest @@ -0,0 +1 @@ +DIST iwlwifi-6000-ucode-9.221.4.1.tgz 216806 RMD160 7d5dd5d7366bd46141d80e63d8e7f1a468e8afbf SHA1 a888cf54974702594e82bcbfca20c26d8f906e9f SHA256 7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1-r1.ebuild new file mode 100644 index 0000000000..0ed739fe1a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ + +MY_PN="iwlwifi-6000-ucode" + +DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" +HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" +SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" + +LICENSE="ipw3945" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +RDEPEND="" + +DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { :; } + +src_install() { + insinto /lib/firmware + doins "${S}/iwlwifi-6000-4.ucode" || die + + dodoc README* || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/iwl6005-ucode-17.168.5.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/iwl6005-ucode-17.168.5.2-r1.ebuild new file mode 100644 index 0000000000..5e323d1b9f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/iwl6005-ucode-17.168.5.2-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ + +MY_PN="iwlwifi-6000g2a-ucode" + +DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" +HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" +SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" + +LICENSE="ipw3945" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +RDEPEND="" + +DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { :; } + +src_install() { + insinto /lib/firmware + doins "${S}/iwlwifi-6000g2a-5.ucode" || die + + dodoc README* || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/Manifest new file mode 100644 index 0000000000..e7b875d177 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/Manifest @@ -0,0 +1 @@ +DIST iwlwifi-6000g2b-ucode-17.168.5.2.tgz 221694 RMD160 d8e4a4c29e455a96ab0556dad83191b7f1e3fff0 SHA1 9a7bf83350d1a5d62847d571ed0748a80c604d7f SHA256 5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/iwl6030-ucode-18.168.6.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/iwl6030-ucode-18.168.6.1-r1.ebuild new file mode 100644 index 0000000000..4e8b89917e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/iwl6030-ucode-18.168.6.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ + +MY_PN="iwlwifi-6000g2b-ucode" + +DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" +HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" +SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" + +LICENSE="ipw3945" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +RDEPEND="" + +DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { :; } + +src_install() { + insinto /lib/firmware + doins "${S}/iwlwifi-6000g2b-6.ucode" || die + + dodoc README* || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/Manifest new file mode 100644 index 0000000000..22b8e3d236 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/Manifest @@ -0,0 +1 @@ +DIST iwlwifi-6050-ucode-41.28.5.1.tgz 223378 RMD160 7d8b97e39dc497edce81cd8c37bc4f50bf951e88 SHA1 3e3f426cfe6a6451ab236a73458e2d7b9edac141 SHA256 597d9a3ddb4b69f4590b436cf33d30a342bab2de3c9d8fa3d007b039accb20c4 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/iwl6050-ucode-41.28.5.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/iwl6050-ucode-41.28.5.1-r1.ebuild new file mode 100644 index 0000000000..a07ee13a60 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/iwl6050-ucode-41.28.5.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ + +MY_PN="iwlwifi-6050-ucode" + +DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" +HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" +SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" + +LICENSE="ipw3945" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +RDEPEND="" + +DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { :; } + +src_install() { + insinto /lib/firmware + doins "${S}/iwlwifi-6050-5.ucode" || die + + dodoc README* || die "dodoc failed" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-14.64.2.47-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-14.64.2.47-r15.ebuild new file mode 100644 index 0000000000..9f99ea90a1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-14.64.2.47-r15.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_COMMIT="93ce6f598da2aa68003d1ebb305f32ec88755344" +CROS_WORKON_TREE="e678d0d27c25cba5abe0581e078ede22b87ba6ab" +CROS_WORKON_PROJECT="chromiumos/third_party/marvell" + +inherit eutils cros-workon + +DESCRIPTION="Marvell SD8787 firmware image" +HOMEPAGE="http://www.marvell.com/" +LICENSE="Marvell International Ltd." + +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RESTRICT="binchecks strip test" + +DEPEND="" +RDEPEND="" + +CROS_WORKON_LOCALNAME="marvell" + +src_install() { + dodir /lib/firmware/mrvl || die + cp -a "${S}"/sd87* "${D}"/lib/firmware/mrvl/ || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-9999.ebuild new file mode 100644 index 0000000000..095a1b8d78 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-9999.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" +CROS_WORKON_PROJECT="chromiumos/third_party/marvell" + +inherit eutils cros-workon + +DESCRIPTION="Marvell SD8787 firmware image" +HOMEPAGE="http://www.marvell.com/" +LICENSE="Marvell International Ltd." + +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RESTRICT="binchecks strip test" + +DEPEND="" +RDEPEND="" + +CROS_WORKON_LOCALNAME="marvell" + +src_install() { + dodir /lib/firmware/mrvl || die + cp -a "${S}"/sd87* "${D}"/lib/firmware/mrvl/ || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/files/rt2870.bin b/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/files/rt2870.bin new file mode 100644 index 0000000000..3dd6fe3126 Binary files /dev/null and b/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/files/rt2870.bin differ diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/realtek-rt2800-firmware-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/realtek-rt2800-firmware-0.0.1.ebuild new file mode 100644 index 0000000000..84c44bfcb9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/realtek-rt2800-firmware-0.0.1.ebuild @@ -0,0 +1,20 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Ebuild that installs Realtek 2800 USB firmware." + +HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git" +LICENSE="ralink-firmware" +SLOT="0" +KEYWORDS="x86 arm amd64" + +RT2800_USB_FW_NAME="rt2870.bin" + +S=${WORKDIR} + +src_install() { + insinto /lib/firmware + doins "${FILESDIR}/${RT2800_USB_FW_NAME}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild new file mode 100644 index 0000000000..8ef77ddd75 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild,v 1.1 2009/11/26 11:46:13 chainsaw Exp $ + +inherit multilib + +MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" +DESCRIPTION="Binary regulatory database for CRDA" +HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" +SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" +LICENSE="as-is" +SLOT="0" + +KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +src_compile() { + einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing untouched binary version." +} + +src_install() { + insinto /usr/$(get_libdir)/crda/; doins regulatory.bin + insinto /usr/$(get_libdir)/crda/pubkeys; doins linville.key.pub.pem + doman regulatory.bin.5 + dodoc README db.txt +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r116.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r116.ebuild new file mode 100644 index 0000000000..ae24f8392b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r116.ebuild @@ -0,0 +1,256 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild,v 1.7 2009/07/24 16:42:43 josejx Exp $ + +EAPI="2" +CROS_WORKON_COMMIT="728b68f811a2b0b12ea57c2e5386bee7e36f0bf9" +CROS_WORKON_TREE="6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5" +CROS_WORKON_PROJECT="chromiumos/third_party/hostap" + +inherit eutils toolchain-funcs qt3 qt4 cros-workon + +DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" +LICENSE="|| ( GPL-2 BSD )" + +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD" + +DEPEND="dev-libs/libnl:0 + dbus? ( sys-apps/dbus ) + kernel_linux? ( + eap-sim? ( sys-apps/pcsc-lite ) + madwifi? ( || + ( >net-wireless/madwifi-ng-tools-0.9.3 + net-wireless/madwifi-old ) + ) + ) + !kernel_linux? ( net-libs/libpcap ) + qt4? ( x11-libs/qt-gui:4 + x11-libs/qt-svg:4 ) + !qt4? ( qt3? ( x11-libs/qt:3 ) ) + readline? ( sys-libs/ncurses sys-libs/readline ) + ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) + !ssl? ( gnutls? ( net-libs/gnutls ) ) + !ssl? ( !gnutls? ( dev-libs/libtommath ) )" +RDEPEND="${DEPEND}" + +MY_S="${WORKDIR}/${P}/wpa_supplicant" + +pkg_setup() { + if use gnutls && use ssl ; then + einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" + fi + + if use qt3 && use qt4 ; then + einfo "You have both 'qt3' and 'qt4' USE flags enabled: defaulting to USE=\"qt4\"" + fi +} + +src_prepare() { + cd ${MY_S} + # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD + sed -i \ + -e "s:\(#include \):#include \n\1:" \ + ../src/l2_packet/l2_packet_freebsd.c || die + + # People seem to take the example configuration file too literally (bug #102361) + sed -i \ + -e "s:^\(opensc_engine_path\):#\1:" \ + -e "s:^\(pkcs11_engine_path\):#\1:" \ + -e "s:^\(pkcs11_module_path\):#\1:" \ + wpa_supplicant.conf || die + + # Change configuration to match Gentoo locations (bug #143750) + sed -i \ + -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ + -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ + wpa_supplicant.conf || die +} + +src_configure() { + local CFGFILE=${MY_S}/.config + + # Toolchain setup + echo "CC = $(tc-getCC)" > ${CFGFILE} + + # Build w/ debug symbols + echo "CFLAGS += -ggdb" >> ${CFGFILE} + + # Basic setup + echo "CONFIG_CTRL_IFACE=y" >> ${CFGFILE} + echo "CONFIG_BACKEND=file" >> ${CFGFILE} + + # Basic authentication methods + # NOTE: These are the options set by the Chromium OS build + echo "CONFIG_DYNAMIC_EAP_METHODS=y" >> ${CFGFILE} + echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CFGFILE} + echo "CONFIG_EAP_MD5=y" >> ${CFGFILE} + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CFGFILE} + echo "CONFIG_EAP_TLS=y" >> ${CFGFILE} + echo "CONFIG_EAP_PEAP=y" >> ${CFGFILE} + echo "CONFIG_EAP_TTLS=y" >> ${CFGFILE} + echo "CONFIG_EAP_GTC=y" >> ${CFGFILE} + echo "CONFIG_EAP_OTP=y" >> ${CFGFILE} + echo "CONFIG_EAP_LEAP=y" >> ${CFGFILE} + echo "CONFIG_PKCS12=y" >> ${CFGFILE} + echo "CONFIG_PEERKEY=y" >> ${CFGFILE} + echo "CONFIG_BGSCAN_SIMPLE=y" >> ${CFGFILE} + echo "CONFIG_BGSCAN_LEARN=y" >> ${CFGFILE} + echo "CONFIG_BGSCAN_DELTA=y" >> ${CFGFILE} + echo "CONFIG_IEEE80211W=y" >> ${CFGFILE} + + if use dbus ; then + echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> ${CFGFILE} + echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> ${CFGFILE} + fi + + if use debug ; then + echo "CONFIG_DEBUG_SYSLOG=y" >> ${CFGFILE} + echo "CONFIG_DEBUG_SYSLOG_FACILITY=LOG_LOCAL6" >> ${CFGFILE} + fi + + if use eap-sim ; then + # Smart card authentication + echo "CONFIG_EAP_SIM=y" >> ${CFGFILE} + echo "CONFIG_EAP_AKA=y" >> ${CFGFILE} + echo "CONFIG_EAP_AKA_PRIME=y" >> ${CFGFILE} + echo "CONFIG_PCSC=y" >> ${CFGFILE} + fi + + if use readline ; then + # readline/history support for wpa_cli + echo "CONFIG_READLINE=y" >> ${CFGFILE} + fi + + # SSL authentication methods + if use ssl ; then + echo "CONFIG_TLS=openssl" >> ${CFGFILE} + echo "CONFIG_SMARTCARD=y" >> ${CFGFILE} + elif use gnutls ; then + echo "CONFIG_TLS=gnutls" >> ${CFGFILE} + echo "CONFIG_GNUTLS_EXTRA=y" >> ${CFGFILE} + else + echo "CONFIG_TLS=internal" >> ${CFGFILE} + fi + + if use kernel_linux ; then + # Linux specific drivers + #echo "CONFIG_DRIVER_ATMEL=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_BROADCOM=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_HERMES=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_HOSTAP=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_IPW=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CFGFILE} + echo "CONFIG_DRIVER_NL80211=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_PRISM54=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_RALINK=y" >> ${CFGFILE} + echo "CONFIG_DRIVER_WEXT=y" >> ${CFGFILE} + echo "CONFIG_DRIVER_WIRED=y" >> ${CFGFILE} + + if use madwifi ; then + # Add include path for madwifi-driver headers + echo "CFLAGS += -I/usr/include/madwifi" >> ${CFGFILE} + echo "CONFIG_DRIVER_MADWIFI=y" >> ${CFGFILE} + fi + + if use ps3 ; then + echo "CONFIG_DRIVER_PS3=y" >> ${CFGFILE} + fi + + elif use kernel_FreeBSD ; then + # FreeBSD specific driver + echo "CONFIG_DRIVER_BSD=y" >> ${CFGFILE} + fi + + # Wi-Fi Protected Setup (WPS) + if use wps ; then + echo "CONFIG_WPS=y" >> ${CFGFILE} + fi + + # Enable mitigation against certain attacks against TKIP + echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> ${CFGFILE} +} + +src_compile() { + emake -C wpa_supplicant || die "emake failed" + + if use qt4 ; then + cd "${MY_S}"/wpa_gui-qt4 + eqmake4 wpa_gui.pro + emake || die "Qt4 wpa_gui compilation failed" + elif use qt3 ; then + cd "${MY_S}"/wpa_gui + eqmake3 wpa_gui.pro + emake || die "Qt3 wpa_gui compilation failed" + fi +} + +src_install() { + cd ${MY_S} + dosbin wpa_supplicant || die + dobin wpa_cli wpa_passphrase || die + + # baselayout-1 compat + if has_version "\):#include \n\1:" \ + ../src/l2_packet/l2_packet_freebsd.c || die + + # People seem to take the example configuration file too literally (bug #102361) + sed -i \ + -e "s:^\(opensc_engine_path\):#\1:" \ + -e "s:^\(pkcs11_engine_path\):#\1:" \ + -e "s:^\(pkcs11_module_path\):#\1:" \ + wpa_supplicant.conf || die + + # Change configuration to match Gentoo locations (bug #143750) + sed -i \ + -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ + -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ + wpa_supplicant.conf || die +} + +src_configure() { + local CFGFILE=${MY_S}/.config + + # Toolchain setup + echo "CC = $(tc-getCC)" > ${CFGFILE} + + # Build w/ debug symbols + echo "CFLAGS += -ggdb" >> ${CFGFILE} + + # Basic setup + echo "CONFIG_CTRL_IFACE=y" >> ${CFGFILE} + echo "CONFIG_BACKEND=file" >> ${CFGFILE} + + # Basic authentication methods + # NOTE: These are the options set by the Chromium OS build + echo "CONFIG_DYNAMIC_EAP_METHODS=y" >> ${CFGFILE} + echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CFGFILE} + echo "CONFIG_EAP_MD5=y" >> ${CFGFILE} + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CFGFILE} + echo "CONFIG_EAP_TLS=y" >> ${CFGFILE} + echo "CONFIG_EAP_PEAP=y" >> ${CFGFILE} + echo "CONFIG_EAP_TTLS=y" >> ${CFGFILE} + echo "CONFIG_EAP_GTC=y" >> ${CFGFILE} + echo "CONFIG_EAP_OTP=y" >> ${CFGFILE} + echo "CONFIG_EAP_LEAP=y" >> ${CFGFILE} + echo "CONFIG_PKCS12=y" >> ${CFGFILE} + echo "CONFIG_PEERKEY=y" >> ${CFGFILE} + echo "CONFIG_BGSCAN_SIMPLE=y" >> ${CFGFILE} + echo "CONFIG_BGSCAN_LEARN=y" >> ${CFGFILE} + echo "CONFIG_BGSCAN_DELTA=y" >> ${CFGFILE} + echo "CONFIG_IEEE80211W=y" >> ${CFGFILE} + + if use dbus ; then + echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> ${CFGFILE} + echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> ${CFGFILE} + fi + + if use debug ; then + echo "CONFIG_DEBUG_SYSLOG=y" >> ${CFGFILE} + echo "CONFIG_DEBUG_SYSLOG_FACILITY=LOG_LOCAL6" >> ${CFGFILE} + fi + + if use eap-sim ; then + # Smart card authentication + echo "CONFIG_EAP_SIM=y" >> ${CFGFILE} + echo "CONFIG_EAP_AKA=y" >> ${CFGFILE} + echo "CONFIG_EAP_AKA_PRIME=y" >> ${CFGFILE} + echo "CONFIG_PCSC=y" >> ${CFGFILE} + fi + + if use readline ; then + # readline/history support for wpa_cli + echo "CONFIG_READLINE=y" >> ${CFGFILE} + fi + + # SSL authentication methods + if use ssl ; then + echo "CONFIG_TLS=openssl" >> ${CFGFILE} + echo "CONFIG_SMARTCARD=y" >> ${CFGFILE} + elif use gnutls ; then + echo "CONFIG_TLS=gnutls" >> ${CFGFILE} + echo "CONFIG_GNUTLS_EXTRA=y" >> ${CFGFILE} + else + echo "CONFIG_TLS=internal" >> ${CFGFILE} + fi + + if use kernel_linux ; then + # Linux specific drivers + #echo "CONFIG_DRIVER_ATMEL=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_BROADCOM=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_HERMES=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_HOSTAP=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_IPW=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CFGFILE} + echo "CONFIG_DRIVER_NL80211=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_PRISM54=y" >> ${CFGFILE} + #echo "CONFIG_DRIVER_RALINK=y" >> ${CFGFILE} + echo "CONFIG_DRIVER_WEXT=y" >> ${CFGFILE} + echo "CONFIG_DRIVER_WIRED=y" >> ${CFGFILE} + + if use madwifi ; then + # Add include path for madwifi-driver headers + echo "CFLAGS += -I/usr/include/madwifi" >> ${CFGFILE} + echo "CONFIG_DRIVER_MADWIFI=y" >> ${CFGFILE} + fi + + if use ps3 ; then + echo "CONFIG_DRIVER_PS3=y" >> ${CFGFILE} + fi + + elif use kernel_FreeBSD ; then + # FreeBSD specific driver + echo "CONFIG_DRIVER_BSD=y" >> ${CFGFILE} + fi + + # Wi-Fi Protected Setup (WPS) + if use wps ; then + echo "CONFIG_WPS=y" >> ${CFGFILE} + fi + + # Enable mitigation against certain attacks against TKIP + echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> ${CFGFILE} +} + +src_compile() { + emake -C wpa_supplicant || die "emake failed" + + if use qt4 ; then + cd "${MY_S}"/wpa_gui-qt4 + eqmake4 wpa_gui.pro + emake || die "Qt4 wpa_gui compilation failed" + elif use qt3 ; then + cd "${MY_S}"/wpa_gui + eqmake3 wpa_gui.pro + emake || die "Qt3 wpa_gui compilation failed" + fi +} + +src_install() { + cd ${MY_S} + dosbin wpa_supplicant || die + dobin wpa_cli wpa_passphrase || die + + # baselayout-1 compat + if has_version " +# Defaults for video drivers +VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage sis tdfx trident \ + vga voodoo" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/package.use.mask new file mode 100644 index 0000000000..e7accf95ba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/package.use.mask @@ -0,0 +1,30 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.12 2009/09/27 13:26:40 maekke Exp $ + +# Markus Meier (27 Sep 2009) +# mask media-gfx/imagemagick[autotrace] as autotrace is not keyworded +media-gfx/imagemagick autotrace + +# Jim Ramsay (5 Nov 2008) +# app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded +app-admin/gkrellm ntlm + +# Gilles Dartiguelongue (19 Oct 2007) +# gdm depends on zenity which is not keyworded +>=gnome-base/gdm-2.20 remote + +# Gilles Dartiguelongue (23 Oct 2007) +# gdm depends on zenity which is not keyworded +>=media-video/totem-2.20 galago + +# Masking this so repoman shuts up about paludis +sys-apps/paludis ruby-bindings + +# missing keywords +media-sound/sox amrnb amrwb ladspa +media-plugins/gst-plugins-meta lame taglib + +# David Hendricks (10 Oct 2011) +# libpci will cause program to exit(1) during init if PCI not present in system +sys-apps/flashrom atahpt drkaiser gfxnvidia nic3com nicintel nicintel_spi nicnatsemi nicrealtek ogp_spi rayer_spi satasii satamv diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/packages b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/packages new file mode 100644 index 0000000000..177ffcff16 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/packages @@ -0,0 +1,7 @@ +# Copyright 2001-2004 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/packages,v 1.1 2008/04/01 17:39:55 wolf31o2 Exp $ + +>=sys-devel/binutils-2.13.90.0.4 +>=sys-devel/gcc-3.2 +>=sys-libs/glibc-2.2.5 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/parent b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/parent new file mode 100644 index 0000000000..eb001c6e8a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/parent @@ -0,0 +1 @@ +../base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/use.force new file mode 100644 index 0000000000..7116ac8c89 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/use.force @@ -0,0 +1,2 @@ +# Force the flag which corresponds to ARCH. +arm diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/use.mask new file mode 100644 index 0000000000..b147ef4e05 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/arm/use.mask @@ -0,0 +1,156 @@ +# Unmask the flag which corresponds to ARCH. +-arm + +# Raúl Porcel +# I've been told xfs is broken on ARM +xfs + +# Mart Raudsepp +# net-misc/networkmanager not keyworded +networkmanager + +# Raúl Porcel +# Fails to build/work +openexr + +# Samuli Suominen +# media-libs/amrnb and media-libs/amrwb not tested. +amr + +# Samuli Suominen +# sci-visualization/grace not tested. +grace + +# Samuli Suominen +# media-gfx/gimp not tested. +gimp + +# Saleem Abdulrasool +# With vapier's permission masking this. +mozilla + +hardened + +# Krzysiek Pawlik +# With vapier's permission masking aoss: +aoss + +# Paul de Vrieze +# There is no java in this profile (if there is it must be available). Without +# this repoman will fail on apps like sys-libs/db +java +java-internal +java-external + +# Stuff that doesn't make sense on this arch +3dfx +cpufreq +dell +laptop +dmi + +# Stuff we don't want +chicken +clisp +fuse +R +octave +tracker +xindy +lyx +mpi +lasi +fusion + +# havent tested yet +cupsddk +gphoto2 +mythtv +dvb +qt3 +arts +kde +afs +mono +pike +lirc +lm_sensors +netjack +beagle +nvtv +mzscheme +xemacs +scanner +madwifi +libupnp +zvbi +dvd +fluidsynth +gnomecd +lapack +cblas +webkit +prolog +sid +libmms +mtp +ieee1394 + +# 2006/02/05 - Donnie Berkholz +# Modular X: mask for architectures on which they aren't available +video_cards_apm +video_cards_ark +video_cards_ast +video_cards_ati +video_cards_cirrus +video_cards_chips +video_cards_cyrix +video_cards_glint +video_cards_i128 +video_cards_i740 +video_cards_imstt +video_cards_intel +video_cards_mach64 +video_cards_mga +video_cards_neomagic +video_cards_newport +video_cards_nsc +video_cards_nv +video_cards_r128 +video_cards_radeon +video_cards_radeonhd +video_cards_rendition +video_cards_s3 +video_cards_s3virge +video_cards_savage +video_cards_siliconmotion +video_cards_sis +video_cards_tdfx +video_cards_tga +video_cards_trident +video_cards_tseng +video_cards_vesa +video_cards_via +video_cards_voodoo + +# 2006/03/07 - Donnie Berkholz +# Modular X: mask for architectures lacking direct rendering +dri + +# Diego Pettenò (6 Dec 2006) +# Unmask the ARM-specific ALSA drivers +-alsa_cards_pxa2xx-i2sound +-alsa_cards_pxa2xx-soc +-alsa_cards_pxa2xx-soc-corgi +-alsa_cards_pxa2xx-soc-poodle +-alsa_cards_pxa2xx-soc-spitz +-alsa_cards_pxa2xx-soc-tosa +-alsa_cards_sa11xx-uda1341ts +-alsa_cards_armaaci +-alsa_cards_at91-soc +-alsa_cards_at91-soc-eti-b1-wm8731 + +# USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh. +# Bug #184563, 18 Sep 2007 +# Robin H. Johnson +audit diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/package.use new file mode 100644 index 0000000000..30ffacc6f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/package.use @@ -0,0 +1,14 @@ +# Need to undo arch/amd64/package.use because that +# profile is shared between the cros sdk chroot and +# amd64 target boards. + +app-arch/bzip2 -static-libs +app-arch/pbzip2 -static +app-arch/pigz -static + +chromeos-base/update_engine -delta_generator +dev-embedded/openocd -ftdi +net-misc/openssh -kerberos +sys-apps/flashrom -dediprog -ft2232_spi -serprog + +dev-libs/glib -static-libs diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/parent new file mode 100644 index 0000000000..75dd5d3f70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/parent @@ -0,0 +1,2 @@ +../no-multilib +../../../../../targets/chromeos diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/use.force new file mode 100644 index 0000000000..330bf8920a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/use.force @@ -0,0 +1,2 @@ +# We don't do multilib. +-multilib diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/package.use new file mode 120000 index 0000000000..8df9670870 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/package.use @@ -0,0 +1 @@ +../package.use \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/parent new file mode 100644 index 0000000000..bc2444a117 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/parent @@ -0,0 +1,3 @@ +../.. +../../../../../../arch/amd64/x32 +../../../../../../targets/chromeos diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/use.force new file mode 120000 index 0000000000..d2b6937a70 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/chromeos/x32/use.force @@ -0,0 +1 @@ +../use.force \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/chromeos/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/chromeos/parent new file mode 100644 index 0000000000..5a8eb20b69 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/chromeos/parent @@ -0,0 +1,2 @@ +.. +../../../../../targets/chromeos diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/desktop/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/desktop/parent new file mode 100644 index 0000000000..ad6c5e126f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/desktop/parent @@ -0,0 +1,2 @@ +.. +../../../../../targets/desktop diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/developer/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/developer/parent new file mode 100644 index 0000000000..4c893748ce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/developer/parent @@ -0,0 +1,2 @@ +.. +../../../../../targets/developer diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/eapi b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/eapi new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/eapi @@ -0,0 +1 @@ +2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/parent new file mode 100644 index 0000000000..605d0438e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/parent @@ -0,0 +1,2 @@ +.. +../../../../releases/10.0 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/server/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/server/parent new file mode 100644 index 0000000000..c39901657c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/10.0/server/parent @@ -0,0 +1,2 @@ +.. +../../../../../targets/server diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/parent new file mode 100644 index 0000000000..cf8b79e1e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/arm/parent @@ -0,0 +1,3 @@ +../../../base +.. +../../../arch/arm diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords new file mode 100644 index 0000000000..ce24e2203f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords @@ -0,0 +1,49 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +=app-emulation/qemu-kvm-0.15.1-r2 amd64 +=dev-cpp/gflags-1.2 amd64 x86 +=dev-libs/dbus-glib-0.92 amd64 x86 +=dev-libs/glib-2.30.2-r1 amd64 x86 +=dev-util/gdbus-codegen-2.30.2 amd64 x86 + +# Get a newer version of pylint +=dev-python/astng-0.21.1 amd64 +=dev-python/logilab-common-0.53.0 amd64 +=dev-python/pylint-0.23.0 amd64 +=dev-python/pyusb-0.4.3 amd64 + +=app-admin/eselect-opengl-1.2.4 amd64 arm x86 +=app-text/xmlto-0.0.24-r1 amd64 arm x86 +=dev-lang/nasm-2.09.10 amd64 x86 +=dev-util/lcov-1.7 amd64 x86 +=net-libs/libpcap-1.1.1-r1 amd64 arm x86 +=sys-apps/findutils-4.4.2-r1 amd64 arm x86 +=sys-apps/seabios-1.6.3 amd64 +=sys-boot/gnu-efi-3.0i amd64 +=sys-boot/os-prober-1.36 amd64 +=sys-devel/gettext-0.18.1.1-r3 amd64 arm x86 +=x11-libs/pixman-0.17.2 amd64 x86 +=x11-proto/glproto-1.4.14-r1 amd64 arm x86 + +# Needed for curl >= 7.2.1.4 +=net-dns/c-ares-1.7.4 amd64 x86 + +# Once we update past these versions, we should move the +# keywords to the ebuild itself and drop these. +=cross-arm-none-eabi/newlib-1.18.0 arm + +=sys-fs/squashfs-tools-4.2 amd64 x86 + +=dev-util/intltool-0.41.0 amd64 x86 + +# Needed for factory autotest. +=dev-python/pyudev-0.12 amd64 x86 + +# Required by dev-util/cmake-2.8.4-r1 +=app-arch/libarchive-2.8.1 amd64 x86 + +# Requires custom patches before unmasking +=dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 +=dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 +=app-crypt/nss-3.14 -* ~arm ~x86 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/x86/10.0/chromeos/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/x86/10.0/chromeos/parent new file mode 100644 index 0000000000..5a8eb20b69 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/x86/10.0/chromeos/parent @@ -0,0 +1,2 @@ +.. +../../../../../targets/chromeos diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/make.defaults new file mode 100644 index 0000000000..e40fdc9c03 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/make.defaults @@ -0,0 +1,9 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +USE="acpi bluetooth cairo opengl usb X pam" + +USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512" +USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls" + +CONFIG_PROTECT="/etc/make.globals" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords new file mode 100644 index 0000000000..f958d00aab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords @@ -0,0 +1,125 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +=app-admin/rsyslog-3.22.1 amd64 arm x86 +=app-arch/tar-1.23-r4 amd64 arm x86 +=app-benchmarks/i7z-0.27-r1 amd64 x86 +=app-editors/nano-2.2.5 amd64 arm x86 +=app-i18n/libhangul-0.0.10 amd64 arm x86 +=app-i18n/zinnia-0.06-r1 amd64 arm x86 +=app-misc/ddccontrol-0.4.2 amd64 arm x86 +=app-misc/ddccontrol-db-20061014 amd64 arm x86 +=dev-cpp/gflags-1.2 amd64 arm x86 +=dev-db/m17n-contrib-1.1.10-r1 amd64 arm x86 +=dev-db/m17n-db-1.6.1-r2 amd64 arm x86 +=dev-db/sqlite-3.6.22-r2 amd64 arm x86 +=dev-libs/atk-1.32.0-r1 amd64 arm x86 +=dev-libs/check-0.9.8 amd64 arm x86 +=dev-libs/dbus-c++-0.0.1 amd64 arm x86 +=dev-libs/dbus-glib-0.92 amd64 arm x86 +=dev-libs/eggdbus-0.5 amd64 arm x86 +=dev-libs/engine_pkcs11-0.1.8 amd64 arm x86 +=dev-libs/glib-2.30.2-r1 amd64 arm x86 +=dev-libs/libchewing-0.3.2-r1 amd64 arm x86 +=dev-libs/libffi-3.0.9-r2 amd64 arm x86 +=dev-libs/libgpg-error-1.10-r1 amd64 arm x86 +=dev-libs/libp11-0.2.7 amd64 arm x86 +=dev-libs/m17n-lib-1.6.1-r1 amd64 arm x86 +=dev-libs/protobuf-2.2.0 amd64 arm x86 +=dev-libs/libusb-1.0.6 amd64 arm x86 +=dev-python/numpy-1.4.0 amd64 arm x86 +=dev-python/python-xlib-0.14 amd64 arm x86 +=dev-python/pyudev-0.12 amd64 arm x86 +=dev-python/pyusb-0.4.3 amd64 arm x86 +=dev-python/pyxdg-0.17-r1 amd64 arm x86 +=dev-python/pyyaml-3.09 amd64 arm x86 +=dev-util/gdbus-codegen-2.30.2 amd64 arm x86 +=dev-util/intltool-0.41.0 amd64 arm x86 +=dev-util/strace-4.5.20-r2 amd64 arm x86 +=dev-util/xxd-1.10 amd64 arm x86 +=gnome-base/orbit-2.14.17 amd64 arm x86 +=media-fonts/ja-ipafonts-003.02 amd64 arm x86 +=media-gfx/perceptualdiff-1.1.1 amd64 arm x86 +=media-libs/freeglut-2.4.0-r2 amd64 arm x86 +=media-libs/freeimage-3.13.1 amd64 arm x86 +=media-libs/jpeg-6b-r9 amd64 arm x86 +=media-sound/alsa-headers-1.0.24 amd64 arm x86 +=net-analyzer/netperf-2.4.4 amd64 arm x86 +=net-dialup/ppp-2.4.5-r3 amd64 arm x86 +=net-dialup/xl2tpd-1.3.0-r1 amd64 arm x86 +=net-libs/gnutls-2.9.5 amd64 arm x86 +=net-libs/libsoup-2.28.2 amd64 arm x86 +=net-libs/libtirpc-0.2.0 amd64 arm x86 +=net-misc/dhcp-4.2.2-r1 amd64 arm x86 +=net-misc/dhcpcd-5.1.1 amd64 arm x86 +=net-misc/iperf-2.0.4 amd64 arm x86 +=net-misc/modemmanager-0.2_p20090925 amd64 arm x86 +=net-misc/wget-1.12-r2 amd64 arm x86 +=sys-auth/pam_pwdfile-0.99-r1 amd64 arm x86 +=sys-apps/baselayout-2.0.1 amd64 arm x86 +=sys-apps/busybox-1.15.3 amd64 arm x86 +=sys-apps/dbus-1.2.20-r4 amd64 arm x86 +=sys-apps/fakeroot-1.12.4 amd64 arm x86 +=sys-apps/flashrom-0.9.1 amd64 x86 +=sys-apps/i2c-tools-3.0.2 amd64 arm x86 +=sys-apps/keyutils-1.1 amd64 arm x86 +=sys-apps/net-tools-1.60_p20090728014017-r1 amd64 arm x86 +=sys-apps/openrc-0.4.3-r4 amd64 arm x86 +=sys-apps/rescan-scsi-bus-1.29 amd64 arm x86 +=sys-apps/sg3_utils-1.27.20090411 amd64 arm x86 +=sys-apps/sysvinit-2.86-r12 amd64 arm x86 +=sys-apps/usbutils-0.86-r1 amd64 arm x86 +=sys-apps/util-linux-2.16.1 amd64 arm x86 +=sys-auth/consolekit-0.3.0-r3 amd64 arm x86 +=sys-auth/polkit-0.100 amd64 x86 arm +=sys-devel/clang-2.8-r3 amd64 arm x86 +=sys-devel/gdb-7.1 amd64 arm x86 +=sys-fs/ecryptfs-utils-91 amd64 arm x86 +=sys-fs/fuse-2.7.4-r2 amd64 arm x86 +=sys-fs/avfs-1.0.0 amd64 arm x86 +=sys-fs/lvm2-2.02.73-r1 amd64 arm x86 +=sys-fs/squashfs-4.2 amd64 arm x86 +=sys-fs/udev-171-r2 amd64 arm x86 +=sys-block/btrace-1.0.0 amd64 arm x86 +=x11-libs/libdrm-2.4.24 amd64 arm x86 +=sys-libs/libhx-3.1 amd64 arm x86 +=sys-libs/zlib-1.2.5-r2 amd64 arm x86 +=sys-power/powertop-1.98 amd64 arm x86 +=x11-apps/xinput_calibrator-0.7.5 arm +=x11-libs/gtk+-2.20.1 amd64 arm x86 +=x11-libs/pixman-0.17.2 amd64 arm x86 +=x11-misc/shared-mime-info-0.70 amd64 arm x86 +=x11-misc/slim-1.3.1-r5 amd64 arm x86 +=x11-misc/xkeyboard-config-1.7 amd64 arm x86 +=x11-proto/glproto-1.4.14-r1 amd64 arm x86 + +# Needed for curl >= 7.23.1 +=net-dns/c-ares-1.7.5 amd64 arm x86 + +# Needed for xorg server >=1.7.x +=x11-libs/libX11-1.3.3 amd64 arm x86 +=x11-libs/libxcb-1.5-r1 amd64 arm x86 +=x11-libs/libXext-1.1.1 amd64 arm x86 +=x11-libs/libXi-1.3 amd64 arm x86 +=x11-libs/libXinerama-1.1 amd64 arm x86 +=x11-libs/libXtst-1.1.0 amd64 arm x86 +=x11-libs/libXxf86vm-1.1.0 amd64 arm x86 +=x11-proto/dri2proto-2.3 amd64 arm x86 +=x11-proto/fixesproto-4.1.1 amd64 arm x86 +=x11-proto/inputproto-2.0 amd64 arm x86 +=x11-proto/recordproto-1.14 amd64 arm x86 +=x11-proto/xextproto-7.1.1 amd64 arm x86 +=x11-proto/xineramaproto-1.2 amd64 arm x86 +=x11-proto/xf86dgaproto-2.1 amd64 arm x86 +=x11-proto/xf86vidmodeproto-2.3 amd64 arm x86 + +# TODO: Remove when we have a proper chrome package. +=www-client/chromium-bin-4.0.222.4_p28661 amd64 arm x86 + +# If a newer version of chrome causes flaky failure, you can add +# something like below, which assumes 15.0.859.0_rc-r1 was the +# last non-flaky version. +# This pins Chrome to the version below by marking more recent versions as unstable. +#>chromeos-base/chromeos-chrome-22.0.1229.1_rc-r1 -amd64 -arm -x86 ~amd64 ~arm ~x86 + +=dev-embedded/openocd-0.4.0 amd64 x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask new file mode 100644 index 0000000000..9e653c1810 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask @@ -0,0 +1,45 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# TODO: ARM is temporarily stuck on mesa-7.5.1-r1 but x86 uses a newer +# version so we mask out only mesa-7.5.2 here. This is a temporary measure +# until we can get per-board cascading profile support. +=media-libs/mesa-7.5.2 + +# TODO: Fix lsof to cross compile on ARM +>sys-process/lsof-4.81-r2 + +# libpng security vulnerability fix +net-dialup/ppp-2.4.5-r3 + +# Cross compile fix in the ebuild (Icedtea -> cups -> libgcrypt). +>dev-libs/libgcrypt-1.4.6 + +# Masked all upstream ebuilds, unupstreamable work in local copy +>=net-misc/dhcpcd-5.1.5 + +# Masked all upstream ebuilds +>=net-wireless/wpa_supplicant-0.7.3 + +# Masked old packages that had old ${PV} numbering scheme +>=app-i18n/ibus-mozc-29 + +# Custom patches +>=sys-boot/syslinux-3.84 + +# chromeos-chrome-14.0.787.0_rc-1 causes test failures, so block it. +# TODO(davidjames): Remove this once the bug is fixed. +=chromeos-base/chromeos-chrome-14.0.787.0_rc-r1 + +# This is unloved by mesa, and should never be pulled into the targets. +# It is actually for clang and ASAN that we want to have edge versions. +=sys-devel/llvm-3.2_pre* diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.provided new file mode 100644 index 0000000000..8ecce477c7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.provided @@ -0,0 +1,91 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# This file lists packages that ebuilds DEPEND on, sometimes implicitly, +# but really are only needed on the build host. This allows us to use +# --root-deps without "--rootdeps=rdeps" to install package DEPEND into +# the sysroot as part of the build process without also having to cross- +# compile and drag in the below packages as dependencies. See "man portage". + +# NOTE: Toolchain packages (gcc, glibc, binutils) are specified in the +# dynamically generated ${BOARD_DIR}/etc/portage/profile/package.provided +# created by the setup_board script. + +app-admin/eselect-1.2.9 +app-admin/eselect-esd-20060719 +app-admin/eselect-fontconfig-1.0 +app-admin/eselect-opengl-1.0.8-r1 +app-admin/eselect-mesa-0.0.8 +app-admin/eselect-vi-1.1.5 + +app-arch/cabextract-1.2-r1 +app-arch/rpm2targz-9.0.0.3g +app-arch/unzip-6.0-r1 + +# Needed for building Icedtea +app-arch/zip-3.0 + +# For board targets we get the root certificate list +# from chromeos-base/root-certificates. +app-misc/ca-certificates-20090709-r6 + +app-portage/portage-utils-0.1.29 + +app-text/build-docbook-catalog-1.4 +app-text/docbook-xsl-stylesheets-1.75.2 +app-text/texi2html-1.76 + +dev-lang/nasm-2.07 +dev-lang/perl-5.8.8-r5 + +# Needed for building Icedtea +dev-java/ant-core-1.7.1-r4 +dev-java/xalan-2.7.1 +dev-java/xerces-2.9.1 + +# Needed for the xsltproc command line tool +dev-libs/libxslt-1.1.24-r1 + +dev-perl/Crypt-PasswdMD5-1.3 +dev-perl/Digest-SHA1-2.11 +dev-perl/XML-Parser-2.36 + +dev-util/cmake-2.8.6 +dev-util/ctags-5.7 +dev-util/gperf-3.0.3 +dev-util/gtk-doc-1.13-r3 +dev-util/gtk-doc-am-1.13-r2 +dev-util/pkgconfig-0.23 + +dev-vcs/git-1.6.4.4 +dev-vcs/subversion-1.6.9 + +perl-core/digest-base-1.16 +perl-core/MIME-Base64-3.08 + +sys-apps/debianutils-3.1.3-r1 +sys-apps/help2man-1.36.4 + +# Needed for building Icedtea +sys-apps/lsb-release-1.4 + +sys-apps/texinfo-4.13 + +sys-devel/autoconf-2.63-r1 +sys-devel/automake-1.10.2 +sys-devel/bc-1.06.95 +sys-devel/bison-2.3 +sys-devel/gettext-0.18.1-r1 +sys-devel/gnuconfig-20090203 +sys-devel/m4-1.4.12 + +sys-kernel/gentoo-sources-2.6.30-r6 + +x11-apps/mkfontscale-1.0.6 +x11-misc/makedepend-1.0.1 + +# Legacy font map encodings which we don't care about. http://crosbug.com/25001 +media-fonts/encodings-1.0.3 + +# Our chromeos-base package takes care of this. +app-misc/editor-wrapper-4 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.unmask new file mode 100644 index 0000000000..815efd4d1e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.unmask @@ -0,0 +1,4 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +>=net-misc/dhcp-4.2.2-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use new file mode 100644 index 0000000000..acb94c3ca2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use @@ -0,0 +1,74 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +app-admin/rsyslog -ssl +app-benchmarks/i7z -X +app-crypt/tpm-tools pkcs11 +app-i18n/zinnia -perl +app-editors/qemacs -X +app-editors/vim minimal +dev-cpp/glog gflags +dev-lang/python -berkdb gdbm +dev-libs/dbus-glib tools +dev-libs/elfutils -utils +dev-libs/glib -doc +dev-libs/nss -utils +dev-libs/opencryptoki tpmtok +dev-libs/opensc ssl -pcsc-lite +dev-libs/openssl pkcs11 +dev-libs/protobuf python +dev-python/pyudev pygobject +dev-util/dialog -unicode minimal +dev-util/perf -doc -demangle -tui -ncurses -perl -python +dev-util/perf-next -doc -demangle -tui -ncurses -perl -python +chromeos-base/chromeos-chrome build_tests +chromeos-base/vboot_reference minimal +media-gfx/imagemagick png +media-libs/freeimage png +media-libs/libdvdread -css +media-libs/libsndfile minimal +# disabled in profiles/default/linux/package.use +media-libs/mesa llvm gallium classic +media-libs/opencv gtk python png jpeg tiff v4l +media-sound/pulseaudio bluetooth dbus -esd +media-video/mplayer cpudetection fbcon -encode -ass -a52 -cdio -dirac -dts -dv -dvd -dvdnav -enca -faac -faad -live -quicktime -mp3 -rar -real -speex -schroedinger -theora -tremor -toolame -twolame -vorbis -xscreensaver -x264 -xv -xvid +net-analyzer/tcpdump -chroot +net-firewall/iptables ipv6 +net-libs/libsoup -ssl +# for curl-7.19.6 turning on ipv6 use flag will turn off ares +net-misc/curl ares +net-misc/dhcpcd crash +net-misc/dhcp ipv6 -server +net-misc/iperf threads +net-misc/iputils ipv6 +net-misc/ntp caps +net-misc/openssh -X +net-misc/openvpn pkcs11 +net-misc/strongswan cisco nat-transport +net-nds/openldap minimal +net-proxy/tsocks tordns +net-wireless/bluez alsa -consolekit -readline +net-wireless/bluez-test alsa -consolekit -readline test-programs +net-wireless/wpa_supplicant dbus debug -readline ssl +sci-geosciences/gpsd -python -ntp -X dbus garmin minimal ocean tntc usb -sockets +sys-apps/busybox -pam -selinux +sys-apps/dbus -X +sys-apps/iproute2 ipv6 +# mosys: crosbug.com/p/11630 +sys-apps/mosys static +sys-apps/smartmontools minimal +sys-auth/consolekit policykit +sys-auth/polkit -introspection +sys-block/parted device-mapper +sys-fs/lvm2 -lvm1 -readline -static +sys-fs/ntfs3g -crypt -external-fuse ntfsprogs suid +sys-fs/udev -devfs-compat -rule_generator hwdb acl gudev +sys-fs/squashfs lzo +sys-libs/gdbm -berkdb +sys-libs/ncurses minimal +sys-libs/pam -berkdb +sys-libs/zlib static-libs +x11-apps/xinit minimal +x11-base/xorg-server -suid +x11-libs/libdrm libkms +x11-libs/libdrm-tests libkms diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use.mask new file mode 100644 index 0000000000..3023e13059 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use.mask @@ -0,0 +1,26 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# Brian Stell (27 August 2010) +# For Chromium OS enable FreeType sub-pixel anti-aliasing and bytecode +# interpreter +media-libs/freetype bindist + +# Jungshik Shin (14 Feb 2011) +# ACPI support is currently disabled in laptop-mode-tools. +# TODO(davidjames): Should it be enabled? +app-laptop/laptop-mode-tools acpi + +# Allow hardened glibc on the target. +sys-libs/glibc -hardened diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/profile.bashrc new file mode 100644 index 0000000000..9726a6cd20 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/profile.bashrc @@ -0,0 +1,27 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Locate all the old style config scripts this package installs. Do it here +# here so we can search the temp $D which has only this pkg rather than the +# full ROOT which has everyone's files. +cros_pre_pkg_preinst_wrap_old_config_scripts() { + # Only wrap when installing into a board sysroot. + [[ $(cros_target) != "board_sysroot" ]] && return 0 + + local wrappers=$( + find "${D}"/usr/bin -name '*-config' -printf '%P ' 2>/dev/null + ) + + local wdir="${CROS_BUILD_BOARD_TREE}/bin" + mkdir -p "${wdir}" + + local c w + for w in ${wrappers} ; do + w="${wdir}/${CHOST}-${w}" + c="${CROS_ADDONS_TREE}/scripts/config_wrapper" + if [[ ! -e ${w} ]] ; then + ln -s "${c}" "${w}" + fi + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/virtuals b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/virtuals new file mode 100644 index 0000000000..2d1c9ba662 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/virtuals @@ -0,0 +1,2 @@ +# Add virtual packages for this profile +virtual/chromeos-bsp-dev chromeos-base/chromeos-bsp-dev-null diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/updates/1Q-2012 b/sdk_container/src/third_party/coreos-overlay/profiles/updates/1Q-2012 new file mode 100644 index 0000000000..d2c877d9ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/updates/1Q-2012 @@ -0,0 +1,3 @@ +move virtual/kernel virtual/linux-sources +slotmove =media-libs/jpeg-6b-r9 62 0 +slotmove .*set:CONFIG_$2=y:g" .config;; + n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; + *) use $1 \ + && busybox_config_option y $2 \ + || busybox_config_option n $2 + return 0 + ;; + esac + einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...) +} + +src_prepare() { + unset KBUILD_OUTPUT #88088 + append-flags -fno-strict-aliasing #310413 + use ppc64 && append-flags -mminimal-toc #130943 + + # patches go here! + epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch + #epatch "${FILESDIR}"/${P}-*.patch + #cp "${FILESDIR}"/ginit.c init/ || die + + # flag cleanup + sed -i -r \ + -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ + Makefile.flags || die + #sed -i '/bbsh/s:^//::' include/applets.h + sed -i '/^#error Aborting compilation./d' applets/applets.c || die + use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile + sed -i \ + -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ + -e "/^AR\>/s:=.*:= $(tc-getAR):" \ + -e "/^CC\>/s:=.*:= $(tc-getCC):" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ + Makefile || die + sed -i \ + -e 's:-static-libgcc::' \ + Makefile.flags || die +} + +src_configure() { + # check for a busybox config before making one of our own. + # if one exist lets return and use it. + + restore_config .config + if [ -f .config ]; then + yes "" | emake -j1 oldconfig > /dev/null + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + # setup the config file + emake -j1 allyesconfig > /dev/null + # nommu forces a bunch of things off which we want on #387555 + busybox_config_option n NOMMU + sed -i '/^#/d' .config + yes "" | emake -j1 oldconfig >/dev/null + + # now turn off stuff we really don't want + busybox_config_option n DMALLOC + busybox_config_option n FEATURE_SUID_CONFIG + busybox_config_option n BUILD_AT_ONCE + busybox_config_option n BUILD_LIBBUSYBOX + busybox_config_option n FEATURE_CLEAN_UP + busybox_config_option n MONOTONIC_SYSCALL + busybox_config_option n USE_PORTABLE_CODE + busybox_config_option n WERROR + + # If these are not set and we are using a uclibc/busybox setup + # all calls to system() will fail. + busybox_config_option y ASH + busybox_config_option n HUSH + + # disable ipv6 applets + if ! use ipv6; then + busybox_config_option n FEATURE_IPV6 + busybox_config_option n TRACEROUTE6 + busybox_config_option n PING6 + fi + + if use static && use pam ; then + ewarn "You cannot have USE='static pam'. Assuming static is more important." + fi + busybox_config_option $(usex static n pam) PAM + busybox_config_option static STATIC + busybox_config_option systemd FEATURE_SYSTEMD + busybox_config_option math FEATURE_AWK_LIBM + + # all the debug options are compiler related, so punt them + busybox_config_option n DEBUG + busybox_config_option y NO_DEBUG_LIB + busybox_config_option n DMALLOC + busybox_config_option n EFENCE + + busybox_config_option selinux SELINUX + + # this opt only controls mounting with /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + emake V=1 busybox +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + dodir /bin + if use sep-usr ; then + # install /ginit to take care of mounting stuff + exeinto / + newexe busybox_unstripped ginit + dosym /ginit /bin/bb + dosym bb /bin/busybox + else + newbin busybox_unstripped busybox + dosym busybox /bin/bb + fi + if use mdev ; then + dodir /$(get_libdir)/mdev/ + use make-symlinks || dosym /bin/bb /sbin/mdev + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf + + exeinto /$(get_libdir)/mdev/ + doexe "${FILESDIR}"/mdev/* + + newinitd "${FILESDIR}"/mdev.rc.1 mdev + fi + if use livecd ; then + dosym busybox /bin/vi + fi + + # bundle up the symlink files for use later + emake DESTDIR="${ED}" install + rm _install/bin/busybox + tar cf busybox-links.tar -C _install . || : #;die + insinto /usr/share/${PN} + use make-symlinks && doins busybox-links.tar + + dodoc AUTHORS README TODO + + cd docs + docinto txt + dodoc *.txt + docinto pod + dodoc *.pod + dohtml *.html + + cd ../examples + docinto examples + dodoc inittab depmod.pl *.conf *.script undeb unrpm +} + +pkg_preinst() { + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + ewarn "setting USE=make-symlinks and emerging to / is very dangerous." + ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." + ewarn "If you are creating a binary only and not merging this is probably ok." + ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + fi +} + +pkg_postinst() { + savedconfig_pkg_postinst + + if use make-symlinks ; then + cd "${T}" || die + mkdir _install + tar xf busybox-links.tar -C _install || die + cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + fi + + if use sep-usr ; then + elog "In order to use the sep-usr support, you have to update your" + elog "kernel command line. Add the option:" + elog " init=/ginit" + elog "To launch a different init than /sbin/init, use:" + elog " init=/ginit /sbin/yourinit" + elog "To get a rescue shell, you may boot with:" + elog " init=/ginit bb" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/busybox/files/busybox-1.19.0-bb.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/busybox/files/busybox-1.19.0-bb.patch new file mode 100644 index 0000000000..a66b45a5e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/busybox/files/busybox-1.19.0-bb.patch @@ -0,0 +1,22 @@ +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -75,6 +75,8 @@ + //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) + //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh)) + //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash)) ++//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) ++//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) + + //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o + //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -7255,6 +7255,8 @@ + } + /* re-exec ourselves with the new arguments */ + execve(bb_busybox_exec_path, argv, envp); ++ execve("/bin/busybox.static", argv, envp); ++ execve("/bin/busybox", argv, envp); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/chvt/chvt-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/chvt/chvt-0.0.1-r1.ebuild new file mode 100644 index 0000000000..9640904e9f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/chvt/chvt-0.0.1-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +# A stub to install "chvt" utility from sys-apps/kbd into sbin. + +DESCRIPTION="chvt: Change virtual terminal console" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" + +DEPEND="sys-apps/kbd" +RDEPEND="" + +# There's no source (required for EAPI=4) +S="${WORKDIR}" + +src_install() { + dosbin ${ROOT}/usr/bin/chvt +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/daisydog/daisydog-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/daisydog/daisydog-0.0.1-r4.ebuild new file mode 100644 index 0000000000..7832fa7375 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/daisydog/daisydog-0.0.1-r4.ebuild @@ -0,0 +1,22 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="2f357f7af0bebed339173bfad1a2e6e3a5191930" +CROS_WORKON_TREE="70399b45e7d690039110a3cd25d04b3648d79fe5" +CROS_WORKON_PROJECT="chromiumos/third_party/daisydog" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Simple HW watchdog daemon" +HOMEPAGE="http://git.chromium.org/gitweb/?p=chromiumos/third_party/daisydog.git" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_configure() { + tc-export CC +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/daisydog/daisydog-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/daisydog/daisydog-9999.ebuild new file mode 100644 index 0000000000..9057099dd1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/daisydog/daisydog-9999.ebuild @@ -0,0 +1,20 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/daisydog" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Simple HW watchdog daemon" +HOMEPAGE="http://git.chromium.org/gitweb/?p=chromiumos/third_party/daisydog.git" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +src_configure() { + tc-export CC +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog new file mode 100644 index 0000000000..e1a9edcac1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog @@ -0,0 +1,1483 @@ +# ChangeLog for sys-apps/dbus +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.365 2013/01/20 13:30:07 ssuominen Exp $ + + 20 Jan 2013; Samuli Suominen -files/dbus.init-1.0, + -files/dbus-1.4.0-asneeded.patch, -dbus-1.4.20.ebuild, -dbus-1.6.2.ebuild: + old + + 20 Jan 2013; Sergey Popov dbus-1.4.20.ebuild, + dbus-1.6.2.ebuild, dbus-1.6.8.ebuild: + Make build.log verbose, wrt bug #453086 + + 17 Nov 2012; Pacho Ramos dbus-1.6.8-r1.ebuild: + Show elog messages only when needed (#440526 by poletti.marco), disable silent + rules. + + 14 Oct 2012; Raúl Porcel dbus-1.6.8.ebuild: + ia64/s390/sh/sparc stable wrt #416725 + + 14 Oct 2012; Anthony G. Basile dbus-1.6.8.ebuild: + stable ppc ppc64, bug #436028 + + 14 Oct 2012; Matt Turner dbus-1.6.8.ebuild: + Stable on alpha, bug 436028. + + 06 Oct 2012; Markus Meier dbus-1.6.8.ebuild: + arm stable, bug #436028 + + 04 Oct 2012; Agostino Sarubbo dbus-1.6.8.ebuild: + Stable for amd64, wrt bug #436028 + +*dbus-1.6.8-r1 (04 Oct 2012) + + 04 Oct 2012; Pawel Hajdan jr dbus-1.6.8.ebuild, + +dbus-1.6.8-r1.ebuild: + x86 stable wrt security bug #436028 (systemd-specific code rolled to -r1, + since systemd is not stable) + + 02 Oct 2012; Jeroen Roovers dbus-1.6.8.ebuild: + Stable for HPPA (bug #436028). + + 29 Sep 2012; Zac Medico dbus-1.6.8.ebuild: + Fix for prefix and add ~x86-linux keyword. + + 29 Sep 2012; Samuli Suominen -dbus-1.4.16.ebuild, + -dbus-1.6.0.ebuild, -dbus-1.6.4.ebuild, -dbus-1.6.4-r1.ebuild, + -files/dbus-1.6.4-CVE-2012-3524-Don-t-access-environment-variables-or-.patch: + old + +*dbus-1.6.8 (29 Sep 2012) + + 29 Sep 2012; Samuli Suominen +dbus-1.6.8.ebuild: + Version bump. + +*dbus-1.6.4-r1 (22 Sep 2012) + + 22 Sep 2012; Samuli Suominen dbus-1.6.4.ebuild, + +dbus-1.6.4-r1.ebuild, + +files/dbus-1.6.4-CVE-2012-3524-Don-t-access-environment-variables-or-.patch: + Import patch for CVE-2012-3524 from Fedora 18. Again, -r0 is for stable and + -r1 for ~arch because of the systemd dependency. + + 25 Aug 2012; Mike Frysinger dbus-1.4.16.ebuild: + Drop useless -vf args to mv #432632 by Joshua B. Kahlenberg. + + 25 Jul 2012; Markus Meier dbus-1.6.2.ebuild: + arm stable, bug #416725 + + 21 Jul 2012; Jeff Horelick dbus-1.6.2.ebuild: + marked x86 per bug 416725 + + 21 Jul 2012; Samuli Suominen dbus-1.6.2.ebuild: + amd64/ppc/ppc64 stable wrt #416725 + + 21 Jul 2012; Samuli Suominen dbus-1.6.2.ebuild: + Use has_version instead of dependency for sys-apps/systemd regarding + stabilization. This is only for 1.6.2 and will be left as-is for 1.6.4. + +*dbus-1.6.4 (20 Jul 2012) + + 20 Jul 2012; Samuli Suominen +dbus-1.6.4.ebuild: + Version bump wrt #427402 by "teidakankan" + + 20 Jul 2012; Jeroen Roovers dbus-1.6.2.ebuild: + Stable for HPPA (bug #416725). + + 15 Jul 2012; Raúl Porcel dbus-1.4.20.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #412535 + + 12 Jul 2012; Akinori Hattori dbus-1.4.20.ebuild: + ia64 stable wrt bug #412535 + +*dbus-1.6.2 (27 Jun 2012) + + 27 Jun 2012; Samuli Suominen +dbus-1.6.2.ebuild: + Version bump. + + 06 Jun 2012; Samuli Suominen -dbus-1.4.16-r2.ebuild, + -dbus-1.4.18.ebuild, -dbus-1.5.12.ebuild, -dbus-1.5.12-r1.ebuild: + old + +*dbus-1.6.0 (06 Jun 2012) + + 06 Jun 2012; Samuli Suominen +dbus-1.6.0.ebuild: + Version bump. + +*dbus-1.5.12-r1 (29 May 2012) + + 29 May 2012; Samuli Suominen dbus-1.4.20.ebuild, + +dbus-1.5.12-r1.ebuild, + +files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch: + When dropping capabilities only include AUDIT caps if we have them wrt + #405975. This makes audit/selinux enabled D-Bus work in a Linux container. + Thanks to Jory A. Pratt and Hinnerk van Bruinehsen. + + 24 May 2012; Mike Frysinger dbus-1.4.16-r2.ebuild, + dbus-1.4.16.ebuild, dbus-1.4.18.ebuild, dbus-1.4.20.ebuild, + dbus-1.5.12.ebuild: + Inherit user for enewuser/etc... + + 16 May 2012; Jeroen Roovers dbus-1.4.20.ebuild: + Stable for HPPA (bug #412535). + + 15 May 2012; Samuli Suominen dbus-1.5.12.ebuild: + This is ready to enter ~arch. + +*dbus-1.5.12 (11 May 2012) + + 11 May 2012; Samuli Suominen +dbus-1.5.12.ebuild, + metadata.xml: + Version bump to development series. File dbus-1.4.0-asneeded.patch fails to + apply and should be looked into before keywording. + + 05 May 2012; Brent Baude dbus-1.4.20.ebuild: + Marking dbus-1.4.20 ppc for bug 412535 + + 05 May 2012; Raúl Porcel dbus-1.4.18.ebuild: + Revert + + 05 May 2012; Raúl Porcel dbus-1.4.18.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #403843 + + 04 May 2012; Jeff Horelick dbus-1.4.16.ebuild, + dbus-1.4.16-r2.ebuild, dbus-1.4.18.ebuild, dbus-1.4.20.ebuild: + dev-util/pkgconfig -> virtual/pkgconfig + + 28 Apr 2012; Alexis Ballier dbus-1.4.20.ebuild: + keyword ~amd64-fbsd + + 23 Apr 2012; Brent Baude dbus-1.4.20.ebuild: + Marking dbus-1.4.20 ppc64 for bug 412535 + + 22 Apr 2012; Markus Meier dbus-1.4.20.ebuild: + arm stable, bug #412535 + + 18 Apr 2012; Jeff Horelick dbus-1.4.20.ebuild: + marked x86 per bug 412535 + + 18 Apr 2012; Agostino Sarubbo dbus-1.4.20.ebuild: + Stable for amd64, wrt bug #412535 + +*dbus-1.4.20 (29 Mar 2012) + + 29 Mar 2012; Samuli Suominen +dbus-1.4.20.ebuild: + Version bump wrt #410179 by Agostino Sarubbo. Stop keeping deprecated + /usr/lib/dbus-1.0/services directory. Create symlink from /etc/machine-id to + /var/lib/dbus/machine-id because it's defined through + -DDBUS_MACHINE_UUID_FILE for tools/dbus-launch.c and might be used in unknown + reverse dependencies. + + 12 Mar 2012; Markus Meier dbus-1.4.18.ebuild: + arm stable, bug #403843 + + 12 Mar 2012; Jeff Horelick dbus-1.4.18.ebuild: + marked x86 per bug 403843 + + 09 Mar 2012; Samuli Suominen dbus-1.4.18.ebuild: + Punt PYTHON_DEPEND usage for USE="test" because we want it only in DEPEND + instead of both DEPEND and RDEPEND. + + 09 Mar 2012; Samuli Suominen dbus-1.4.18.ebuild: + amd64/ppc/ppc64 stable wrt #403843 + + 27 Feb 2012; Jeroen Roovers dbus-1.4.18.ebuild: + Stable for HPPA (bug #403843). + + 17 Feb 2012; Tobias Klausmann dbus-1.4.16-r2.ebuild: + Stable on alpha, bug #401513 + +*dbus-1.4.18 (14 Feb 2012) + + 14 Feb 2012; Samuli Suominen +dbus-1.4.18.ebuild: + Version bump. + + 01 Feb 2012; Samuli Suominen -dbus-1.4.12.ebuild: + old + + 01 Feb 2012; Samuli Suominen dbus-1.4.16.ebuild: + ppc/ppc64 stable wrt #387257 + + 27 Nov 2011; Raúl Porcel dbus-1.4.16.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #387257 + + 12 Nov 2011; Samuli Suominen dbus-1.4.16-r2.ebuild: + Fix missing SLOT in glib block by Jeroen Roovers + + 11 Nov 2011; Samuli Suominen -dbus-1.4.16-r1.ebuild: + old + + 11 Nov 2011; Samuli Suominen dbus-1.4.16-r2.ebuild: + Block any glib with obsolete path to machine-id wrt #390143 by Ewgenij + Starostin + +*dbus-1.4.16-r2 (05 Nov 2011) + + 05 Nov 2011; Samuli Suominen +dbus-1.4.16-r2.ebuild, + +files/dbus.initd: + Fix dbus-uuidgen call in init.d wrt #387713, Comment #10 by Pacho Ramos + + 29 Oct 2011; Markus Meier dbus-1.4.16.ebuild: + arm stable, bug #387257 + + 23 Oct 2011; Markus Meier dbus-1.4.16.ebuild: + x86 stable, bug #387257 + +*dbus-1.4.16-r1 (20 Oct 2011) + + 20 Oct 2011; Ian Stakenvicius +dbus-1.4.16-r1.ebuild: + Dropped keepdir on /var/run/dbus as the init.d script already ensures this + path exists (bug 387897) + + 19 Oct 2011; Jeroen Roovers dbus-1.4.16.ebuild: + Stable for HPPA (bug #387257). + + 16 Oct 2011; Samuli Suominen dbus-1.4.16.ebuild: + amd64 stable wrt #387257 + + 16 Oct 2011; Samuli Suominen dbus-1.4.16.ebuild: + Don't pass --enable-asserts with USE="debug" wrt #386699 + + 16 Oct 2011; Samuli Suominen metadata.xml: + Drop semi-inactive maintainers and use herd. + + 16 Oct 2011; Samuli Suominen -dbus-1.4.14.ebuild: + old + + 04 Oct 2011; Samuli Suominen dbus-1.4.16.ebuild: + Fix install location of system-activation.txt and remove useless dohtml wrt + #385421 by Chris Mayo + +*dbus-1.4.16 (26 Sep 2011) + + 26 Sep 2011; Samuli Suominen +dbus-1.4.16.ebuild: + Version bump wrt #384293 by "ScytheMan" + + 23 Sep 2011; Lars Wendler files/dbus.init-1.0: + non-maintainer commit: Fixed warnings in init script (bug #381883). + + 05 Aug 2011; Samuli Suominen -dbus-1.4.6.ebuild, + -dbus-1.4.8-r1.ebuild, -dbus-1.4.10.ebuild: + [This is a placeholder. Please ignore.] + +*dbus-1.4.14 (05 Aug 2011) + + 05 Aug 2011; Samuli Suominen +dbus-1.4.14.ebuild: + Version bump wrt #377603 by Sebastian Pipping. Fix API documentation building + and installing wrt #372293 by Chris Mayo. + + 03 Jul 2011; Kacper Kowalik dbus-1.4.12.ebuild: + ppc64 stable wrt #371261 + + 26 Jun 2011; Raúl Porcel dbus-1.4.12.ebuild: + arm/ia64/s390/sh/sparc/x86 stable wrt #371261 + + 22 Jun 2011; Brent Baude dbus-1.4.12.ebuild: + Marking dbus-1.4.12 ppc for bug 371261 + + 21 Jun 2011; Tobias Klausmann dbus-1.4.12.ebuild: + Stable on alpha, bug #371261 + + 17 Jun 2011; Markos Chandras dbus-1.4.12.ebuild: + Stable on amd64 wrt bug #371261 + + 16 Jun 2011; Samuli Suominen dbus-1.4.12.ebuild: + Fix missing dev-libs/glib and dev-libs/dbus-glib deps and USE="test" handling + wrt #371927 by Patrick Lauer + + 14 Jun 2011; Jeroen Roovers dbus-1.4.12.ebuild: + Stable for HPPA (bug #371261). + +*dbus-1.4.12 (12 Jun 2011) + + 12 Jun 2011; Samuli Suominen +dbus-1.4.12.ebuild: + Version bump wrt security #371261 + +*dbus-1.4.10 (08 Jun 2011) + + 08 Jun 2011; Samuli Suominen +dbus-1.4.10.ebuild: + Version bump and move machine-id from /var/lib/dbus to /etc wrt #370451 by + Michał Górny. + +*dbus-1.4.8-r1 (05 May 2011) + + 05 May 2011; Samuli Suominen +dbus-1.4.8-r1.ebuild: + Use systemd.eclass to get path for unit files wrt #365941 by Michał Górny. + + 26 Apr 2011; Samuli Suominen dbus-1.4.8.ebuild: + dev-libs/expat is required for building too. + + 23 Apr 2011; Samuli Suominen dbus-1.4.6.ebuild: + ppc64 stable wrt #360769 + + 23 Apr 2011; Raúl Porcel dbus-1.4.6.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #360769 + +*dbus-1.4.8 (20 Apr 2011) + + 20 Apr 2011; Samuli Suominen +dbus-1.4.8.ebuild: + Version bump wrt #363399. Pass --without-systemdsystemunitdir to disable + systemd support wrt #363961. + + 15 Apr 2011; Christian Faulhammer dbus-1.4.6.ebuild: + stable x86, bug 360769 + + 12 Apr 2011; Jeroen Roovers dbus-1.4.6.ebuild: + Stable for HPPA (bug #360769). + + 10 Apr 2011; Markus Meier dbus-1.4.6.ebuild: + arm stable, bug #360769 + + 27 Mar 2011; Christoph Mende dbus-1.4.6.ebuild: + Stable on amd64 wrt bug #360769 + + 27 Mar 2011; Brent Baude dbus-1.4.6.ebuild: + Marking dbus-1.4.6 ppc for bug 360769 + + 03 Mar 2011; Arfrever Frehtes Taifersar Arahesis + dbus-1.4.1.ebuild, dbus-1.4.6.ebuild: + Use Python 2 during running tests (bug #357081). + +*dbus-1.4.6 (26 Feb 2011) + + 26 Feb 2011; Samuli Suominen +dbus-1.4.6.ebuild: + Version bump. + + 11 Jan 2011; Kacper Kowalik dbus-1.4.1.ebuild: + ppc stable wrt #348766 + + 04 Jan 2011; Raúl Porcel dbus-1.4.1.ebuild: + ia64/s390/sh/sparc stable wrt #348766 + + 02 Jan 2011; Tobias Klausmann dbus-1.4.1.ebuild: + Stable on alpha, bug #348766 + + 27 Dec 2010; Markus Meier dbus-1.4.1.ebuild: + arm stable, bug #348766 + + 24 Dec 2010; Samuli Suominen dbus-1.4.1.ebuild: + Use virtualx.eclass for testsuite wrt #349403 by "Nikoli". + + 23 Dec 2010; Jeroen Roovers dbus-1.4.1.ebuild: + Stable for HPPA (bug #348766). + + 22 Dec 2010; Samuli Suominen dbus-1.4.1.ebuild: + amd64/ppc64 stable wrt security #348766 + + 22 Dec 2010; Pawel Hajdan jr dbus-1.4.1.ebuild: + x86 stable wrt security bug #348766 + +*dbus-1.4.1 (21 Dec 2010) + + 21 Dec 2010; Samuli Suominen +dbus-1.4.1.ebuild: + Version bump wrt #348766 by Tim Sammut. + + 30 Oct 2010; Samuli Suominen dbus-1.4.0.ebuild: + ppc64 stable wrt #343323 + + 20 Sep 2010; Samuli Suominen dbus-1.4.0.ebuild: + Remove pregenerated files from tarball wrt #337989 by Xake. + + 18 Sep 2010; Samuli Suominen dbus-1.4.0.ebuild: + Remove USE conditional for removing .la files as dbus ships functional + pkg-config file. Remove annoying ebeep. + + 13 Sep 2010; Maciej Mrozowski dbus-1.2.24-r2.ebuild, + dbus-1.4.0.ebuild: + Fix html docs installation, bug 336762. Fix by 'zimous'. + +*dbus-1.4.0 (12 Sep 2010) + + 12 Sep 2010; Maciej Mrozowski +dbus-1.4.0.ebuild, + +files/dbus-1.4.0-asneeded.patch: + Version bump 1.4.0: ported as-needed patch, static-libs, remove .la files, + sorted deps, dohtml QA fix + +*dbus-1.3.0-r3 (09 Sep 2010) +*dbus-1.2.24-r2 (09 Sep 2010) + + 09 Sep 2010; Gilles Dartiguelongue -dbus-1.2.3-r1.ebuild, + -files/dbus-1.2.3-bsd.patch, + -files/dbus-1.2.3-panic-from-dbus_signature_validate.patch, + +dbus-1.2.24-r2.ebuild, +dbus-1.3.0-r3.ebuild: + Apply thread safety patch from master, bug #336588. Sync dbus-1.2 with 1.3 + ebuild enhancements. Clean up old revision. + +*dbus-1.3.0-r2 (05 Aug 2010) +*dbus-1.2.24-r1 (05 Aug 2010) + + 05 Aug 2010; Jim Ramsay +files/80-dbus, + +dbus-1.2.24-r1.ebuild, +dbus-1.3.0-r2.ebuild: + Fix xinitrc.d dbus startup script for interoperability with consolekit + (Bug 329317) + + 05 Aug 2010; Maciej Mrozowski + +files/dbus-1.2.24-thread-safety.patch: + Commited backport from master to 1.2.24 (bug + https://bugs.freedesktop.org/show_bug.cgi?id=17754) - patch to fix thread + safety in protected_change_timeout for further review. + + 10 Jul 2010; Jeroen Roovers dbus-1.2.24.ebuild: + Stable for HPPA (bug #321637). + + 24 May 2010; Raúl Porcel dbus-1.2.24.ebuild: + alpha/arm/ia64/s390/sh/sparc stable wrt #297031 + + 11 May 2010; Brent Baude dbus-1.2.24.ebuild: + stable ppc64, bug 297031 + + 20 Apr 2010; Samuli Suominen dbus-1.2.3-r1.ebuild, + dbus-1.2.24.ebuild, dbus-1.3.0-r1.ebuild: + Remove outdated revdep-rebuild message wrt #313959 by Dirk-Lüder Kreie. + + 16 Apr 2010; Brent Baude dbus-1.2.24.ebuild: + stable ppc, bug 297031 + + 15 Apr 2010; Steev Klimaszewski -dbus-1.2.12.ebuild: + dbus: Remove dbus 1.2.12, it only had unstable keywords, and 1.2.24 is + currently being stabled. + + 09 Apr 2010; Pacho Ramos dbus-1.2.24.ebuild: + amd64 stable, bug 297031 + + 08 Apr 2010; Christian Faulhammer dbus-1.2.24.ebuild: + stable x86, bug 297031 + + 26 Mar 2010; Samuli Suominen dbus-1.2.24.ebuild, + dbus-1.3.0-r1.ebuild: + Don't unpack() in src_prepare and create messagebus user in pkg_setup() + wrt #222551 by Tim Yamin. + +*dbus-1.2.24 (25 Mar 2010) + + 25 Mar 2010; -dbus-1.2.22.ebuild, +dbus-1.2.24.ebuild: + dbus: New upstream release, fixes a crasher with syslogging. Also move + to using EAPI-2, side results are not dying after successfully + installing when using xorg-server-9999 (and eventually xorg-server 1.8.) + Should also fix bug #222551, so that the messagebus user/group get + created before src_install. + +*dbus-1.2.22 (21 Mar 2010) + + 21 Mar 2010; -dbus-1.2.20.ebuild, +dbus-1.2.22.ebuild: + dbus: bump 1.2.20 to 1.2.22 + +*dbus-1.2.20 (03 Feb 2010) + + 03 Feb 2010; -files/0001-Fix-inotify-shutdown.patch, + -dbus-1.2.18.ebuild, + -files/0002-Fix-compilation-in-disable-selinux-case.patch, + +dbus-1.2.20.ebuild: + New upstream release, includes the 2 patches we had applied to 1.2.18 + +*dbus-1.2.18 (03 Feb 2010) + + 03 Feb 2010; +files/0001-Fix-inotify-shutdown.patch, + +dbus-1.2.18.ebuild, + +files/0002-Fix-compilation-in-disable-selinux-case.patch: + Bump dbus, add 2 patches from upstream, one to fix a compilation issue + with selinux disabled, the other to move the shutdown handler into + inotify. + + 23 Nov 2009; Gilles Dartiguelongue dbus-1.3.0-r1.ebuild: + Add missing docbook-xml-dtd:4.1.2 dependency, bug #293867. + + 05 Nov 2009; Gilles Dartiguelongue dbus-1.3.0-r1.ebuild: + Build doc in and only once, bug #291735. + +*dbus-1.3.0-r1 (01 Nov 2009) + + 01 Nov 2009; Gilles Dartiguelongue +dbus-1.3.0-r1.ebuild: + Version bump. + * Do not install unsafe, test dedicated dbus, bug #287722. + * Generate dbus UUID at postinst, bug #258516. + * Generate and install doxygen doc, bug #194077. + * Drop -rdynamic, dbus handles it by itself with USE=debug, bug #267090. + * Do not die because of unsupported CFLAG, bug #274456. + + 08 Aug 2009; Diego E. Pettenò dbus-1.3.0.ebuild, + +files/dbus-1.3.0-no-cloexec.patch: + Add patch from upstream to fix check for cloexec (bug #280299). No + revbump, but it didn't use cloexec there before. + + 08 Aug 2009; Diego E. Pettenò dbus-1.3.0.ebuild: + Remove ~x86-fbsd keyword as per bug #280299 for now. + + 05 Aug 2009; Samuli Suominen dbus-1.3.0.ebuild, + +files/dbus-1.3.0-asneeded.patch: + Fix test suite building with -Wl,--as-needed (undefined reference to + clock_gettime) wrt #280170. + +*dbus-1.3.0 (03 Aug 2009) + + 03 Aug 2009; +dbus-1.3.0.ebuild: + Add dbus 1.3.0. + + 26 Jul 2009; Gilles Dartiguelongue + -files/dbus-1.0.1-fixfilecreation.patch, -dbus-1.0.2-r2.ebuild, + -dbus-1.1.4.ebuild, -files/dbus-1.1.4-xdisplay_null.patch, + -dbus-1.1.20.ebuild, -files/dbus-1.1.20-fix-build.patch, + -dbus-1.2.1.ebuild, -dbus-1.2.3.ebuild: + Clean up old revisions, notably for security issues, bug #271769. + + 23 Apr 2009; Nirbheek Chauhan dbus-1.2.12: + Fix bug 267125 (murphy's law causes a two-character change before cvs + commit to cause build-failure) + + 23 Apr 2009; Nirbheek Chauhan dbus-1.2.12: + Fix bug 267111 (check if xorg-server is installed before checking for hal + USE flag on it) + +*dbus-1.2.12 (21 Apr 2009) + + 21 Apr 2009; Nirbheek Chauhan +dbus-1.2.12.ebuild: + Add dbus-1.2.12, reviewed by steev + + 05 Feb 2009; Alexis Ballier + +files/dbus-1.2.3-bsd.patch, dbus-1.2.3-r1.ebuild: + Backport an upstream patch to fix runtime error on FreeBSD, bug #236779 + and rekeyword it for x86-fbsd + + 15 Jan 2009; Peter Alfredsen metadata.xml: + Compnerd retired. + + 13 Jan 2009; Doug Goldstein metadata.xml: + gentopia is becoming freedesktop + + 25 Nov 2008; Alexis Ballier dbus-1.2.3.ebuild, + dbus-1.2.3-r1.ebuild: + keyword -x86-fbsd, doesn't work, bug #236779 + + 11 Oct 2008; Tobias Scherbaum + dbus-1.2.3-r1.ebuild: + ppc stable, bug #240308 + + 08 Oct 2008; Raúl Porcel dbus-1.2.3-r1.ebuild: + alpha/ia64 stable wrt #240308 + + 07 Oct 2008; Friedrich Oslage dbus-1.2.3-r1.ebuild: + Stable on sparc, security bug #240308 + + 07 Oct 2008; Jeroen Roovers dbus-1.2.3-r1.ebuild: + Stable for HPPA (bug #240308). + + 06 Oct 2008; Markus Meier dbus-1.2.3-r1.ebuild: + amd64/x86 stable, bug #240308 + + 06 Oct 2008; Markus Rothe dbus-1.2.3-r1.ebuild: + Stable on ppc64; bug #240308 + +*dbus-1.2.3-r1 (06 Oct 2008) + + 06 Oct 2008; Doug Goldstein + +files/dbus-1.2.3-panic-from-dbus_signature_validate.patch, + +dbus-1.2.3-r1.ebuild: + Fix potential DoS issue. fdo bug #17803. Gentoo bug #240308 + + 06 Oct 2008; dbus-1.0.2-r2.ebuild, dbus-1.1.4.ebuild, + dbus-1.1.20.ebuild, dbus-1.2.1.ebuild, dbus-1.2.3.ebuild: + Remove the autotools calls, and the enewuser/enewgroup || die calls. + +*dbus-1.2.3 (12 Aug 2008) + + 12 Aug 2008; Steev Klimaszewski +dbus-1.2.3.ebuild: + Bump dbus to 1.2.3 + +*dbus-1.2.1 (05 Apr 2008) + + 05 Apr 2008; Steev Klimaszewski +dbus-1.2.1.ebuild: + New release, includes X11 building fix and other misc changes. + + 04 Mar 2008; Tobias Scherbaum dbus-1.1.20.ebuild: + ppc stable, bug #211451 + + 29 Feb 2008; Jeroen Roovers dbus-1.1.20.ebuild: + Stable for HPPA (bug #211451). + + 29 Feb 2008; Brent Baude dbus-1.1.20.ebuild: + Marking dbus-1.1.20 ppc64 for bug 211451 + + 28 Feb 2008; Raúl Porcel dbus-1.1.20.ebuild: + alpha/ia64/sparc stable wrt security #211451 + + 28 Feb 2008; Christian Faulhammer dbus-1.1.20.ebuild: + stable x86, security bug 211451 + + 28 Feb 2008; Steve Dibb dbus-1.1.20.ebuild: + amd64 stable, sec bug 211451 + + 28 Feb 2008; Steev Klimaszewski + +files/dbus-1.1.20-fix-build.patch, dbus-1.1.20.ebuild: + Add patch so dbus 1.1.20 builds without X + +*dbus-1.1.20 (27 Feb 2008) + + 27 Feb 2008; Doug Klima +dbus-1.1.20.ebuild: + fix for CVE-2008-0595. potentially fixes bug #211076 + + 12 Feb 2008; Steev Klimaszewski dbus-1.1.4.ebuild: + Disable libaudit when not using SELinux. Should close bug #209571. + Thanks to jamatik for reporting. + + 07 Feb 2008; Steev Klimaszewski dbus-1.1.4.ebuild: + Only patch if we are building with use X, the patch causes an error when + built without X. Fixes bug #209175. Thanks to Nikolay S. Rybaloff for + reporting. + + 06 Feb 2008; Steev Klimaszewski dbus-1.0.2-r2.ebuild, + dbus-1.1.4.ebuild: + Fix minor elog typo. Closes bug #208799. Thanks to Imre Péntek + for reporting. + + 05 Feb 2008; Steev Klimaszewski + +files/dbus-1.1.4-xdisplay_null.patch, dbus-1.1.4.ebuild: + Add a patch from Matthias Clasen to fix dbus-launch hanging around after you + exit X + + 18 Jan 2008; Steev Klimaszewski dbus-1.1.4.ebuild: + Change make install to use emake. Add warning along with ebeep to inform + users using Xorg with the hal useflag that restarting DBus will also restart + their X session. + +*dbus-1.1.4 (17 Jan 2008) + + 17 Jan 2008; Steev Klimaszewski + -files/dbus-inotify-fix-thoenig-01.patch, -dbus-1.1.3-r1.ebuild, + +dbus-1.1.4.ebuild: + New release candidate - the same as 1.1.3-r1 but upstream felt it was better + to release a new tarball + +*dbus-1.1.3-r1 (17 Jan 2008) + + 17 Jan 2008; Steev Klimaszewski + +files/dbus-inotify-fix-thoenig-01.patch, -dbus-1.1.3.ebuild, + +dbus-1.1.3-r1.ebuild: + Bug in 1.1.3's inotify release, adding a patch with a revision bump from + Timo Hoenig to fix the issue. + +*dbus-1.1.3 (16 Jan 2008) + + 16 Jan 2008; Steev Klimaszewski +dbus-1.1.3.ebuild: + New upstream release, this is 1.2RC0, very stable release, give it some + testing! + + 13 Dec 2007; Doug Klima -dbus-1.0.2-r1.ebuild: + remove old version + + 11 Jul 2007; Roy Marples dbus-1.0.2-r2.ebuild: + Keyworded ~sparc-fbsd. + Only install files in /etc/X11 if we USE X. + Fix QA warnings regaring kenerl_linux and kernel_FreeBSD. + + 05 Jun 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: + generate the machine-id during pkg_postinst() for users that only use a + session bus + + 13 May 2007; Joshua Kinard dbus-1.0.2-r2.ebuild: + Stable on mips, per #174807. + + 22 Apr 2007; Tobias Scherbaum + dbus-1.0.2-r2.ebuild: + ppc stable, bug #174807 + + 17 Apr 2007; Jeroen Roovers dbus-1.0.2-r2.ebuild: + Stable for HPPA (bug #174807). + + 17 Apr 2007; Gustavo Zacarias dbus-1.0.2-r2.ebuild: + Stable on sparc wrt #174807 + + 16 Apr 2007; Bryan Østergaard dbus-1.0.2-r2.ebuild: + Stable on Alpha, bug 174807. + + 16 Apr 2007; Raúl Porcel dbus-1.0.2-r2.ebuild: + ia64 stable wrt bug 174807 + + 16 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: + Change elog as per bug #168262 + + 16 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: + keepdir system.d for bug #157629 + + 16 Apr 2007; Markus Rothe dbus-1.0.2-r2.ebuild: + Stable on ppc64 + + 06 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: + Fix up SELinux support + + 04 Apr 2007; Doug Goldstein files/dbus.init-1.0: + Remove init script hack for parallel starting since HAL is now fixed. + + 04 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: + stable for amd64 and x86 + +*dbus-1.0.2-r2 (03 Apr 2007) + + 03 Apr 2007; Doug Goldstein + -files/dbus-0.60-decls-ansi-c.patch, + -files/dbus-0.60-mono-return-null-fix.diff, -files/dbus-0.60-qt-pc.patch, + -files/dbus.init-0.61, -files/dbus-0.61-i-hate-qt-so-much.patch, + -files/dbus-0.61-libxml-dep.patch, + -files/dbus-0.61-mono-tools-update.diff, + -files/dbus-0.61-qt-disabling.patch, + -files/dbus-0.62-match-rule-security-fix.patch, metadata.xml, + -dbus-0.61-r1.ebuild, -dbus-0.62-r2.ebuild, -dbus-1.0.2.ebuild, + +dbus-1.0.2-r2.ebuild: + rev bump to add -rdynamic to get backtraces. Clean up old files and ebuilds. + +*dbus-1.0.2-r1 (23 Feb 2007) + + 23 Feb 2007; Roy Marples files/dbus.init-1.0, + +dbus-1.0.2-r1.ebuild: + Bump for a non bash init script. + + 09 Feb 2007; Alexander H. Færøy dbus-1.0.2.ebuild: + Stable on MIPS; bug #154522 + + 09 Feb 2007; Bryan Østergaard dbus-1.0.2.ebuild: + Stable on Alpha, bug 154522. + + 06 Feb 2007; Doug Goldstein dbus-0.62-r2.ebuild: + Removing keywords for ebuilds that are no longer supported. alpha and mips + are on unsupported versions still + + 29 Jan 2007; Gustavo Zacarias dbus-1.0.2.ebuild: + Stable on sparc wrt #154522 + + 23 Jan 2007; Jeroen Roovers dbus-1.0.2.ebuild: + Stable for HPPA (bug #154522). + + 22 Jan 2007; Olivier Crête dbus-1.0.2.ebuild: + Stable on amd64 per bug #154522 + + 21 Jan 2007; Andrej Kacian dbus-1.0.2.ebuild: + Stable on x86, bug #154522. + + 21 Jan 2007; Markus Rothe dbus-1.0.2.ebuild: + Stable on ppc64; bug #154522 + + 21 Jan 2007; nixnut dbus-1.0.2.ebuild: + Stable on ppc wrt bug 154522 + + 08 Jan 2007; Roy Marples files/dbus.init-1.0: + init script needs localmount so it can create a pidfile correctly. + init script is after bootmisc so the pidfile doesn't get erased in a + parallel boot. + + 05 Jan 2007; Saleem Abdulrasool dbus-0.62-r2.ebuild: + fix up debug codepaths for qt bindings (bug #160112), disable qt4 on mips + + 05 Jan 2007; Doug Goldstein dbus-0.61-r1.ebuild, + dbus-0.62-r2.ebuild, dbus-1.0.2.ebuild: + remove debug.eclass and add debug USE flag + + 18 Dec 2006; Bryan Østergaard Manifest: + Fix broken digest. Thanks to Caster reporting it in #gentoo-bugs. + + 17 Dec 2006; Alexander H. Færøy + +files/dbus-0.60-decls-ansi-c.patch, + +files/dbus-0.60-mono-return-null-fix.diff, +files/dbus-0.60-qt-pc.patch, + +files/dbus-0.61-i-hate-qt-so-much.patch, + +files/dbus-0.61-libxml-dep.patch, +files/dbus-0.61-qt-disabling.patch, + +dbus-0.61-r1.ebuild: + Regenrating dbus-0.61-r1 with mips stable only. + + 17 Dec 2006; Doug Goldstein -dbus-0.61-r1.ebuild, + -dbus-0.62-r1.ebuild: + Removing security affected versions. This means mips loses their stable, + but they were warned. + + 16 Dec 2006; Bryan Østergaard dbus-0.62-r2.ebuild: + Stable on Alpha, bug 154522. + + 13 Dec 2006; Brent Baude dbus-0.62-r2.ebuild: + Marking dbus-0.62-r2 ppc64 for bug 156681 + + 13 Dec 2006; Jeroen Roovers dbus-0.62-r2.ebuild: + Stable for HPPA (bug #156681). + + 13 Dec 2006; Michael Cummings dbus-0.62-r2.ebuild: + Keywording amd64, bug 156681 + + 13 Dec 2006; Gustavo Zacarias dbus-0.62-r2.ebuild: + Stable on sparc wrt security #156681 + + 13 Dec 2006; Tobias Scherbaum dbus-0.62-r2.ebuild: + ppc stable, bug #156681 + + 13 Dec 2006; Christian Faulhammer dbus-0.62-r2.ebuild: + stable x86, security bug #156681 + +*dbus-0.62-r2 (13 Dec 2006) + + 13 Dec 2006; Doug Goldstein + +files/dbus-0.62-match-rule-security-fix.patch, +dbus-0.62-r2.ebuild: + Backported security fix for CVE-2006-6107 to 0.6x series + + 13 Dec 2006; Doug Goldstein dbus-0.62-r1.ebuild, + dbus-1.0.2.ebuild: + re-adding ~mips to dbus-0.62-r1 & dbus-1.0.2 + +*dbus-1.0.2 (13 Dec 2006) + + 13 Dec 2006; Doug Goldstein + -files/dbus-1.0.1-pthread-holder-fix.diff, -dbus-1.0.1.ebuild, + -dbus-1.0.1-r1.ebuild, -dbus-1.0.1-r2.ebuild, +dbus-1.0.2.ebuild: + Rev bump 1.0.2. Security fix for CVE-2006-6107. Gentoo bug #156681. fd.o bug + #9142. Removing prior vunerable versions (except current stable) + + 10 Dec 2006; Lars Weiler dbus-0.62-r1.ebuild: + Stable on ppc now; bug #154522. + +*dbus-1.0.1-r2 (04 Dec 2006) + + 04 Dec 2006; Doug Goldstein + +files/dbus-1.0.1-fixfilecreation.patch, dbus-1.0.1-r1.ebuild, + +dbus-1.0.1-r2.ebuild: + Fix dnotify on file creation + + 02 Dec 2006; Doug Goldstein dbus-0.62-r1.ebuild: + Fix bug #156225. Masking -fstack-protector-all + + 01 Dec 2006; Jeroen Roovers dbus-0.62-r1.ebuild: + Stable for HPPA (bug #154522, on HPPA weeks last longer!). + +*dbus-1.0.1-r1 (19 Nov 2006) + + 19 Nov 2006; Doug Goldstein -files/dbus.init-0.95, + -files/dbus-0.95-pass-context.patch, +files/dbus.init-1.0, + +files/dbus-1.0.1-pthread-holder-fix.diff, -dbus-0.95.ebuild, + dbus-1.0.1.ebuild, +dbus-1.0.1-r1.ebuild: + pthreads assertion fix from upstream + + 19 Nov 2006; Lars Weiler dbus-0.62-r1.ebuild: + Reverting to ~ppc due to build-failure with current stable qt + (x11-libs/qt-4.1.4-r2); see bug #154522. + + 18 Nov 2006; nixnut dbus-0.62-r1.ebuild: + Stable on ppc wrt bug 154522 + +*dbus-1.0.1 (17 Nov 2006) + + 17 Nov 2006; Steev Klimaszewski -dbus-1.0.0.ebuild, + +dbus-1.0.1.ebuild: + New point release of D-Bus. Fixes an issue with dbus_threads_init_default + asserting when called. It also cleans up the uuid documentation and makes + uuid's conform to the spec. + + 17 Nov 2006; Andrej Kacian dbus-0.62-r1.ebuild: + Stable on x86, bug #154522. + + 15 Nov 2006; Markus Rothe dbus-0.62-r1.ebuild: + Stable on ppc64; bug #154522 + + 10 Nov 2006; Steve Dibb dbus-0.62-r1.ebuild: + amd64 stable, bug 154522 + +*dbus-1.0 (10 Nov 2006) + + 10 Nov 2006; Doug Goldstein -dbus-0.94.ebuild, + +dbus-1.0.0.ebuild: + Adding D-Bus 1.0.0 + + 09 Nov 2006; Gustavo Zacarias dbus-0.62-r1.ebuild: + Stable on sparc wrt #154522 + + 06 Nov 2006; Timothy Redaelli dbus-0.95.ebuild: + Added ~x86-fbsd keyword. + + 05 Nov 2006; Doug Goldstein + +files/dbus-0.95-pass-context.patch, dbus-0.62-r1.ebuild, + dbus-0.95.ebuild: + Apply patch from FreeDesktop.org bug #8298 for FreeBSD support. Removed an + unnecessary patch and comment from 0.62 since we switched to expat from + libxml. + +*dbus-0.95 (05 Nov 2006) + + 05 Nov 2006; Doug Goldstein +files/dbus.init-0.95, + +dbus-0.95.ebuild: + rev bump. Changed init script to generate machine id as per new upstream + recommendation. Cleaned up initscript. + + 05 Nov 2006; Ilya A. Volynets-Evenbakh + dbus-0.61-r1.ebuild: + Stabilize dbus on mips + + 03 Nov 2006; Sven Wegener dbus-0.62-r1.ebuild, + dbus-0.94.ebuild: + Fixup the hasq check. + + 02 Nov 2006; Caleb Tennis dbus-0.62-r1.ebuild: + Modify ebuild to build only against Qt-4.1, as it fails against Qt-4.2 - + even with dbus disabled + + 31 Oct 2006; Doug Goldstein dbus-0.62-r1.ebuild: + Fixing bug #149656 + + 31 Oct 2006; Doug Goldstein -files/dbus.init-0.60, + -files/dbus-0.60-gcj.patch, -files/dbus-0.60-gcj-2.patch, + -files/dbus-0.60-mono-arguments.patch, -files/dbus-0.60-mono-docs.patch, + -files/dbus-0.60-qdbusmarshall.patch, -files/dbus-0.60-qt.patch, + -dbus-0.60-r4.ebuild, -dbus-0.62.ebuild: + Removed previous versions and old patches + + 30 Oct 2006; Doug Goldstein -dbus-0.91.ebuild: + Removing dbus 0.91 since it's for dbus-core + +*dbus-0.94 (30 Oct 2006) + + 30 Oct 2006; Doug Goldstein +dbus-0.94.ebuild: + Moving dbus-core back over as dbus + + 20 Oct 2006; Aron Griffis dbus-0.61-r1.ebuild: + Mark 0.61-r1 stable on alpha + + 22 Sep 2006; Doug Goldstein + -files/dbus-0.23.2-python_api.patch, -files/dbus-0.23.2-version_fix.patch, + -files/dbus-0.23-dbus_session_connect.patch, + -files/dbus-0.23-fd_set.patch, -files/dbus-0.23-pyexecdir.patch, + -files/dbus-0.23-qt.patch, -files/dbus-dnotify_configure-01.diff, + -files/dbus-dnotify_watchdirs-01.diff, -files/dbus, + -dbus-0.23.4-r1.ebuild: + Removed the old dbus-0.23 series\! + +*dbus-0.62-r1 (21 Sep 2006) + + 21 Sep 2006; Doug Goldstein -dbus-0.50-r2.ebuild, + +dbus-0.62-r1.ebuild: + Switching to expat from libxml2 since now libxml2 suffers from bitrot + instead of expat. Removed old version. + + 23 Aug 2006; Jeroen Roovers dbus-0.61-r1.ebuild: + Stable for HPPA (bug #137325). + + 23 Aug 2006; Steev Klimaszewski dbus-0.91.ebuild: + Block versions less than ourself. So we can up/downgrade properly. + + 21 Aug 2006; Stefan Schweizer dbus-0.91.ebuild: + qt3 was missing in IUSE, thanks jakub + + 20 Aug 2006; Stefan Schweizer dbus-0.91.ebuild: + depend on old qt3 bindings for backwards compatibility, new apps should + directly depend on the bindings + +*dbus-0.91 (18 Aug 2006) + + 18 Aug 2006; Steev Klimaszewski +dbus-0.91.ebuild: + New upstream release, package.masked because there are no qt3 bindings, + someone needs to either work on them, or incorporate them into the KDE apps + that use dbus, this MUST stay package.masked until KDE bumps to all using + QT4, or someone steps up and fixes the qt3 bindings (they need a lot of + love) + + 12 Jul 2006; Aron Griffis dbus-0.61-r1.ebuild: + Mark 0.61-r1 stable on ia64. #137325 + + 05 Jul 2006; Chris Gianelloni dbus-0.61-r1.ebuild: + Stable on x86 wrt bug #137325. + + 04 Jul 2006; Doug Goldstein dbus-0.62.ebuild: + Fix typo that shouldn't really affect compiles + + 03 Jul 2006; Luis Medinas dbus-0.61-r1.ebuild: + Stable on amd64. Bug #137325. + + 02 Jul 2006; Lars Weiler dbus-0.61-r1.ebuild: + Stable on ppc; bug #137325. + + 30 Jun 2006; Markus Rothe dbus-0.61-r1.ebuild: + Stable on ppc64; bug #137325 + + 30 Jun 2006; Gustavo Zacarias dbus-0.61-r1.ebuild: + Stable on sparc wrt #137325 + + 30 Jun 2006; Doug Goldstein dbus-0.62.ebuild: + updating qt4 depends bug #138391 + + 24 Jun 2006; Doug Goldstein dbus-0.23.4-r1.ebuild, + dbus-0.50-r2.ebuild: + USE flag change qt->qt3/qt4 bug #137785 + + 23 Jun 2006; Doug Goldstein -dbus-0.50-r1.ebuild, + -dbus-0.60-r3.ebuild, dbus-0.60-r4.ebuild, dbus-0.61-r1.ebuild: + removing old revs. Changed qt USE flag to qt3/qt4 in all instances + + 20 Jun 2006; Doug Goldstein dbus-0.62.ebuild: + Unfortunately genstef was wrong and didn't speak to anyone before making the + change that he did. Now he understand it, switching back. + + 20 Jun 2006; Stefan Schweizer dbus-0.62.ebuild: + qt3 -> qt, fix digest + +*dbus-0.62 (20 Jun 2006) + + 20 Jun 2006; Doug Goldstein +dbus-0.62.ebuild: + Rev bumped to 0.62. Had to remove arm, sh, and mips due to repoman issues. + Bug #137325 + + 27 Apr 2006; Alec Warner files/digest-dbus-0.23.4-r1, + files/digest-dbus-0.50-r1, files/digest-dbus-0.50-r2, + files/digest-dbus-0.60-r4, Manifest: + Fixing SHA256 digest, pass four + + 21 Apr 2006; Steev Klimaszewski files/dbus.init-0.60: + Update the dbus 0.60 init script as well with the nscd/dns dependencies. + + 21 Apr 2006; Steev Klimaszewski files/dbus.init-0.61: + Update the 0.61 init script to start after nscd/dns, fixes an apparent problem + reported by Uberlord on amd64. + + 09 Apr 2006; Steev Klimaszewski dbus-0.23.4-r1.ebuild, + dbus-0.50-r1.ebuild, dbus-0.50-r2.ebuild, dbus-0.60-r3.ebuild, + dbus-0.60-r4.ebuild: + Migrate the xml2 useflag to be xml, per bug #79178 + +*dbus-0.61-r1 (27 Mar 2006) + + 27 Mar 2006; Doug Goldstein + +files/dbus-0.60-mono-return-null-fix.diff, +files/dbus.init-0.61, + +dbus-0.61-r1.ebuild: + Mono bindings fix. New Initscript + + 16 Mar 2006; Doug Goldstein + +files/dbus-0.61-i-hate-qt-so-much.patch, + +files/dbus-0.61-libxml-dep.patch, +files/dbus-0.61-qt-disabling.patch, + dbus-0.61.ebuild: + Adding some necessary patches to fix QT mess. + + 15 Mar 2006; Doug Goldstein dbus-0.61.ebuild: + disable QT4 support + + 14 Mar 2006; Joe McCann + +files/dbus-0.60-decls-ansi-c.patch: + Add missing patch to cvs + + 14 Mar 2006; Doug Goldstein files/dbus.init-0.60: + Handle PEBCAK error + +*dbus-0.61 (14 Mar 2006) + + 14 Mar 2006; Doug Goldstein + +files/dbus-0.61-mono-tools-update.diff, +dbus-0.61.ebuild: + rev bump. dropped gcj support since the bindings are unmaintained and broken + and were problematic. Fixed monodoc depends to only require monodoc rather + then mono-tools as well. + + 10 Mar 2006; Michael Hanselmann dbus-0.60-r4.ebuild: + Stable on ppc. + + 21 Feb 2006; Jeroen Roovers dbus-0.60-r4.ebuild: + Stable on hppa. + + 19 Feb 2006; Joshua Kinard dbus-0.60-r4.ebuild: + Revert mips stabilization for 0.60-r4. According to geoman, there are still + some unresolved issues with it on mips. + + 19 Feb 2006; Joshua Kinard dbus-0.60-r4.ebuild: + Marked stable on mips. + + 19 Feb 2006; Saleem Abdulrasool dbus-0.60-r4.ebuild: + stable on x86 as per bug 122846 + + 17 Feb 2006; Aron Griffis dbus-0.60-r4.ebuild: + Mark 0.60-r4 stable on alpha/ia64 + + 16 Feb 2006; Chris Gianelloni dbus-0.23.4-r1.ebuild: + Ported dbus-0.23.4-r1.ebuild to modular X dependencies. + + 16 Feb 2006; dbus-0.60-r4.ebuild: + Marked stable on amd64 + + 16 Feb 2006; Gustavo Zacarias dbus-0.60-r4.ebuild: + Stable on sparc wrt #122846 + + 15 Feb 2006; Markus Rothe dbus-0.60-r4.ebuild: + Stable on ppc64; bug #122846 + + 07 Feb 2006; Aron Griffis dbus-0.60-r3.ebuild: + Mark 0.60-r3 stable on alpha + + 01 Feb 2006; Doug Goldstein ChangeLog: + New patch for gcj handling detection of jar. Use emake -j1 to let gcj + compile. 2 AMD64 fixes as well. + + 22 Jan 2006; Tobias Scherbaum dbus-0.60-r3.ebuild: + ppc stable, bug #113826 + + 22 Jan 2006; Markus Rothe dbus-0.60-r3.ebuild: + Stable on ppc64; bug #113826 + + 22 Jan 2006; dbus-0.60-r3.ebuild: + Marked stable on amd64 per bug #113826 + + 21 Jan 2006; Saleem Abdulrasool dbus-0.60-r3.ebuild: + stable on x86 as per bug #113818 + + 20 Jan 2006; Gustavo Zacarias dbus-0.60-r3.ebuild: + Stable on sparc wrt #119634 #113826 + + 19 Jan 2006; Saleem Abdulrasool dbus-0.50-r1.ebuild, + dbus-0.50-r2.ebuild, dbus-0.60-r3.ebuild: + Fix GTK+ dependencies as per bug #119415 + + 06 Jan 2006; Chris PeBenito dbus-0.60-r3.ebuild: + Add explicit handling of SELinux support. + + 04 Jan 2006; Doug Goldstein -dbus-0.23-r3.ebuild, + dbus-0.60-r3.ebuild: + Some more ideas with QT. Even though it's now acknowledged by the QT guys + that it's a bug on their side. Changed gcj to detect current running version + rather then best installed. (thx eradicator) + + 03 Jan 2006; Rene Nussbaumer dbus-0.23.4-r1.ebuild: + Stable on hppa. + + 03 Jan 2006; dbus-0.23.4-r1.ebuild: + Stable on IA64; bug #116242. + +*dbus-0.60-r3 (03 Jan 2006) + + 03 Jan 2006; Doug Goldstein -dbus-0.60-r2.ebuild, + +dbus-0.60-r3.ebuild: + No changes, just rev bump since I didn't fix the init script before it hit + the mirrors. + + 02 Jan 2006; Doug Goldstein dbus-0.60-r2.ebuild: + switched to newinitd + + 02 Jan 2006; Michael Hanselmann dbus-0.23.4-r1.ebuild: + Stable on ppc. + + 02 Jan 2006; Doug Goldstein dbus-0.23.4-r1.ebuild: + Tweaked some QT related stuff. + +*dbus-0.60-r2 (02 Jan 2006) + + 02 Jan 2006; Doug Goldstein + +files/dbus-0.60-gcj.patch, +files/dbus-0.60-mono-docs.patch, + +files/dbus-0.60-qt.patch, +files/dbus-0.60-qt-pc.patch, + -dbus-0.60-r1.ebuild, +dbus-0.60-r2.ebuild: + Fixed gcj issues. Fixed QT issues (except QT4 support, only QT3 support). + Added dbus-qt-1.pc file. Fixed issues when USE="doc mono". + + 31 Dec 2005; Markus Rothe dbus-0.23.4-r1.ebuild: + Stable on ppc64 + + 30 Dec 2005; Gustavo Zacarias dbus-0.23.4-r1.ebuild: + Stable on sparc wrt #116242 + + 30 Dec 2005; Doug Goldstein + -files/dbus-0.23.2-abi_api.patch, -dbus-0.36.2.ebuild: + compnerd got nutsy and messed up the digest. Also deleted 1 unnecessary patch. + + 30 Dec 2005; Saleem Abdulrasool + dbus-0.23.4-r1.ebuild: + stable on x86 + + 29 Dec 2005; Simon Stelling dbus-0.23.4-r1.ebuild: + stable on amd64 + + 26 Dec 2005; Saleem Abdulrasool dbus-0.50-r2.ebuild: + Dropping the gcj USE flag as it is currently not functional. + + 26 Dec 2005; Bryan Østergaard dbus-0.50-r2.ebuild: + Comment out gcj support since it really didn't work. + +*dbus-0.60-r1 (21 Dec 2005) +*dbus-0.50-r2 (21 Dec 2005) + + 21 Dec 2005; Doug Goldstein -dbus-0.23.2.ebuild, + -dbus-0.23.2-r1.ebuild, -dbus-0.23.4.ebuild, -dbus-0.50.ebuild, + +dbus-0.50-r2.ebuild, -dbus-0.60.ebuild, +dbus-0.60-r1.ebuild: + change libxml2 depend to 2.6.21 because of bugs in that package made dbus + mem usage insane when using it. copied QT fixes to dbus 0.60. Changed the + verbose and checks to only be run when compiled with debug USE flag. Added + support for Java bindings. Fixed up depends in general. Cleaned up ebuilds + in general. + + 17 Dec 2005; Guy Martin dbus-0.50-r1.ebuild: + Stable on hppa. + + 03 Dec 2005; Saleem Abdulrasool dbus-0.60.ebuild: + Fixing use flag hell. + +*dbus-0.60 (01 Dec 2005) + + 01 Dec 2005; Saleem Abdulrasool +dbus-0.60.ebuild: + Ading 0.60 to the tree. This is to test things against it and start patching. + There was a API/ABI change. + + 27 Nov 2005; Saleem Abdulrasool dbus-0.50-r1.ebuild: + Bumping mondoc deps and adding in mono-tools dep to prevent breaking on new + style layout of monodoc. Resolves bug #113528 + + 24 Nov 2005; Marcus D. Hanwell dbus-0.50-r1.ebuild: + Set the qt3 directory and moc, closes bugs 112965, 103667 and 109823. + + 08 Nov 2005; Stefan Briesenick files/dbus: + fixed init-script. + +*dbus-0.50-r1 (08 Nov 2005) + + 08 Nov 2005; Saleem Abdulrasool files/dbus, + +dbus-0.50-r1.ebuild: + Changing the initscript (with revbump). Minor cosmetic changes (changed to + doinit). + + 07 Nov 2005; Diego Pettenò dbus-0.50.ebuild: + Don't enable dnotify for every system, but just when using Linux kernel, as + it's a Linux feature. + + 07 Nov 2005; Steev Klimaszewski dbus-0.36.2.ebuild, + dbus-0.50.ebuild: + Change the path for the system socket back into /var/run/dbus/ + This fixeds Bug #96451. Thanks to joem for pointing it out, as + well as kwant for filing the bug. + +*dbus-0.50 (07 Nov 2005) + + 07 Nov 2005; Steev Klimaszewski + +files/dbus-dnotify_configure-01.diff, + +files/dbus-dnotify_watchdirs-01.diff, +dbus-0.50.ebuild: + Version bump. Add patches to fix dnotify support. + + 05 Nov 2005; Stephen P. Becker dbus-0.36.2.ebuild: + added ~mips keyword + + 01 Nov 2005; Doug Goldstein dbus-0.36.2.ebuild: + make dbus depend on gtk+ 2.6 while they claim gtk+ 2.0, they use 2.6 API + calls. fixes bug #111118 + + 19 Oct 2005; Stephen P. Becker dbus-0.23.4-r1.ebuild: + added ~mips keyword + + 15 Sep 2005; dbus-0.23.4-r1.ebuild: + Make hal not pass /bin/false as a shell to ecommit. Bug #103421 + +*dbus-0.36.2 (10 Sep 2005) + + 10 Sep 2005; Doug Goldstein -dbus-0.36.1.ebuild, + +dbus-0.36.2.ebuild: + Rev Bump for security reasons + + 26 Aug 2005; Doug Goldstein dbus-0.36.1.ebuild: + Fixing bug #103421 + +*dbus-0.36.1 (25 Aug 2005) + + 25 Aug 2005; Doug Goldstein -dbus-0.36.ebuild, + +dbus-0.36.1.ebuild: + rev bump. Should fix amd64 issues. bug #103601 + +*dbus-0.36 (24 Aug 2005) + + 24 Aug 2005; Doug Goldstein -dbus-0.35.2.ebuild, + +dbus-0.36.ebuild: + revision bump. Make sure we're using the messagebus user as well. + +*dbus-0.35.2 (18 Aug 2005) + + 18 Aug 2005; Doug Goldstein metadata.xml, + +dbus-0.35.2.ebuild: + added dbus 0.35.2 to tree, p.mask'd as per Gnome herd's request + added self to maintainership to receive the issues + + 27 Jul 2005; Guy Martin dbus-0.23-r3.ebuild, + dbus-0.23.4-r1.ebuild: + Stable on hppa. + + 22 Jul 2005; Gustavo Zacarias dbus-0.23-r3.ebuild: + Stable on sparc + +*dbus-0.23.4-r1 (14 Jul 2005) + + 14 Jul 2005; Marinus Schraal dbus-0.23.4-r1.ebuild : + Fix location of system socket (#96451) + + 07 Jul 2005; Caleb Tennis dbus-0.23-r3.ebuild, + dbus-0.23.2.ebuild, dbus-0.23.2-r1.ebuild: + Fix qt dep + +*dbus-0.23.4 (15 Mar 2005) + + 15 Mar 2005; foser dbus-0.23.4.ebuild : + New release, fix qt dep (#84256) + + 11 Mar 2005; Martin Schlemmer files/dbus: + Fix rcscript to not clobber return of stop() due to existance of pidfile or + not. + + 10 Mar 2005; Peter Johanson dbus-0.23-r3.ebuild, + dbus-0.23.2-r1.ebuild, dbus-0.23.2.ebuild: + mono moved from dev-dotnet -> dev-lang + +*dbus-0.23.2-r1 (06 Mar 2005) + + 06 Mar 2005; foser dbus-0.23.2-r1.ebuild : + Add patch to fix abi/api issues (#83979) + Add session launch script (#77504) + +*dbus-0.23.2 (03 Mar 2005) + + 03 Mar 2005; foser dbus-0.23.2.ebuild : + New release (#81794) + Add patch to work around mono lib versioning problem (#81794) + + 27 Feb 2005; Jason Wever dbus-0.23-r3.ebuild: + Added ~sparc keyword. + + 20 Feb 2005; Aron Griffis dbus-0.23-r3.ebuild: + stable on ia64 #80601 + + 11 Feb 2005; Jan Brinkmann dbus-0.23-r3.ebuild: + stable on amd64. see #80601 + + 10 Feb 2005; Michael Hanselmann dbus-0.23-r3.ebuild: + Stable on ppc. + + 10 Feb 2005; Markus Rothe dbus-0.23-r3.ebuild: + Stable on ppc64; bug #80601 + +*dbus-0.23-r3 (09 Feb 2005) + + 09 Feb 2005; foser dbus-0.23-r3.ebuild : + Bump to remove mono dep (still ~arch :/) so we can mark stable + + 07 Feb 2005; Jeremy Huddleston + +files/dbus-0.23-pyexecdir.patch, dbus-0.23-r2.ebuild: + Multilib fix for python. + +*dbus-0.23-r2 (06 Feb 2005) + + 06 Feb 2005; foser dbus-0.23-r2.ebuild : + Add include fix (#78617) + Add fix for unsafe default permissions (#80601) + Fix the X switch to actually work + + 20 Jan 2005; Aron Griffis dbus-0.22-r1.ebuild, + dbus-0.22-r2.ebuild, dbus-0.22-r3.ebuild, dbus-0.23-r1.ebuild: + mark 0.22-r1 stable on ia64; add ~ia64 to the rest + +*dbus-0.23-r1 (21 Jan 2005) + + 21 Jan 2005; foser dbus-0.23-r1.ebuild : + Keep the right services dir + + 13 Jan 2005; Heinrich Wendel +files/dbus-0.23-qt.patch, + dbus-0.23.ebuild: + fix qt again + +*dbus-0.23 (13 Jan 2005) + + 13 Jan 2005; foser dbus-0.23.ebuild : + New release, minor ebuild fixes + Add some touch statements for #77833 + + 08 Jan 2005; Tom Martin dbus-0.22-r1.ebuild: + Stable on amd64. + +*dbus-0.22-r3 (29 Dec 2004) + + 29 Dec 2004; Heinrich Wendel +files/dbus-0.22-qt.patch, + +dbus-0.22-r3.ebuild: + readd qt support, bug #65504 + + 17 Dec 2004; Markus Rothe dbus-0.22-r2.ebuild: + Stable on ppc64 + + 11 Nov 2004; Mike Gardiner dbus-0.22-r1.ebuild, + dbus-0.22-r2.ebuild: + Keyworded ppc for GNOME 2.8 + + 08 Nov 2004; Markus Rothe dbus-0.22-r2.ebuild: + Marked ~ppc64 + +*dbus-0.22-r2 (31 Oct 2004) + + 31 Oct 2004; foser dbus-0.22-r2.ebuild : + Re-enable mono USE + Add a couple of patches to get the mono bindings up to par + + 29 Oct 2004; foser dbus-0.22-r1.ebuild : + Disable mono USE, so we can mark stable + + 21 Oct 2004; Aron Griffis dbus-0.22-r1.ebuild: + add ~ia64 + + 15 Oct 2004; foser dbus-0.22-r1.ebuild : + Disable qt bindings for now (#65504) + Fix LICENSE + +*dbus-0.22-r1 (21 Sep 2004) + + 21 Sep 2004; foser dbus-0.22-r1.ebuild : + Add python bindings patch to make hal-device-manager work + Add inherit python for the python modules + + 18 Sep 2004; Travis Tilley dbus-0.22.ebuild: + added a fix that gets around a lib64 sandbox bug and added ~amd64 keyword + + 03 Sep 2004; Pieter Van den Abeele dbus-0.22.ebuild: + Masked dbus-0.22.ebuild stable for ppc + +*dbus-0.22 (17 Aug 2004) + + 17 Aug 2004; foser dbus-0.22.ebuild : + Readd mono & libxml2 building + Fix licensing to dual GPL-2 AFL-2.1 (#60280) + Fix init script to also work when a user session is running, thanks to Marcel Martin (#60280) + Set the session socket dir to /tmp (should probably be reconsidered) + Disable doc building, it works halfway but doesn't get installed right + + 11 Aug 2004; foser dbus-0.21.ebuild : + Add messagebus user creation (#52462) + + 08 Aug 2004; David Holm dbus-0.21.ebuild: + Added to ~ppc. + + 25 Jun 2004; Aron Griffis dbus-0.21.ebuild: + QA - fix use invocation + +*dbus-0.21 (07 Apr 2004) + + 07 Apr 2004; foser dbus-0.21.ebuild : + Overhaul of the whole ebuild, lots of cleanups. + Fixed deps (#43806) + Fixed api doc building & installation + Added init script & postinst note (#46101) + Added myself as maintainer for this package to metadat + + 17 Feb 2004; Aron Griffis dbus-0.20.ebuild: + Remove all KEYWORDS other than ~x86, since none of the support stuff (i.e. + mono) is marked on the other platforms + +*dbus-0.20 (04 Dec 2003) + + 04 Dec 2003; Seemant Kulleen dbus-0.12.ebuild, + dbus-0.20.ebuild: + version bump. Ebuild provided by: James Dumay in bug + #35301 + + 14 Nov 2003; Seemant Kulleen dbus-0.13.ebuild: + qt disabled, because the bindings are broken currently + +*dbus-0.13 (03 Oct 2003) + + 03 Oct 2003; Seemant Kulleen dbus-0.13.ebuild: + version bump + +*dbus-0.12 (12 Sep 2003) + 12 Sep 2003; Seemant Kulleen : + version bump + +*dbus-0.11 (21 Jun 2003) + + 21 Jun 2003; Seemant Kulleen dbus-0.11.ebuild, + files/dbus-0.11-cvs-update.patch: + dbus thingy from freedesktop.org -- for upcoming apps like xmms2 etc diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest new file mode 100644 index 0000000000..fafbc74c46 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1 +AUX dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch 1320 SHA256 ab3398f4fb46ec9a134581a825180422b2b8f5e8dd250bca3127c31a39d923a7 SHA512 e8cac05a0291f24fc3cd82cfd504a78b1d356a9ee613e226c3b16ccbfd8251afb036d4fb9da372a066e5bc9417fddbc3f10b68713620c4fd798069fdd8f6dbf8 WHIRLPOOL 9e30cbcba7ebe13cdc8a9e3ad0bb7d3d6e667dfba23a6cedfbacbbed34f6eb15bc6f0dcb42392f0c1a23ac891f0d820759f4201b8bac9b51d4241e74bed5ca2d +AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f +DIST dbus-1.6.8.tar.gz 1929630 SHA256 fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac SHA512 eb26f1dfb6c6e3757a408a98e0f4012eda926e2f8ee7a2356ebd567a2e4a7d96effca7cec6e6b4f9e7bc578cbdd7b703d00158343a260859aff0718c76f296b0 WHIRLPOOL b614da2bc57376c8ad626ed2469e9a2cfcf7a2debba97187728048ad73e0c5075b290766d088e470b266fcad3e3cf2ec2c9c8477f1f7c5a232f1f74cadc83c1a +EBUILD dbus-1.6.8-r1.ebuild 5208 SHA256 8b687bb32fd9acc1329455b4a918e0293490fea5c1f3b84a5bbdabb871494193 SHA512 f0ca13ef1bc9e9364546e0892b4d376b71107a06dc368ba5a4b2753435ead152ee876f137ba003975a88a922e64e51911aa23f34953dcf47bc036d7640b1a1ea WHIRLPOOL f28ffc0a3741de0d727e7253ce61d549aa729d4476786970bb5c8c73ddbfe28479d58be2598ee0d5f0a4813e7356f409d828fe4b4f0b830ac9c7ac2eac286f5e +EBUILD dbus-1.6.8.ebuild 4977 SHA256 12c078f1279d359f21d808136dfd8e5e0877f57970ccadac069245f6054498f5 SHA512 92108bf767eb0ca035c229ba5785db26da5d0aa27dbb6dd3cc77ed0217313b7b193476b622a02824dc6580962805895670f9e82647da579ec6e84b438816a2ef WHIRLPOOL 9b3c06858526dab5fa21074d9217bbe395a35e4c42be04fb305f2adddb3ab7222384be25421840253dc3679bb72490bbdfa125926ad2c13bdf3bb4b21bd11323 +MISC ChangeLog 54150 SHA256 a1f1bcbe8400cfe7edab0a8f4384d589cf9edfdf146db5462775211d42434f76 SHA512 3bf81584342c89ed383cc0355654853325af9ec391431858316584c42ed17ba1b8f8a390e96861c270776ecb501c802cd0b80458b3d3fb09b19f0310e1e50064 WHIRLPOOL df842fcc9fe212dfa76c8cbab7b4c2635f8e69b9f6f747e4e68138dd3f31257c5b8e5ad014fd2b2d5965da084b743100678bc6aabf50865e2c0d5811fd2ea0c2 +MISC metadata.xml 342 SHA256 5db8eac45a8872150729ee08297c2a19468336c3b9412e9f8e64ca2a2f5406c3 SHA512 01e10de9adb42a26339a096215305853c646c23c533df70ad044f92109d2138efe86465b00462d649f1d0e8ea1896320e09a571fcbe95318c5df9024d8f65b19 WHIRLPOOL 303cd9e4e6451ddf37da658766c877b960942f8a170948b60e6f4b1d72e7d3df5f4b4bf4fb92016caacaa611198e77aefaeedd5d3706c538b0bd0b5c086fabba +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQ+/ECAAoJEEdUh39IaPFNJ1QH/2ggvsLSqbLXgDM2jxkU1FeX +Gc6N/qtMeHfHwYDBpe/UVbSo6oc/qO86cQAHSXtfmHt39CMOre7qpis3JvdWNlSl +bhvELSNmbZ1htf+xKVLMqVsaRd6TPw3EMn5dXzYol1HXCGMPridJof1x/nMqnELy +01gEeNKJCYElUhS7OQstj5P0Oo/r+zhcayKsY9MhSk2xGiGQmo9Cok+Qo6bGtwFs +2dNS414chMVwZZkEd3RMneyNkCG/rv/F63JJS2/1BpxAtx8/EHIGTIV0zCmCtTJ2 +8iBkCWa302morhWn+cjZE78aknOJC9cv1X3fM4UGOOmXYv6Wkhljms9Eov2ln0o= +=GZ5u +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.2.20-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.2.20-r4.ebuild new file mode 100644 index 0000000000..2353fb5788 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.2.20-r4.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.12.ebuild,v 1.3 2009/04/23 05:46:44 nirbheek Exp $ + +inherit eutils multilib flag-o-matic + +DESCRIPTION="A message bus system, a simple way for applications to talk to each other" +HOMEPAGE="http://dbus.freedesktop.org/" +SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" + +LICENSE="|| ( GPL-2 AFL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug doc selinux test X" + +RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 ) + selinux? ( sys-libs/libselinux + sec-policy/selinux-dbus ) + >=dev-libs/expat-1.95.8 + !contexts/dbus_contexts + ++ ++ 4096 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-print-fixed.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-print-fixed.patch new file mode 100644 index 0000000000..bf1a829933 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-print-fixed.patch @@ -0,0 +1,343 @@ +diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c +index 75d00ac..abb45ee 100644 +--- a/tools/dbus-print-message.c ++++ b/tools/dbus-print-message.c +@@ -142,6 +142,284 @@ print_ay (DBusMessageIter *iter, int depth) + free (bytes); + } + ++#include ++#define DBUS_INT64_PRINTF_ARGUMENT PRIi64 ++#define DBUS_UINT64_PRINTF_ARGUMENT PRIu64 ++#define MAXPFX 4096 ++ ++static int ++pf_can_simple(DBusMessageIter *iter) ++{ ++ switch (dbus_message_iter_get_arg_type(iter)) ++ { ++ case DBUS_TYPE_STRING: ++ case DBUS_TYPE_INT16: ++ case DBUS_TYPE_INT32: ++ case DBUS_TYPE_UINT16: ++ case DBUS_TYPE_UINT32: ++ case DBUS_TYPE_INT64: ++ case DBUS_TYPE_UINT64: ++ case DBUS_TYPE_BYTE: ++ case DBUS_TYPE_BOOLEAN: ++ case DBUS_TYPE_DOUBLE: ++ return 1; ++ default: ++ return 0; ++ } ++} ++ ++static void pf_key(DBusMessageIter *iter, const char *pfx, char *buf, size_t sz) ++{ ++ char *sv; ++ dbus_bool_t bv; ++ dbus_int16_t i16v; ++ dbus_int32_t i32v; ++ dbus_int64_t i64v; ++ dbus_uint16_t u16v; ++ dbus_uint32_t u32v; ++ dbus_uint64_t u64v; ++ unsigned char u8v; ++ double dv; ++ ++ switch (dbus_message_iter_get_arg_type(iter)) { ++ case DBUS_TYPE_STRING: ++ dbus_message_iter_get_basic(iter, &sv); ++ snprintf(buf, sz, "%s/%s", pfx, sv); ++ break; ++ case DBUS_TYPE_BOOLEAN: ++ dbus_message_iter_get_basic(iter, &bv); ++ snprintf(buf, sz, "%s/%s", pfx, (bv ? "true" : "false")); ++ break; ++ case DBUS_TYPE_INT16: ++ dbus_message_iter_get_basic(iter, &i16v); ++ snprintf(buf, sz, "%s/%d", pfx, i16v); ++ break; ++ case DBUS_TYPE_INT32: ++ dbus_message_iter_get_basic(iter, &i32v); ++ snprintf(buf, sz, "%s/%d", pfx, i32v); ++ break; ++ case DBUS_TYPE_INT64: ++ dbus_message_iter_get_basic(iter, &i64v); ++#ifdef DBUS_INT64_PRINTF_ARGUMENT ++ snprintf(buf, sz, "%s/%" DBUS_INT64_PRINTF_ARGUMENT, pfx, i64v); ++#else ++ snprintf(buf, sz, "%s/[int64]", pfx); ++#endif ++ break; ++ case DBUS_TYPE_UINT16: ++ dbus_message_iter_get_basic(iter, &u16v); ++ snprintf(buf, sz, "%s/%u", pfx, u16v); ++ break; ++ case DBUS_TYPE_UINT32: ++ dbus_message_iter_get_basic(iter, &u32v); ++ snprintf(buf, sz, "%s/%u", pfx, u32v); ++ break; ++ case DBUS_TYPE_UINT64: ++ dbus_message_iter_get_basic(iter, &u64v); ++#ifdef DBUS_UINT64_PRINTF_ARGUMENT ++ snprintf(buf, sz, "%s/%" DBUS_UINT64_PRINTF_ARGUMENT, pfx, u64v); ++#else ++ snprintf(buf, sz, "%s/[uint64]", pfx); ++#endif ++ break; ++ case DBUS_TYPE_BYTE: ++ dbus_message_iter_get_basic(iter, &u8v); ++ snprintf(buf, sz, "%s/%02x", pfx, (unsigned int)u8v & 0xFF); ++ break; ++ case DBUS_TYPE_DOUBLE: ++ dbus_message_iter_get_basic(iter, &dv); ++ snprintf(buf, sz, "%s/%g", pfx, dv); ++ break; ++ default: ++ snprintf(buf, sz, "%s/[pf-unknown]", pfx); ++ break; ++ } ++} ++ ++static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all); ++ ++static void pf_string(DBusMessageIter *iter, const char *pfx) ++{ ++ char *val; ++ dbus_message_iter_get_basic(iter, &val); ++ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", val); ++} ++ ++static void pf_boolean(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_bool_t bv; ++ dbus_message_iter_get_basic(iter, &bv); ++ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", (bv ? "true" : "false")); ++} ++ ++static void pf_uint16(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_uint16_t uv; ++ dbus_message_iter_get_basic(iter, &uv); ++ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); ++} ++ ++static void pf_int16(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_int16_t iv; ++ dbus_message_iter_get_basic(iter, &iv); ++ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); ++} ++ ++static void pf_uint32(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_uint32_t uv; ++ dbus_message_iter_get_basic(iter, &uv); ++ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); ++} ++ ++static void pf_int32(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_int32_t iv; ++ dbus_message_iter_get_basic(iter, &iv); ++ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); ++} ++ ++static void pf_uint64(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_uint64_t uv; ++ dbus_message_iter_get_basic(iter, &uv); ++#ifdef DBUS_UINT64_PRINTF_ARGUMENT ++ printf("%s%s%" DBUS_UINT64_PRINTF_ARGUMENT "\n", pfx, pfx[0] ? " " : "", uv); ++#else ++ printf("%s%s[uint64]\n", pfx, pfx[0] ? " " : ""); ++#endif ++} ++ ++static void pf_int64(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_int64_t iv; ++ dbus_message_iter_get_basic(iter, &iv); ++#ifdef DBUS_INT64_PRINTF_ARGUMENT ++ printf("%s%s%" DBUS_INT64_PRINTF_ARGUMENT "\n", pfx, pfx[0] ? " " : "", iv); ++#else ++ printf("%s%s[int64]\n", pfx, pfx[0] ? " " : ""); ++#endif ++} ++ ++static void pf_double(DBusMessageIter *iter, const char *pfx) ++{ ++ double dv; ++ dbus_message_iter_get_basic(iter, &dv); ++ printf("%s%s%g\n", pfx, pfx[0] ? " " : "", dv); ++} ++ ++static void pf_byte(DBusMessageIter *iter, const char *pfx) ++{ ++ unsigned char bv; ++ dbus_message_iter_get_basic(iter, &bv); ++ printf("%s%s%02x\n", pfx, pfx[0] ? " " : "", (unsigned int)bv & 0xFF); ++} ++ ++static void pf_array(DBusMessageIter *iter, const char *pfx) ++{ ++ int type; ++ DBusMessageIter subiter; ++ char npfx[MAXPFX]; ++ int i = 0; ++ ++ dbus_message_iter_recurse(iter, &subiter); ++ type = dbus_message_iter_get_arg_type(&subiter); ++ ++ while (type != DBUS_TYPE_INVALID) ++ { ++ snprintf(npfx, sizeof(npfx), "%s/%d", pfx, i); ++ print_fixed_iter(&subiter, npfx, 0); ++ dbus_message_iter_next(&subiter); ++ type = dbus_message_iter_get_arg_type(&subiter); ++ i++; ++ } ++} ++ ++static void pf_variant(DBusMessageIter *iter, const char *pfx) ++{ ++ DBusMessageIter subiter; ++ dbus_message_iter_recurse(iter, &subiter); ++ print_fixed_iter(&subiter, pfx, 0); ++} ++ ++static void pf_dict(DBusMessageIter *iter, const char *pfx) ++{ ++ DBusMessageIter subiter; ++ char npfx[MAXPFX]; ++ ++ dbus_message_iter_recurse(iter, &subiter); ++ /* Nasty hack to make string -> thing dicts more parseable. */ ++ if (pf_can_simple(&subiter)) ++ { ++ pf_key(&subiter, pfx, npfx, sizeof(npfx)); ++ } ++ else ++ { ++ snprintf(npfx, MAXPFX, "%s/[complex-key]", pfx); ++ } ++ dbus_message_iter_next(&subiter); ++ print_fixed_iter(&subiter, npfx, 0); ++} ++ ++static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all) ++{ ++ static struct { ++ int type; ++ void (*func)(DBusMessageIter *iter, const char *pfx); ++ } printers[] = { ++ { DBUS_TYPE_STRING, pf_string }, ++ { DBUS_TYPE_ARRAY, pf_array }, ++ { DBUS_TYPE_STRUCT, pf_array }, /* yes, really. They're identical. */ ++ { DBUS_TYPE_VARIANT, pf_variant }, ++ { DBUS_TYPE_DICT_ENTRY, pf_dict }, ++ { DBUS_TYPE_BOOLEAN, pf_boolean }, ++ { DBUS_TYPE_UINT32, pf_uint32 }, ++ { DBUS_TYPE_INT32, pf_int32 }, ++ { DBUS_TYPE_SIGNATURE, pf_string }, ++ { DBUS_TYPE_OBJECT_PATH, pf_string }, ++ { DBUS_TYPE_INT16, pf_int16 }, ++ { DBUS_TYPE_UINT16, pf_uint16 }, ++ { DBUS_TYPE_INT64, pf_int64 }, ++ { DBUS_TYPE_UINT64, pf_uint64 }, ++ { DBUS_TYPE_DOUBLE, pf_double }, ++ { DBUS_TYPE_BYTE, pf_byte }, ++ { 0, NULL } ++ }; ++ int type; ++ int i; ++ ++ do ++ { ++ type = dbus_message_iter_get_arg_type(iter); ++ if (type == DBUS_TYPE_INVALID) ++ return; ++ for (i = 0; printers[i].func; i++) ++ { ++ if (printers[i].type == type) ++ { ++ printers[i].func(iter, pfx); ++ break; ++ } ++ } ++ if (!printers[i].func) ++ { ++ printf("print-fixed-iter: no idea what %d is\n", type); ++ } ++ } ++ while (all && dbus_message_iter_next(iter)); ++} ++ ++void print_message_fixed(DBusMessage *msg) ++{ ++ DBusMessageIter iter; ++ int type; ++ ++ type = dbus_message_get_type(msg); ++ dbus_message_iter_init(msg, &iter); ++ print_fixed_iter(&iter, "", 1); ++} ++ + static void + print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth) + { +diff --git a/tools/dbus-print-message.h b/tools/dbus-print-message.h +index 26700d8..cb72efd 100644 +--- a/tools/dbus-print-message.h ++++ b/tools/dbus-print-message.h +@@ -26,6 +26,7 @@ + #include + #include + ++void print_message_fixed (DBusMessage *message); + void print_message (DBusMessage *message, dbus_bool_t literal); + + #endif /* DBUS_PRINT_MESSAGE_H */ +diff --git a/tools/dbus-send.c b/tools/dbus-send.c +index c7d5090..ffd9b71 100644 +--- a/tools/dbus-send.c ++++ b/tools/dbus-send.c +@@ -51,7 +51,7 @@ static const char *appname; + static void + usage (int ecode) + { +- fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] [contents ...]\n", appname); ++ fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--fixed] [--reply-timeout=MSEC] [contents ...]\n", appname); + exit (ecode); + } + +@@ -242,6 +242,7 @@ main (int argc, char *argv[]) + const char *type_str = NULL; + const char *address = NULL; + int session_or_system = FALSE; ++ int fixed = 0; + + appname = argv[0]; + +@@ -298,6 +299,8 @@ main (int argc, char *argv[]) + type_str = strchr (arg, '=') + 1; + else if (!strcmp(arg, "--help")) + usage (0); ++ else if (!strcmp(arg, "--fixed")) ++ fixed = 1; + else if (arg[0] == '-') + usage (1); + else if (path == NULL) +@@ -524,7 +527,10 @@ main (int argc, char *argv[]) + + if (reply) + { +- print_message (reply, print_reply_literal); ++ if (fixed) ++ print_message_fixed (reply); ++ else ++ print_message (reply, print_reply_literal); + dbus_message_unref (reply); + } + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-unix-fd.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-unix-fd.patch new file mode 100644 index 0000000000..990a520d4a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-unix-fd.patch @@ -0,0 +1,33 @@ +diff --git a/tools/dbus-send.c b/tools/dbus-send.c +index cde0bb7..0a6f79a 100644 +--- a/tools/dbus-send.c ++++ b/tools/dbus-send.c +@@ -67,6 +67,7 @@ append_arg (DBusMessageIter *iter, int type, const char *value) + double d; + unsigned char byte; + dbus_bool_t v_BOOLEAN; ++ int _int; + + /* FIXME - we are ignoring OOM returns on all these functions */ + switch (type) +@@ -137,6 +138,11 @@ append_arg (DBusMessageIter *iter, int type, const char *value) + } + break; + ++ case DBUS_TYPE_UNIX_FD: ++ _int = strtoul (value, NULL, 0); ++ dbus_message_iter_append_basic (iter, DBUS_TYPE_UNIX_FD, &_int); ++ break; ++ + default: + fprintf (stderr, "%s: Unsupported data type %c\n", appname, (char) type); + exit (1); +@@ -215,6 +221,8 @@ type_from_name (const char *arg) + type = DBUS_TYPE_BOOLEAN; + else if (!strcmp (arg, "objpath")) + type = DBUS_TYPE_OBJECT_PATH; ++ else if (!strcmp (arg, "fd")) ++ type = DBUS_TYPE_UNIX_FD; + else + { + fprintf (stderr, "%s: Unknown type \"%s\"\n", appname, arg); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-variant-dict.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-variant-dict.patch new file mode 100644 index 0000000000..68bec09432 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-variant-dict.patch @@ -0,0 +1,58 @@ +diff --git a/tools/dbus-send.c b/tools/dbus-send.c +index 0a6f79a..6c56306 100644 +--- a/tools/dbus-send.c ++++ b/tools/dbus-send.c +@@ -164,6 +164,8 @@ append_array (DBusMessageIter *iter, int type, const char *value) + free (dupval); + } + ++static int type_from_name(const char *name); ++ + static void + append_dict (DBusMessageIter *iter, int keytype, int valtype, const char *value) + { +@@ -187,7 +189,30 @@ append_dict (DBusMessageIter *iter, int keytype, int valtype, const char *value) + fprintf (stderr, "%s: Malformed dictionary\n", appname); + exit (1); + } +- append_arg (&subiter, valtype, val); ++ if (valtype == DBUS_TYPE_VARIANT) ++ { ++ char sig[2]; ++ char *c = strchr(val, ':'); ++ if (!c) ++ { ++ fprintf (stderr, "Missing type in variant dict\n"); ++ exit (1); ++ } ++ *(c++) = '\0'; ++ sig[0] = type_from_name(val); ++ sig[1] = '\0'; ++ DBusMessageIter subsubiter; ++ dbus_message_iter_open_container (&subiter, ++ DBUS_TYPE_VARIANT, ++ sig, ++ &subsubiter); ++ append_arg(&subsubiter, sig[0], c); ++ dbus_message_iter_close_container (&subiter, &subsubiter); ++ } ++ else ++ { ++ append_arg (&subiter, valtype, val); ++ } + + dbus_message_iter_close_container (iter, &subiter); + val = strtok (NULL, ","); +@@ -473,7 +498,11 @@ main (int argc, char *argv[]) + exit (1); + } + *(c++) = 0; +- secondary_type = type_from_name (arg); ++ if (!strcmp(arg, "variant")) ++ /* Hack: support variant values for dictionaries. */ ++ secondary_type = DBUS_TYPE_VARIANT; ++ else ++ secondary_type = type_from_name (arg); + sig[0] = DBUS_DICT_ENTRY_BEGIN_CHAR; + sig[1] = type; + sig[2] = secondary_type; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch new file mode 100644 index 0000000000..45d610c5ef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/405975 + +From e1b83fb58eadfd02227673db9a7e2833d29b0c98 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 23 Apr 2012 00:32:43 +0200 +Subject: [PATCH] selinux: when dropping capabilities only include AUDIT caps + if we have them + +When we drop capabilities we shouldn't assume we can keep +CAP_AUDIT_WRITE unconditionally, since it will not be available when +running in containers. + +This patch only adds CAP_AUDIT_WRITE to the list of caps we keep if we +actually have it in the first place. + +This makes audit/selinux enabled D-Bus work in a Linux container. +--- + bus/selinux.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bus/selinux.c b/bus/selinux.c +index 36287e9..1bfc791 100644 +--- a/bus/selinux.c ++++ b/bus/selinux.c +@@ -1053,8 +1053,9 @@ _dbus_change_to_daemon_user (const char *user, + int rc; + + capng_clear (CAPNG_SELECT_BOTH); +- capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, +- CAP_AUDIT_WRITE); ++ if (capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE)) ++ capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, ++ CAP_AUDIT_WRITE); + rc = capng_change_id (uid, gid, CAPNG_DROP_SUPP_GRP); + if (rc) + { +-- +1.7.10 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-gold.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-gold.patch new file mode 100644 index 0000000000..53f4b94438 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-gold.patch @@ -0,0 +1,12 @@ +diff --git a/dbus-1.2.20/configure b/dbus-1.2.20.patched/configure +index 0bfd213..728d40b 100755 +--- a/dbus-1.2.20/configure ++++ b/dbus-1.2.20.patched/configure +@@ -9933,6 +9933,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-send-print-fixed.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-send-print-fixed.patch new file mode 100644 index 0000000000..1e13c73ab9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-send-print-fixed.patch @@ -0,0 +1,340 @@ +diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c +index 75d00ac..abb45ee 100644 +--- a/tools/dbus-print-message.c ++++ b/tools/dbus-print-message.c +@@ -142,6 +142,281 @@ print_ay (DBusMessageIter *iter, int depth) + free (bytes); + } + ++#define MAXPFX 4096 ++ ++static int ++pf_can_simple(DBusMessageIter *iter) ++{ ++ switch (dbus_message_iter_get_arg_type(iter)) ++ { ++ case DBUS_TYPE_STRING: ++ case DBUS_TYPE_INT16: ++ case DBUS_TYPE_INT32: ++ case DBUS_TYPE_UINT16: ++ case DBUS_TYPE_UINT32: ++ case DBUS_TYPE_INT64: ++ case DBUS_TYPE_UINT64: ++ case DBUS_TYPE_BYTE: ++ case DBUS_TYPE_BOOLEAN: ++ case DBUS_TYPE_DOUBLE: ++ return 1; ++ default: ++ return 0; ++ } ++} ++ ++static void pf_key(DBusMessageIter *iter, const char *pfx, char *buf, size_t sz) ++{ ++ char *sv; ++ dbus_bool_t bv; ++ dbus_int16_t i16v; ++ dbus_int32_t i32v; ++ dbus_int64_t i64v; ++ dbus_uint16_t u16v; ++ dbus_uint32_t u32v; ++ dbus_uint64_t u64v; ++ unsigned char u8v; ++ double dv; ++ ++ switch (dbus_message_iter_get_arg_type(iter)) { ++ case DBUS_TYPE_STRING: ++ dbus_message_iter_get_basic(iter, &sv); ++ snprintf(buf, sz, "%s/%s", pfx, sv); ++ break; ++ case DBUS_TYPE_BOOLEAN: ++ dbus_message_iter_get_basic(iter, &bv); ++ snprintf(buf, sz, "%s/%s", pfx, (bv ? "true" : "false")); ++ break; ++ case DBUS_TYPE_INT16: ++ dbus_message_iter_get_basic(iter, &i16v); ++ snprintf(buf, sz, "%s/%d", pfx, i16v); ++ break; ++ case DBUS_TYPE_INT32: ++ dbus_message_iter_get_basic(iter, &i32v); ++ snprintf(buf, sz, "%s/%d", pfx, i32v); ++ break; ++ case DBUS_TYPE_INT64: ++ dbus_message_iter_get_basic(iter, &i64v); ++#ifdef DBUS_INT64_PRINTF_MODIFIER ++ snprintf(buf, sz, "%s/%" DBUS_INT64_PRINTF_MODIFIER "d", pfx, i64v); ++#else ++ snprintf(buf, sz, "%s/[int64]", pfx); ++#endif ++ break; ++ case DBUS_TYPE_UINT16: ++ dbus_message_iter_get_basic(iter, &u16v); ++ snprintf(buf, sz, "%s/%u", pfx, u16v); ++ break; ++ case DBUS_TYPE_UINT32: ++ dbus_message_iter_get_basic(iter, &u32v); ++ snprintf(buf, sz, "%s/%u", pfx, u32v); ++ break; ++ case DBUS_TYPE_UINT64: ++ dbus_message_iter_get_basic(iter, &u64v); ++#ifdef DBUS_UINT64_PRINTF_MODIFIER ++ snprintf(buf, sz, "%s/%" DBUS_UINT64_PRINTF_MODIFIER "u", pfx, u64v); ++#else ++ snprintf(buf, sz, "%s/[uint64]", pfx); ++#endif ++ break; ++ case DBUS_TYPE_BYTE: ++ dbus_message_iter_get_basic(iter, &u8v); ++ snprintf(buf, sz, "%s/%02x", pfx, (unsigned int)u8v & 0xFF); ++ break; ++ case DBUS_TYPE_DOUBLE: ++ dbus_message_iter_get_basic(iter, &dv); ++ snprintf(buf, sz, "%s/%g", pfx, dv); ++ break; ++ default: ++ snprintf(buf, sz, "%s/[pf-unknown]", pfx); ++ break; ++ } ++} ++ ++static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all); ++ ++static void pf_string(DBusMessageIter *iter, const char *pfx) ++{ ++ char *val; ++ dbus_message_iter_get_basic(iter, &val); ++ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", val); ++} ++ ++static void pf_boolean(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_bool_t bv; ++ dbus_message_iter_get_basic(iter, &bv); ++ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", (bv ? "true" : "false")); ++} ++ ++static void pf_uint16(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_uint16_t uv; ++ dbus_message_iter_get_basic(iter, &uv); ++ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); ++} ++ ++static void pf_int16(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_int16_t iv; ++ dbus_message_iter_get_basic(iter, &iv); ++ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); ++} ++ ++static void pf_uint32(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_uint32_t uv; ++ dbus_message_iter_get_basic(iter, &uv); ++ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); ++} ++ ++static void pf_int32(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_int32_t iv; ++ dbus_message_iter_get_basic(iter, &iv); ++ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); ++} ++ ++static void pf_uint64(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_uint64_t uv; ++ dbus_message_iter_get_basic(iter, &uv); ++#ifdef DBUS_UINT64_PRINTF_MODIFIER ++ printf("%s%s%" DBUS_UINT64_PRINTF_MODIFIER "u\n", pfx, pfx[0] ? " " : "", uv); ++#else ++ printf("%s%s[uint64]\n", pfx, pfx[0] ? " " : ""); ++#endif ++} ++ ++static void pf_int64(DBusMessageIter *iter, const char *pfx) ++{ ++ dbus_int64_t iv; ++ dbus_message_iter_get_basic(iter, &iv); ++#ifdef DBUS_INT64_PRINTF_MODIFIER ++ printf("%s%s%" DBUS_INT64_PRINTF_MODIFIER "d\n", pfx, pfx[0] ? " " : "", iv); ++#else ++ printf("%s%s[int64]\n", pfx, pfx[0] ? " " : ""); ++#endif ++} ++ ++static void pf_double(DBusMessageIter *iter, const char *pfx) ++{ ++ double dv; ++ dbus_message_iter_get_basic(iter, &dv); ++ printf("%s%s%g\n", pfx, pfx[0] ? " " : "", dv); ++} ++ ++static void pf_byte(DBusMessageIter *iter, const char *pfx) ++{ ++ unsigned char bv; ++ dbus_message_iter_get_basic(iter, &bv); ++ printf("%s%s%02x\n", pfx, pfx[0] ? " " : "", (unsigned int)bv & 0xFF); ++} ++ ++static void pf_array(DBusMessageIter *iter, const char *pfx) ++{ ++ int type; ++ DBusMessageIter subiter; ++ char npfx[MAXPFX]; ++ int i = 0; ++ ++ dbus_message_iter_recurse(iter, &subiter); ++ type = dbus_message_iter_get_arg_type(&subiter); ++ ++ while (type != DBUS_TYPE_INVALID) ++ { ++ snprintf(npfx, sizeof(npfx), "%s/%d", pfx, i); ++ print_fixed_iter(&subiter, npfx, 0); ++ dbus_message_iter_next(&subiter); ++ type = dbus_message_iter_get_arg_type(&subiter); ++ i++; ++ } ++} ++ ++static void pf_variant(DBusMessageIter *iter, const char *pfx) ++{ ++ DBusMessageIter subiter; ++ dbus_message_iter_recurse(iter, &subiter); ++ print_fixed_iter(&subiter, pfx, 0); ++} ++ ++static void pf_dict(DBusMessageIter *iter, const char *pfx) ++{ ++ DBusMessageIter subiter; ++ char npfx[MAXPFX]; ++ ++ dbus_message_iter_recurse(iter, &subiter); ++ /* Nasty hack to make string -> thing dicts more parseable. */ ++ if (pf_can_simple(&subiter)) ++ { ++ pf_key(&subiter, pfx, npfx, sizeof(npfx)); ++ } ++ else ++ { ++ snprintf(npfx, MAXPFX, "%s/[complex-key]", pfx); ++ } ++ dbus_message_iter_next(&subiter); ++ print_fixed_iter(&subiter, npfx, 0); ++} ++ ++static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all) ++{ ++ static struct { ++ int type; ++ void (*func)(DBusMessageIter *iter, const char *pfx); ++ } printers[] = { ++ { DBUS_TYPE_STRING, pf_string }, ++ { DBUS_TYPE_ARRAY, pf_array }, ++ { DBUS_TYPE_STRUCT, pf_array }, /* yes, really. They're identical. */ ++ { DBUS_TYPE_VARIANT, pf_variant }, ++ { DBUS_TYPE_DICT_ENTRY, pf_dict }, ++ { DBUS_TYPE_BOOLEAN, pf_boolean }, ++ { DBUS_TYPE_UINT32, pf_uint32 }, ++ { DBUS_TYPE_INT32, pf_int32 }, ++ { DBUS_TYPE_SIGNATURE, pf_string }, ++ { DBUS_TYPE_OBJECT_PATH, pf_string }, ++ { DBUS_TYPE_INT16, pf_int16 }, ++ { DBUS_TYPE_UINT16, pf_uint16 }, ++ { DBUS_TYPE_INT64, pf_int64 }, ++ { DBUS_TYPE_UINT64, pf_uint64 }, ++ { DBUS_TYPE_DOUBLE, pf_double }, ++ { DBUS_TYPE_BYTE, pf_byte }, ++ { 0, NULL } ++ }; ++ int type; ++ int i; ++ ++ do ++ { ++ type = dbus_message_iter_get_arg_type(iter); ++ if (type == DBUS_TYPE_INVALID) ++ return; ++ for (i = 0; printers[i].func; i++) ++ { ++ if (printers[i].type == type) ++ { ++ printers[i].func(iter, pfx); ++ break; ++ } ++ } ++ if (!printers[i].func) ++ { ++ printf("print-fixed-iter: no idea what %d is\n", type); ++ } ++ } ++ while (all && dbus_message_iter_next(iter)); ++} ++ ++void print_message_fixed(DBusMessage *msg) ++{ ++ DBusMessageIter iter; ++ int type; ++ ++ type = dbus_message_get_type(msg); ++ dbus_message_iter_init(msg, &iter); ++ print_fixed_iter(&iter, "", 1); ++} ++ + static void + print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth) + { +diff --git a/tools/dbus-print-message.h b/tools/dbus-print-message.h +index 26700d8..cb72efd 100644 +--- a/tools/dbus-print-message.h ++++ b/tools/dbus-print-message.h +@@ -26,6 +26,7 @@ + #include + #include + ++void print_message_fixed (DBusMessage *message); + void print_message (DBusMessage *message, dbus_bool_t literal); + + #endif /* DBUS_PRINT_MESSAGE_H */ +diff --git a/tools/dbus-send.c b/tools/dbus-send.c +index c7d5090..ffd9b71 100644 +--- a/tools/dbus-send.c ++++ b/tools/dbus-send.c +@@ -51,7 +51,7 @@ static const char *appname; + static void + usage (int ecode) + { +- fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] [contents ...]\n", appname); ++ fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--fixed] [--reply-timeout=MSEC] [contents ...]\n", appname); + exit (ecode); + } + +@@ -242,6 +242,7 @@ main (int argc, char *argv[]) + const char *type_str = NULL; + const char *address = NULL; + int session_or_system = FALSE; ++ int fixed = 0; + + appname = argv[0]; + +@@ -298,6 +299,8 @@ main (int argc, char *argv[]) + type_str = strchr (arg, '=') + 1; + else if (!strcmp(arg, "--help")) + usage (0); ++ else if (!strcmp(arg, "--fixed")) ++ fixed = 1; + else if (arg[0] == '-') + usage (1); + else if (path == NULL) +@@ -526,7 +529,10 @@ main (int argc, char *argv[]) + + if (reply) + { +- print_message (reply, print_reply_literal); ++ if (fixed) ++ print_message_fixed (reply); ++ else ++ print_message (reply, print_reply_literal); + dbus_message_unref (reply); + } + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.init-1.0 b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.init-1.0 new file mode 100644 index 0000000000..e96ea05cd1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.init-1.0 @@ -0,0 +1,51 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.4 2007/04/04 13:35:25 cardoe Exp $ + +opts="reload" + +depend() { + need localmount + after bootmisc +} + +start() { + ebegin "Starting D-BUS system messagebus" + + /usr/bin/dbus-uuidgen --ensure + + # We need to test if /var/run/dbus exists, since script will fail if it does not + [ ! -e /var/run/dbus ] && mkdir /var/run/dbus + + start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system + eend $? +} + +stop() { + local retval + + ebegin "Stopping D-BUS system messagebus" + + start-stop-daemon --stop --pidfile /var/run/dbus.pid + retval=$? + + eend ${retval} + + [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket + + return ${retval} +} + +reload() { + local retval + + ebegin "Reloading D-BUS messagebus config" + + /usr/bin/dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + retval=$? + eend ${retval} + return ${retval} +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd new file mode 100644 index 0000000000..65271f69c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd @@ -0,0 +1,50 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $ + +extra_started_commands="reload" + +depend() { + need localmount + after bootmisc +} + +start() { + ebegin "Starting D-BUS system messagebus" + /usr/bin/dbus-uuidgen --ensure=/etc/machine-id + + # We need to test if /var/run/dbus exists, since script will fail if it does not + [ ! -e /var/run/dbus ] && mkdir /var/run/dbus + + start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system + eend $? +} + +stop() { + local retval + + ebegin "Stopping D-BUS system messagebus" + + start-stop-daemon --stop --pidfile /var/run/dbus.pid + retval=$? + + eend ${retval} + + [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket + + return ${retval} +} + +reload() { + local retval + + ebegin "Reloading D-BUS messagebus config" + + /usr/bin/dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + retval=$? + eend ${retval} + return ${retval} +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/org.freedesktop.DBus.Properties.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/org.freedesktop.DBus.Properties.xml new file mode 100644 index 0000000000..694155f5d3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/org.freedesktop.DBus.Properties.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml new file mode 100644 index 0000000000..4e9b563738 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml @@ -0,0 +1,11 @@ + + + + freedesktop + + freedesktop-bugs@gentoo.org + + + Build with sys-apps/systemd at_console support + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/ChangeLog new file mode 100644 index 0000000000..0df29b8a07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/ChangeLog @@ -0,0 +1,595 @@ +# ChangeLog for sys-apps/debianutils +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.138 2009/08/14 13:59:29 jer Exp $ + + 14 Aug 2009; Jeroen Roovers + -files/debianutils-2.16.2-palo.patch, + -files/debianutils-2.28.2-mkboot-quiet.patch, + -files/debianutils-2.28.2-no-bs-namespace.patch, + -debianutils-2.28.5.ebuild, -debianutils-2.29.ebuild, + -debianutils-2.30.ebuild, -debianutils-2.31.ebuild, + -debianutils-3.0.1.ebuild, -debianutils-3.0.2.ebuild, + -debianutils-3.1.ebuild, -debianutils-3.1.1.ebuild: + Remove old. + +*debianutils-3.2.1-r1 (11 Aug 2009) + + 11 Aug 2009; Jeroen Roovers -debianutils-3.2.1.ebuild, + +debianutils-3.2.1-r1.ebuild, + +files/debianutils-3.2.1-no-bs-namespace.patch: + Redo the namespace patch. + +*debianutils-3.2.1 (11 Aug 2009) + + 11 Aug 2009; Jeroen Roovers +debianutils-3.2.1.ebuild: + Version bump. + + 13 Jul 2009; Joseph Jezak debianutils-3.1.3.ebuild: + Marked ppc stable for bug #273060. + +*debianutils-3.2 (05 Jul 2009) + + 05 Jul 2009; Jeroen Roovers +debianutils-3.2.ebuild: + Version bump. + + 24 Jun 2009; Raúl Porcel debianutils-3.1.3.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #273060 + + 19 Jun 2009; Brent Baude debianutils-3.1.3.ebuild: + stable ppc64, bug 273060 + + 16 Jun 2009; Tobias Klausmann + debianutils-3.1.3.ebuild: + Stable on alpha, bug #273060 + + 10 Jun 2009; Markus Meier debianutils-3.1.3.ebuild: + amd64/x86 stable, bug #273060 + + 09 Jun 2009; Jeroen Roovers -debianutils-2.28.2.ebuild, + -debianutils-2.28.4.ebuild: + Remove old. + + 09 Jun 2009; Jeroen Roovers debianutils-3.1.3.ebuild: + Stable for HPPA (bug #273060). + +*debianutils-3.1.3 (06 May 2009) + + 06 May 2009; Jeroen Roovers +debianutils-3.1.3.ebuild: + Version bump. + +*debianutils-3.1.1 (03 May 2009) + + 03 May 2009; Jeroen Roovers +debianutils-3.1.1.ebuild: + Version bump. + +*debianutils-3.1 (02 May 2009) + + 02 May 2009; Jeroen Roovers +debianutils-3.1.ebuild: + Version bump. + +*debianutils-3.0.2 (02 May 2009) + + 02 May 2009; Jeroen Roovers debianutils-3.0.1.ebuild, + +debianutils-3.0.2.ebuild: + Version bump. Remove commented epatches. + +*debianutils-3.0.1 (01 May 2009) + + 01 May 2009; Jeroen Roovers +debianutils-3.0.1.ebuild: + Version bump. + + 18 Mar 2009; Brent Baude debianutils-2.28.5.ebuild: + stable ppc, bug 260463 + +*debianutils-2.31 (14 Mar 2009) + + 14 Mar 2009; Mike Frysinger + +files/debianutils-2.31-no-bs-namespace.patch, +debianutils-2.31.ebuild: + Version bump #259496 by Raúl Porcel. + + 07 Mar 2009; Jeremy Olexa debianutils-2.28.5.ebuild: + amd64 stable, bug 260463 + + 27 Feb 2009; Brent Baude debianutils-2.28.5.ebuild: + stable ppc64, bug 260463 + + 08 Aug 2008; Jeroen Roovers debianutils-2.28.2.ebuild, + debianutils-2.28.4.ebuild, debianutils-2.28.5.ebuild, + debianutils-2.29.ebuild, debianutils-2.30.ebuild: + Add SMAIL license (bug #176006). + +*debianutils-2.30 (08 Aug 2008) + + 08 Aug 2008; Jeroen Roovers +debianutils-2.30.ebuild: + Version bump. + + 10 Jul 2008; Jeroen Roovers debianutils-2.28.5.ebuild: + Stable for HPPA too. + +*debianutils-2.29 (19 Jun 2008) + + 19 Jun 2008; Mike Frysinger +debianutils-2.29.ebuild: + Version bumps #228015. + + 17 Jun 2008; Raúl Porcel debianutils-2.28.5.ebuild: + alpha/ia64/sparc/x86 stable + + 17 Jun 2008; Alexis Ballier + debianutils-2.28.5.ebuild: + keyword ~sparc-fbsd + + 16 Jun 2008; Alexis Ballier + debianutils-2.28.5.ebuild: + keyword ~x86-fbsd + + 16 Jun 2008; Alexis Ballier + debianutils-2.28.5.ebuild: + fix deps on fbsd wrt mktemp + + 16 Jun 2008; Alexis Ballier + debianutils-2.28.5.ebuild: + bind installkernel and mkboot to kernel_linux useflag as discussed on bug + #225759 + +*debianutils-2.28.5 (05 May 2008) + + 05 May 2008; Mike Frysinger + +debianutils-2.28.5.ebuild: + Version bump #219496 by Conrad Kostecki. + +*debianutils-2.28.4 (13 Apr 2008) + + 13 Apr 2008; Mike Frysinger + +debianutils-2.28.4.ebuild: + Version bump #217431 by Arfrever Frehtes Taifersar Arahesis. + + 16 Mar 2008; nixnut debianutils-2.28.2.ebuild: + Stable on ppc wrt bug 213591 + + 07 Feb 2008; Samuli Suominen debianutils-2.28.2.ebuild: + amd64 stable + + 05 Feb 2008; Markus Rothe debianutils-2.28.2.ebuild: + Stable on ppc64 + + 04 Feb 2008; Jeroen Roovers debianutils-2.28.2.ebuild: + Stable for HPPA too. + + 04 Feb 2008; Mike Frysinger + +files/debianutils-2.28.2-mkboot-quiet.patch, debianutils-2.28.2.ebuild: + Send which error output to /dev/null. + + 23 Jan 2008; Mike Frysinger debianutils-2.25.ebuild, + debianutils-2.28.2.ebuild: + Pull in either mktemp or latest coreutils for the mktemp binary. + + 21 Jan 2008; Raúl Porcel debianutils-2.28.2.ebuild: + alpha/ia64/sparc/x86 stable + + 21 Dec 2007; Tobias Scherbaum + debianutils-2.25.ebuild: + ppc stable + +*debianutils-2.28.2 (21 Dec 2007) + + 21 Dec 2007; Doug Klima + -files/debianutils-2.15-palo.patch, + +files/debianutils-2.28.2-no-bs-namespace.patch, + -debianutils-2.18.1.ebuild, -debianutils-2.21.ebuild, + -debianutils-2.22.1.ebuild, -debianutils-2.23.1.ebuild, + +debianutils-2.28.2.ebuild: + remove old versions. version bump for bug #194523 + + 21 Dec 2007; Doug Klima debianutils-2.25.ebuild: + amd64 stable + + 01 Dec 2007; Markus Rothe debianutils-2.25.ebuild: + Stable on ppc64 + + 19 Nov 2007; Joshua Kinard debianutils-2.25.ebuild: + Stable on mips. + + 08 Nov 2007; Jeroen Roovers debianutils-2.25.ebuild: + Stable for HPPA too. + + 07 Nov 2007; Raúl Porcel debianutils-2.25.ebuild: + alpha/ia64/sparc/x86 stable + + 15 Oct 2007; Markus Rothe debianutils-2.23.1.ebuild: + Stable on ppc64 + + 01 Oct 2007; Christian Birchinger + debianutils-2.23.1.ebuild: + Added sparc stable keyword + +*debianutils-2.25 (29 Sep 2007) + + 29 Sep 2007; Mike Frysinger +debianutils-2.25.ebuild: + Version bump #194005. + + 28 Sep 2007; Joshua Kinard debianutils-2.23.1.ebuild: + Stable on mips. + + 18 Sep 2007; Raúl Porcel debianutils-2.23.1.ebuild: + alpha/ia64/x86 stable + +*debianutils-2.23.1 (17 Aug 2007) + + 17 Aug 2007; Mike Frysinger + +debianutils-2.23.1.ebuild: + Version bump. + + 13 Aug 2007; Gustavo Zacarias + debianutils-2.22.1.ebuild: + Stable on sparc + + 12 Aug 2007; Tom Gall debianutils-2.22.1.ebuild: + stable on ppc64 + + 10 Aug 2007; Raúl Porcel debianutils-2.22.1.ebuild: + alpha/ia64/x86 stable + +*debianutils-2.22.1 (09 Jul 2007) + + 09 Jul 2007; Mike Frysinger + +debianutils-2.22.1.ebuild: + Version bump #184629. + + 17 Jun 2007; Christoph Mende + debianutils-2.17.5.ebuild: + Stable on amd64 wrt bug 181258 + + 17 Jun 2007; Raúl Porcel debianutils-2.17.5.ebuild: + alpha stable wrt #182280 + + 17 Jun 2007; Markus Rothe debianutils-2.17.5.ebuild: + Stable on ppc64; bug #182280 + + 17 Jun 2007; Tobias Scherbaum + debianutils-2.17.5.ebuild: + ppc stable, bug #182280 + +*debianutils-2.21 (16 Jun 2007) + + 16 Jun 2007; Mike Frysinger +debianutils-2.21.ebuild: + Version bump #181905 by Raul Porcel. + + 23 May 2007; Gustavo Zacarias + debianutils-2.17.5.ebuild: + Stable on sparc + +*debianutils-2.18.1 (16 May 2007) + + 16 May 2007; Roy Marples +debianutils-2.18.1.ebuild: + New version, fixes #177576. + + 05 May 2007; Raúl Porcel debianutils-2.18.ebuild: + Back to ~arch + +*debianutils-2.18 (05 May 2007) + + 05 May 2007; Mike Frysinger +debianutils-2.18.ebuild: + Version bump #175706 by Raul Porcel. + + 24 Apr 2007; Alexander Færøy + debianutils-2.17.5.ebuild: + Stable on MIPS. + + 23 Apr 2007; Raúl Porcel debianutils-2.17.5.ebuild: + ia64 + x86 stable + + 25 Mar 2007; Jose Luis Rivero + debianutils-2.17.4.ebuild: + Stable on alpha wrt bug #169082 + + 18 Mar 2007; nixnut debianutils-2.17.4.ebuild: + Stable on ppc wrt bug 169082 + + 17 Mar 2007; Steve Dibb debianutils-2.17.4.ebuild: + amd64 stable, bug 169082 + + 07 Mar 2007; Alexander H. Færøy + debianutils-2.17.4.ebuild: + Stable on MIPS; bug #169082 + + 06 Mar 2007; Gustavo Zacarias + debianutils-2.17.4.ebuild: + Stable on sparc wrt #169082 + + 06 Mar 2007; Markus Rothe debianutils-2.17.4.ebuild: + Stable on ppc64; bug #169082 + + 04 Mar 2007; Jeroen Roovers debianutils-2.17.4.ebuild: + Stable for HPPA (bug #169082). + + 03 Mar 2007; Raúl Porcel debianutils-2.17.4.ebuild: + x86 stable wrt bug 169082 + +*debianutils-2.17.5 (03 Mar 2007) + + 03 Mar 2007; Mike Frysinger + +debianutils-2.17.5.ebuild: + Version bump #168818 by teidakankan. + +*debianutils-2.17.4 (07 Dec 2006) + + 07 Dec 2006; Mike Frysinger + +debianutils-2.17.4.ebuild: + Version bump. + +*debianutils-2.17.1 (15 Sep 2006) + + 15 Sep 2006; Mike Frysinger + +debianutils-2.17.1.ebuild: + Version bump #147540 by Raul Porcel. + +*debianutils-2.16.2 (06 Jul 2006) + + 06 Jul 2006; Mike Frysinger + +files/debianutils-2.16.2-palo.patch, +debianutils-2.16.2.ebuild: + Version bump. + + 29 Apr 2006; Joshua Kinard debianutils-2.15.ebuild: + Marked stable on mips. + + 22 Apr 2006; Fabian Groffen debianutils-2.15.ebuild: + Marked ppc-macos stable (bug #127975) + +*debianutils-2.15-r1 (15 Apr 2006) + + 15 Apr 2006; Jeroen Roovers + +files/debianutils-2.15-palo.patch, +debianutils-2.15-r1.ebuild: + mkboot: fix the shebang, the notice about the -i option and the palo test/run + + 02 Apr 2006; Bryan Østergaard + debianutils-2.15.ebuild: + Drop ~x86-fbsd, was taken out of an overlay. + + 30 Mar 2006; Gustavo Zacarias + debianutils-2.15.ebuild: + Stable on sparc wrt #127975 + + 30 Mar 2006; Diego Pettenò + debianutils-2.15.ebuild: + Add ~x86-fbsd keyword. + + 30 Mar 2006; Chris White debianutils-2.15.ebuild: + debianutils-2.15 x86 stable bug #127975. + + 30 Mar 2006; Marcus D. Hanwell debianutils-2.15.ebuild: + Stable on amd64, bug 127975. + + 29 Mar 2006; Markus Rothe debianutils-2.15.ebuild: + Stable on ppc64; bug #127975 + + 29 Mar 2006; Luca Barbato debianutils-2.15.ebuild: + Marked ppc, see bug #127975 + +*debianutils-2.15 (03 Nov 2005) + + 03 Nov 2005; Mike Frysinger +debianutils-2.15.ebuild: + Version bump #111275 by Richard Hartmann. + + 16 Sep 2005; Aron Griffis + debianutils-2.14.1-r1.ebuild: + Mark 2.14.1-r1 stable on alpha + + 03 Sep 2005; Markus Rothe + debianutils-2.14.1-r1.ebuild: + Stable on ppc64 + + 19 Aug 2005; Michael Hanselmann + debianutils-2.14.1-r1.ebuild: + Stable on ppc. + + 16 Aug 2005; Gustavo Zacarias + debianutils-2.14.1-r1.ebuild: + Stable on sparc + +*debianutils-2.14.1-r1 (13 Jul 2005) + + 13 Jul 2005; Martin Schlemmer + +files/debianutils-2.14.1-no-bs-namespace.patch, + +debianutils-2.14.1-r1.ebuild: + Allow dots in the names, bug #95173. Patch by Kerin Millar. + +*debianutils-2.14.1 (02 Jul 2005) + + 02 Jul 2005; Mike Frysinger + +debianutils-2.14.1.ebuild: + Version bump #92748 by Kerin Millar. + +*debianutils-2.13.2 (16 Jun 2005) + + 16 Jun 2005; Mike Frysinger + +debianutils-2.13.2.ebuild: + Version bump. + +*debianutils-2.13.1-r1 (24 Mar 2005) + + 24 Mar 2005; Mike Frysinger + +debianutils-2.13.1-r1.ebuild: + Version bump to fix install locations #86349 by Peter Gantner. + +*debianutils-2.13.1 (22 Mar 2005) + + 22 Mar 2005; Mike Frysinger + +debianutils-2.13.1.ebuild: + Version bump. + + 28 Nov 2004; Joseph Jezak + debianutils-1.16.7-r4.ebuild: + Had to remove coreutils from the ppc-macos dependancy list because we + still don't have a coreutils virtual and it got added back in. + + 12 Sep 2004; Pieter Van den Abeele + debianutils-1.16.7-r4.ebuild: + keeping in stable, but made coreutils a !macos? dependency + Debianutils is needed for portage, but we haven't been able to create a + coreutils virtual yet. + + 22 Aug 2004; Michael Hanselmann + debianutils-1.16.7-r4.ebuild: + Added to macos. Stable because it's a dependency for bleeding-edge + Portage-versions. + + 25 Apr 2004; Michael Sterrett + debianutils-1.16.7-r4.ebuild: + inherit eutils for epatch + +*debianutils-1.16.7-r4 (10 Dec 2003) + + 10 Dec 2003; Seemant Kulleen + debianutils-1.16.7-r3.ebuild, debianutils-1.16.7-r4.ebuild, + files/debianutils-1.16.7-gentoo.patch: + mkboot queries portage for sys-boot/grub instead of sys-apps/grub, thanks to + max@gentoo.org in #gentoo-dev + + 09 Dec 2003; Seemant Kulleen + debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild: + don't install the readlink manpage -- partially closes bug #32096 by Radek + Podgorny + + 26 Sep 2003; Bartosch Pixa + debianutils-1.16.7-r3.ebuild: + set ppc in keywords + + 25 Sep 2003; Martin Schlemmer + debianutils-1.16.7-r3.ebuild, files/debianutils-1.16.7-gentoo.patch: + Fix bug #25216 (use portageq and not qpkg to check if grub is installed), mark + stable as otherwise its been working fine for a long time. + + 19 Sep 2003; Christian Birchinger + debianutils-1.16.7-r3.ebuild: + Added sparc stable keyword + + 17 Sep 2003; Jon Portnoy + debianutils-1.16.7-r3.ebuild : + ia64 keywords. + + 12 Sep 2003; Seemant Kulleen + debianutils-1.16.7-r3.ebuild: + moved to stable x86 + + 27 Aug 2003; Seemant Kulleen + debianutils-1.16.7-r3.ebuild: + hits stable, because coreutils-5.0 has hit stable. marked for all arches -- + the change between -r2 and -r3 is just the removal of readlink + + 27 Aug 2003; Seemant Kulleen + debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild: + changed SRC_URI to point to our own mirrors. thanks to Alastair Tse + for pointing that out in bug #26274 + + 03 Aug 2003; Seemant Kulleen + debianutils-1.16.7-r3.ebuild: + added coreutils to dependency + +*debianutils-1.16.7-r3 (02 Aug 2003) + + 02 Aug 2003; Seemant Kulleen + debianutils-1.16.7-r1.ebuild, debianutils-1.16.7-r2.ebuild, + debianutils-1.16.7-r3.ebuild: + removed old version, this version will hit stable, when coreutils-5.0 hits + stable -- removal of /bin/readlink from here, thanks to SpanKYzor in bug + #25600 + +*debianutils-1.16.7-r2 (19 May 2003) + + 06 Jul 2003; Guy Martin debianutils-1.16.7-r2.ebuild : + Marked stable on hppa. + + 06 Jul 2003; Joshua Kinard debianutils-1.16.7-r2.ebuild: + Changed ~mips to mips in KEYWORDS + + 24 Jun 2003; Aron Griffis + debianutils-1.16.7-r2.ebuild: + Mark stable on alpha + + 22 Jun 2003; Joshua Kinard debianutils-1.16.7-r2.ebuild: + Changed ~sparc to sparc in KEYWORDS + + 19 May 2003; Martin Schlemmer + debianutils-1.16.7-r2.ebuild, files/debianutils-1.16.7-gcc33.patch: + Fix gcc-3.3 issue, bug #21211. + +*debianutils-1.16.7-r1 (03 Apr 2003) + + 12 Apr 2003; Seemant Kulleen Manifest, + debianutils-1.16.7-r1.ebuild: + SMAIL license removed, thanks to: Luke-Jr in bug #18948 + + 03 Apr 2003; Seemant Kulleen + debianutils-1.16.7-r1.ebuild, debianutils-1.16.7.ebuild, + debianutils-1.16.7.ebuild, files/debianutils-1.16.7-gentoo.patch: + Added patch for run-parts to ignore .keep files. Patch was submitted by: Jukka + Salmi in bug #18423. + +*debianutils-1.16.7 (26 Mar 2003) + + 26 Mar 2003; Seemant Kulleen debianutils-1.16.7.ebuild, + files/debianutils-1.16.7-gentoo.patch: + version bump + + 21 Feb 2003; Zach Welch debianutils-1.16.3.ebuild : + Added arm to keywords. + + 07 Feb 2003; Guy Martin debianutils-1.16.3.ebuild : + Added hppa to keywords. + +*debianutils-1.16.3 (20 Dec 2002) + + 07 Mar 2003; Seemant Kulleen + files/debianutils-compress.patch: + added patch to use bzip2 instead of gzip for savelog + + 07 Mar 2003; Seemant Kulleen debianutils-1.16.3.ebuild: + use epatch + + 20 Dec 2002; Jan Seidel : debianutils-1.13.3-r3.ebuild + Added mips to keywords + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*debianutils-1.16.3 (25 Sep 2002) + + 23 Oct 2002; Mike Frysinger : + Removed bootcd USE flag and added IUSE + + 25 Sep 2002; Martin Schlemmer : + Version update. Add some of missing util. Add patch to make + installkernel and mkboot more Gentoo friendly. + +*debianutils-1.13.3-r3 (14 July 2002) + + 14 Jul 2002; phoen][x debianutils-1.13.3-r3.ebuild : + Added KEYWORDS, SLOT. + +*debianutils-1.16 (23 Mar 2002) + + 23 Oct 2002; Mike Frysinger : + Removed bootcd USE flag and added IUSE + + 14 Jul 2002; phoen][x debianutils-1.16.ebuild : + Added KEYWORDS, SLOT. + + 23 Mar 2002; Seemant Kulleen debianutils-1.16.ebuild : + + Version update. With it came a change in the SRC_URI as well. Submitted by + Jim Nutt. + +*debianutils-1.13.3-r4 (1 Feb 2002) + + 14 Jul 2002; phoen][x debianutils-1.13.3-r4.ebuild : + Added KEYWORDS, SLOT. + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/Manifest new file mode 100644 index 0000000000..92422696f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/Manifest @@ -0,0 +1 @@ +DIST debianutils_3.1.3.tar.gz 132108 RMD160 b38fdc56519ce22627d0dd320455b89460eafea9 SHA1 6de01d71eec751db913b8ad66e90fb4e63b7b27b SHA256 83861a6c28166b0c84ab248d44fcd19d8c3940fa43f9450a7a8c9870af59ae8f diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3-r1.ebuild new file mode 120000 index 0000000000..2a68695e3b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3-r1.ebuild @@ -0,0 +1 @@ +debianutils-3.1.3.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3.ebuild new file mode 100644 index 0000000000..ff2b037708 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-3.1.3.ebuild,v 1.7 2009/07/13 18:22:10 josejx Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="A selection of tools from Debian" +HOMEPAGE="http://packages.qa.debian.org/d/debianutils.html" +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz" + +LICENSE="BSD GPL-2 SMAIL" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="kernel_linux static" + +PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-2.31-no-bs-namespace.patch + epatch "${FILESDIR}"/${P}-installkernel-symlinks.patch +} + +src_compile() { + use static && append-ldflags -static + econf || die + emake || die +} + +src_install() { + into / + dobin tempfile run-parts || die + if use kernel_linux ; then + dosbin installkernel || die "installkernel failed" + fi + + into /usr + dosbin savelog || die "savelog failed" + + doman tempfile.1 run-parts.8 savelog.8 + use kernel_linux && doman installkernel.8 + cd debian + dodoc changelog control +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-2.31-no-bs-namespace.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-2.31-no-bs-namespace.patch new file mode 100644 index 0000000000..0e58219228 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-2.31-no-bs-namespace.patch @@ -0,0 +1,26 @@ +Allow dots in the names, bug #95173. Patch by Kerin Millar. +Re-sourced for 2.28.2 + +--- debianutils-2.28.2/run-parts.8 ++++ debianutils-2.28.2/run-parts.8 +@@ -27,7 +27,8 @@ + + If neither the \-\-lsbsysinit option nor the \-\-regex option is given + then the names must consist entirely of upper and lower case letters, +-digits, underscores, and hyphens. ++digits, underscores, hyphens, and periods. However, the name must not begin ++with a period. + + If the \-\-lsbsysinit option is given, then the names must not end + in .dpkg\-old or .dpkg\-dist or .dpkg\-new or .dpkg\-tmp, and must +--- debianutils-2.28.2/run-parts.c ++++ debianutils-2.28.2/run-parts.c +@@ -494,7 +494,7 @@ regex_compile_pattern (void) + != 0) + pt_regex = &tradre; + +- } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-]+$", ++ } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-][a-zA-Z0-9._-]+$", + REG_EXTENDED | REG_NOSUB)) != 0) + pt_regex = &classicalre; + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-3.1.3-installkernel-symlinks.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-3.1.3-installkernel-symlinks.patch new file mode 100644 index 0000000000..4f1c31e57f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-3.1.3-installkernel-symlinks.patch @@ -0,0 +1,29 @@ +--- a/installkernel 2010-02-12 04:39:49.000000000 +0000 ++++ b/installkernel 2010-02-12 05:38:40.000000000 +0000 +@@ -41,11 +41,7 @@ + + cat "$2" > "$dir/$1-$ver" + +- # This section is for backwards compatibility only + if test -f "$dir/$1" ; then +- # The presence of "$dir/$1" is unusual in modern intallations, and +- # the results are mostly unused. So only recreate them if they +- # already existed. + if test -L "$dir/$1" ; then + # If we were using links, continue to use links, updating if + # we need to. +@@ -55,12 +51,12 @@ + else + mv "$dir/$1" "$dir/$1.old" + fi +- ln -sf "$1-$ver" "$dir/$1" + else # No links + mv "$dir/$1" "$dir/$1.old" +- cat "$2" > "$dir/$1" + fi + fi ++ ++ ln -sf "$1-$ver" "$dir/$1" + } + + if [ "$(basename $img)" = "vmlinux" ] ; then diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/metadata.xml new file mode 100644 index 0000000000..96a2d58636 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/metadata.xml @@ -0,0 +1,5 @@ + + + +base-system + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/Manifest new file mode 100644 index 0000000000..1f7bfefabd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/Manifest @@ -0,0 +1 @@ +DIST dmidecode-2.10.tar.bz2 51904 RMD160 f2cf8155f60d76aa7ff9b2ce9ab28a357bf79704 SHA1 5366792a6df3266c9ecf7955f123027443370593 SHA256 4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/dmidecode-2.10.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/dmidecode-2.10.ebuild new file mode 100644 index 0000000000..21c8538613 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/dmidecode-2.10.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/dmidecode-2.10.ebuild,v 1.8 2011/03/23 17:28:30 vapier Exp $ + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="DMI (Desktop Management Interface) table related utilities" +HOMEPAGE="http://www.nongnu.org/dmidecode/" +SRC_URI="http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* amd64 arm ia64 ppc sparc x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-2.10-smbios_base.patch + + sed -i \ + -e '/^prefix/s:/usr/local:/usr:' \ + -e "/^docdir/s:dmidecode:${PF}:" \ + -e '/^PROGRAMS !=/d' \ + Makefile || die +} + +src_compile() { + emake \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" \ + || die +} + +src_install() { + emake install DESTDIR="${D}" || die + prepalldocs +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/files/dmidecode-2.10-smbios_base.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/files/dmidecode-2.10-smbios_base.patch new file mode 100644 index 0000000000..b118c74ceb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dmidecode/files/dmidecode-2.10-smbios_base.patch @@ -0,0 +1,74 @@ +--- dmidecode.c.orig 2011-05-25 21:35:54.000000000 -0700 ++++ dmidecode.c 2011-05-25 22:19:11.000000000 -0700 +@@ -4204,6 +4204,43 @@ + return 1; + } + ++ ++/* ++ * Probe for EFI interface ++ */ ++#define DEBUGFS_NO_SMBIOS (-1) ++static int address_from_debugfs(size_t *address) ++{ ++ FILE *efi_smbios_base; ++ const char *filename; ++ char linebuf[64]; ++ int ret; ++ ++ *address = 0; /* Prevent compiler warning */ ++ ++ /* ChromeOS contains /sys/kernel/debug/efi_smbios_base */ ++ if ((efi_smbios_base = fopen(filename = "/sys/kernel/debug/efi_smbios_base", "r")) == NULL) ++ { ++ /* Try another interface */ ++ return DEBUGFS_NO_SMBIOS; ++ } ++ ret = DEBUGFS_NO_SMBIOS; ++ if ((fgets(linebuf, sizeof(linebuf) - 1, efi_smbios_base)) != NULL) ++ { ++ *address = strtoul(linebuf, NULL, 0); ++ if (!(opt.flags & FLAG_QUIET)) ++ printf("# SMBIOS entry point at 0x%08lx\n", ++ (unsigned long)*address); ++ ret = 0; ++ } ++ if (fclose(efi_smbios_base) != 0) ++ perror(filename); ++ ++ if (ret == DEBUGFS_NO_SMBIOS) ++ fprintf(stderr, "%s: SMBIOS entry point missing\n", filename); ++ return ret; ++} ++ + /* + * Probe for EFI interface + */ +@@ -4257,6 +4294,7 @@ + int found = 0; + size_t fp; + int efi; ++ int debugfs; + u8 *buf; + + if (sizeof(u8) != 1 || sizeof(u16) != 2 || sizeof(u32) != 4 || '\0' != 0) +@@ -4315,6 +4353,11 @@ + goto done; + } + ++ /* Try debugfs: /sys/kernel/debug/efi_smbios_base */ ++ debugfs = address_from_debugfs(&fp); ++ if (debugfs == 0) ++ goto address_check; ++ + /* First try EFI (ia64, Intel-based Mac) */ + efi = address_from_efi(&fp); + switch (efi) +@@ -4326,6 +4369,7 @@ + goto exit_free; + } + ++address_check: + if ((buf = mem_chunk(fp, 0x20, opt.devmem)) == NULL) + { + ret = 1; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dtc/dtc-1.3.0-r19.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dtc/dtc-1.3.0-r19.ebuild new file mode 100644 index 0000000000..cf97fa5ac6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dtc/dtc-1.3.0-r19.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2011 Gentoo Foundation +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.3.0.ebuild,v 1.1 2011/06/15 21:19:11 flameeyes Exp $ + +EAPI=4 +CROS_WORKON_COMMIT="4e386342d40895e6152fb3b15c1fc100b96f406a" +CROS_WORKON_TREE="2fbdec828197e222838833d257710db96695654b" +CROS_WORKON_PROJECT="chromiumos/third_party/dtc" +CROS_WORKON_LOCALNAME="dtc" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="Open Firmware device-tree compiler" +HOMEPAGE="http://www.t2-project.org/packages/dtc.html" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="" + +RDEPEND="" +DEPEND="sys-devel/flex + sys-devel/bison" + +src_compile() { + tc-export AR CC + emake PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" +} + +src_test() { + emake check +} + +src_install() { + emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \ + install + dodoc Documentation/manual.txt +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dtc/dtc-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dtc/dtc-9999.ebuild new file mode 100644 index 0000000000..27b5bed025 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dtc/dtc-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.3.0.ebuild,v 1.1 2011/06/15 21:19:11 flameeyes Exp $ + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/dtc" +CROS_WORKON_LOCALNAME="dtc" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="Open Firmware device-tree compiler" +HOMEPAGE="http://www.t2-project.org/packages/dtc.html" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="sys-devel/flex + sys-devel/bison" + +src_compile() { + tc-export AR CC + emake PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" +} + +src_test() { + emake check +} + +src_install() { + emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \ + install + dodoc Documentation/manual.txt +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashbench/files/flashbench-20121121-Makefile-install.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashbench/files/flashbench-20121121-Makefile-install.patch new file mode 100644 index 0000000000..62340f9cba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashbench/files/flashbench-20121121-Makefile-install.patch @@ -0,0 +1,33 @@ +diff --git a/Makefile b/Makefile +index 9398f72..a9b7716 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,7 @@ +-CC := gcc +-CFLAGS := -O2 -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -g2 +-LDFLAGS := -lrt ++CFLAGS ?= -O2 -g2 ++CFLAGS += -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter ++ ++LDLIBS += -lrt + + all: flashbench erase + +@@ -9,10 +10,15 @@ vm.o: vm.c vm.h dev.h + flashbench.o: flashbench.c vm.h dev.h + + flashbench: flashbench.o dev.o vm.o +- $(CC) -o $@ flashbench.o dev.o vm.o $(LDFLAGS) +- ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) + + erase: erase.o + ++install: all ++ mkdir -p $(DESTDIR)/usr/bin ++ install -m 755 -D flashbench erase $(DESTDIR)/usr/bin/ ++ + clean: + rm -f flashbench flashbench.o erase erase.o dev.o vm.o ++ ++.PHONY: all clean diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashbench/flashbench-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashbench/flashbench-9999.ebuild new file mode 100644 index 0000000000..fe33054247 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashbench/flashbench-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# build with +# ACCEPT=~arm emerge-$BOARD flashbench +EAPI="4" + +inherit eutils + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/bradfa/flashbench.git" + EGIT_MASTER="dev" + inherit git-2 + SRC_URI="" +else + # This is a snapshot of "dev" branch + VER="dev-20121121" + SRC_URI="https://storage.cloud.google.com/chromeos-localmirror/distfiles/flashbench-${VER}.tar.gz" + S=${WORKDIR}/${PN}-${VER} +fi + +DESCRIPTION="Flash Storage Benchmark" +HOMEPAGE="https://github.com/bradfa/flashbench" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/flashbench-20121121-Makefile-install.patch +} + +src_configure() { + tc-export CC +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashmap/flashmap-0.3-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashmap/flashmap-0.3-r10.ebuild new file mode 100644 index 0000000000..3d7d43bb54 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashmap/flashmap-0.3-r10.ebuild @@ -0,0 +1,41 @@ +# Copyright 2011 The Chromium OS Authors +# Distributed under the terms of the GNU General Public License v2 +# $Header: + +EAPI="4" +CROS_WORKON_COMMIT="fa5c49ea40c44f6322ee9860c0a06df73a8562e1" +CROS_WORKON_TREE="e581823802f8d3adafbbe03ff0f17cc1476697fa" +CROS_WORKON_PROJECT="chromiumos/third_party/flashmap" + +inherit cros-workon toolchain-funcs multilib + +DESCRIPTION="Utility for manipulating firmware ROM mapping data structure" +HOMEPAGE="http://flashmap.googlecode.com" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +# Disable unit testing for now because one of the test cases for detecting +# buffer overflow causes emake to fail when fmap_test is run. +# RESTRICT="test" will override FEATURES="test" and will also cause +# src_test() to be ignored by relevant scripts. +RESTRICT="test" +FEATURES="test" + +src_compile() { + tc-export AR CC LD NM STRIP OBJCOPY + emake || die +} + +src_test() { + tc-export AR CC LD NM STRIP OBJCOPY + # default "test" target uses lcov, so "test_only" was added to only + # build and run the test without generating coverage statistics + emake test_only || die +} + +src_install() { + emake LIBDIR=$(get_libdir) DESTDIR="${D}" USE_PKG_CONFIG=1 install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashmap/flashmap-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashmap/flashmap-9999.ebuild new file mode 100644 index 0000000000..02b7806c7a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashmap/flashmap-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 2011 The Chromium OS Authors +# Distributed under the terms of the GNU General Public License v2 +# $Header: + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/third_party/flashmap" + +inherit cros-workon toolchain-funcs multilib + +DESCRIPTION="Utility for manipulating firmware ROM mapping data structure" +HOMEPAGE="http://flashmap.googlecode.com" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +# Disable unit testing for now because one of the test cases for detecting +# buffer overflow causes emake to fail when fmap_test is run. +# RESTRICT="test" will override FEATURES="test" and will also cause +# src_test() to be ignored by relevant scripts. +RESTRICT="test" +FEATURES="test" + +src_compile() { + tc-export AR CC LD NM STRIP OBJCOPY + emake || die +} + +src_test() { + tc-export AR CC LD NM STRIP OBJCOPY + # default "test" target uses lcov, so "test_only" was added to only + # build and run the test without generating coverage statistics + emake test_only || die +} + +src_install() { + emake LIBDIR=$(get_libdir) DESTDIR="${D}" USE_PKG_CONFIG=1 install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/ChangeLog new file mode 100644 index 0000000000..5707418a74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/ChangeLog @@ -0,0 +1,24 @@ +# ChangeLog for sys-apps/flashrom +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.3 2010/01/28 20:04:28 idl0r Exp $ + +*flashrom-0.9.1 (28 Jan 2010) + + 28 Jan 2010; Christian Ruppert -flashrom-0.9.0.ebuild, + +flashrom-0.9.1.ebuild, metadata.xml: + Version bump, bug 284543. + Add ftdi and serprog useflag. + Update longdesc in metadata.xml. + + 08 May 2009; Mart Raudsepp flashrom-0.9.0.ebuild: + Fix homepage, pointed out by Anton Bolshakov + +*flashrom-0.9.0 (05 May 2009) + + 05 May 2009; Mart Raudsepp +metadata.xml, + +flashrom-0.9.0.ebuild: + Initial import of flashrom - a utility for reading, writing, verifying and + erasing flash ROM chips. It's used to flash BIOS/coreboot/firmware images. + Roughly based on ebuilds from Peter Stuge and Christian Ruppert. Closes bug + 196945 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/flashrom-0.9.4-r234.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/flashrom-0.9.4-r234.ebuild new file mode 100644 index 0000000000..2f61a8f0be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/flashrom-0.9.4-r234.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.4.ebuild,v 1.5 2011/09/20 16:03:21 nativemad Exp $ + +EAPI="4" +CROS_WORKON_COMMIT="6a1618ff25817ef7125a1d17b2a48ec04989adc0" +CROS_WORKON_TREE="846bf83a0323d8d44bc25c0c93f82b1121eb2766" +CROS_WORKON_PROJECT="chromiumos/third_party/flashrom" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" +HOMEPAGE="http://flashrom.org/" +#SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog +drkaiser ++dummy ft2232_spi +gfxnvidia +internal +linux_i2c +linux_spi +nic3com +nicintel ++nicintel_spi +nicnatsemi +nicrealtek +ogp_spi +rayer_spi ++satasii +satamv +serprog +wiki static -use_os_timer" + +COMMON_DEPEND="atahpt? ( sys-apps/pciutils ) + dediprog? ( virtual/libusb:0 ) + drkaiser? ( sys-apps/pciutils ) + ft2232_spi? ( dev-embedded/libftdi ) + gfxnvidia? ( sys-apps/pciutils ) + internal? ( sys-apps/pciutils ) + nic3com? ( sys-apps/pciutils ) + nicintel? ( sys-apps/pciutils ) + nicintel_spi? ( sys-apps/pciutils ) + nicnatsemi? ( sys-apps/pciutils ) + nicrealtek? ( sys-apps/pciutils ) + rayer_spi? ( sys-apps/pciutils ) + satasii? ( sys-apps/pciutils ) + satamv? ( sys-apps/pciutils ) + ogp_spi? ( sys-apps/pciutils )" +# Force pciutils to rebuild as USE=static-libs in chroot. +COMMON_DEPEND="${COMMON_DEPEND} + sys-apps/pciutils[static-libs]" +RDEPEND="${COMMON_DEPEND} + internal? ( sys-apps/dmidecode )" +DEPEND="${COMMON_DEPEND} + sys-apps/diffutils" + +_flashrom_enable() { + local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}" + args+=" $c=`use $1 && echo yes || echo no`" +} +flashrom_enable() { + local u + for u in "$@" ; do _flashrom_enable $u ; done +} + +src_compile() { + local progs=0 + local args="" + + # Programmer + flashrom_enable \ + atahpt bitbang_spi buspirate_spi dediprog drkaiser \ + ft2232_spi gfxnvidia linux_i2c linux_spi nic3com nicintel \ + nicintel_spi nicnatsemi nicrealtek ogp_spi rayer_spi \ + satasii satamv serprog \ + internal dummy + _flashrom_enable wiki PRINT_WIKI + + # You have to specify at least one programmer, and if you specify more than + # one programmer you have to include either dummy or internal in the list. + for prog in ${IUSE//[+-]} ; do + case ${prog} in + internal|dummy|wiki|use_os_timer) continue ;; + esac + + use ${prog} && : $(( progs++ )) + done + if [ $progs -ne 1 ] ; then + if ! use internal && ! use dummy ; then + ewarn "You have to specify at least one programmer, and if you specify" + ewarn "more than one programmer, you have to enable either dummy or" + ewarn "internal as well. 'internal' will be the default now." + args+=" CONFIG_INTERNAL=yes" + fi + fi + + tc-export AR CC RANLIB + + # Configure Flashrom to use OS timer instead of calibrated delay loop + # if USE flag is specified or if a certain board requires it. + if use use_os_timer ; then + einfo "Configuring Flashrom to use OS timer" + args="$args CONFIG_USE_OS_TIMER=yes" + else + einfo "Configuring Flashrom to use delay loop" + args="$args CONFIG_USE_OS_TIMER=no" + fi + + # WARNERROR=no, bug 347879 + # TODO(hungte) Workaround for crosbug.com/32967: always provide + # dynamic and static version binaries if 'static' is not + # specified in USE flag. We should deprecate this behavior once + # we find a better way to fix flashrom execution dependency. + + local dynamic_args="$args CONFIG_STATIC=no" + local static_args="$args CONFIG_STATIC=yes" + emake WARNERROR=no ${static_args} || die + if ! use static; then + # Provide the static one as flashrom_s. + cp flashrom flashrom_s + emake clean + emake WARNERROR=no ${dynamic_args} || die + fi +} + +src_install() { + dosbin flashrom || die + if ! use static;then + # crosbug.com/32967: Default target is not static. Provide the + # auxiliary static version as flashrom_s. + dosbin flashrom_s || die + fi + doman flashrom.8 + dodoc README +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/flashrom-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/flashrom-9999.ebuild new file mode 100644 index 0000000000..bc769c3440 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/flashrom-9999.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.4.ebuild,v 1.5 2011/09/20 16:03:21 nativemad Exp $ + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/third_party/flashrom" + +inherit cros-workon toolchain-funcs + +DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" +HOMEPAGE="http://flashrom.org/" +#SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog +drkaiser ++dummy ft2232_spi +gfxnvidia +internal +linux_i2c +linux_spi +nic3com +nicintel ++nicintel_spi +nicnatsemi +nicrealtek +ogp_spi +rayer_spi ++satasii +satamv +serprog +wiki static -use_os_timer" + +COMMON_DEPEND="atahpt? ( sys-apps/pciutils ) + dediprog? ( virtual/libusb:0 ) + drkaiser? ( sys-apps/pciutils ) + ft2232_spi? ( dev-embedded/libftdi ) + gfxnvidia? ( sys-apps/pciutils ) + internal? ( sys-apps/pciutils ) + nic3com? ( sys-apps/pciutils ) + nicintel? ( sys-apps/pciutils ) + nicintel_spi? ( sys-apps/pciutils ) + nicnatsemi? ( sys-apps/pciutils ) + nicrealtek? ( sys-apps/pciutils ) + rayer_spi? ( sys-apps/pciutils ) + satasii? ( sys-apps/pciutils ) + satamv? ( sys-apps/pciutils ) + ogp_spi? ( sys-apps/pciutils )" +# Force pciutils to rebuild as USE=static-libs in chroot. +COMMON_DEPEND="${COMMON_DEPEND} + sys-apps/pciutils[static-libs]" +RDEPEND="${COMMON_DEPEND} + internal? ( sys-apps/dmidecode )" +DEPEND="${COMMON_DEPEND} + sys-apps/diffutils" + +_flashrom_enable() { + local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}" + args+=" $c=`use $1 && echo yes || echo no`" +} +flashrom_enable() { + local u + for u in "$@" ; do _flashrom_enable $u ; done +} + +src_compile() { + local progs=0 + local args="" + + # Programmer + flashrom_enable \ + atahpt bitbang_spi buspirate_spi dediprog drkaiser \ + ft2232_spi gfxnvidia linux_i2c linux_spi nic3com nicintel \ + nicintel_spi nicnatsemi nicrealtek ogp_spi rayer_spi \ + satasii satamv serprog \ + internal dummy + _flashrom_enable wiki PRINT_WIKI + + # You have to specify at least one programmer, and if you specify more than + # one programmer you have to include either dummy or internal in the list. + for prog in ${IUSE//[+-]} ; do + case ${prog} in + internal|dummy|wiki|use_os_timer) continue ;; + esac + + use ${prog} && : $(( progs++ )) + done + if [ $progs -ne 1 ] ; then + if ! use internal && ! use dummy ; then + ewarn "You have to specify at least one programmer, and if you specify" + ewarn "more than one programmer, you have to enable either dummy or" + ewarn "internal as well. 'internal' will be the default now." + args+=" CONFIG_INTERNAL=yes" + fi + fi + + tc-export AR CC RANLIB + + # Configure Flashrom to use OS timer instead of calibrated delay loop + # if USE flag is specified or if a certain board requires it. + if use use_os_timer ; then + einfo "Configuring Flashrom to use OS timer" + args="$args CONFIG_USE_OS_TIMER=yes" + else + einfo "Configuring Flashrom to use delay loop" + args="$args CONFIG_USE_OS_TIMER=no" + fi + + # WARNERROR=no, bug 347879 + # TODO(hungte) Workaround for crosbug.com/32967: always provide + # dynamic and static version binaries if 'static' is not + # specified in USE flag. We should deprecate this behavior once + # we find a better way to fix flashrom execution dependency. + + local dynamic_args="$args CONFIG_STATIC=no" + local static_args="$args CONFIG_STATIC=yes" + emake WARNERROR=no ${static_args} || die + if ! use static; then + # Provide the static one as flashrom_s. + cp flashrom flashrom_s + emake clean + emake WARNERROR=no ${dynamic_args} || die + fi +} + +src_install() { + dosbin flashrom || die + if ! use static;then + # crosbug.com/32967: Default target is not static. Provide the + # auxiliary static version as flashrom_s. + dosbin flashrom_s || die + fi + doman flashrom.8 + dodoc README +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/metadata.xml new file mode 100644 index 0000000000..e94021f7f8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/flashrom/metadata.xml @@ -0,0 +1,30 @@ + + + +no-herd + + leio@gentoo.org + + + peter@stuge.se + Please CC on all bugs + + + Enable flashing through FTDI/SPI USB interface + Enable Serial Flasher support + + +flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It's often used to flash BIOS/EFI/coreboot/firmware images. + + * Supports more than 195 flash chips, 75 chipsets, 130 mainboards, and 17 devices (PCI or USB) which can be used as external programmers. + * Supports parallel, LPC, FWH and SPI flash interfaces and various chip packages (DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40, TSOP48, and more) + * No physical access needed, root access is sufficient. + * No bootable floppy disk, bootable CD-ROM or other media needed. + * No keyboard or monitor needed. Simply reflash remotely via SSH. + * No instant reboot needed. Reflash your chip in a running system, verify it, be happy. The new firmware will be present next time you boot. + * Crossflashing and hotflashing is possible as long as the flash chips are electrically and logically compatible (same protocol). Great for recovery. + * Scriptability. Reflash a whole pool of identical machines at the same time from the command line. It is recommended to check flashrom output and error codes. + * Speed. flashrom is often much faster than most vendor flash tools. + * Portability. Supports Linux, FreeBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/files/iotools-1.2.nopie.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/files/iotools-1.2.nopie.patch new file mode 100644 index 0000000000..eef4b399e8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/files/iotools-1.2.nopie.patch @@ -0,0 +1,12 @@ +diff -Naur Makefile Makefile +--- Makefile 2009-04-09 12:33:32.000000000 -0700 ++++ Makefile 2010-05-14 15:14:25.000000000 -0700 +@@ -33,7 +33,7 @@ + IOTOOLS_DEBUG = -O2 -DNDEBUG + endif + +-CFLAGS = -Wall -Werror $(DEFS) $(ARCHFLAGS) $(IOTOOLS_STATIC) $(IOTOOLS_DEBUG) ++CFLAGS = -Wall -Werror $(DEFS) $(ARCHFLAGS) $(IOTOOLS_STATIC) $(IOTOOLS_DEBUG) -nopie + DEFS = -D_GNU_SOURCE -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) + SBINDIR ?= /usr/local/sbin + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/iotools-1.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/iotools-1.2-r2.ebuild new file mode 100644 index 0000000000..02807619ee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/iotools-1.2-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 2010 Google Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Simple commands to access hardware device registers" +HOMEPAGE="http://code.google.com/p/iotools/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 amd64" +IUSE="hardened" + +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" + +src_compile() { + # If we are on hardened/x86, turn off PIE because the code uses %ebx + if use x86 ; then + if use hardened ; then + epatch "${FILESDIR}"/iotools-1.2.nopie.patch + fi + fi + + emake CC="$(tc-getCC)" || die "emake failed" +} + +IOTOOLS_COMMANDS="and btr bts busy_loop cmos_read cmos_write cpu_list \ + cpuid io_read16 io_read32 io_read8 io_write16 io_write32 \ + io_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 \ + mmio_read8 mmio_write16 mmio_write32 mmio_write64 \ + mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 \ + pci_write16 pci_write32 pci_write8 rdmsr rdtsc runon shl \ + shr smbus_quick smbus_read16 smbus_read8 smbus_readblock \ + smbus_receive_byte smbus_send_byte smbus_write16 \ + smbus_write8 smbus_writeblock wrmsr xor" + +src_install() { + dosbin iotools || die + + echo "installing symbolic link shortcuts for iotools" + # Note: This is done manually because invoking the iotools binary + # when cross-compiling will likely fail. + cd "${D}/usr/sbin" + for COMMAND in ${IOTOOLS_COMMANDS} ; do + ln -s iotools ${COMMAND} + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/Manifest new file mode 100644 index 0000000000..c89b160618 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/Manifest @@ -0,0 +1 @@ +DIST keyutils-1.1.tar.bz2 39206 RMD160 7fad7364ef59b4933ce108317abd606fb727c592 SHA1 e3e523e42d7cedb39d57e5f9a7315b30cf7d9d96 SHA256 a67456986bbdce8872d75f3d537ea2a398ddae412a2a0bf8b9fa62bdd2ade002 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.1-installdir.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.1-installdir.patch new file mode 100644 index 0000000000..5699a41303 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.1-installdir.patch @@ -0,0 +1,22 @@ +diff -ruN keyutils-1.1/Makefile keyutils-1.1.new/Makefile +--- keyutils-1.1/Makefile 2010-05-13 16:46:06.000000000 -0700 ++++ keyutils-1.1.new/Makefile 2010-05-13 16:46:45.000000000 -0700 +@@ -11,7 +11,7 @@ + ETCDIR := /etc + BINDIR := /bin + SBINDIR := /sbin +-LIBDIR := /lib ++LIBDIR := /usr/lib + USRLIBDIR := /usr/lib + SHAREDIR := /usr/share/keyutils + INCLUDEDIR := /usr/include +@@ -92,7 +92,7 @@ + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + mkdir -p $(DESTDIR)$(USRLIBDIR) +- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) + $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl + $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key + $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.1.ebuild new file mode 100644 index 0000000000..e1a3080b2b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.1.ebuild,v 1.2 2006/11/26 10:25:32 peper Exp $ + +inherit eutils multilib + +DESCRIPTION="Linux Key Management Utilities" +HOMEPAGE="http://www.kernel.org/" +SRC_URI="http://people.redhat.com/~dhowells/${PN}/${P}.tar.bz2" +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" +DEPEND=">=sys-kernel/linux-headers-2.6.11" +#RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-installdir.patch" +} + +src_compile() { + tc-getCC + emake CFLAGS="-Wall ${CFLAGS}" NO_ARLIB=0 +} + +src_install() { + emake install DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" USRLIBDIR="/usr/$(get_libdir)" NO_ARLIB=0 + dodoc README +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/Manifest new file mode 100644 index 0000000000..eaac3f7367 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/Manifest @@ -0,0 +1,51 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674 RMD160 28491f1c5a654b21b4d82c2a23b8d0f30ea32960 SHA1 73a8deeb2765a31c0f51042a8ae69e7b3752e8de SHA256 8735f921aadd901b98983ce9678d3e7babb9fd3553ce7881460c050dc5611f66 +AUX module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345 RMD160 12e3132824dadbf853228dec146347cf2b87f31c SHA1 b2b16636ae61de179d4674dbe5c48868aa1e2ca0 SHA256 6cd1ae6736bec9c72474acb6b7dce68db1ec0703f0b55f312dcfefce7cf56166 +AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 RMD160 ce073d744e0eb191ef10f3a1186f393b42620813 SHA1 5138c1a5b7ead76d683d5d3f31d7c161b0a4dfb2 SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6 +AUX module-init-tools-3.6-hidden-dirs.patch 372 RMD160 17e339f529d17a3396331f7d0e23f726dc3d75cf SHA1 1844b256795d81bf687a2722b6aae3b12807a317 SHA256 cf89453c57dce3b839c062f6fd89ced1f72683e1635e761fae2f6b651f69d36a +AUX module-init-tools-3.6-skip-sys-check.patch 1775 RMD160 bbc71209ce22fbb8da4d1717221bb2c8e30e45c9 SHA1 39b0ba97b9905d39528755a7ea2c3829987aafb5 SHA256 1888621529238d1d449e1cf1ba0842070fff6b79de8a58602b877f369a98f2f3 +AUX modutils-2.4.27-alias.patch 2246 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf2675ff SHA1 7d69355210aaccbd2dc6dd8a9b1b736f74dfdd36 SHA256 453e3ab982088e2e85164e63b4944af58cd01c2b2d45d75fdcda6649a339878f +AUX modutils-2.4.27-build.patch 948 RMD160 f1b08653720bbba56505cef5df378d6365c54ed5 SHA1 481d7f31c6e58e4356537b728779d014edece374 SHA256 7b015de3c739e996247edcda9a1df59fa871f4e93a408a8033f0e64c36325703 +AUX modutils-2.4.27-flex.patch 805 RMD160 aa0806e61e5287a5ce821bce66cbfa028e50576b SHA1 87d2dee1db44ff854e3d4c371efd78cc3f613578 SHA256 dbe0c3207751157e7b104d66bdfeea280343ceabe856dc5d51849c206fdccad9 +AUX modutils-2.4.27-gcc.patch 7438 RMD160 a3d1fa1e6dd865e531684882daab881b90d0e142 SHA1 657796971d5b0e6ec6ebcbfa1f66a1f09e5ec6aa SHA256 8ecda7ac4010c54e7fbdd8b2109b5c19ea2266f67d430ab6413188c63cdca2a6 +AUX modutils-2.4.27-hppa.patch 302 RMD160 15c0b2aadee725ef21370c9f016da6c74b882b6f SHA1 6af5f392dd173eacacc258211c67ef103ccaff49 SHA256 9b4e629a310732129b96766e0c6f185008e98f8429551da85372a01fa59c7d05 +AUX modutils-2.4.27-no-nested-function.patch 1422 RMD160 6c34f6ff25019884495c21af525e88a63e449b3c SHA1 17eeaddba0fc3e476138a05d570eb79ab77b67ed SHA256 3e9961a7c9411e8c01eb48d9053d7901ec7a90ee0e070e85bd766385f36d563d +AUX update-modules-3.5.sh 10519 RMD160 16c6c32397aa0e063e12cdd79efc81d02bcd2133 SHA1 3d5e2ae0f23b35147b38ec26c3377d2b697969c0 SHA256 b8866f643d369569de040b89c997b6a864ec3f0767a5e86b78d4b0badaa267c9 +AUX update-modules.8 3210 RMD160 6d82ea356c1751ad46cf1c30e0fe237e7a4f50f2 SHA1 ed64791ca8e3215ee8a98784326f5d1c8a60bfd4 SHA256 4e352ee28ecaf79fac2a0216b8b4b52ced864cd258752f33213d1ac8f4a5849c +DIST module-init-tools-3.10.tar.bz2 885014 RMD160 225827526953c6d7ced53f7f326d48943ae5294b SHA1 761c03b9a3171e08215c0e793e1f299681bb1455 SHA256 fef01424081e728ff6fadc96a8e9b6e4efe3d21f315f1e27b1a16abf7047c12b +DIST module-init-tools-3.11-man.tar.bz2 8067 RMD160 18b3e17ac534899b2e2afecf50e86a187447a57a SHA1 1e7385433554bdac0451cd9bc56dc7ce6e51624a SHA256 48944831741696e39d7ce439131b4239e4352726f4b99d042c140db7d0404466 +DIST module-init-tools-3.11.1.tar.bz2 200815 RMD160 deebbe725d7ad6b886cb8b77c42ff8b5f00fffbe SHA1 1be5f6be71fb9ea7790c9736114bbbf14e43c32e SHA256 c5bc5fba03769fec786a305abdf97f37c5d7a33e61b92f4ee4f1b80cbc1d1dc0 +DIST module-init-tools-3.11.tar.bz2 220460 RMD160 6734d6b9d4ca49c1cb5a2c5e2f741746bbce67d0 SHA1 3944445cffdc9c6d6143e94fbfdf6f7a8e3fd3b9 SHA256 69c1fd3f55b8da7a105e9e1be0f1684ea780d2f8724b11985a2161c6b73cd0d9 +DIST module-init-tools-3.12.tar.bz2 938086 RMD160 3ea858854d4fba25301b2a68cfb5614ad1281658 SHA1 caf70188c85370936626027ae5b5a9258cc851f9 SHA256 d012ab07ea26721467a85a775f34747c1c8897e37f16bec5317d8a72ef8b4f17 +DIST module-init-tools-3.13.tar.bz2 975594 RMD160 18842745faad77a42c1636980d2ae7dd208dae40 SHA1 587c6df08986a4db9feb286ca0d4dba07f05c50e SHA256 6a29185d09fab7c30817d57994336bb2e1a9da5b80b82c8b282d2c08a221925b +DIST module-init-tools-3.16-man.tar.bz2 9300 RMD160 9a2f8801f353c0a6ecfe53955dd59dc21227a89d SHA1 6138725eff35e2d465ca133a32902b22fe43c383 SHA256 a80cfeb48279964b2c515ab5ca06925dd22d2187ae1043992650bf7950fc36c8 +DIST module-init-tools-3.16.tar.bz2 228821 RMD160 55b0f26bcf15ab39d9852c94a3d65beec3e079e0 SHA1 919c9fb3e8c73a5790411da1c4d79efda19db195 SHA256 e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b +DIST module-init-tools-3.5.tar.bz2 212177 RMD160 a49dda7ea6545dc91f6156930572150841743744 SHA1 86289ccafc47c0f1dde0955fda1922cdcc79ae9f SHA256 842496eae31ccd1334cd548f93d90180ca4f6c2cdde411e13c606bebe9f8cbea +DIST module-init-tools-3.6-man.tar.bz2 8872 RMD160 c7bcce7696f6fab2b356d5ccd0bc14c849d763e2 SHA1 41d1cbd20314519b4b8e23c2d9daf514600223b1 SHA256 a8b5dcc3572619d604645292abd7adf508511141a3bdb94cf58f79eb86836b22 +DIST module-init-tools-3.6.tar.bz2 230327 RMD160 40cc2e8e1f31f94ba8dfdc014e547e6184b02b69 SHA1 ce1ab358502865e336bbcf5cb728af1cc8d9ed1f SHA256 64a0b3b058f2236be1a8138356306c91e5f23f149a131428e4c7d97b1c050728 +DIST module-init-tools-3.8.tar.bz2 802725 RMD160 147017323c3222844ff91f12398a2545b8815b36 SHA1 28cb40b5a94d6d10df144b821350dd87a749707e SHA256 dc880716a6b16a28dd5e18178bd266b9f598bd29b2580688390915bcc1aef65e +DIST module-init-tools-3.9.tar.bz2 193216 RMD160 a0bb8bbc385c183e29af64d6de50c940cf631872 SHA1 3f61aea95910a4218db5c0f2436c2906848c2454 SHA256 b21e3094000571ffa567d6bb829cc2e17615a2547f07e91393332e7a210d63dc +DIST modutils-2.4.27.tar.bz2 234963 RMD160 3179d364106859cf6dbd1fad82d8356337634735 SHA1 fa268b48d98e0efab349d45fa7fb2372d58320c1 SHA256 ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 +EBUILD module-init-tools-3.10.ebuild 1373 RMD160 a5e8bd7dcbb1ecaa903cc3d3235647cde78c269d SHA1 95a8262d2983583d13e151678d71d3b77f6a5cd5 SHA256 4cf6d1d551dd388abf2d33ae4424756537c7fc5f73e46c5dbf64dc13ce1cea6b +EBUILD module-init-tools-3.11.1.ebuild 2606 RMD160 cec2c9854f970dfea95852459041968d31bc5011 SHA1 bcc6f8d6576eeed58388268170658b8fc3ffbd81 SHA256 a0e05b7c7ec0f9170e0ac7205637c88f27e18a45d353e666711d3f6131cb9eba +EBUILD module-init-tools-3.11.ebuild 1468 RMD160 d3db4058d907aa3d28c3ce0d141d1ed03d223320 SHA1 220d0a0b114575a49efd833bff1b5663095cd91f SHA256 6dd893e5a33ed75cdc56336b5dda50ca3ceb5d3b4a7d3fec47db2fb41b4febc0 +EBUILD module-init-tools-3.12-r1.ebuild 2955 RMD160 6018854ddb14a7063943f2802a9d6951c434d7ab SHA1 f93389fcb936aa4ee96b1d0e2f386979da8b2186 SHA256 74847e053f6e64c3bfef86ab16ceb9ed295dd1110c74910f8c037a6aebcb016a +EBUILD module-init-tools-3.12.ebuild 2506 RMD160 ff7df345fb4b20e23f5c86d201b0fbe8a50cfe13 SHA1 a724fa9670912f01485106456099e51469df5263 SHA256 3aa46926741fb93d8670e235711f6593846c2032cd64e5127a5a3447ac53c13c +EBUILD module-init-tools-3.13.ebuild 2963 RMD160 cbb7470e14f6158989284a4813423039a106820a SHA1 7690114b35b0f83e2dbd2d92fa0d16015da74d38 SHA256 fc50a4f058e81d4bed91afd332195156498ebe8aa860f454aa1641e19fe2e0e0 +EBUILD module-init-tools-3.16-r1.ebuild 2979 RMD160 780a8e370fde55d0cb5fd9805416539f201f5ddb SHA1 02ed466cfe26308413adf329ce49224a8ae8980d SHA256 b2eeaca9e22797390d181e58dba4d371adde122114d14188a57704d1141fe8c7 +EBUILD module-init-tools-3.16.ebuild 3012 RMD160 b666e8aef01b136ac357b878287f0942b77bf55c SHA1 0781c989da0a73e06be38ce651fa2e7357b25a00 SHA256 c4e5ef1e7b5217cba96a9926b72b09a3229331ee616ef5e426df3fdc5067a040 +EBUILD module-init-tools-3.5.ebuild 5193 RMD160 9ffc849326ab7bc700ebc518ba61068c06fb1d03 SHA1 6e01eccd8190e27785c5af3c93a2d95c35f33c7f SHA256 5bc29dcbd501bf85be32ecf6ba4a8c5118635bc93d6d730d74d5e61f7a41728e +EBUILD module-init-tools-3.6-r1.ebuild 5357 RMD160 f94239b661403ba5eeadd19a23ec35dbe16239dd SHA1 d966f4a540293f5b6fdd710ae2c2796c8ec5fa8b SHA256 6912a0aac2fd3c9a0bd2638a78a09aa555305be98478d94dec53ce3d3d224dbb +EBUILD module-init-tools-3.8.ebuild 1537 RMD160 79042e4f47f1200bda66a5114f3e74c9f93ccfb0 SHA1 855903af0babe41a6cd7d6ad2ee6f41cf0865b01 SHA256 737da2d4e1d2d63736e828e31a24868e00e2fc40f2c1de3fa232a8c313daed06 +EBUILD module-init-tools-3.9.ebuild 1372 RMD160 bff47da007a4010fad3b3036f5dbfb1ada52821c SHA1 fa1f0ca025151df886c1848dcdca6c36b2e6db52 SHA256 69a0a34769d9d6ee7a3f36579bb2268f0c61444abc8f6dc3a453ac682a2dede3 +MISC ChangeLog 31348 RMD160 0cb5530cf5a532011bac9912e9dcdd041ddee53b SHA1 c8ca45f1f5857b53dd2f2b50eb8bc214687ed35f SHA256 b65dfea47d5b2e8b9b2bdef9319a292bad2b073bbe254693b20c0d8e219dfc7b +MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk8sfC4ACgkQblQW9DDEZTjqBACfdAEyJLL13Gq6VRkevAQT80dx +54UAoLXU/TzFR5uKl9aJcjsh6evIjT1j +=Dkr7 +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/module-init-tools-3.16-use-fd-syscall.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/module-init-tools-3.16-use-fd-syscall.patch new file mode 100644 index 0000000000..849da55ba1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/module-init-tools-3.16-use-fd-syscall.patch @@ -0,0 +1,179 @@ +Description: In support of the new finit_module syscall, keep the file + descriptor for the desired module around when loading. In the case where + a module is uncompressed and unstripped, attempt to load via the fd and + finit_module. If finit_module does not exist (ENOSYS), fall back to using + init_module with the blob read from the fd. +Author: Kees Cook + +diff -uNrp module-init-tools-3.16~/insmod.c module-init-tools-3.16/insmod.c +--- module-init-tools-3.16~/insmod.c 2011-06-02 10:55:01.000000000 -0700 ++++ module-init-tools-3.16/insmod.c 2012-09-11 15:42:26.976369988 -0700 +@@ -56,18 +56,18 @@ static const char *moderror(int err) + } + } + +-static void *grab_file(const char *filename, unsigned long *size) ++static void *grab_file(const char *filename, unsigned long *size, int *fd) + { + unsigned int max = 16384; +- int ret, fd, err_save; ++ int ret, err_save; + void *buffer; + + if (streq(filename, "-")) +- fd = dup(STDIN_FILENO); ++ *fd = dup(STDIN_FILENO); + else +- fd = open(filename, O_RDONLY, 0); ++ *fd = open(filename, O_RDONLY, 0); + +- if (fd < 0) ++ if (*fd < 0) + return NULL; + + buffer = malloc(max); +@@ -75,7 +75,7 @@ static void *grab_file(const char *filen + goto out_error; + + *size = 0; +- while ((ret = read(fd, buffer + *size, max - *size)) > 0) { ++ while ((ret = read(*fd, buffer + *size, max - *size)) > 0) { + *size += ret; + if (*size == max) { + void *p; +@@ -89,13 +89,12 @@ static void *grab_file(const char *filen + if (ret < 0) + goto out_error; + +- close(fd); + return buffer; + + out_error: + err_save = errno; + free(buffer); +- close(fd); ++ close(*fd); + errno = err_save; + return NULL; + } +@@ -104,6 +103,7 @@ int main(int argc, char *argv[]) + { + unsigned int i; + long int ret; ++ int fd; + unsigned long len; + void *file; + char *filename, *options = strdup(""); +@@ -149,18 +149,21 @@ int main(int argc, char *argv[]) + strcat(options, " "); + } + +- file = grab_file(filename, &len); ++ file = grab_file(filename, &len, &fd); + if (!file) { + fprintf(stderr, "insmod: can't read '%s': %s\n", + filename, strerror(errno)); + exit(1); + } + +- ret = init_module(file, len, options); ++ ret = finit_module(fd, options, 0); ++ if (ret != 0 && errno == ENOSYS) ++ ret = init_module(file, len, options); + if (ret != 0) { + fprintf(stderr, "insmod: error inserting '%s': %li %s\n", + filename, ret, moderror(errno)); + } ++ close(fd); + free(file); + + if (ret != 0) +diff -uNrp module-init-tools-3.16~/modprobe.c module-init-tools-3.16/modprobe.c +--- module-init-tools-3.16~/modprobe.c 2011-06-02 10:55:01.000000000 -0700 ++++ module-init-tools-3.16/modprobe.c 2012-09-11 15:42:58.746370022 -0700 +@@ -1713,6 +1713,7 @@ static int insmod(struct list_head *list + modprobe_flags_t flags) + { + int ret; ++ int fd; + struct elf_file *module; + const struct module_softdep *softdep; + const char *command; +@@ -1778,10 +1779,17 @@ static int insmod(struct list_head *list + strerror(errno)); + goto out; + } +- if (flags & mit_strip_modversion) ++ fd = open(mod->filename, O_RDONLY); ++ if (flags & mit_strip_modversion) { + module->ops->strip_section(module, "__versions"); +- if (flags & mit_strip_vermagic) ++ close(fd); ++ fd = -1; ++ } ++ if (flags & mit_strip_vermagic) { + clear_magic(module); ++ close(fd); ++ fd = -1; ++ } + + /* Config file might have given more options */ + opts = add_extra_options(mod->modname, optstring, conf->options); +@@ -1792,7 +1800,13 @@ static int insmod(struct list_head *list + goto out_elf_file; + + /* request kernel linkage */ +- ret = init_module(module->data, module->len, opts); ++ if (fd < 0) ++ ret = init_module(module->data, module->len, opts); ++ else { ++ ret = finit_module(fd, opts, 0); ++ if (ret != 0 && errno == ENOSYS) ++ ret = init_module(module->data, module->len, opts); ++ } + if (ret != 0) { + if (errno == EEXIST) { + if (flags & mit_first_time) +@@ -1810,6 +1820,7 @@ static int insmod(struct list_head *list + } + out_elf_file: + release_elf_file(module); ++ close(fd); + free(opts); + out: + free_module(mod); +diff -uNrp module-init-tools-3.16~/util.h module-init-tools-3.16/util.h +--- module-init-tools-3.16~/util.h 2011-06-02 10:55:01.000000000 -0700 ++++ module-init-tools-3.16/util.h 2012-09-11 15:41:49.126370186 -0700 +@@ -3,6 +3,31 @@ + + #include + ++#include ++#include ++#ifndef __NR_finit_module ++# if defined(__x86_64__) ++# define __NR_finit_module 313 ++# elif defined(__i386__) ++# define __NR_finit_module 350 ++# elif defined(__arm__) ++# define __NR_finit_module 379 ++# endif ++#endif ++ ++#ifdef __NR_finit_module ++static inline int finit_module(int fd, const char *uargs, int flags) ++{ ++ return syscall(__NR_finit_module, fd, uargs, flags); ++} ++#else ++static inline int finit_module(int fd, const char *uargs, int flags) ++{ ++ errno = ENOSYS; ++ return -1; ++} ++#endif ++ + struct string_table + { + unsigned int cnt; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules-3.5.sh b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules-3.5.sh new file mode 100755 index 0000000000..206521ce8a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules-3.5.sh @@ -0,0 +1,395 @@ +#!/bin/bash +# vim:ts=4 +# Distributed under the terms of the GNU General Public License v2 +# +# This script will do: +# - create /etc/modules.conf from /etc/modules.d/* +# - create /etc/modprobe.conf from /etc/modprobe.d/* +# - update modules.dep if modules.conf has been updated so depmod doesnt whine +# +# This is all for backwards compatibility. In the perfect world, we would be +# running a linux-2.6 kernel and not have any modules.d directory. Then there +# would be no work for us as module-init-tools automatically scans modprobe.d. +# Until that happens, we'll keep scanning and warning and being a pita. +# + + +ROOT="${ROOT%/}/" +[ "${ROOT}" = "${ROOT#/}" ] && ROOT="${PWD}/${ROOT}" +cd "${ROOT}" + +argv0=${0##*/} +. /etc/init.d/functions.sh || { + echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 + exit 1 +} +umask 022 +esyslog() { :; } +export PATH=/sbin:${PATH} + +[ "${argv0}" = "modules-update" ] && ewarn "Please run 'update-modules' from now on; 'modules-update' is going away" + + +# +# Setup some variables +# + +HEADER="### This file is automatically generated by update-modules" + +# +# Parse command-line +# + +VERBOSE=0 +DEBUG=0 +FORCE="false" +BACKUP="false" +KV= +while [ -n "$1" ] ; do + case $1 in + --assume-kernel=*) KV=${1#*=};; + -b|--backup) BACKUP="true";; + -f|--force|force) FORCE="true";; + -v|--verbose) ((VERBOSE+=1));; + -d|--debug) ((DEBUG+=1));; + -V|--version) exec echo "${argv0}$Revision: 1.1 $ $Date: 2008/10/25 23:55:43 $";; + -h|--help) + cat <<-EOF + Usage: update-modules [options] + + Options: + --assume-kernel=KV Assume the kernel is at least version KV + -b, --backup Backup existing config files (add .old ext) + -f, --force Force execution in face of bad things + -v, --verbose Be a bit more verbose in what we do + -d, --debug Helpful debug output + -V, --version Dump version info + -h, --help This help screen, duh + EOF + exit 0 + ;; + *) + eerror "Error: I don't understand $1" + exit 1 + ;; + esac + shift +done + +if [ ! -w ./etc ] ; then + eerror "You must be root to do this" + exit 2 +fi + +[ ${DEBUG} -gt 0 ] && set -x + +veinfo() { [ ${VERBOSE} -gt 0 ] && einfo "$*" ; return 0 ; } +vewarn() { [ ${VERBOSE} -gt 0 ] && ewarn "$*" ; return 0 ; } + +[ "${ROOT}" != "/" ] && veinfo "Operating on ROOT = '${ROOT}'" + +# +# Let's check the optimal case first: nothing to do +# +if ! ${FORCE} ; then + if [ ! -d "./etc/modules.d" ] ; then + if [ ! -d "./etc/modprobe.d" ] ; then + veinfo "No /etc/modules.d or /etc/modprobe.d dir; Nothing to do!" + exit 0 + + elif [ -e "./etc/modprobe.conf" ] ; then + vewarn "You should put settings in /etc/modprobe.d/ rather than modprobe.conf" + + elif [ -e "./etc/modules.conf" ] ; then + vewarn "If you only run linux-2.4, you should delete /etc/modules.conf" + + else + veinfo "We have just /etc/modprobe.d; Nothing to do!" + exit 0 + fi + else + vewarn "You have /etc/modules.d, so things need to get coalesced" + fi +fi + +# +# Build list of config files to generate and verify none +# have been modified in any way +# +for x in modprobe.conf modules.conf ; do + x="./etc/${x}" + [ -r ${x} ] || continue + + if [ "$(sed -ne 1p ${x})" != "${HEADER}" ] ; then + ewarn "Warning: ${x#.} has not been automatically generated" + + if ${FORCE} ; then + ewarn "--force specified, (re)generating file anyway" + else + eerror "Use \"update-modules force\" to force (re)generation" + exit 1 + fi + fi +done + + +# +# If the system doesnt have old modutils, then this is prob linux-2.6 only +# +if type -P modprobe.old > /dev/null || \ + LC_ALL=C modprobe -V 2>/dev/null | grep -qs "modprobe version" +then + GENERATE_OLD="true" +else + GENERATE_OLD="false" +fi + + +# Reset the sorting order since we depend on it +export LC_COLLATE="C" + +KV=${KV:-$(uname -r)} + + +# +# Desc: backup a config file if need be and replace with new one +# Usage: backup +# Ex: backup /etc/modules.conf /etc/modules.conf.tempfile +# +backup() { + if ${BACKUP} && [ -e "$1" ] ; then + mv -f "$1" "$1".old + fi + mv -f "$2" "$1" +} + + +# +# Desc: Create module header +# Usage: create_header +# Ex: create_header /etc/modules.d +create_header() { + local moddir=$1 + + cat <<-EOF + ${HEADER} + # + # Please do not edit this file directly. If you want to change or add + # anything please take a look at the files in ${moddir} and read + # the manpage for update-modules(8). + # + EOF +} + + +# +# Desc: Combine all config files in a dir and place output in a file +# Usage: generate_config +# Ex: generate_config /etc/modules.conf /etc/modules.d +# +generate_config() { + local config=$1 + local moddir=$2 + local refdir=$3 + local silent=$4 + local tmpfile="${config}.$$" + + [ -z "${silent}" ] && ebegin "Updating ${config#./etc/}" + + create_header ${refdir:-${moddir}} > "${tmpfile}" + + for cfg in "${moddir}"/* ; do + [ -d "${cfg}" ] && continue + [ ! -r "${cfg}" ] && continue + + # Skip backup and RCS files #20597 + case ${cfg} in *~|*.bak|*,v) continue;; esac + + # If config file is found in the reference dir, then skip it + [ -n "${refdir}" ] && [ -e "${refdir}/${cfg##*/}" ] && continue + + ( + echo "### update-modules: start processing ${cfg#.}" + if [ -x "${cfg}" ] ; then + # $cfg can be executable; nice touch, Wichert! :) + "${cfg}" + else + cat "${cfg}" + fi + echo + echo "### update-modules: end processing ${cfg#.}" + echo + ) >> "${tmpfile}" + done + + backup "${config}" "${tmpfile}" + + [ -z "${silent}" ] && eend 0 + + return 0 +} + + +# +# Generate the old modules.conf file based upon all the snippets in +# modules.d. Since modprobe doesnt handle modules.d, we need to gather +# the files together in modules.conf for it. +# + +if [ ! -d "./etc/modules.d" ] ; then + veinfo "No need to generate modules.conf :)" + +elif ${FORCE} || is_older_than ./etc/modules.conf ./etc/modules.d ; then + generate_config ./etc/modules.conf ./etc/modules.d + +else + veinfo "modules.conf: already up-to-date wheatness" +fi + +# +# Call depmod to keep insmod from complaining that modules.conf is more +# recent then the modules.dep file. +# +if [ -e "./etc/modules.conf" ] ; then + depfile=$( + # the modules.conf file has optional syntax: + # depfile=/path/to/modules.dep + ret=$(sed -n -e '/^[[:space:]]*depfile=/s:.*=::p' ./etc/modules.conf) + eval echo "${ret:-/lib/modules/${KV}/modules.dep}" + ) + + if [ -d "${depfile%/*}" ] ; then + if [ ./etc/modules.conf -nt "${depfile}" ] ; then + arch=$(uname -m) + ebegin "Updating modules.dep" + for cfg in /lib/modules/${KV}/build /usr/src/linux-${KV} \ + /lib/modules/${KV} /boot /usr/src/linux "" + do + cfg=".${cfg}/System.map" + for suffix in -genkernel-${arch}-${KV} -genkernel-'*'-${KV} -${KV} "" ; do + scfg=$(echo ${cfg}${suffix}) + scfg=${scfg%% *} + [ -f "${scfg}" ] && cfg=${scfg} && break 2 + done + cfg="" + done + [ -n "${cfg}" ] && cfg="-F ${cfg}" + depmod -b "${ROOT}" -a ${cfg} ${KV} + eend $? + veinfo "Ran: depmod -b '${ROOT}' -a ${cfg} ${KV}" + else + veinfo "modules.dep: already up-to-date goodness" + fi + else + vewarn "The dir '${depfile}' does not exist, skipping call to depmod" + fi +fi + + +# +# Generate the new modprobe.conf file if possible. What this entails is +# grabbing details from the old modprobe via the -c option and sticking +# it in the newer config file. This is useful for backwards compat support +# and for packages that provide older style /etc/modules.d/ files but not +# newer style /etc/modprobe.d/ files. +# +# First we try to use the script `generate-modprobe.conf` from the +# module-init-tools and if that fails us, we try and generate modprobe.conf +# ourselves from the /etc/modules.d/ files. +# +if ! type -P generate-modprobe.conf > /dev/null ; then + vewarn "Skipping /etc/modprobe.conf generation (generate-modprobe.conf doesn't exist)" + +elif ! ${FORCE} && ! is_older_than ./etc/modprobe.conf ./etc/modules.d ./etc/modprobe.d ; then + veinfo "modprobe.conf: already up-to-date nutness" + +elif [ ! -e ./etc/modules.conf -a ! -e ./etc/modules.d ] ; then + veinfo "No need to generate modprobe.conf :)" + rm -f ./etc/modprobe.conf + +else + # + # First, bitch like crazy + # + for f in ./etc/modules.d/* ; do + # hack: ignore baselayout ;x + case ${f##*/} in + aliases|i386) continue;; + esac + [ -e "${f}" ] || continue + if [ ! -e "./etc/modprobe.d/${f##*/}" ] ; then + ewarn "Please file a bug about ${f#.}: it needs an /etc/modprobe.d/${f##*/}" + fi + done + + generated_ok=0 + tmpfile="./etc/modprobe.conf.$$" + + # + # First we try to use regular generate-modprobe.conf + # + if ${GENERATE_OLD} ; then + ebegin "Updating modprobe.conf" + create_header /etc/modprobe.d > "${tmpfile}" + if generate-modprobe.conf ${ASSUME_KV:+--assume-kernel=${KV}} \ + >> "${tmpfile}" 2> "${tmpfile}.err" + then + backup "./etc/modprobe.conf" "${tmpfile}" + eend 0 + generated_ok=1 + else + [[ ${VERBOSE} -gt 0 ]] && cat "${tmpfile}.err" + eend 1 "Warning: could not generate /etc/modprobe.conf!" + fi + fi + + # + # If the helper script failed, we fall back to doing it by hand + # + if [[ ${generated_ok} -eq 0 ]] ; then + ebegin "Updating modprobe.conf by hand" + + generate_config ./etc/modprobe.conf ./etc/modules.d ./etc/modprobe.d 0 + create_header /etc/modprobe.d > "${tmpfile}" + + # Just use generate-modprobe.conf to filter compatible syntax + if TESTING_MODPROBE_CONF=./etc/modprobe.conf \ + generate-modprobe.conf ${ASSUME_KV:+--assume-kernel=${KV}} \ + >> "${tmpfile}" 2> "${tmpfile}.err" + then + # we use mv here instead of backup_config() as the call to + # generate_config() above already took care of the backup + mv -f "${tmpfile}" "./etc/modprobe.conf" + eend $? + else + [[ ${VERBOSE} -gt 0 ]] && cat "${tmpfile}.err" + eend 1 "Warning: could not generate /etc/modprobe.conf!" + fi + fi + + # + # Now append all the new files ... modprobe will not scan /etc/modprobe.d/ + # if /etc/modprobe.conf exists, so we need to append /etc/modprobe.conf with + # /etc/modprobe.d/* ... http://bugs.gentoo.org/145962 + # + if [[ -e ./etc/modprobe.conf ]] ; then + for cfg in ./etc/modprobe.d/* ; do + [ -d "${cfg}" ] && continue + [ ! -r "${cfg}" ] && continue + + # Skip backup and RCS files #20597 + case ${cfg} in *~|*.bak|*,v) continue;; esac + + ( + echo + echo "### update-modules: start processing ${cfg#.}" + cat "${cfg}" + echo "### update-modules: end processing ${cfg#.}" + ) >> "./etc/modprobe.conf" + done + fi + + rm -f "${tmpfile}" "${tmpfile}.err" +fi + +: # make sure we fall through with 0 exit status diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules.8 b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules.8 new file mode 100644 index 0000000000..16e99e28c8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules.8 @@ -0,0 +1,74 @@ +.TH UPDATE-MODULES 8 "Gentoo Linux" "2007" +.SH NAME +update\-modules \- (re)generate module config files in /etc/ +.SH SYNOPSIS +\fBupdate\-modules\fR \fI[options]\fR +.SH DESCRIPTION +\fBupdate\-modules\fR is a simple tool to manage the module config files found +in the /etc/ directory. + +The old Linux module utilities use a single file for all their configuration. +This makes it difficult for packages to dynamically add information about their +own modules. + +\fBupdate-modules\fR makes the dynamic addition of information easier by +generating the single configuration file from the many files located in +\fI/etc/modules.d/\fR. All files in that directory are assembled together to +form \fI/etc/modules.conf\fR. + +Newer Linux module utilities include support automatically for a directory of +configuration files in \fI/etc/modprobe.d/\fR. However, to maintain backwards +compatibility with packages that do not yet support this, we still need to +assemble the contents of \fI/etc/modules.d/\fR and \fI/etc/modprobe.d/\fR and +produce the corresponding \fI/etc/modules.conf\fR and \fI/etc/modprobe.conf\fR. + +Also, when requested, it is also possible to generate \fI/etc/modules.devfs\fR. +.SH OPTIONS +.TP +\fI\-\-assume-kernel=\fR +When calculating which files need to be generated, assume the kernel version +is at least the specified \fIKV\fR. +.TP +\fI\-b\fR, \fI\-\-backup\fR +When updating configuration files, make backups by renaming files with a '.old' +suffix if they are going to be updated. +.TP +\fI\-d\fR, \fI\-\-debug\fR +Run with shell debugging enabled. Really only useful for tracking down +misbehavior. +.TP +\fI\-D\fR, \fI\-\-devfs\fR +Force generation of the deprecated \fI/etc/modules.devfs\fR file. +.TP +\fI\-f\fR, \fI\-\-force\fR +Force generation of files regardless of timestamps. By default, +\fBupdate-modules\fR will regenerate files only when timestamps indicate that +the configuration files are out of date. +.TP +\fI\-v\fR, \fI\-\-verbose\fR +Enable verbose output since by default, \fBupdate-modules\fR only displays +information when it does something and not when it skips steps. +.SH "FILES" +There are two types of file you can put in the module directories: normal files +and exectuable files. Normal files contain standard modules configuration +information, as described in \fBmodules.conf\fR(5) (for files in +\fI/etc/modules.d/\fR) or as described in \fBmodprobe.conf\fR(5) (for files in +\fI/etc/modprobe.d/\fR). Executable files are executed and their output is +used as extra configuration information. Error messages are sent to stderr and +thus do not become part of the configuration file. + +.nf +\fI/etc/modules.d/\fR - config snippets for old module utilities (<= linux-2.4) +\fI/etc/modules.conf\fR - sum of all files in \fI/etc/modules.d/\fR +\fI/etc/modprobe.d/\fR - config snippets for new module utilities (>= linux-2.6) +\fI/etc/modprobe.conf\fR - sum of all files in \fI/etc/modprobe.d/\fR +.fi +.SH "REPORTING BUGS" +Please report bugs via http://bugs.gentoo.org/ +.SH AUTHORS +This manual page was written by Wichert Akkerman +for the Debian GNU/Linux system. Modified for \fIGentoo Linux\fR. +.SH "SEE ALSO" +.BR depmod (1), +.BR modules.conf (5), +.BR modprobe.conf (5) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/module-init-tools-3.16-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/module-init-tools-3.16-r4.ebuild new file mode 100644 index 0000000000..41d5c1f1d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/module-init-tools-3.16-r4.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild,v 1.8 2012/02/04 00:33:38 williamh Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="tools for managing linux kernel modules" +HOMEPAGE="http://modules.wiki.kernel.org/" +SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2 + mirror://gentoo/${P}-man.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="static" +RESTRICT="test" + +DEPEND="sys-libs/zlib" +RDEPEND="${DEPEND} + ! "${T}"/usb-load-ehci-first.conf + install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS + install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS + EOF + + insinto /etc/modprobe.d + doins "${T}"/usb-load-ehci-first.conf || die #260139 +} + +pkg_postinst() { + # cheat to keep users happy + if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then + sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules + fi + + # For files that were upgraded but not renamed via their ebuild to + # have a proper .conf extension, rename them so etc-update tools can + # take care of things. #274942 + local i f cfg + eshopts_push -s nullglob + for f in "${ROOT}"etc/modprobe.d/* ; do + # The .conf files need no upgrading unless a non-.conf exists, + # so skip this until later ... + [[ ${f} == *.conf ]] && continue + # If a .conf doesn't exist, then a package needs updating, or + # the user created it, or it's orphaned. Either way, we don't + # really know, so leave it alone. + [[ ! -f ${f}.conf ]] && continue + + i=0 + while :; do + cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}") + [[ ! -e ${cfg} ]] && break + ((i++)) + done + elog "Updating ${f}; please run 'etc-update'" + mv "${f}.conf" "${cfg}" + mv "${f}" "${f}.conf" + done + # Whine about any non-.conf files that are left + for f in "${ROOT}"etc/modprobe.d/* ; do + [[ ${f} == *.conf ]] && continue + ewarn "The '${f}' file needs to be upgraded to end with a '.conf'." + ewarn "Either upgrade the package that owns it, or manually rename it." + done + eshopts_pop +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/files/chromeos-version.sh new file mode 100755 index 0000000000..31caa7e48c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/files/chromeos-version.sh @@ -0,0 +1,7 @@ +#!/bin/bash +exec awk ' + $1 == "CORE" { core = $NF } + $1 == "MAJOR" { major = $NF } + $1 == "MINOR" { minor = $NF } + END { printf "%s.%s.%s\n", core, major, minor } +' "$1/Makefile" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/mosys-1.2.03-r112.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/mosys-1.2.03-r112.ebuild new file mode 100644 index 0000000000..a64970b7fd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/mosys-1.2.03-r112.ebuild @@ -0,0 +1,47 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="24288602238e3eb3e4d4f1938d02e181a746f408" +CROS_WORKON_TREE="3988fb67f7ea025b9fd98e32e81faf93ffb5fca3" +CROS_WORKON_PROJECT="chromiumos/platform/mosys" +CROS_WORKON_LOCALNAME="../platform/mosys" + +inherit flag-o-matic toolchain-funcs cros-workon + +DESCRIPTION="Utility for obtaining various bits of low-level system info" +HOMEPAGE="http://mosys.googlecode.com/" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="static" +RDEPEND="sys-apps/util-linux + >=sys-apps/flashmap-0.3-r4" +DEPEND="${RDEPEND}" + +src_compile() { + # Generate a default .config for our target architecture. This will + # likely become more sophisticated as we broaden board support. + einfo "using default configuration for $(tc-arch)" + ARCH=$(tc-arch) make defconfig || die + + tc-export AR AS CC CXX LD NM STRIP OBJCOPY PKG_CONFIG + export FMAP_LINKOPT="$(${PKG_CONFIG} --libs-only-l fmap)" + append-ldflags "$(${PKG_CONFIG} --libs-only-L fmap)" + export LDFLAGS="$(raw-ldflags)" + append-flags "$(${PKG_CONFIG} --cflags fmap)" + export CFLAGS + + if use static; then + # We can't use append-ldflags because the build system doesn't + # handle LDFLAGS correctly: + # http://code.google.com/p/mosys/issues/detail?id=3 + append-flags "-static" + fi + + emake || die +} + +src_install() { + dosbin mosys || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/mosys-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/mosys-9999.ebuild new file mode 100644 index 0000000000..c2cee6e69d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/mosys/mosys-9999.ebuild @@ -0,0 +1,45 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/mosys" +CROS_WORKON_LOCALNAME="../platform/mosys" + +inherit flag-o-matic toolchain-funcs cros-workon + +DESCRIPTION="Utility for obtaining various bits of low-level system info" +HOMEPAGE="http://mosys.googlecode.com/" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static" +RDEPEND="sys-apps/util-linux + >=sys-apps/flashmap-0.3-r4" +DEPEND="${RDEPEND}" + +src_compile() { + # Generate a default .config for our target architecture. This will + # likely become more sophisticated as we broaden board support. + einfo "using default configuration for $(tc-arch)" + ARCH=$(tc-arch) make defconfig || die + + tc-export AR AS CC CXX LD NM STRIP OBJCOPY PKG_CONFIG + export FMAP_LINKOPT="$(${PKG_CONFIG} --libs-only-l fmap)" + append-ldflags "$(${PKG_CONFIG} --libs-only-L fmap)" + export LDFLAGS="$(raw-ldflags)" + append-flags "$(${PKG_CONFIG} --cflags fmap)" + export CFLAGS + + if use static; then + # We can't use append-ldflags because the build system doesn't + # handle LDFLAGS correctly: + # http://code.google.com/p/mosys/issues/detail?id=3 + append-flags "-static" + fi + + emake || die +} + +src_install() { + dosbin mosys || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/Manifest new file mode 100644 index 0000000000..e72fcaf4dd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/Manifest @@ -0,0 +1,2 @@ +DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de +DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/2.1.10.11-r9.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/2.1.10.11-r9.patch new file mode 100644 index 0000000000..5d20f2e941 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/2.1.10.11-r9.patch @@ -0,0 +1,3458 @@ +diff --git a/bin/ebuild b/bin/ebuild +index f8b6d79..66ea6cf 100755 +--- a/bin/ebuild ++++ b/bin/ebuild +@@ -204,8 +204,9 @@ def discard_digests(myebuild, mysettings, mydbapi): + portage._doebuild_manifest_exempt_depend += 1 + pkgdir = os.path.dirname(myebuild) + fetchlist_dict = portage.FetchlistDict(pkgdir, mysettings, mydbapi) +- from portage.manifest import Manifest +- mf = Manifest(pkgdir, mysettings["DISTDIR"], ++ mf = mysettings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))) ++ mf = mf.load_manifest(pkgdir, mysettings["DISTDIR"], + fetchlist_dict=fetchlist_dict, manifest1_compat=False) + mf.create(requiredDistfiles=None, + assumeDistHashesSometimes=True, assumeDistHashesAlways=True) +@@ -228,10 +229,8 @@ build_dir_phases = set(["setup", "unpack", "prepare", "configure", "compile", + # sourced again even if $T/environment already exists. + ebuild_changed = False + if mytree == "porttree" and build_dir_phases.intersection(pargs): +- metadata, st, emtime = \ +- portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) +- if metadata is None: +- ebuild_changed = True ++ ebuild_changed = \ ++ portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir)[0] is None + + tmpsettings = portage.config(clone=portage.settings) + tmpsettings["PORTAGE_VERBOSE"] = "1" +diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip +index d25259d..098e0c6 100755 +--- a/bin/ebuild-helpers/prepstrip ++++ b/bin/ebuild-helpers/prepstrip +@@ -4,31 +4,60 @@ + + source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh + ++# avoid multiple calls to `has`. this creates things like: ++# FEATURES_foo=false ++# if "foo" is not in $FEATURES ++tf() { "$@" && echo true || echo false ; } ++exp_tf() { ++ local flag var=$1 ++ shift ++ for flag in "$@" ; do ++ eval ${var}_${flag}=$(tf has ${flag} ${!var}) ++ done ++} ++exp_tf FEATURES installsources nostrip splitdebug ++exp_tf RESTRICT binchecks installsources strip ++ + banner=false + SKIP_STRIP=false +-if has nostrip ${FEATURES} || \ +- has strip ${RESTRICT} +-then ++if ${RESTRICT_strip} || ${FEATURES_nostrip} ; then + SKIP_STRIP=true + banner=true +- has installsources ${FEATURES} || exit 0 ++ ${FEATURES_installsources} || exit 0 + fi + +-STRIP=${STRIP:-${CHOST}-strip} +-type -P -- ${STRIP} > /dev/null || STRIP=strip +-OBJCOPY=${OBJCOPY:-${CHOST}-objcopy} +-type -P -- ${OBJCOPY} > /dev/null || OBJCOPY=objcopy ++# look up the tools we might be using ++for t in STRIP:strip OBJCOPY:objcopy READELF:readelf ; do ++ v=${t%:*} # STRIP ++ t=${t#*:} # strip ++ eval ${v}=\"${!v:-${CHOST}-${t}}\" ++ type -P -- ${!v} >/dev/null || eval ${v}=${t} ++done ++ ++# Figure out what tool set we're using to strip stuff ++unset SAFE_STRIP_FLAGS DEF_STRIP_FLAGS SPLIT_STRIP_FLAGS ++case $(${STRIP} --version 2>/dev/null) in ++*elfutils*) # dev-libs/elfutils ++ # elfutils default behavior is always safe, so don't need to specify ++ # any flags at all ++ SAFE_STRIP_FLAGS="" ++ DEF_STRIP_FLAGS="--remove-comment" ++ SPLIT_STRIP_FLAGS="-f" ++ ;; ++*GNU*) # sys-devel/binutils ++ # We'll leave out -R .note for now until we can check out the relevance ++ # of the section when it has the ALLOC flag set on it ... ++ SAFE_STRIP_FLAGS="--strip-unneeded" ++ DEF_STRIP_FLAGS="-R .comment -R .GCC.command.line" ++ SPLIT_STRIP_FLAGS= ++ ;; ++esac ++: ${PORTAGE_STRIP_FLAGS=${SAFE_STRIP_FLAGS} ${DEF_STRIP_FLAGS}} + +-# We'll leave out -R .note for now until we can check out the relevance +-# of the section when it has the ALLOC flag set on it ... +-export SAFE_STRIP_FLAGS="--strip-unneeded" +-export PORTAGE_STRIP_FLAGS=${PORTAGE_STRIP_FLAGS-${SAFE_STRIP_FLAGS} -R .comment} + prepstrip_sources_dir=/usr/src/debug/${CATEGORY}/${PF} + +-if has installsources ${FEATURES} && ! type -P debugedit >/dev/null ; then +- ewarn "FEATURES=installsources is enabled but the debugedit binary could not" +- ewarn "be found. This feature will not work unless debugedit is installed!" +-fi ++type -P debugedit >/dev/null && debugedit_found=true || debugedit_found=false ++debugedit_warned=false + + unset ${!INODE_*} + +@@ -41,19 +70,33 @@ inode_var_name() { + } + + save_elf_sources() { +- has installsources ${FEATURES} || return 0 +- has installsources ${RESTRICT} && return 0 +- type -P debugedit >/dev/null || return 0 ++ ${FEATURES_installsources} || return 0 ++ ${RESTRICT_installsources} && return 0 ++ if ! ${debugedit_found} ; then ++ if ! ${debugedit_warned} ; then ++ debugedit_warned=true ++ ewarn "FEATURES=installsources is enabled but the debugedit binary could not" ++ ewarn "be found. This feature will not work unless debugedit is installed!" ++ fi ++ return 0 ++ fi + + local x=$1 + local inode=$(inode_var_name "$x") + [[ -n ${!inode} ]] && return 0 +- debugedit -b "${WORKDIR}" -d "${prepstrip_sources_dir}" \ +- -l "${T}"/debug.sources "${x}" ++ ++ # since we're editing the ELF here, we should recompute the build-id ++ # (the -i flag below). save that output so we don't need to recompute ++ # it later on in the save_elf_debug step. ++ buildid=$(debugedit -i \ ++ -b "${WORKDIR}" \ ++ -d "${prepstrip_sources_dir}" \ ++ -l "${T}"/debug.sources \ ++ "${x}") + } + + save_elf_debug() { +- has splitdebug ${FEATURES} || return 0 ++ ${FEATURES_splitdebug} || return 0 + + local x=$1 + local y="${D}usr/lib/debug/${x:${#D}}.debug" +@@ -61,23 +104,30 @@ save_elf_debug() { + # dont save debug info twice + [[ ${x} == *".debug" ]] && return 0 + +- # this will recompute the build-id, but for now that's ok +- local buildid="$( type -P debugedit >/dev/null && debugedit -i "${x}" )" +- +- mkdir -p $(dirname "${y}") ++ mkdir -p "${y%/*}" + + local inode=$(inode_var_name "$x") + if [[ -n ${!inode} ]] ; then + ln "${D}usr/lib/debug/${!inode:${#D}}.debug" "$y" + else + eval $inode=\$x +- ${OBJCOPY} --only-keep-debug "${x}" "${y}" +- ${OBJCOPY} --add-gnu-debuglink="${y}" "${x}" +- [[ -g ${x} ]] && chmod go-r "${y}" +- [[ -u ${x} ]] && chmod go-r "${y}" +- chmod a-x,o-w "${y}" ++ if [[ -e ${T}/prepstrip.split.debug ]] ; then ++ mv "${T}"/prepstrip.split.debug "${y}" ++ else ++ ${OBJCOPY} --only-keep-debug "${x}" "${y}" ++ ${OBJCOPY} --add-gnu-debuglink="${y}" "${x}" ++ fi ++ local args="a-x,o-w" ++ [[ -g ${x} || -u ${x} ]] && args+=",go-r" ++ chmod ${args} "${y}" + fi + ++ # if we don't already have build-id from debugedit, look it up ++ if [[ -z ${buildid} ]] ; then ++ # convert the readelf output to something useful ++ buildid=$(${READELF} -x .note.gnu.build-id "${x}" 2>/dev/null \ ++ | awk '$NF ~ /GNU/ { getline; printf $2$3$4$5; getline; print $2 }') ++ fi + if [[ -n ${buildid} ]] ; then + local buildid_dir="${D}usr/lib/debug/.build-id/${buildid:0:2}" + local buildid_file="${buildid_dir}/${buildid:2}" +@@ -87,11 +137,31 @@ save_elf_debug() { + fi + } + ++process_elf() { ++ local x=$1 strip_flags=${*:2} ++ ++ vecho " ${x:${#D}}" ++ save_elf_sources "${x}" ++ ++ if ${strip_this} ; then ++ # see if we can split & strip at the same time ++ if [[ -n ${SPLIT_STRIP_FLAGS} ]] ; then ++ ${STRIP} ${strip_flags} \ ++ -f "${T}"/prepstrip.split.debug \ ++ -F "${x##*/}.debug" \ ++ "${x}" ++ save_elf_debug "${x}" ++ else ++ save_elf_debug "${x}" ++ ${STRIP} ${strip_flags} "${x}" ++ fi ++ fi ++} ++ + # The existance of the section .symtab tells us that a binary is stripped. + # We want to log already stripped binaries, as this may be a QA violation. + # They prevent us from getting the splitdebug data. +-if ! has binchecks ${RESTRICT} && \ +- ! has strip ${RESTRICT} ; then ++if ! ${RESTRICT_binchecks} && ! ${RESTRICT_strip} ; then + log=$T/scanelf-already-stripped.log + qa_var="QA_PRESTRIPPED_${ARCH/-/_}" + [[ -n ${!qa_var} ]] && QA_PRESTRIPPED="${!qa_var}" +@@ -149,6 +219,7 @@ do + # actually causes problems. install sources for all + # elf types though cause that stuff is good. + ++ buildid= + if [[ ${f} == *"current ar archive"* ]] ; then + vecho " ${x:${#D}}" + if ${strip_this} ; then +@@ -156,12 +227,7 @@ do + ${STRIP} -g "${x}" + fi + elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then +- vecho " ${x:${#D}}" +- save_elf_sources "${x}" +- if ${strip_this} ; then +- save_elf_debug "${x}" +- ${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}" +- fi ++ process_elf "${x}" ${PORTAGE_STRIP_FLAGS} + elif [[ ${f} == *"SB relocatable"* ]] ; then + vecho " ${x:${#D}}" + save_elf_sources "${x}" +@@ -173,9 +239,9 @@ do + done + + if [[ -s ${T}/debug.sources ]] && \ +- has installsources ${FEATURES} && \ +- ! has installsources ${RESTRICT} && \ +- type -P debugedit >/dev/null ++ ${FEATURES_installsources} && \ ++ ! ${RESTRICT_installsources} && \ ++ ${debugedit_found} + then + vecho "installsources: rsyncing source files" + [[ -d ${D}${prepstrip_sources_dir} ]] || mkdir -p "${D}${prepstrip_sources_dir}" +diff --git a/bin/egencache b/bin/egencache +index 1b4265d..5e68980 100755 +--- a/bin/egencache ++++ b/bin/egencache +@@ -38,6 +38,7 @@ except ImportError: + from portage import os, _encodings, _unicode_encode, _unicode_decode + from _emerge.MetadataRegen import MetadataRegen + from portage.cache.cache_errors import CacheError, StatCollision ++from portage.cache import metadata + from portage.manifest import guessManifestFileType + from portage.util import cmp_sort_key, writemsg_level + from portage import cpv_getkey +@@ -203,9 +204,11 @@ class GenCache(object): + consumer=self._metadata_callback, + max_jobs=max_jobs, max_load=max_load) + self.returncode = os.EX_OK +- metadbmodule = portdb.settings.load_best_module("portdbapi.metadbmodule") +- self._trg_cache = metadbmodule(portdb.porttrees[0], +- "metadata/cache", portage.auxdbkeys[:]) ++ conf = portdb.repositories.get_repo_for_location(portdb.porttrees[0]) ++ self._trg_cache = conf.get_pregenerated_cache(portage.auxdbkeys[:], ++ force=True, readonly=False) ++ if self._trg_cache is None: ++ raise Exception("cache format %s isn't supported" % (conf.cache_format,)) + if rsync: + self._trg_cache.raise_stat_collision = True + try: +@@ -215,13 +218,15 @@ class GenCache(object): + pass + self._existing_nodes = set() + +- def _metadata_callback(self, cpv, ebuild_path, repo_path, metadata): ++ def _metadata_callback(self, cpv, repo_path, metadata, ebuild_hash): + self._existing_nodes.add(cpv) + self._cp_missing.discard(cpv_getkey(cpv)) + if metadata is not None: + if metadata.get('EAPI') == '0': + del metadata['EAPI'] + try: ++ chf = self._trg_cache.validation_chf ++ metadata['_%s_' % chf] = getattr(ebuild_hash, chf) + try: + self._trg_cache[cpv] = metadata + except StatCollision as sc: +@@ -240,7 +245,7 @@ class GenCache(object): + max_mtime += 1 + max_mtime = long(max_mtime) + try: +- os.utime(ebuild_path, (max_mtime, max_mtime)) ++ os.utime(ebuild_hash.location, (max_mtime, max_mtime)) + except OSError as e: + self.returncode |= 1 + writemsg_level( +diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh +index 8c191ff..05136f4 100755 +--- a/bin/misc-functions.sh ++++ b/bin/misc-functions.sh +@@ -882,8 +882,16 @@ preinst_selinux_labels() { + dyn_package() { + # Make sure $PWD is not ${D} so that we don't leave gmon.out files + # in there in case any tools were built with -pg in CFLAGS. ++ + cd "${T}" +- install_mask "${PORTAGE_BUILDDIR}/image" "${PKG_INSTALL_MASK}" ++ ++ local PROOT="${T}/packaging" ++ # make a temporary copy of ${D} so that any modifications we do that ++ # are binpkg specific, do not influence the actual installed image. ++ cp -la "${PORTAGE_BUILDDIR}/image" "${PROOT}" || die "failed creating packaging tree" ++ ++ install_mask "${PROOT}" "${PKG_INSTALL_MASK}" ++ + local tar_options="" + [[ $PORTAGE_VERBOSE = 1 ]] && tar_options+=" -v" + # Sandbox is disabled in case the user wants to use a symlink +@@ -892,7 +900,7 @@ dyn_package() { + [ -z "${PORTAGE_BINPKG_TMPFILE}" ] && \ + die "PORTAGE_BINPKG_TMPFILE is unset" + mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" || die "mkdir failed" +- tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \ ++ tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${PROOT}" . | \ + $PORTAGE_BZIP2_COMMAND -c > "$PORTAGE_BINPKG_TMPFILE" + assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'" + PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ +@@ -913,6 +921,9 @@ dyn_package() { + [ -n "${md5_hash}" ] && \ + echo ${md5_hash} > "${PORTAGE_BUILDDIR}"/build-info/BINPKGMD5 + vecho ">>> Done." ++ ++ # cleanup our temp tree ++ rm -rf "${PROOT}" + cd "${PORTAGE_BUILDDIR}" + >> "$PORTAGE_BUILDDIR/.packaged" || \ + die "Failed to create $PORTAGE_BUILDDIR/.packaged" +@@ -985,6 +996,21 @@ success_hooks() { + done + } + ++install_hooks() { ++ local hooks_dir="${PORTAGE_CONFIGROOT}etc/portage/hooks/install" ++ local fp ++ local ret=0 ++ shopt -s nullglob ++ for fp in "${hooks_dir}"/*; do ++ if [ -x "$fp" ]; then ++ "$fp" ++ ret=$(( $ret | $? )) ++ fi ++ done ++ shopt -u nullglob ++ return $ret ++} ++ + if [ -n "${MISC_FUNCTIONS_ARGS}" ]; then + source_all_bashrcs + [ "$PORTAGE_DEBUG" == "1" ] && set -x +diff --git a/bin/portageq b/bin/portageq +index 57a7c39..a8a3a63 100755 +--- a/bin/portageq ++++ b/bin/portageq +@@ -473,6 +473,9 @@ def best_visible(argv): + if pkg.visible: + writemsg_stdout("%s\n" % (pkg.cpv,), noiselevel=-1) + return os.EX_OK ++ ++ # No package found, write out an empty line. ++ writemsg_stdout("\n", noiselevel=-1) + except KeyError: + pass + return 1 +@@ -480,16 +483,27 @@ best_visible.uses_root = True + + + def mass_best_visible(argv): +- """ []+ ++ """ [] []+ + Returns category/package-version (without .ebuild). ++ The pkgtype argument defaults to "ebuild" if unspecified, ++ otherwise it must be one of ebuild, binary, or installed. + """ ++ type_map = { ++ "ebuild":"porttree", ++ "binary":"bintree", ++ "installed":"vartree"} ++ + if (len(argv) < 2): + print("ERROR: insufficient parameters!") + sys.exit(2) + try: +- for pack in argv[1:]: +- mylist=portage.db[argv[0]]["porttree"].dbapi.match(pack) +- print(pack+":"+portage.best(mylist)) ++ root = argv.pop(0) ++ pkgtype = "ebuild" ++ if argv[0] in type_map: ++ pkgtype = argv.pop(0) ++ for pack in argv: ++ writemsg_stdout("%s:" % pack, noiselevel=-1) ++ best_visible([root, pkgtype, pack]) + except KeyError: + sys.exit(1) + mass_best_visible.uses_root = True +diff --git a/bin/repoman b/bin/repoman +index 10f603e..a90729c 100755 +--- a/bin/repoman ++++ b/bin/repoman +@@ -1103,7 +1103,9 @@ for x in scanlist: + portage._doebuild_manifest_exempt_depend += 1 + try: + distdir = repoman_settings['DISTDIR'] +- mf = portage.manifest.Manifest(checkdir, distdir, ++ mf = repoman_settings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(checkdir))) ++ mf = mf.load_manifest(checkdir, distdir, + fetchlist_dict=fetchlist_dict) + mf.create(requiredDistfiles=None, + assumeDistHashesAlways=True) +@@ -1308,7 +1310,9 @@ for x in scanlist: + raise + continue + +- mf = Manifest(checkdir, repoman_settings["DISTDIR"]) ++ mf = repoman_settings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(checkdir))) ++ mf = mf.load_manifest(checkdir, repoman_settings["DISTDIR"]) + mydigests=mf.getTypeDigests("DIST") + + fetchlist_dict = portage.FetchlistDict(checkdir, repoman_settings, portdb) +diff --git a/cnf/make.globals b/cnf/make.globals +index 0be9732..df40d6e 100644 +--- a/cnf/make.globals ++++ b/cnf/make.globals +@@ -101,6 +101,9 @@ PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress + # message should be produced. + PORTAGE_SYNC_STALE="30" + ++# Executed before emerge exit if FEATURES=clean-logs is enabled. ++PORT_LOGDIR_CLEAN="find \"\${PORT_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete" ++ + # Minimal CONFIG_PROTECT + CONFIG_PROTECT="/etc" + CONFIG_PROTECT_MASK="/etc/env.d" +diff --git a/man/emerge.1 b/man/emerge.1 +index 835d2c0..e1df6d2 100644 +--- a/man/emerge.1 ++++ b/man/emerge.1 +@@ -543,18 +543,16 @@ to be set in the \fBmake.conf\fR(5) + \fBEMERGE_DEFAULT_OPTS\fR variable. + .TP + .BR "\-\-rebuild\-if\-new\-rev [ y | n ]" +-Rebuild packages when dependencies that are used at both build\-time and +-run\-time are built, if the dependency is not already installed with the +-same version and revision. ++Rebuild packages when build\-time dependencies are built from source, if the ++dependency is not already installed with the same version and revision. + .TP + .BR "\-\-rebuild\-if\-new\-ver [ y | n ]" +-Rebuild packages when dependencies that are used at both build\-time and +-run\-time are built, if the dependency is not already installed with the +-same version. Revision numbers are ignored. ++Rebuild packages when build\-time dependencies are built from source, if the ++dependency is not already installed with the same version. Revision numbers ++are ignored. + .TP + .BR "\-\-rebuild\-if\-unbuilt [ y | n ]" +-Rebuild packages when dependencies that are used at both build\-time and +-run\-time are built. ++Rebuild packages when build\-time dependencies are built from source. + .TP + .BR "\-\-rebuilt\-binaries [ y | n ]" + Replace installed packages with binary packages that have +diff --git a/man/make.conf.5 b/man/make.conf.5 +index e86dc74..a388fd4 100644 +--- a/man/make.conf.5 ++++ b/man/make.conf.5 +@@ -198,10 +198,6 @@ non-developers as well. The \fBsandbox\fR feature is very important and + should not be disabled by default. + .RS + .TP +-.B allow\-missing\-manifests +-Allow missing manifest entries. This is primarily useful for temporary +-trees or instances where manifests aren't used. +-.TP + .B assume\-digests + When commiting work to cvs with \fBrepoman\fR(1), assume that all existing + SRC_URI digests are correct. This feature also affects digest generation via +@@ -241,6 +237,12 @@ like "File not recognized: File truncated"), try recompiling the application + with ccache disabled before reporting a bug. Unless you are doing development + work, do not enable ccache. + .TP ++.B clean\-logs ++Enable automatic execution of the command specified by the ++PORT_LOGDIR_CLEAN variable. The default PORT_LOGDIR_CLEAN setting will ++remove all files from PORT_LOGDIR that were last modified at least 7 ++days ago. ++.TP + .B collision\-protect + A QA\-feature to ensure that a package doesn't overwrite files it doesn't own. + The \fICOLLISION_IGNORE\fR variable can be used to selectively disable this +@@ -599,6 +601,13 @@ directory does not exist, it will be created automatically and group permissions + will be applied to it. If the directory already exists, portage will not + modify it's permissions. + .TP ++.B PORT_LOGDIR_CLEAN ++This variable should contain a command for portage to call in order ++to clean PORT_LOGDIR. The command string should contain a ++\\${PORT_LOGDIR} place\-holder that will be substituted ++with the value of that variable. This variable will have no effect ++unless \fBclean\-logs\fR is enabled in \fBFEATURES\fR. ++.TP + \fBPORTAGE_BINHOST\fR = \fI[space delimited URI list]\fR + This is a list of hosts from which portage will grab prebuilt\-binary packages. + Each entry in the list must specify the full address of a directory +diff --git a/man/portage.5 b/man/portage.5 +index f115570..1f05d97 100644 +--- a/man/portage.5 ++++ b/man/portage.5 +@@ -776,6 +776,13 @@ precedence over settings in \fBlayout.conf\fR, except tools such as + masters = gentoo java-overlay + # indicate that this repo can be used as a substitute for foo-overlay + aliases = foo-overlay ++# do not sign manifests in this repo ++sign\-manifests = false ++# thin\-manifests only contain DIST entries ++thin\-manifests = true ++# indicate that this repo requires manifests for each package, and is ++# considered a failure if a manifest file is missing/incorrect ++use\-manifests = strict + .fi + .RE + .TP +diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py +index feb68d0..61c7848 100644 +--- a/pym/_emerge/EbuildFetcher.py ++++ b/pym/_emerge/EbuildFetcher.py +@@ -21,7 +21,7 @@ class EbuildFetcher(SpawnProcess): + + __slots__ = ("config_pool", "ebuild_path", "fetchonly", "fetchall", + "pkg", "prefetch") + \ +- ("_digests", "_settings", "_uri_map") ++ ("_digests", "_manifest", "_settings", "_uri_map") + + def already_fetched(self, settings): + """ +@@ -40,7 +40,7 @@ class EbuildFetcher(SpawnProcess): + + digests = self._get_digests() + distdir = settings["DISTDIR"] +- allow_missing = "allow-missing-manifests" in settings.features ++ allow_missing = self._get_manifest().allow_missing + + for filename in uri_map: + # Use stat rather than lstat since fetch() creates +@@ -179,7 +179,7 @@ class EbuildFetcher(SpawnProcess): + not in ('yes', 'true') + + rval = 1 +- allow_missing = 'allow-missing-manifests' in self._settings.features ++ allow_missing = self._get_manifest().allow_missing + try: + if fetch(self._uri_map, self._settings, fetchonly=self.fetchonly, + digests=copy.deepcopy(self._get_digests()), +@@ -203,11 +203,16 @@ class EbuildFetcher(SpawnProcess): + raise AssertionError("ebuild not found for '%s'" % self.pkg.cpv) + return self.ebuild_path + ++ def _get_manifest(self): ++ if self._manifest is None: ++ pkgdir = os.path.dirname(self._get_ebuild_path()) ++ self._manifest = self.pkg.root_config.settings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))).load_manifest(pkgdir, None) ++ return self._manifest ++ + def _get_digests(self): +- if self._digests is not None: +- return self._digests +- self._digests = portage.Manifest(os.path.dirname( +- self._get_ebuild_path()), None).getTypeDigests("DIST") ++ if self._digests is None: ++ self._digests = self._get_manifest().getTypeDigests("DIST") + return self._digests + + def _get_uri_map(self): +diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py +index e53298b..f51b86f 100644 +--- a/pym/_emerge/EbuildMetadataPhase.py ++++ b/pym/_emerge/EbuildMetadataPhase.py +@@ -20,8 +20,8 @@ class EbuildMetadataPhase(SubProcess): + used to extract metadata from the ebuild. + """ + +- __slots__ = ("cpv", "ebuild_path", "fd_pipes", "metadata_callback", +- "ebuild_mtime", "metadata", "portdb", "repo_path", "settings") + \ ++ __slots__ = ("cpv", "ebuild_hash", "fd_pipes", "metadata_callback", ++ "metadata", "portdb", "repo_path", "settings") + \ + ("_raw_metadata",) + + _file_names = ("ebuild",) +@@ -31,7 +31,7 @@ class EbuildMetadataPhase(SubProcess): + def _start(self): + settings = self.settings + settings.setcpv(self.cpv) +- ebuild_path = self.ebuild_path ++ ebuild_path = self.ebuild_hash.location + + eapi = None + if eapi is None and \ +@@ -44,8 +44,8 @@ class EbuildMetadataPhase(SubProcess): + + if eapi is not None: + if not portage.eapi_is_supported(eapi): +- self.metadata_callback(self.cpv, self.ebuild_path, +- self.repo_path, {'EAPI' : eapi}, self.ebuild_mtime) ++ self.metadata_callback(self.cpv, ++ self.repo_path, {'EAPI' : eapi}, self.ebuild_hash) + self._set_returncode((self.pid, os.EX_OK << 8)) + self.wait() + return +@@ -128,6 +128,5 @@ class EbuildMetadataPhase(SubProcess): + else: + metadata = zip(portage.auxdbkeys, metadata_lines) + self.metadata = self.metadata_callback(self.cpv, +- self.ebuild_path, self.repo_path, metadata, +- self.ebuild_mtime) ++ self.repo_path, metadata, self.ebuild_hash) + +diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py +index 8103175..b338056 100644 +--- a/pym/_emerge/MetadataRegen.py ++++ b/pym/_emerge/MetadataRegen.py +@@ -3,6 +3,7 @@ + + import portage + from portage import os ++from portage.eclass_cache import hashed_path + from _emerge.EbuildMetadataPhase import EbuildMetadataPhase + from _emerge.PollScheduler import PollScheduler + +@@ -68,16 +69,15 @@ class MetadataRegen(PollScheduler): + ebuild_path, repo_path = portdb.findname2(cpv) + if ebuild_path is None: + raise AssertionError("ebuild not found for '%s'" % cpv) +- metadata, st, emtime = portdb._pull_valid_cache( ++ metadata, ebuild_hash = portdb._pull_valid_cache( + cpv, ebuild_path, repo_path) + if metadata is not None: + if consumer is not None: +- consumer(cpv, ebuild_path, +- repo_path, metadata) ++ consumer(cpv, repo_path, metadata, ebuild_hash) + continue + +- yield EbuildMetadataPhase(cpv=cpv, ebuild_path=ebuild_path, +- ebuild_mtime=emtime, ++ yield EbuildMetadataPhase(cpv=cpv, ++ ebuild_hash=ebuild_hash, + metadata_callback=portdb._metadata_callback, + portdb=portdb, repo_path=repo_path, + settings=portdb.doebuild_settings) +@@ -176,9 +176,9 @@ class MetadataRegen(PollScheduler): + # On failure, still notify the consumer (in this case the metadata + # argument is None). + self._consumer(metadata_process.cpv, +- metadata_process.ebuild_path, + metadata_process.repo_path, +- metadata_process.metadata) ++ metadata_process.metadata, ++ metadata_process.ebuild_hash) + + self._schedule() + +diff --git a/pym/_emerge/MiscFunctionsProcess.py b/pym/_emerge/MiscFunctionsProcess.py +index ce0ab14..afa44fb 100644 +--- a/pym/_emerge/MiscFunctionsProcess.py ++++ b/pym/_emerge/MiscFunctionsProcess.py +@@ -29,5 +29,11 @@ class MiscFunctionsProcess(AbstractEbuildProcess): + AbstractEbuildProcess._start(self) + + def _spawn(self, args, **kwargs): +- self.settings.pop("EBUILD_PHASE", None) +- return spawn(" ".join(args), self.settings, **kwargs) ++ # Temporarily unset EBUILD_PHASE so that bashrc code doesn't ++ # think this is a real phase. ++ phase_backup = self.settings.pop("EBUILD_PHASE", None) ++ try: ++ return spawn(" ".join(args), self.settings, **kwargs) ++ finally: ++ if phase_backup is not None: ++ self.settings["EBUILD_PHASE"] = phase_backup +diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py +index 2166963..6b65b56 100644 +--- a/pym/_emerge/actions.py ++++ b/pym/_emerge/actions.py +@@ -1658,14 +1658,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + porttrees_data = [] + for path in porttrees: + src_db = portdb._pregen_auxdb.get(path) +- if src_db is None and \ +- os.path.isdir(os.path.join(path, 'metadata', 'cache')): +- src_db = portdb.metadbmodule( +- path, 'metadata/cache', auxdbkeys, readonly=True) +- try: +- src_db.ec = portdb._repo_info[path].eclass_db +- except AttributeError: +- pass + + if src_db is not None: + porttrees_data.append(TreeData(portdb.auxdb[path], +@@ -1704,7 +1696,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + if onProgress is not None: + onProgress(maxval, curval) + +- from portage.cache.util import quiet_mirroring + from portage import eapi_is_supported, \ + _validate_cache_for_unsupported_eapis + +@@ -1713,7 +1704,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + # 1) erase the progress bar + # 2) show the error message + # 3) redraw the progress bar on a new line +- noise = quiet_mirroring() + + for cp in cp_all: + for tree_data in porttrees_data: +@@ -1721,13 +1711,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + tree_data.valid_nodes.add(cpv) + try: + src = tree_data.src_db[cpv] +- except KeyError as e: +- noise.missing_entry(cpv) +- del e +- continue +- except CacheError as ce: +- noise.exception(cpv, ce) +- del ce ++ except (CacheError, KeyError): + continue + + eapi = src.get('EAPI') +@@ -1737,8 +1721,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + eapi_supported = eapi_is_supported(eapi) + if not eapi_supported: + if not _validate_cache_for_unsupported_eapis: +- noise.misc(cpv, "unable to validate " + \ +- "cache for EAPI='%s'" % eapi) + continue + + dest = None +@@ -1753,8 +1735,9 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + + if dest is not None: + if not (dest['_mtime_'] == src['_mtime_'] and \ +- tree_data.eclass_db.is_eclass_data_valid( +- dest['_eclasses_']) and \ ++ tree_data.eclass_db.validate_and_rewrite_cache( ++ dest['_eclasses_'], tree_data.dest_db.validation_chf, ++ tree_data.dest_db.store_eclass_paths) is not None and \ + set(dest['_eclasses_']) == set(src['_eclasses_'])): + dest = None + else: +@@ -1775,15 +1758,13 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + try: + inherited = src.get('INHERITED', '') + eclasses = src.get('_eclasses_') +- except CacheError as ce: +- noise.exception(cpv, ce) +- del ce ++ except CacheError: + continue + + if eclasses is not None: +- if not tree_data.eclass_db.is_eclass_data_valid( +- src['_eclasses_']): +- noise.eclass_stale(cpv) ++ if tree_data.eclass_db.validate_and_rewrite_cache( ++ src['_eclasses_'], tree_data.src_db.validation_chf, ++ tree_data.src_db.store_eclass_paths) is None: + continue + inherited = eclasses + else: +@@ -1791,7 +1772,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + + if tree_data.src_db.complete_eclass_entries and \ + eclasses is None: +- noise.corruption(cpv, "missing _eclasses_ field") + continue + + if inherited: +@@ -1801,11 +1781,9 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + eclasses = tree_data.eclass_db.get_eclass_data(inherited) + except KeyError: + # INHERITED contains a non-existent eclass. +- noise.eclass_stale(cpv) + continue + + if eclasses is None: +- noise.eclass_stale(cpv) + continue + src['_eclasses_'] = eclasses + else: +@@ -1820,9 +1798,9 @@ def action_metadata(settings, portdb, myopts, porttrees=None): + + try: + tree_data.dest_db[cpv] = src +- except CacheError as ce: +- noise.exception(cpv, ce) +- del ce ++ except CacheError: ++ # ignore it; can't do anything about it. ++ pass + + curval += 1 + if onProgress is not None: +diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py +index 8b6125d..42cc659 100644 +--- a/pym/_emerge/depgraph.py ++++ b/pym/_emerge/depgraph.py +@@ -174,7 +174,7 @@ class _rebuild_config(object): + rebuild_exclude = self._frozen_config.rebuild_exclude + rebuild_ignore = self._frozen_config.rebuild_ignore + if (self.rebuild and isinstance(parent, Package) and +- parent.built and (priority.buildtime or priority.runtime) and ++ parent.built and priority.buildtime and + isinstance(dep_pkg, Package) and + not rebuild_exclude.findAtomForPackage(parent) and + not rebuild_ignore.findAtomForPackage(dep_pkg)): +@@ -209,66 +209,63 @@ class _rebuild_config(object): + + return True + +- def _trigger_rebuild(self, parent, build_deps, runtime_deps): ++ def _trigger_rebuild(self, parent, build_deps): + root_slot = (parent.root, parent.slot_atom) + if root_slot in self.rebuild_list: + return False + trees = self._frozen_config.trees +- children = set(build_deps).intersection(runtime_deps) + reinstall = False +- for slot_atom in children: +- kids = set([build_deps[slot_atom], runtime_deps[slot_atom]]) +- for dep_pkg in kids: +- dep_root_slot = (dep_pkg.root, slot_atom) +- if self._needs_rebuild(dep_pkg): ++ for slot_atom, dep_pkg in build_deps.items(): ++ dep_root_slot = (dep_pkg.root, slot_atom) ++ if self._needs_rebuild(dep_pkg): ++ self.rebuild_list.add(root_slot) ++ return True ++ elif ("--usepkg" in self._frozen_config.myopts and ++ (dep_root_slot in self.reinstall_list or ++ dep_root_slot in self.rebuild_list or ++ not dep_pkg.installed)): ++ ++ # A direct rebuild dependency is being installed. We ++ # should update the parent as well to the latest binary, ++ # if that binary is valid. ++ # ++ # To validate the binary, we check whether all of the ++ # rebuild dependencies are present on the same binhost. ++ # ++ # 1) If parent is present on the binhost, but one of its ++ # rebuild dependencies is not, then the parent should ++ # be rebuilt from source. ++ # 2) Otherwise, the parent binary is assumed to be valid, ++ # because all of its rebuild dependencies are ++ # consistent. ++ bintree = trees[parent.root]["bintree"] ++ uri = bintree.get_pkgindex_uri(parent.cpv) ++ dep_uri = bintree.get_pkgindex_uri(dep_pkg.cpv) ++ bindb = bintree.dbapi ++ if self.rebuild_if_new_ver and uri and uri != dep_uri: ++ cpv_norev = catpkgsplit(dep_pkg.cpv)[:-1] ++ for cpv in bindb.match(dep_pkg.slot_atom): ++ if cpv_norev == catpkgsplit(cpv)[:-1]: ++ dep_uri = bintree.get_pkgindex_uri(cpv) ++ if uri == dep_uri: ++ break ++ if uri and uri != dep_uri: ++ # 1) Remote binary package is invalid because it was ++ # built without dep_pkg. Force rebuild. + self.rebuild_list.add(root_slot) + return True +- elif ("--usepkg" in self._frozen_config.myopts and +- (dep_root_slot in self.reinstall_list or +- dep_root_slot in self.rebuild_list or +- not dep_pkg.installed)): +- +- # A direct rebuild dependency is being installed. We +- # should update the parent as well to the latest binary, +- # if that binary is valid. +- # +- # To validate the binary, we check whether all of the +- # rebuild dependencies are present on the same binhost. +- # +- # 1) If parent is present on the binhost, but one of its +- # rebuild dependencies is not, then the parent should +- # be rebuilt from source. +- # 2) Otherwise, the parent binary is assumed to be valid, +- # because all of its rebuild dependencies are +- # consistent. +- bintree = trees[parent.root]["bintree"] +- uri = bintree.get_pkgindex_uri(parent.cpv) +- dep_uri = bintree.get_pkgindex_uri(dep_pkg.cpv) +- bindb = bintree.dbapi +- if self.rebuild_if_new_ver and uri and uri != dep_uri: +- cpv_norev = catpkgsplit(dep_pkg.cpv)[:-1] +- for cpv in bindb.match(dep_pkg.slot_atom): +- if cpv_norev == catpkgsplit(cpv)[:-1]: +- dep_uri = bintree.get_pkgindex_uri(cpv) +- if uri == dep_uri: +- break +- if uri and uri != dep_uri: +- # 1) Remote binary package is invalid because it was +- # built without dep_pkg. Force rebuild. +- self.rebuild_list.add(root_slot) +- return True +- elif (parent.installed and +- root_slot not in self.reinstall_list): +- inst_build_time = parent.metadata.get("BUILD_TIME") +- try: +- bin_build_time, = bindb.aux_get(parent.cpv, +- ["BUILD_TIME"]) +- except KeyError: +- continue +- if bin_build_time != inst_build_time: +- # 2) Remote binary package is valid, and local package +- # is not up to date. Force reinstall. +- reinstall = True ++ elif (parent.installed and ++ root_slot not in self.reinstall_list): ++ inst_build_time = parent.metadata.get("BUILD_TIME") ++ try: ++ bin_build_time, = bindb.aux_get(parent.cpv, ++ ["BUILD_TIME"]) ++ except KeyError: ++ continue ++ if bin_build_time != inst_build_time: ++ # 2) Remote binary package is valid, and local package ++ # is not up to date. Force reinstall. ++ reinstall = True + if reinstall: + self.reinstall_list.add(root_slot) + return reinstall +@@ -282,31 +279,15 @@ class _rebuild_config(object): + need_restart = False + graph = self._graph + build_deps = {} +- runtime_deps = {} +- leaf_nodes = deque(graph.leaf_nodes()) +- +- def ignore_non_runtime(priority): +- return not priority.runtime + +- def ignore_non_buildtime(priority): +- return not priority.buildtime ++ leaf_nodes = deque(graph.leaf_nodes()) + + # Trigger rebuilds bottom-up (starting with the leaves) so that parents + # will always know which children are being rebuilt. + while graph: + if not leaf_nodes: +- # We're interested in intersection of buildtime and runtime, +- # so ignore edges that do not contain both. +- leaf_nodes.extend(graph.leaf_nodes( +- ignore_priority=ignore_non_runtime)) +- if not leaf_nodes: +- leaf_nodes.extend(graph.leaf_nodes( +- ignore_priority=ignore_non_buildtime)) +- if not leaf_nodes: +- # We'll have to drop an edge that is both +- # buildtime and runtime. This should be +- # quite rare. +- leaf_nodes.append(graph.order[-1]) ++ # We'll have to drop an edge. This should be quite rare. ++ leaf_nodes.append(graph.order[-1]) + + node = leaf_nodes.popleft() + if node not in graph: +@@ -315,32 +296,23 @@ class _rebuild_config(object): + slot_atom = node.slot_atom + + # Remove our leaf node from the graph, keeping track of deps. +- parents = graph.nodes[node][1].items() ++ parents = graph.parent_nodes(node) + graph.remove(node) + node_build_deps = build_deps.get(node, {}) +- node_runtime_deps = runtime_deps.get(node, {}) +- for parent, priorities in parents: ++ for parent in parents: + if parent == node: + # Ignore a direct cycle. + continue + parent_bdeps = build_deps.setdefault(parent, {}) +- parent_rdeps = runtime_deps.setdefault(parent, {}) +- for priority in priorities: +- if priority.buildtime: +- parent_bdeps[slot_atom] = node +- if priority.runtime: +- parent_rdeps[slot_atom] = node +- if slot_atom in parent_bdeps and slot_atom in parent_rdeps: +- parent_rdeps.update(node_runtime_deps) ++ parent_bdeps[slot_atom] = node + if not graph.child_nodes(parent): + leaf_nodes.append(parent) + + # Trigger rebuilds for our leaf node. Because all of our children +- # have been processed, build_deps and runtime_deps will be +- # completely filled in, and self.rebuild_list / self.reinstall_list +- # will tell us whether any of our children need to be rebuilt or +- # reinstalled. +- if self._trigger_rebuild(node, node_build_deps, node_runtime_deps): ++ # have been processed, the build_deps will be completely filled in, ++ # and self.rebuild_list / self.reinstall_list will tell us whether ++ # any of our children need to be rebuilt or reinstalled. ++ if self._trigger_rebuild(node, node_build_deps): + need_restart = True + + return need_restart +diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py +index c978ce2..57b376d 100644 +--- a/pym/_emerge/help.py ++++ b/pym/_emerge/help.py +@@ -641,26 +641,24 @@ def help(myopts, havecolor=1): + print() + print(" " + green("--rebuild-if-new-rev") + " [ %s | %s ]" % \ + (turquoise("y"), turquoise("n"))) +- desc = "Rebuild packages when dependencies that are " + \ +- "used at both build-time and run-time are built, " + \ +- "if the dependency is not already installed with the " + \ +- "same version and revision." ++ desc = "Rebuild packages when build-time dependencies are built " + \ ++ "from source, if the dependency is not already installed with " + \ ++ "the same version and revision." + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() + print(" " + green("--rebuild-if-new-ver") + " [ %s | %s ]" % \ + (turquoise("y"), turquoise("n"))) +- desc = "Rebuild packages when dependencies that are " + \ +- "used at both build-time and run-time are built, " + \ +- "if the dependency is not already installed with the " + \ +- "same version. Revision numbers are ignored." ++ desc = "Rebuild packages when build-time dependencies are built " + \ ++ "from source, if the dependency is not already installed with " + \ ++ "the same version. Revision numbers are ignored." + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() + print(" " + green("--rebuild-if-unbuilt") + " [ %s | %s ]" % \ + (turquoise("y"), turquoise("n"))) +- desc = "Rebuild packages when dependencies that are " + \ +- "used at both build-time and run-time are built." ++ desc = "Rebuild packages when build-time dependencies are built " + \ ++ "from source" + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() +diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py +index 2830214..4cabafd 100644 +--- a/pym/_emerge/main.py ++++ b/pym/_emerge/main.py +@@ -28,7 +28,8 @@ import portage.exception + from portage.data import secpass + from portage.dbapi.dep_expand import dep_expand + from portage.util import normalize_path as normpath +-from portage.util import shlex_split, writemsg_level, writemsg_stdout ++from portage.util import (shlex_split, varexpand, ++ writemsg_level, writemsg_stdout) + from portage._sets import SETPREFIX + from portage._global_updates import _global_updates + +@@ -388,6 +389,8 @@ def post_emerge(myaction, myopts, myfiles, + " %s spawn failed of %s\n" % (bad("*"), postemerge,), + level=logging.ERROR, noiselevel=-1) + ++ clean_logs(settings) ++ + if "--quiet" not in myopts and \ + myaction is None and "@world" in myfiles: + show_depclean_suggestion() +@@ -1222,7 +1225,6 @@ def ionice(settings): + if not ionice_cmd: + return + +- from portage.util import varexpand + variables = {"PID" : str(os.getpid())} + cmd = [varexpand(x, mydict=variables) for x in ionice_cmd] + +@@ -1238,6 +1240,35 @@ def ionice(settings): + out.eerror("PORTAGE_IONICE_COMMAND returned %d" % (rval,)) + out.eerror("See the make.conf(5) man page for PORTAGE_IONICE_COMMAND usage instructions.") + ++def clean_logs(settings): ++ ++ if "clean-logs" not in settings.features: ++ return ++ ++ clean_cmd = settings.get("PORT_LOGDIR_CLEAN") ++ if clean_cmd: ++ clean_cmd = shlex_split(clean_cmd) ++ if not clean_cmd: ++ return ++ ++ logdir = settings.get("PORT_LOGDIR") ++ if logdir is None or not os.path.isdir(logdir): ++ return ++ ++ variables = {"PORT_LOGDIR" : logdir} ++ cmd = [varexpand(x, mydict=variables) for x in clean_cmd] ++ ++ try: ++ rval = portage.process.spawn(cmd, env=os.environ) ++ except portage.exception.CommandNotFound: ++ rval = 127 ++ ++ if rval != os.EX_OK: ++ out = portage.output.EOutput() ++ out.eerror("PORT_LOGDIR_CLEAN returned %d" % (rval,)) ++ out.eerror("See the make.conf(5) man page for " ++ "PORT_LOGDIR_CLEAN usage instructions.") ++ + def setconfig_fallback(root_config): + from portage._sets.base import DummyPackageSet + from portage._sets.files import WorldSelectedSet +diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py +index 35f0412..3fed2b6 100644 +--- a/pym/_emerge/search.py ++++ b/pym/_emerge/search.py +@@ -305,8 +305,9 @@ class search(object): + myebuild = self._findname(mycpv) + if myebuild: + pkgdir = os.path.dirname(myebuild) +- from portage import manifest +- mf = manifest.Manifest( ++ mf = self.settings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))) ++ mf = mf.load_manifest( + pkgdir, self.settings["DISTDIR"]) + try: + uri_map = self._getFetchMap(mycpv) +diff --git a/pym/portage/cache/flat_hash.py b/pym/portage/cache/flat_hash.py +index b6bc074..2eae9f6 100644 +--- a/pym/portage/cache/flat_hash.py ++++ b/pym/portage/cache/flat_hash.py +@@ -31,7 +31,7 @@ class database(fs_template.FsBased): + self.label.lstrip(os.path.sep).rstrip(os.path.sep)) + write_keys = set(self._known_keys) + write_keys.add("_eclasses_") +- write_keys.add("_mtime_") ++ write_keys.add("_%s_" % (self.validation_chf,)) + self._write_keys = sorted(write_keys) + if not self.readonly and not os.path.exists(self.location): + self._ensure_dirs() +@@ -69,7 +69,6 @@ class database(fs_template.FsBased): + raise cache_errors.CacheCorruption(cpv, e) + + def _setitem(self, cpv, values): +-# import pdb;pdb.set_trace() + s = cpv.rfind("/") + fp = os.path.join(self.location,cpv[:s],".update.%i.%s" % (os.getpid(), cpv[s+1:])) + try: +@@ -153,3 +152,9 @@ class database(fs_template.FsBased): + dirs.append((depth+1, p)) + continue + yield p[len_base+1:] ++ ++ ++class md5_database(database): ++ ++ validation_chf = 'md5' ++ store_eclass_paths = False +diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py +index 4c735d7..07ec20e 100644 +--- a/pym/portage/cache/metadata.py ++++ b/pym/portage/cache/metadata.py +@@ -6,6 +6,7 @@ import errno + import re + import stat + import sys ++from operator import attrgetter + from portage import os + from portage import _encodings + from portage import _unicode_encode +@@ -63,9 +64,11 @@ class database(flat_hash.database): + if "INHERITED" in d: + if self.ec is None: + self.ec = portage.eclass_cache.cache(self.location[:-15]) ++ getter = attrgetter(self.validation_chf) + try: +- d["_eclasses_"] = self.ec.get_eclass_data( +- d["INHERITED"].split()) ++ ec_data = self.ec.get_eclass_data(d["INHERITED"].split()) ++ d["_eclasses_"] = dict((k, (v.eclass_dir, getter(v))) ++ for k,v in ec_data.items()) + except KeyError as e: + # INHERITED contains a non-existent eclass. + raise cache_errors.CacheCorruption(cpv, e) +diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py +deleted file mode 100644 +index cfa0051..0000000 +--- a/pym/portage/cache/metadata_overlay.py ++++ /dev/null +@@ -1,105 +0,0 @@ +-# Copyright 1999-2010 Gentoo Foundation +-# Distributed under the terms of the GNU General Public License v2 +- +-from portage.cache import template +-from portage.cache.cache_errors import CacheCorruption +-from portage.cache.flat_hash import database as db_rw +-from portage.cache.metadata import database as db_ro +- +-class database(template.database): +- +- serialize_eclasses = False +- +- def __init__(self, location, label, auxdbkeys, db_rw=db_rw, db_ro=db_ro, +- *args, **config): +- super_config = config.copy() +- super_config.pop("gid", None) +- super_config.pop("perms", None) +- super(database, self).__init__(location, label, auxdbkeys, +- *args, **super_config) +- self.db_rw = db_rw(location, label, auxdbkeys, **config) +- self.commit = self.db_rw.commit +- self.autocommits = self.db_rw.autocommits +- if isinstance(db_ro, type): +- ro_config = config.copy() +- ro_config["readonly"] = True +- self.db_ro = db_ro(label, "metadata/cache", auxdbkeys, **ro_config) +- else: +- self.db_ro = db_ro +- +- def __getitem__(self, cpv): +- """funnel whiteout validation through here, since value needs to be fetched""" +- try: +- value = self.db_rw[cpv] +- except KeyError: +- return self.db_ro[cpv] # raises a KeyError when necessary +- except CacheCorruption: +- del self.db_rw[cpv] +- return self.db_ro[cpv] # raises a KeyError when necessary +- if self._is_whiteout(value): +- if self._is_whiteout_valid(cpv, value): +- raise KeyError(cpv) +- else: +- del self.db_rw[cpv] +- return self.db_ro[cpv] # raises a KeyError when necessary +- else: +- return value +- +- def _setitem(self, name, values): +- try: +- value_ro = self.db_ro.get(name) +- except CacheCorruption: +- value_ro = None +- if value_ro is not None and \ +- self._are_values_identical(value_ro, values): +- # we have matching values in the underlying db_ro +- # so it is unnecessary to store data in db_rw +- try: +- del self.db_rw[name] # delete unwanted whiteout when necessary +- except KeyError: +- pass +- return +- self.db_rw[name] = values +- +- def _delitem(self, cpv): +- value = self[cpv] # validates whiteout and/or raises a KeyError when necessary +- if cpv in self.db_ro: +- self.db_rw[cpv] = self._create_whiteout(value) +- else: +- del self.db_rw[cpv] +- +- def __contains__(self, cpv): +- try: +- self[cpv] # validates whiteout when necessary +- except KeyError: +- return False +- return True +- +- def __iter__(self): +- s = set() +- for cpv in self.db_rw: +- if cpv in self: # validates whiteout when necessary +- yield cpv +- # set includes whiteouts so they won't be yielded later +- s.add(cpv) +- for cpv in self.db_ro: +- if cpv not in s: +- yield cpv +- +- def _is_whiteout(self, value): +- return value["EAPI"] == "whiteout" +- +- def _create_whiteout(self, value): +- return {"EAPI":"whiteout","_eclasses_":value["_eclasses_"],"_mtime_":value["_mtime_"]} +- +- def _is_whiteout_valid(self, name, value_rw): +- try: +- value_ro = self.db_ro[name] +- return self._are_values_identical(value_rw,value_ro) +- except KeyError: +- return False +- +- def _are_values_identical(self, value1, value2): +- if value1['_mtime_'] != value2['_mtime_']: +- return False +- return value1["_eclasses_"] == value2["_eclasses_"] +diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py +index f84d8f4..515ba02 100644 +--- a/pym/portage/cache/template.py ++++ b/pym/portage/cache/template.py +@@ -7,6 +7,7 @@ from portage.cache.cache_errors import InvalidRestriction + from portage.cache.mappings import ProtectedDict + import sys + import warnings ++import operator + + if sys.hexversion >= 0x3000000: + basestring = str +@@ -21,6 +22,8 @@ class database(object): + autocommits = False + cleanse_keys = False + serialize_eclasses = True ++ validation_chf = 'mtime' ++ store_eclass_paths = True + + def __init__(self, location, label, auxdbkeys, readonly=False): + """ initialize the derived class; specifically, store label/keys""" +@@ -40,7 +43,8 @@ class database(object): + self.updates = 0 + d=self._getitem(cpv) + if self.serialize_eclasses and "_eclasses_" in d: +- d["_eclasses_"] = reconstruct_eclasses(cpv, d["_eclasses_"]) ++ d["_eclasses_"] = reconstruct_eclasses(cpv, d["_eclasses_"], ++ self.validation_chf, paths=self.store_eclass_paths) + elif "_eclasses_" not in d: + d["_eclasses_"] = {} + mtime = d.get('_mtime_') +@@ -60,22 +64,46 @@ class database(object): + override this in derived classess""" + raise NotImplementedError + ++ @staticmethod ++ def _internal_eclasses(extern_ec_dict, chf_type, paths): ++ """ ++ When serialize_eclasses is False, we have to convert an external ++ eclass dict containing hashed_path objects into an appropriate ++ internal dict containing values of chf_type (and eclass dirs ++ if store_eclass_paths is True). ++ """ ++ if not extern_ec_dict: ++ return extern_ec_dict ++ chf_getter = operator.attrgetter(chf_type) ++ if paths: ++ intern_ec_dict = dict((k, (v.eclass_dir, chf_getter(v))) ++ for k, v in extern_ec_dict.items()) ++ else: ++ intern_ec_dict = dict((k, chf_getter(v)) ++ for k, v in extern_ec_dict.items()) ++ return intern_ec_dict ++ + def __setitem__(self, cpv, values): + """set a cpv to values + This shouldn't be overriden in derived classes since it handles the readonly checks""" + if self.readonly: + raise cache_errors.ReadOnlyRestriction() ++ d = None + if self.cleanse_keys: + d=ProtectedDict(values) + for k, v in list(d.items()): + if not v: + del d[k] +- if self.serialize_eclasses and "_eclasses_" in values: +- d["_eclasses_"] = serialize_eclasses(d["_eclasses_"]) +- elif self.serialize_eclasses and "_eclasses_" in values: +- d = ProtectedDict(values) +- d["_eclasses_"] = serialize_eclasses(d["_eclasses_"]) +- else: ++ if "_eclasses_" in values: ++ if d is None: ++ d = ProtectedDict(values) ++ if self.serialize_eclasses: ++ d["_eclasses_"] = serialize_eclasses(d["_eclasses_"], ++ self.validation_chf, paths=self.store_eclass_paths) ++ else: ++ d["_eclasses_"] = self._internal_eclasses(d["_eclasses_"], ++ self.validation_chf, self.store_eclass_paths) ++ elif d is None: + d = values + self._setitem(cpv, d) + if not self.autocommits: +@@ -159,6 +187,18 @@ class database(object): + except KeyError: + return x + ++ def validate_entry(self, entry, ebuild_hash, eclass_db): ++ hash_key = '_%s_' % self.validation_chf ++ if entry[hash_key] != getattr(ebuild_hash, self.validation_chf): ++ return False ++ update = eclass_db.validate_and_rewrite_cache(entry['_eclasses_'], self.validation_chf, ++ self.store_eclass_paths) ++ if update is None: ++ return False ++ if update: ++ entry['_eclasses_'] = update ++ return True ++ + def get_matches(self, match_dict): + """generic function for walking the entire cache db, matching restrictions to + filter what cpv's are returned. Derived classes should override this if they +@@ -195,7 +235,9 @@ class database(object): + keys = __iter__ + items = iteritems + +-def serialize_eclasses(eclass_dict): ++_keysorter = operator.itemgetter(0) ++ ++def serialize_eclasses(eclass_dict, chf_type='mtime', paths=True): + """takes a dict, returns a string representing said dict""" + """The "new format", which causes older versions of = noise.call_update_min: +- noise.update(x) +- count = 0 +- +- if not trg_cache.autocommits: +- trg_cache.commit() +- +- # ok. by this time, the trg_cache is up to date, and we have a dict +- # with a crapload of cpv's. we now walk the target db, removing stuff if it's in the list. +- for key in dead_nodes: +- try: +- del trg_cache[key] +- except KeyError: +- pass +- except cache_errors.CacheError as ce: +- noise.exception(ce) +- del ce +- noise.finish() +- +- +-class quiet_mirroring(object): +- # call_update_every is used by mirror_cache to determine how often to call in. +- # quiet defaults to 2^24 -1. Don't call update, 'cept once every 16 million or so :) +- call_update_min = 0xffffff +- def update(self,key,*arg): pass +- def exception(self,key,*arg): pass +- def eclass_stale(self,*arg): pass +- def missing_entry(self, key): pass +- def misc(self,key,*arg): pass +- def corruption(self, key, s): pass +- def finish(self, *arg): pass +- +-class non_quiet_mirroring(quiet_mirroring): +- call_update_min=1 +- def update(self,key,*arg): print("processed",key) +- def exception(self, key, *arg): print("exec",key,arg) +- def missing(self,key): print("key %s is missing", key) +- def corruption(self,key,*arg): print("corrupt %s:" % key,arg) +- def eclass_stale(self,key,*arg):print("stale %s:"%key,arg) +- +diff --git a/pym/portage/cache/volatile.py b/pym/portage/cache/volatile.py +index 0bf6bab..f96788d 100644 +--- a/pym/portage/cache/volatile.py ++++ b/pym/portage/cache/volatile.py +@@ -8,6 +8,7 @@ class database(template.database): + + autocommits = True + serialize_eclasses = False ++ store_eclass_paths = False + + def __init__(self, *args, **config): + config.pop("gid", None) +@@ -21,5 +22,5 @@ class database(template.database): + def _setitem(self, name, values): + self._data[name] = copy.deepcopy(values) + +- def _getitem(self, cpv): ++ def __getitem__(self, cpv): + return copy.deepcopy(self._data[cpv]) +diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py +index 9e7e455..ef90bf6 100644 +--- a/pym/portage/checksum.py ++++ b/pym/portage/checksum.py +@@ -255,8 +255,10 @@ def perform_checksum(filename, hashname="MD5", calc_prelink=0): + " hash function not available (needs dev-python/pycrypto)") + myhash, mysize = hashfunc_map[hashname](myfilename) + except (OSError, IOError) as e: +- if e.errno == errno.ENOENT: ++ if e.errno in (errno.ENOENT, errno.ESTALE): + raise portage.exception.FileNotFound(myfilename) ++ elif e.errno == portage.exception.PermissionDenied.errno: ++ raise portage.exception.PermissionDenied(myfilename) + raise + return myhash, mysize + finally: +diff --git a/pym/portage/const.py b/pym/portage/const.py +index f108176..bfcdbef 100644 +--- a/pym/portage/const.py ++++ b/pym/portage/const.py +@@ -86,16 +86,16 @@ EBUILD_PHASES = ("pretend", "setup", "unpack", "prepare", "configure" + "package", "preinst", "postinst","prerm", "postrm", + "nofetch", "config", "info", "other") + SUPPORTED_FEATURES = frozenset([ +- "allow-missing-manifests", + "assume-digests", "binpkg-logs", "buildpkg", "buildsyspkg", "candy", +- "ccache", "chflags", "collision-protect", "compress-build-logs", ++ "ccache", "chflags", "clean-logs", ++ "collision-protect", "compress-build-logs", + "digest", "distcc", "distcc-pump", "distlocks", "ebuild-locks", "fakeroot", + "fail-clean", "fixpackages", "force-mirror", "getbinpkg", + "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror", + "metadata-transfer", "mirror", "multilib-strict", "news", + "noauto", "noclean", "nodoc", "noinfo", "noman", +- "nostrip", "notitles", "parallel-fetch", "parallel-install", +- "parse-eapi-ebuild-head", ++ "nostrip", "notitles", "no-env-update", "parallel-fetch", ++ "parallel-install", "parse-eapi-ebuild-head", + "prelink-checksums", "preserve-libs", + "protect-owned", "python-trace", "sandbox", + "selinux", "sesandbox", "sfperms", +diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py +index bf8ecd9..46524e4 100644 +--- a/pym/portage/dbapi/porttree.py ++++ b/pym/portage/dbapi/porttree.py +@@ -17,7 +17,7 @@ portage.proxy.lazyimport.lazyimport(globals(), + 'portage.versions:best,catpkgsplit,_pkgsplit@pkgsplit,ver_regexp', + ) + +-from portage.cache import metadata_overlay, volatile ++from portage.cache import volatile + from portage.cache.cache_errors import CacheError + from portage.cache.mappings import Mapping + from portage.dbapi import dbapi +@@ -121,8 +121,6 @@ class portdbapi(dbapi): + self._have_root_eclass_dir = os.path.isdir( + os.path.join(self.settings.repositories.mainRepoLocation(), "eclass")) + +- self.metadbmodule = self.settings.load_best_module("portdbapi.metadbmodule") +- + #if the portdbapi is "frozen", then we assume that we can cache everything (that no updates to it are happening) + self.xcache = {} + self.frozen = 0 +@@ -153,6 +151,9 @@ class portdbapi(dbapi): + self.auxdbmodule = self.settings.load_best_module("portdbapi.auxdbmodule") + self.auxdb = {} + self._pregen_auxdb = {} ++ # If the current user doesn't have depcachedir write permission, ++ # then the depcachedir cache is kept here read-only access. ++ self._ro_auxdb = {} + self._init_cache_dirs() + depcachedir_w_ok = os.access(self.depcachedir, os.W_OK) + cache_kwargs = { +@@ -169,18 +170,14 @@ class portdbapi(dbapi): + # to the cache entries/directories. + if secpass < 1 or not depcachedir_w_ok: + for x in self.porttrees: ++ self.auxdb[x] = volatile.database( ++ self.depcachedir, x, filtered_auxdbkeys, ++ **cache_kwargs) + try: +- db_ro = self.auxdbmodule(self.depcachedir, x, ++ self._ro_auxdb[x] = self.auxdbmodule(self.depcachedir, x, + filtered_auxdbkeys, readonly=True, **cache_kwargs) + except CacheError: +- self.auxdb[x] = volatile.database( +- self.depcachedir, x, filtered_auxdbkeys, +- **cache_kwargs) +- else: +- self.auxdb[x] = metadata_overlay.database( +- self.depcachedir, x, filtered_auxdbkeys, +- db_rw=volatile.database, db_ro=db_ro, +- **cache_kwargs) ++ pass + else: + for x in self.porttrees: + if x in self.auxdb: +@@ -188,17 +185,16 @@ class portdbapi(dbapi): + # location, label, auxdbkeys + self.auxdb[x] = self.auxdbmodule( + self.depcachedir, x, filtered_auxdbkeys, **cache_kwargs) +- if self.auxdbmodule is metadata_overlay.database: +- self.auxdb[x].db_ro.ec = self._repo_info[x].eclass_db + if "metadata-transfer" not in self.settings.features: + for x in self.porttrees: + if x in self._pregen_auxdb: + continue +- if os.path.isdir(os.path.join(x, "metadata", "cache")): +- self._pregen_auxdb[x] = self.metadbmodule( +- x, "metadata/cache", filtered_auxdbkeys, readonly=True) ++ conf = self.repositories.get_repo_for_location(x) ++ cache = conf.get_pregenerated_cache(filtered_auxdbkeys, readonly=True) ++ if cache is not None: ++ self._pregen_auxdb[x] = cache + try: +- self._pregen_auxdb[x].ec = self._repo_info[x].eclass_db ++ cache.ec = self._repo_info[x].eclass_db + except AttributeError: + pass + # Selectively cache metadata in order to optimize dep matching. +@@ -340,16 +336,16 @@ class portdbapi(dbapi): + @returns: A new EbuildMetadataPhase instance, or None if the + metadata cache is already valid. + """ +- metadata, st, emtime = self._pull_valid_cache(cpv, ebuild_path, repo_path) ++ metadata, ebuild_hash = self._pull_valid_cache(cpv, ebuild_path, repo_path) + if metadata is not None: + return None + +- process = EbuildMetadataPhase(cpv=cpv, ebuild_path=ebuild_path, +- ebuild_mtime=emtime, metadata_callback=self._metadata_callback, ++ process = EbuildMetadataPhase(cpv=cpv, ++ ebuild_hash=ebuild_hash, metadata_callback=self._metadata_callback, + portdb=self, repo_path=repo_path, settings=self.doebuild_settings) + return process + +- def _metadata_callback(self, cpv, ebuild_path, repo_path, metadata, mtime): ++ def _metadata_callback(self, cpv, repo_path, metadata, ebuild_hash): + + i = metadata + if hasattr(metadata, "items"): +@@ -362,8 +358,17 @@ class portdbapi(dbapi): + else: + metadata["_eclasses_"] = {} + ++ try: ++ cache = self.auxdb[repo_path] ++ chf = cache.validation_chf ++ metadata['_%s_' % chf] = getattr(ebuild_hash, chf) ++ except CacheError: ++ # Normally this shouldn't happen, so we'll show ++ # a traceback for debugging purposes. ++ traceback.print_exc() ++ cache = None ++ + metadata.pop("INHERITED", None) +- metadata["_mtime_"] = mtime + + eapi = metadata.get("EAPI") + if not eapi or not eapi.strip(): +@@ -374,21 +379,22 @@ class portdbapi(dbapi): + metadata[k] = "" + metadata["EAPI"] = "-" + eapi.lstrip("-") + +- try: +- self.auxdb[repo_path][cpv] = metadata +- except CacheError: +- # Normally this shouldn't happen, so we'll show +- # a traceback for debugging purposes. +- traceback.print_exc() ++ if cache is not None: ++ try: ++ cache[cpv] = metadata ++ except CacheError: ++ # Normally this shouldn't happen, so we'll show ++ # a traceback for debugging purposes. ++ traceback.print_exc() + return metadata + + def _pull_valid_cache(self, cpv, ebuild_path, repo_path): + try: +- # Don't use unicode-wrapped os module, for better performance. +- st = _os.stat(_unicode_encode(ebuild_path, +- encoding=_encodings['fs'], errors='strict')) +- emtime = st[stat.ST_MTIME] +- except OSError: ++ ebuild_hash = eclass_cache.hashed_path(ebuild_path) ++ # snag mtime since we use it later, and to trigger stat failure ++ # if it doesn't exist ++ ebuild_hash.mtime ++ except FileNotFound: + writemsg(_("!!! aux_get(): ebuild for " \ + "'%s' does not exist at:\n") % (cpv,), noiselevel=-1) + writemsg("!!! %s\n" % ebuild_path, noiselevel=-1) +@@ -401,39 +407,35 @@ class portdbapi(dbapi): + pregen_auxdb = self._pregen_auxdb.get(repo_path) + if pregen_auxdb is not None: + auxdbs.append(pregen_auxdb) ++ ro_auxdb = self._ro_auxdb.get(repo_path) ++ if ro_auxdb is not None: ++ auxdbs.append(ro_auxdb) + auxdbs.append(self.auxdb[repo_path]) + eclass_db = self._repo_info[repo_path].eclass_db + +- doregen = True + for auxdb in auxdbs: + try: + metadata = auxdb[cpv] + except KeyError: +- pass ++ continue + except CacheError: +- if auxdb is not pregen_auxdb: ++ if not auxdb.readonly: + try: + del auxdb[cpv] +- except KeyError: +- pass +- except CacheError: ++ except (KeyError, CacheError): + pass +- else: +- eapi = metadata.get('EAPI', '').strip() +- if not eapi: +- eapi = '0' +- if not (eapi[:1] == '-' and eapi_is_supported(eapi[1:])) and \ +- emtime == metadata['_mtime_'] and \ +- eclass_db.is_eclass_data_valid(metadata['_eclasses_']): +- doregen = False +- +- if not doregen: ++ continue ++ eapi = metadata.get('EAPI', '').strip() ++ if not eapi: ++ eapi = '0' ++ if eapi[:1] == '-' and eapi_is_supported(eapi[1:]): ++ continue ++ if auxdb.validate_entry(metadata, ebuild_hash, eclass_db): + break +- +- if doregen: ++ else: + metadata = None + +- return (metadata, st, emtime) ++ return (metadata, ebuild_hash) + + def aux_get(self, mycpv, mylist, mytree=None, myrepo=None): + "stub code for returning auxilliary db information, such as SLOT, DEPEND, etc." +@@ -467,7 +469,7 @@ class portdbapi(dbapi): + _("ebuild not found for '%s'") % mycpv, noiselevel=1) + raise KeyError(mycpv) + +- mydata, st, emtime = self._pull_valid_cache(mycpv, myebuild, mylocation) ++ mydata, ebuild_hash = self._pull_valid_cache(mycpv, myebuild, mylocation) + doregen = mydata is None + + if doregen: +@@ -490,10 +492,10 @@ class portdbapi(dbapi): + + if eapi is not None and not portage.eapi_is_supported(eapi): + mydata = self._metadata_callback( +- mycpv, myebuild, mylocation, {'EAPI':eapi}, emtime) ++ mycpv, mylocation, {'EAPI':eapi}, ebuild_hash) + else: +- proc = EbuildMetadataPhase(cpv=mycpv, ebuild_path=myebuild, +- ebuild_mtime=emtime, ++ proc = EbuildMetadataPhase(cpv=mycpv, ++ ebuild_hash=ebuild_hash, + metadata_callback=self._metadata_callback, portdb=self, + repo_path=mylocation, + scheduler=PollScheduler().sched_iface, +@@ -511,15 +513,17 @@ class portdbapi(dbapi): + # do we have a origin repository name for the current package + mydata["repository"] = self.repositories.get_name_for_location(mylocation) + mydata["INHERITED"] = ' '.join(mydata.get("_eclasses_", [])) +- mydata["_mtime_"] = st[stat.ST_MTIME] ++ mydata["_mtime_"] = ebuild_hash.mtime + + eapi = mydata.get("EAPI") + if not eapi: + eapi = "0" + mydata["EAPI"] = eapi + if not eapi_is_supported(eapi): +- for k in set(mydata).difference(("_mtime_", "_eclasses_")): +- mydata[k] = "" ++ keys = set(mydata) ++ keys.discard("_eclasses_") ++ keys.discard("_mtime_") ++ mydata.update((k, '') for k in keys) + mydata["EAPI"] = "-" + eapi.lstrip("-") + + #finally, we look at our internal cache entry and return the requested data. +@@ -576,7 +580,9 @@ class portdbapi(dbapi): + if myebuild is None: + raise AssertionError(_("ebuild not found for '%s'") % mypkg) + pkgdir = os.path.dirname(myebuild) +- mf = Manifest(pkgdir, self.settings["DISTDIR"]) ++ mf = self.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))).load_manifest( ++ pkgdir, self.settings["DISTDIR"]) + checksums = mf.getDigests() + if not checksums: + if debug: +@@ -644,7 +650,9 @@ class portdbapi(dbapi): + if myebuild is None: + raise AssertionError(_("ebuild not found for '%s'") % mypkg) + pkgdir = os.path.dirname(myebuild) +- mf = Manifest(pkgdir, self.settings["DISTDIR"]) ++ mf = self.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))) ++ mf = mf.load_manifest(pkgdir, self.settings["DISTDIR"]) + mysums = mf.getDigests() + + failures = {} +diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py +index 7f7873b..5214aa1 100644 +--- a/pym/portage/dbapi/vartree.py ++++ b/pym/portage/dbapi/vartree.py +@@ -60,6 +60,7 @@ from _emerge.PollScheduler import PollScheduler + from _emerge.MiscFunctionsProcess import MiscFunctionsProcess + + import errno ++import fileinput + import gc + import io + from itertools import chain +@@ -194,7 +195,7 @@ class vardbapi(dbapi): + """ + if self._lock_count: + self._lock_count += 1 +- else: ++ elif os.environ.get("PORTAGE_LOCKS") != "false": + if self._lock is not None: + raise AssertionError("already locked") + # At least the parent needs to exist for the lock file. +@@ -210,7 +211,7 @@ class vardbapi(dbapi): + """ + if self._lock_count > 1: + self._lock_count -= 1 +- else: ++ elif os.environ.get("PORTAGE_LOCKS") != "false": + if self._lock is None: + raise AssertionError("not locked") + self._lock_count = 0 +@@ -1839,16 +1840,10 @@ class dblink(object): + else: + self.settings.pop("PORTAGE_LOG_FILE", None) + +- # Lock the config memory file to prevent symlink creation +- # in merge_contents from overlapping with env-update. +- self.vartree.dbapi._fs_lock() +- try: +- env_update(target_root=self.settings['ROOT'], +- prev_mtimes=ldpath_mtimes, +- contents=contents, env=self.settings.environ(), +- writemsg_level=self._display_merge) +- finally: +- self.vartree.dbapi._fs_unlock() ++ env_update(target_root=self.settings['ROOT'], ++ prev_mtimes=ldpath_mtimes, ++ contents=contents, env=self.settings.environ(), ++ writemsg_level=self._display_merge, vardbapi=self.vartree.dbapi) + + return os.EX_OK + +@@ -3270,6 +3265,15 @@ class dblink(object): + max_dblnk = dblnk + self._installed_instance = max_dblnk + ++ if self.settings.get("INSTALL_MASK"): ++ # Apply INSTALL_MASK before collision-protect, since it may ++ # be useful to avoid collisions in some scenarios. ++ phase = MiscFunctionsProcess(background=False, ++ commands=["preinst_mask"], phase="preinst", ++ scheduler=self._scheduler, settings=self.settings) ++ phase.start() ++ phase.wait() ++ + # We check for unicode encoding issues after src_install. However, + # the check must be repeated here for binary packages (it's + # inexpensive since we call os.walk() here anyway). +@@ -3394,14 +3398,6 @@ class dblink(object): + if installed_files: + return 1 + +- # check for package collisions +- blockers = self._blockers +- if blockers is None: +- blockers = [] +- collisions, symlink_collisions, plib_collisions = \ +- self._collision_protect(srcroot, destroot, +- others_in_slot + blockers, myfilelist, mylinklist) +- + # Make sure the ebuild environment is initialized and that ${T}/elog + # exists for logging of collision-protect eerror messages. + if myebuild is None: +@@ -3413,6 +3409,14 @@ class dblink(object): + for other in others_in_slot]) + prepare_build_dirs(settings=self.settings, cleanup=cleanup) + ++ # check for package collisions ++ blockers = self._blockers ++ if blockers is None: ++ blockers = [] ++ collisions, symlink_collisions, plib_collisions = \ ++ self._collision_protect(srcroot, destroot, ++ others_in_slot + blockers, myfilelist, mylinklist) ++ + if collisions: + collision_protect = "collision-protect" in self.settings.features + protect_owned = "protect-owned" in self.settings.features +@@ -3803,17 +3807,24 @@ class dblink(object): + if pkgcmp(catpkgsplit(self.pkg)[1:], catpkgsplit(v)[1:]) < 0: + downgrade = True + +- # Lock the config memory file to prevent symlink creation +- # in merge_contents from overlapping with env-update. +- self.vartree.dbapi._fs_lock() +- try: +- #update environment settings, library paths. DO NOT change symlinks. +- env_update(makelinks=(not downgrade), +- target_root=self.settings['ROOT'], prev_mtimes=prev_mtimes, +- contents=contents, env=self.settings.environ(), +- writemsg_level=self._display_merge) +- finally: +- self.vartree.dbapi._fs_unlock() ++ #update environment settings, library paths. DO NOT change symlinks. ++ env_update(makelinks=(not downgrade), ++ target_root=self.settings['ROOT'], prev_mtimes=prev_mtimes, ++ contents=contents, env=self.settings.environ(), ++ writemsg_level=self._display_merge, vardbapi=self.vartree.dbapi) ++ ++ # Fix *.la files to point to libs in target_root, if they ++ # don't do so already. ++ re_root = self.settings["ROOT"].strip("/") ++ if re_root: ++ fix_files = [] ++ for path in contents: ++ if path.endswith(".la"): ++ if os.path.exists(path): fix_files.append(path) ++ if fix_files: ++ pat = re.compile(r"([' =](?:-[IL])?/)(usr|lib|opt)") ++ for line in fileinput.input(fix_files, inplace=1): ++ sys.stdout.write(pat.sub(r"\1%s/\2" % re_root, line)) + + # For gcc upgrades, preserved libs have to be removed after the + # the library path has been updated. +diff --git a/pym/portage/eclass_cache.py b/pym/portage/eclass_cache.py +index 1374f1d..1044ad0 100644 +--- a/pym/portage/eclass_cache.py ++++ b/pym/portage/eclass_cache.py +@@ -6,21 +6,57 @@ __all__ = ["cache"] + + import stat + import sys ++import operator + from portage.util import normalize_path + import errno +-from portage.exception import PermissionDenied ++from portage.exception import FileNotFound, PermissionDenied + from portage import os ++from portage import checksum + + if sys.hexversion >= 0x3000000: + long = int + ++ ++class hashed_path(object): ++ ++ def __init__(self, location): ++ self.location = location ++ ++ def __getattr__(self, attr): ++ if attr == 'mtime': ++ # use stat.ST_MTIME; accessing .st_mtime gets you a float ++ # depending on the python version, and long(float) introduces ++ # some rounding issues that aren't present for people using ++ # the straight c api. ++ # thus use the defacto python compatibility work around; ++ # access via index, which guarantees you get the raw long. ++ try: ++ self.mtime = obj = os.stat(self.location)[stat.ST_MTIME] ++ except OSError as e: ++ if e.errno in (errno.ENOENT, errno.ESTALE): ++ raise FileNotFound(self.location) ++ elif e.errno == PermissionDenied.errno: ++ raise PermissionDenied(self.location) ++ raise ++ return obj ++ if not attr.islower(): ++ # we don't care to allow .mD5 as an alias for .md5 ++ raise AttributeError(attr) ++ hashname = attr.upper() ++ if hashname not in checksum.hashfunc_map: ++ raise AttributeError(attr) ++ val = checksum.perform_checksum(self.location, hashname)[0] ++ setattr(self, attr, val) ++ return val ++ ++ + class cache(object): + """ + Maintains the cache information about eclasses used in ebuild. + """ + def __init__(self, porttree_root, overlays=[]): + +- self.eclasses = {} # {"Name": ("location","_mtime_")} ++ self.eclasses = {} # {"Name": hashed_path} + self._eclass_locations = {} + + # screw with the porttree ordering, w/out having bash inherit match it, and I'll hurt you. +@@ -80,14 +116,16 @@ class cache(object): + for y in eclass_filenames: + if not y.endswith(".eclass"): + continue ++ obj = hashed_path(os.path.join(x, y)) ++ obj.eclass_dir = x + try: +- mtime = os.stat(os.path.join(x, y))[stat.ST_MTIME] +- except OSError: ++ mtime = obj.mtime ++ except FileNotFound: + continue + ys=y[:-eclass_len] + if x == self._master_eclass_root: + master_eclasses[ys] = mtime +- self.eclasses[ys] = (x, mtime) ++ self.eclasses[ys] = obj + self._eclass_locations[ys] = x + continue + +@@ -98,22 +136,30 @@ class cache(object): + # so prefer the master entry. + continue + +- self.eclasses[ys] = (x, mtime) ++ self.eclasses[ys] = obj + self._eclass_locations[ys] = x + +- def is_eclass_data_valid(self, ec_dict): ++ def validate_and_rewrite_cache(self, ec_dict, chf_type, stores_paths): ++ """ ++ This will return an empty dict if the ec_dict parameter happens ++ to be empty, therefore callers must take care to distinguish ++ between empty dict and None return values. ++ """ + if not isinstance(ec_dict, dict): +- return False +- for eclass, tup in ec_dict.items(): +- cached_data = self.eclasses.get(eclass, None) +- """ Only use the mtime for validation since the probability of a +- collision is small and, depending on the cache implementation, the +- path may not be specified (cache from rsync mirrors, for example). +- """ +- if cached_data is None or tup[1] != cached_data[1]: +- return False +- +- return True ++ return None ++ our_getter = operator.attrgetter(chf_type) ++ cache_getter = lambda x:x ++ if stores_paths: ++ cache_getter = operator.itemgetter(1) ++ d = {} ++ for eclass, ec_data in ec_dict.items(): ++ cached_data = self.eclasses.get(eclass) ++ if cached_data is None: ++ return None ++ if cache_getter(ec_data) != our_getter(cached_data): ++ return None ++ d[eclass] = cached_data ++ return d + + def get_eclass_data(self, inherits): + ec_dict = {} +diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py +index 13efab7..b2f96e6 100644 +--- a/pym/portage/manifest.py ++++ b/pym/portage/manifest.py +@@ -49,6 +49,12 @@ def guessManifestFileType(filename): + else: + return "DIST" + ++def guessThinManifestFileType(filename): ++ type = guessManifestFileType(filename) ++ if type != "DIST": ++ return None ++ return "DIST" ++ + def parseManifest2(mysplit): + myentry = None + if len(mysplit) > 4 and mysplit[0] in portage.const.MANIFEST2_IDENTIFIERS: +@@ -93,12 +99,15 @@ class Manifest2Entry(ManifestEntry): + class Manifest(object): + parsers = (parseManifest2,) + def __init__(self, pkgdir, distdir, fetchlist_dict=None, +- manifest1_compat=False, from_scratch=False): ++ manifest1_compat=False, from_scratch=False, thin=False, allow_missing=False, ++ allow_create=True): + """ create new Manifest instance for package in pkgdir + and add compability entries for old portage versions if manifest1_compat == True. + Do not parse Manifest file if from_scratch == True (only for internal use) + The fetchlist_dict parameter is required only for generation of +- a Manifest (not needed for parsing and checking sums).""" ++ a Manifest (not needed for parsing and checking sums). ++ If thin is specified, then the manifest carries only info for ++ distfiles.""" + self.pkgdir = _unicode_decode(pkgdir).rstrip(os.sep) + os.sep + self.fhashdict = {} + self.hashes = set() +@@ -120,7 +129,13 @@ class Manifest(object): + else: + self.fetchlist_dict = {} + self.distdir = distdir +- self.guessType = guessManifestFileType ++ self.thin = thin ++ if thin: ++ self.guessType = guessThinManifestFileType ++ else: ++ self.guessType = guessManifestFileType ++ self.allow_missing = allow_missing ++ self.allow_create = allow_create + + def getFullname(self): + """ Returns the absolute path to the Manifest file for this instance """ +@@ -223,11 +238,13 @@ class Manifest(object): + + def write(self, sign=False, force=False): + """ Write Manifest instance to disk, optionally signing it """ ++ if not self.allow_create: ++ return + self.checkIntegrity() + try: + myentries = list(self._createManifestEntries()) + update_manifest = True +- if not force: ++ if myentries and not force: + try: + f = io.open(_unicode_encode(self.getFullname(), + encoding=_encodings['fs'], errors='strict'), +@@ -246,9 +263,20 @@ class Manifest(object): + pass + else: + raise ++ + if update_manifest: +- write_atomic(self.getFullname(), +- "".join("%s\n" % str(myentry) for myentry in myentries)) ++ if myentries or not (self.thin or self.allow_missing): ++ write_atomic(self.getFullname(), "".join("%s\n" % ++ str(myentry) for myentry in myentries)) ++ else: ++ # With thin manifest, there's no need to have ++ # a Manifest file if there are no DIST entries. ++ try: ++ os.unlink(self.getFullname()) ++ except OSError as e: ++ if e.errno != errno.ENOENT: ++ raise ++ + if sign: + self.sign() + except (IOError, OSError) as e: +@@ -305,6 +333,8 @@ class Manifest(object): + distfiles to raise a FileNotFound exception for (if no file or existing + checksums are available), and defaults to all distfiles when not + specified.""" ++ if not self.allow_create: ++ return + if checkExisting: + self.checkAllHashes() + if assumeDistHashesSometimes or assumeDistHashesAlways: +@@ -313,64 +343,20 @@ class Manifest(object): + distfilehashes = {} + self.__init__(self.pkgdir, self.distdir, + fetchlist_dict=self.fetchlist_dict, from_scratch=True, +- manifest1_compat=False) +- cpvlist = [] ++ manifest1_compat=False, thin=self.thin) + pn = os.path.basename(self.pkgdir.rstrip(os.path.sep)) + cat = self._pkgdir_category() + + pkgdir = self.pkgdir ++ if self.thin: ++ cpvlist = self._update_thin_pkgdir(cat, pn, pkgdir) ++ else: ++ cpvlist = self._update_thick_pkgdir(cat, pn, pkgdir) + +- for pkgdir, pkgdir_dirs, pkgdir_files in os.walk(pkgdir): +- break +- for f in pkgdir_files: +- try: +- f = _unicode_decode(f, +- encoding=_encodings['fs'], errors='strict') +- except UnicodeDecodeError: +- continue +- if f[:1] == ".": +- continue +- pf = None +- if f[-7:] == '.ebuild': +- pf = f[:-7] +- if pf is not None: +- mytype = "EBUILD" +- ps = portage.versions._pkgsplit(pf) +- cpv = "%s/%s" % (cat, pf) +- if not ps: +- raise PortagePackageException( +- _("Invalid package name: '%s'") % cpv) +- if ps[0] != pn: +- raise PortagePackageException( +- _("Package name does not " +- "match directory name: '%s'") % cpv) +- cpvlist.append(cpv) +- elif manifest2MiscfileFilter(f): +- mytype = "MISC" +- else: +- continue +- self.fhashdict[mytype][f] = perform_multiple_checksums(self.pkgdir+f, self.hashes) +- recursive_files = [] +- +- pkgdir = self.pkgdir +- cut_len = len(os.path.join(pkgdir, "files") + os.sep) +- for parentdir, dirs, files in os.walk(os.path.join(pkgdir, "files")): +- for f in files: +- try: +- f = _unicode_decode(f, +- encoding=_encodings['fs'], errors='strict') +- except UnicodeDecodeError: +- continue +- full_path = os.path.join(parentdir, f) +- recursive_files.append(full_path[cut_len:]) +- for f in recursive_files: +- if not manifest2AuxfileFilter(f): +- continue +- self.fhashdict["AUX"][f] = perform_multiple_checksums( +- os.path.join(self.pkgdir, "files", f.lstrip(os.sep)), self.hashes) + distlist = set() + for cpv in cpvlist: + distlist.update(self._getCpvDistfiles(cpv)) ++ + if requiredDistfiles is None: + # This allows us to force removal of stale digests for the + # ebuild --force digest option (no distfiles are required). +@@ -404,6 +390,81 @@ class Manifest(object): + if f in requiredDistfiles: + raise + ++ def _is_cpv(self, cat, pn, filename): ++ if not filename.endswith(".ebuild"): ++ return None ++ pf = filename[:-7] ++ if pf is None: ++ return None ++ ps = portage.versions._pkgsplit(pf) ++ cpv = "%s/%s" % (cat, pf) ++ if not ps: ++ raise PortagePackageException( ++ _("Invalid package name: '%s'") % cpv) ++ if ps[0] != pn: ++ raise PortagePackageException( ++ _("Package name does not " ++ "match directory name: '%s'") % cpv) ++ return cpv ++ ++ def _update_thin_pkgdir(self, cat, pn, pkgdir): ++ for pkgdir, pkgdir_dirs, pkgdir_files in os.walk(pkgdir): ++ break ++ cpvlist = [] ++ for f in pkgdir_files: ++ try: ++ f = _unicode_decode(f, ++ encoding=_encodings['fs'], errors='strict') ++ except UnicodeDecodeError: ++ continue ++ if f[:1] == '.': ++ continue ++ pf = self._is_cpv(cat, pn, f) ++ if pf is not None: ++ cpvlist.append(pf) ++ return cpvlist ++ ++ def _update_thick_pkgdir(self, cat, pn, pkgdir): ++ cpvlist = [] ++ for pkgdir, pkgdir_dirs, pkgdir_files in os.walk(pkgdir): ++ break ++ for f in pkgdir_files: ++ try: ++ f = _unicode_decode(f, ++ encoding=_encodings['fs'], errors='strict') ++ except UnicodeDecodeError: ++ continue ++ if f[:1] == ".": ++ continue ++ pf = self._is_cpv(cat, pn, f) ++ if pf is not None: ++ mytype = "EBUILD" ++ cpvlist.append(pf) ++ elif manifest2MiscfileFilter(f): ++ mytype = "MISC" ++ else: ++ continue ++ self.fhashdict[mytype][f] = perform_multiple_checksums(self.pkgdir+f, self.hashes) ++ recursive_files = [] ++ ++ pkgdir = self.pkgdir ++ cut_len = len(os.path.join(pkgdir, "files") + os.sep) ++ for parentdir, dirs, files in os.walk(os.path.join(pkgdir, "files")): ++ for f in files: ++ try: ++ f = _unicode_decode(f, ++ encoding=_encodings['fs'], errors='strict') ++ except UnicodeDecodeError: ++ continue ++ full_path = os.path.join(parentdir, f) ++ recursive_files.append(full_path[cut_len:]) ++ for f in recursive_files: ++ if not manifest2AuxfileFilter(f): ++ continue ++ self.fhashdict["AUX"][f] = perform_multiple_checksums( ++ os.path.join(self.pkgdir, "files", f.lstrip(os.sep)), self.hashes) ++ return cpvlist ++ + def _pkgdir_category(self): + return self.pkgdir.rstrip(os.sep).split(os.sep)[-2] + +diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py +index 87aa606..02a7844 100644 +--- a/pym/portage/package/ebuild/_config/special_env_vars.py ++++ b/pym/portage/package/ebuild/_config/special_env_vars.py +@@ -156,7 +156,7 @@ environ_filter += [ + "PORTAGE_RO_DISTDIRS", + "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS", + "PORTAGE_RSYNC_RETRIES", "PORTAGE_SYNC_STALE", +- "PORTAGE_USE", "PORT_LOGDIR", ++ "PORTAGE_USE", "PORT_LOGDIR", "PORT_LOGDIR_CLEAN", + "QUICKPKG_DEFAULT_OPTS", + "RESUMECOMMAND", "RESUMECOMMAND_FTP", + "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS", +diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py +index a591c9a..5ed477e 100644 +--- a/pym/portage/package/ebuild/config.py ++++ b/pym/portage/package/ebuild/config.py +@@ -309,7 +309,6 @@ class config(object): + if self.modules["user"] is None: + self.modules["user"] = {} + self.modules["default"] = { +- "portdbapi.metadbmodule": "portage.cache.metadata.database", + "portdbapi.auxdbmodule": "portage.cache.flat_hash.database", + } + +@@ -864,7 +863,11 @@ class config(object): + try: + mod = load_mod(best_mod) + except ImportError: +- raise ++ if best_mod == "portage.cache.metadata_overlay.database": ++ best_mod = "portage.cache.flat_hash.database" ++ mod = load_mod(best_mod) ++ else: ++ raise + return mod + + def lock(self): +diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py +index 1e34b14..6c823e0 100644 +--- a/pym/portage/package/ebuild/digestcheck.py ++++ b/pym/portage/package/ebuild/digestcheck.py +@@ -28,49 +28,33 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None): + + if mysettings.get("EBUILD_SKIP_MANIFEST") == "1": + return 1 +- allow_missing = "allow-missing-manifests" in mysettings.features + pkgdir = mysettings["O"] +- manifest_path = os.path.join(pkgdir, "Manifest") +- if not os.path.exists(manifest_path): +- if allow_missing: +- return 1 +- writemsg(_("!!! Manifest file not found: '%s'\n") % manifest_path, +- noiselevel=-1) +- if strict: +- return 0 +- else: +- return 1 + if mf is None: +- mf = Manifest(pkgdir, mysettings["DISTDIR"]) +- manifest_empty = True +- for d in mf.fhashdict.values(): +- if d: +- manifest_empty = False +- break +- if manifest_empty: +- writemsg(_("!!! Manifest is empty: '%s'\n") % manifest_path, +- noiselevel=-1) +- if strict: +- return 0 +- else: +- return 1 ++ mf = mysettings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))) ++ mf = mf.load_manifest(pkgdir, mysettings["DISTDIR"]) + eout = EOutput() + eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" + try: + if strict and "PORTAGE_PARALLEL_FETCHONLY" not in mysettings: +- eout.ebegin(_("checking ebuild checksums ;-)")) +- mf.checkTypeHashes("EBUILD") +- eout.eend(0) +- eout.ebegin(_("checking auxfile checksums ;-)")) +- mf.checkTypeHashes("AUX") +- eout.eend(0) +- eout.ebegin(_("checking miscfile checksums ;-)")) +- mf.checkTypeHashes("MISC", ignoreMissingFiles=True) +- eout.eend(0) ++ if mf.fhashdict.get("EBUILD"): ++ eout.ebegin(_("checking ebuild checksums ;-)")) ++ mf.checkTypeHashes("EBUILD") ++ eout.eend(0) ++ if mf.fhashdict.get("AUX"): ++ eout.ebegin(_("checking auxfile checksums ;-)")) ++ mf.checkTypeHashes("AUX") ++ eout.eend(0) ++ if mf.fhashdict.get("MISC"): ++ eout.ebegin(_("checking miscfile checksums ;-)")) ++ mf.checkTypeHashes("MISC", ignoreMissingFiles=True) ++ eout.eend(0) + for f in myfiles: + eout.ebegin(_("checking %s ;-)") % f) + ftype = mf.findFile(f) + if ftype is None: ++ if mf.allow_missing: ++ continue + eout.eend(1) + writemsg(_("\n!!! Missing digest for '%s'\n") % (f,), + noiselevel=-1) +@@ -90,7 +74,7 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None): + writemsg(_("!!! Got: %s\n") % e.value[2], noiselevel=-1) + writemsg(_("!!! Expected: %s\n") % e.value[3], noiselevel=-1) + return 0 +- if allow_missing: ++ if mf.thin or mf.allow_missing: + # In this case we ignore any missing digests that + # would otherwise be detected below. + return 1 +diff --git a/pym/portage/package/ebuild/digestgen.py b/pym/portage/package/ebuild/digestgen.py +index eb7210e..f7cf149 100644 +--- a/pym/portage/package/ebuild/digestgen.py ++++ b/pym/portage/package/ebuild/digestgen.py +@@ -53,8 +53,15 @@ def digestgen(myarchives=None, mysettings=None, myportdb=None): + return 0 + mytree = os.path.dirname(os.path.dirname(mysettings["O"])) + manifest1_compat = False +- mf = Manifest(mysettings["O"], mysettings["DISTDIR"], ++ mf = mysettings.repositories.get_repo_for_location(mytree) ++ mf = mf.load_manifest(mysettings["O"], mysettings["DISTDIR"], + fetchlist_dict=fetchlist_dict, manifest1_compat=manifest1_compat) ++ ++ if not mf.allow_create: ++ writemsg_stdout(_(">>> Skipping creating Manifest for %s; " ++ "repository is configured to not use them\n") % mysettings["O"]) ++ return 1 ++ + # Don't require all hashes since that can trigger excessive + # fetches when sufficient digests already exist. To ease transition + # while Manifest 1 is being removed, only require hashes that will +diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py +index a710e09..f5c4c81 100644 +--- a/pym/portage/package/ebuild/doebuild.py ++++ b/pym/portage/package/ebuild/doebuild.py +@@ -3,6 +3,7 @@ + + __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild'] + ++import fileinput + import gzip + import errno + import io +@@ -50,7 +51,6 @@ from portage.exception import DigestException, FileNotFound, \ + IncorrectParameter, InvalidDependString, PermissionDenied, \ + UnsupportedAPIException + from portage.localization import _ +-from portage.manifest import Manifest + from portage.output import style_to_ansi_code + from portage.package.ebuild.prepare_build_dirs import prepare_build_dirs + from portage.util import apply_recursive_permissions, \ +@@ -480,21 +480,27 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, + return 1 + + global _doebuild_manifest_cache ++ pkgdir = os.path.dirname(myebuild) ++ manifest_path = os.path.join(pkgdir, "Manifest") ++ if tree == "porttree": ++ repo_config = mysettings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))) ++ else: ++ repo_config = None + mf = None + if "strict" in features and \ + "digest" not in features and \ + tree == "porttree" and \ ++ not repo_config.thin_manifest and \ + mydo not in ("digest", "manifest", "help") and \ +- not portage._doebuild_manifest_exempt_depend: ++ not portage._doebuild_manifest_exempt_depend and \ ++ not (repo_config.allow_missing_manifest and not os.path.exists(manifest_path)): + # Always verify the ebuild checksums before executing it. + global _doebuild_broken_ebuilds + + if myebuild in _doebuild_broken_ebuilds: + return 1 + +- pkgdir = os.path.dirname(myebuild) +- manifest_path = os.path.join(pkgdir, "Manifest") +- + # Avoid checking the same Manifest several times in a row during a + # regen with an empty cache. + if _doebuild_manifest_cache is None or \ +@@ -505,7 +511,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, + out.eerror(_("Manifest not found for '%s'") % (myebuild,)) + _doebuild_broken_ebuilds.add(myebuild) + return 1 +- mf = Manifest(pkgdir, mysettings["DISTDIR"]) ++ mf = repo_config.load_manifest(pkgdir, mysettings["DISTDIR"]) + + else: + mf = _doebuild_manifest_cache +@@ -513,10 +519,12 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, + try: + mf.checkFileHashes("EBUILD", os.path.basename(myebuild)) + except KeyError: +- out = portage.output.EOutput() +- out.eerror(_("Missing digest for '%s'") % (myebuild,)) +- _doebuild_broken_ebuilds.add(myebuild) +- return 1 ++ if not (mf.allow_missing and ++ os.path.basename(myebuild) not in mf.fhashdict["EBUILD"]): ++ out = portage.output.EOutput() ++ out.eerror(_("Missing digest for '%s'") % (myebuild,)) ++ _doebuild_broken_ebuilds.add(myebuild) ++ return 1 + except FileNotFound: + out = portage.output.EOutput() + out.eerror(_("A file listed in the Manifest " +@@ -536,7 +544,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, + if mf.getFullname() in _doebuild_broken_manifests: + return 1 + +- if mf is not _doebuild_manifest_cache: ++ if mf is not _doebuild_manifest_cache and not mf.allow_missing: + + # Make sure that all of the ebuilds are + # actually listed in the Manifest. +@@ -553,8 +561,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, + _doebuild_broken_manifests.add(manifest_path) + return 1 + +- # Only cache it if the above stray files test succeeds. +- _doebuild_manifest_cache = mf ++ # We cache it only after all above checks succeed. ++ _doebuild_manifest_cache = mf + + logfile=None + builddir_lock = None +@@ -1300,13 +1308,14 @@ _post_phase_cmds = { + + "install" : [ + "install_qa_check", +- "install_symlink_html_docs"], ++ "install_symlink_html_docs", ++ "install_hooks"], + + "preinst" : [ + "preinst_sfperms", + "preinst_selinux_labels", + "preinst_suid_scan", +- "preinst_mask"] ++ ] + } + + def _post_phase_userpriv_perms(mysettings): +@@ -1497,6 +1506,7 @@ def _post_src_install_uid_fix(mysettings, out): + + destdir = mysettings["D"] + unicode_errors = [] ++ fix_files = [] + + while True: + +@@ -1585,10 +1595,12 @@ def _post_src_install_uid_fix(mysettings, out): + new_contents, mode='wb') + + mystat = os.lstat(fpath) +- if stat.S_ISREG(mystat.st_mode) and \ +- mystat.st_ino not in counted_inodes: +- counted_inodes.add(mystat.st_ino) +- size += mystat.st_size ++ if stat.S_ISREG(mystat.st_mode): ++ if fname.endswith(".la"): ++ fix_files.append(fpath) ++ if mystat.st_ino not in counted_inodes: ++ counted_inodes.add(mystat.st_ino) ++ size += mystat.st_size + if mystat.st_uid != portage_uid and \ + mystat.st_gid != portage_gid: + continue +@@ -1656,6 +1668,14 @@ def _post_src_install_uid_fix(mysettings, out): + mode='w', encoding=_encodings['repo.content'], + errors='strict').write(_unicode_decode(v + '\n')) + ++ re_root = mysettings["ROOT"].strip("/") ++ if fix_files and re_root: ++ # Replace references to our sysroot with references to "/" in binpkg. ++ # Sysroot will be re-appended when the package is installed. ++ pat = re.compile(r"([' =](-[IL])?/)%s/" % re.escape(re_root)) ++ for line in fileinput.input(fix_files, inplace=1): ++ sys.stdout.write(pat.sub(r"\1", line)) ++ + _reapply_bsdflags_to_image(mysettings) + + def _reapply_bsdflags_to_image(mysettings): +diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py +index 5cbbf87..11c4c01 100644 +--- a/pym/portage/package/ebuild/fetch.py ++++ b/pym/portage/package/ebuild/fetch.py +@@ -356,7 +356,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, + allow_missing_digests = True + pkgdir = mysettings.get("O") + if digests is None and not (pkgdir is None or skip_manifest): +- mydigests = Manifest( ++ mydigests = mysettings.repositories.get_repo_for_location( ++ os.path.dirname(os.path.dirname(pkgdir))).load_manifest( + pkgdir, mysettings["DISTDIR"]).getTypeDigests("DIST") + elif digests is None or skip_manifest: + # no digests because fetch was not called for a specific package +diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py +index 9f0bb99..0fe4a0e 100644 +--- a/pym/portage/repository/config.py ++++ b/pym/portage/repository/config.py +@@ -16,6 +16,7 @@ from portage.util import normalize_path, writemsg, writemsg_level, shlex_split + from portage.localization import _ + from portage import _unicode_encode + from portage import _encodings ++from portage import manifest + + _repo_name_sub_re = re.compile(r'[^\w-]') + +@@ -36,7 +37,8 @@ class RepoConfig(object): + """Stores config of one repository""" + + __slots__ = ['aliases', 'eclass_overrides', 'eclass_locations', 'location', 'user_location', 'masters', 'main_repo', +- 'missing_repo_name', 'name', 'priority', 'sync', 'format'] ++ 'missing_repo_name', 'name', 'priority', 'sync', 'format', 'sign_manifest', 'thin_manifest', ++ 'allow_missing_manifest', 'create_manifest', 'disable_manifest', 'cache_format'] + + def __init__(self, name, repo_opts): + """Build a RepoConfig with options in repo_opts +@@ -105,6 +107,36 @@ class RepoConfig(object): + missing = False + self.name = name + self.missing_repo_name = missing ++ self.thin_manifest = False ++ self.allow_missing_manifest = False ++ self.create_manifest = True ++ self.disable_manifest = False ++ self.cache_format = None ++ ++ def get_pregenerated_cache(self, auxdbkeys, readonly=True, force=False): ++ format = self.cache_format ++ if format is None: ++ if not force: ++ return None ++ format = 'pms' ++ if format == 'pms': ++ from portage.cache.metadata import database ++ name = 'metadata/cache' ++ elif format == 'md5-dict': ++ from portage.cache.flat_hash import md5_database as database ++ name = 'metadata/md5-cache' ++ else: ++ return None ++ return database(self.location, name, ++ auxdbkeys, readonly=readonly) ++ ++ def load_manifest(self, *args, **kwds): ++ kwds['thin'] = self.thin_manifest ++ kwds['allow_missing'] = self.allow_missing_manifest ++ kwds['allow_create'] = self.create_manifest ++ if self.disable_manifest: ++ kwds['from_scratch'] = True ++ return manifest.Manifest(*args, **kwds) + + def update(self, new_repo): + """Update repository with options in another RepoConfig""" +@@ -169,107 +201,101 @@ class RepoConfig(object): + + class RepoConfigLoader(object): + """Loads and store config of several repositories, loaded from PORTDIR_OVERLAY or repos.conf""" +- def __init__(self, paths, settings): +- """Load config from files in paths""" +- def parse(paths, prepos, ignored_map, ignored_location_map): +- """Parse files in paths to load config""" +- parser = SafeConfigParser() +- try: +- parser.read(paths) +- except ParsingError as e: +- writemsg(_("!!! Error while reading repo config file: %s\n") % e, noiselevel=-1) +- prepos['DEFAULT'] = RepoConfig("DEFAULT", parser.defaults()) +- for sname in parser.sections(): +- optdict = {} +- for oname in parser.options(sname): +- optdict[oname] = parser.get(sname, oname) +- +- repo = RepoConfig(sname, optdict) +- if repo.location and not os.path.exists(repo.location): +- writemsg(_("!!! Invalid repos.conf entry '%s'" +- " (not a dir): '%s'\n") % (sname, repo.location), noiselevel=-1) +- continue + +- if repo.name in prepos: +- old_location = prepos[repo.name].location +- if old_location is not None and repo.location is not None and old_location != repo.location: +- ignored_map.setdefault(repo.name, []).append(old_location) +- ignored_location_map[old_location] = repo.name +- prepos[repo.name].update(repo) +- else: +- prepos[repo.name] = repo +- +- def add_overlays(portdir, portdir_overlay, prepos, ignored_map, ignored_location_map): +- """Add overlays in PORTDIR_OVERLAY as repositories""" +- overlays = [] +- if portdir: +- portdir = normalize_path(portdir) +- overlays.append(portdir) +- port_ov = [normalize_path(i) for i in shlex_split(portdir_overlay)] +- overlays.extend(port_ov) +- default_repo_opts = {} +- if prepos['DEFAULT'].aliases is not None: +- default_repo_opts['aliases'] = \ +- ' '.join(prepos['DEFAULT'].aliases) +- if prepos['DEFAULT'].eclass_overrides is not None: +- default_repo_opts['eclass-overrides'] = \ +- ' '.join(prepos['DEFAULT'].eclass_overrides) +- if prepos['DEFAULT'].masters is not None: +- default_repo_opts['masters'] = \ +- ' '.join(prepos['DEFAULT'].masters) +- if overlays: +- #overlay priority is negative because we want them to be looked before any other repo +- base_priority = 0 +- for ov in overlays: +- if os.path.isdir(ov): +- repo_opts = default_repo_opts.copy() +- repo_opts['location'] = ov +- repo = RepoConfig(None, repo_opts) +- repo_conf_opts = prepos.get(repo.name) +- if repo_conf_opts is not None: +- if repo_conf_opts.aliases is not None: +- repo_opts['aliases'] = \ +- ' '.join(repo_conf_opts.aliases) +- if repo_conf_opts.eclass_overrides is not None: +- repo_opts['eclass-overrides'] = \ +- ' '.join(repo_conf_opts.eclass_overrides) +- if repo_conf_opts.masters is not None: +- repo_opts['masters'] = \ +- ' '.join(repo_conf_opts.masters) +- repo = RepoConfig(repo.name, repo_opts) +- if repo.name in prepos: +- old_location = prepos[repo.name].location +- if old_location is not None and old_location != repo.location: +- ignored_map.setdefault(repo.name, []).append(old_location) +- ignored_location_map[old_location] = repo.name +- if old_location == portdir: +- portdir = repo.user_location +- prepos[repo.name].update(repo) +- repo = prepos[repo.name] +- else: +- prepos[repo.name] = repo +- +- if ov == portdir and portdir not in port_ov: +- repo.priority = -1000 +- else: +- repo.priority = base_priority +- base_priority += 1 ++ @staticmethod ++ def _add_overlays(portdir, portdir_overlay, prepos, ignored_map, ignored_location_map): ++ """Add overlays in PORTDIR_OVERLAY as repositories""" ++ overlays = [] ++ if portdir: ++ portdir = normalize_path(portdir) ++ overlays.append(portdir) ++ port_ov = [normalize_path(i) for i in shlex_split(portdir_overlay)] ++ overlays.extend(port_ov) ++ default_repo_opts = {} ++ if prepos['DEFAULT'].aliases is not None: ++ default_repo_opts['aliases'] = \ ++ ' '.join(prepos['DEFAULT'].aliases) ++ if prepos['DEFAULT'].eclass_overrides is not None: ++ default_repo_opts['eclass-overrides'] = \ ++ ' '.join(prepos['DEFAULT'].eclass_overrides) ++ if prepos['DEFAULT'].masters is not None: ++ default_repo_opts['masters'] = \ ++ ' '.join(prepos['DEFAULT'].masters) ++ if overlays: ++ #overlay priority is negative because we want them to be looked before any other repo ++ base_priority = 0 ++ for ov in overlays: ++ if os.path.isdir(ov): ++ repo_opts = default_repo_opts.copy() ++ repo_opts['location'] = ov ++ repo = RepoConfig(None, repo_opts) ++ repo_conf_opts = prepos.get(repo.name) ++ if repo_conf_opts is not None: ++ if repo_conf_opts.aliases is not None: ++ repo_opts['aliases'] = \ ++ ' '.join(repo_conf_opts.aliases) ++ if repo_conf_opts.eclass_overrides is not None: ++ repo_opts['eclass-overrides'] = \ ++ ' '.join(repo_conf_opts.eclass_overrides) ++ if repo_conf_opts.masters is not None: ++ repo_opts['masters'] = \ ++ ' '.join(repo_conf_opts.masters) ++ repo = RepoConfig(repo.name, repo_opts) ++ if repo.name in prepos: ++ old_location = prepos[repo.name].location ++ if old_location is not None and old_location != repo.location: ++ ignored_map.setdefault(repo.name, []).append(old_location) ++ ignored_location_map[old_location] = repo.name ++ if old_location == portdir: ++ portdir = repo.user_location ++ prepos[repo.name].update(repo) ++ repo = prepos[repo.name] ++ else: ++ prepos[repo.name] = repo + ++ if ov == portdir and portdir not in port_ov: ++ repo.priority = -1000 + else: +- writemsg(_("!!! Invalid PORTDIR_OVERLAY" +- " (not a dir): '%s'\n") % ov, noiselevel=-1) ++ repo.priority = base_priority ++ base_priority += 1 ++ ++ else: ++ writemsg(_("!!! Invalid PORTDIR_OVERLAY" ++ " (not a dir): '%s'\n") % ov, noiselevel=-1) ++ ++ return portdir ++ ++ @staticmethod ++ def _parse(paths, prepos, ignored_map, ignored_location_map): ++ """Parse files in paths to load config""" ++ parser = SafeConfigParser() ++ try: ++ parser.read(paths) ++ except ParsingError as e: ++ writemsg(_("!!! Error while reading repo config file: %s\n") % e, noiselevel=-1) ++ prepos['DEFAULT'] = RepoConfig("DEFAULT", parser.defaults()) ++ for sname in parser.sections(): ++ optdict = {} ++ for oname in parser.options(sname): ++ optdict[oname] = parser.get(sname, oname) ++ ++ repo = RepoConfig(sname, optdict) ++ if repo.location and not os.path.exists(repo.location): ++ writemsg(_("!!! Invalid repos.conf entry '%s'" ++ " (not a dir): '%s'\n") % (sname, repo.location), noiselevel=-1) ++ continue + +- return portdir ++ if repo.name in prepos: ++ old_location = prepos[repo.name].location ++ if old_location is not None and repo.location is not None and old_location != repo.location: ++ ignored_map.setdefault(repo.name, []).append(old_location) ++ ignored_location_map[old_location] = repo.name ++ prepos[repo.name].update(repo) ++ else: ++ prepos[repo.name] = repo + +- def repo_priority(r): +- """ +- Key funtion for comparing repositories by priority. +- None is equal priority zero. +- """ +- x = prepos[r].priority +- if x is None: +- return 0 +- return x ++ def __init__(self, paths, settings): ++ """Load config from files in paths""" + + prepos = {} + location_map = {} +@@ -279,10 +305,12 @@ class RepoConfigLoader(object): + + portdir = settings.get('PORTDIR', '') + portdir_overlay = settings.get('PORTDIR_OVERLAY', '') +- parse(paths, prepos, ignored_map, ignored_location_map) ++ ++ self._parse(paths, prepos, ignored_map, ignored_location_map) ++ + # If PORTDIR_OVERLAY contains a repo with the same repo_name as + # PORTDIR, then PORTDIR is overridden. +- portdir = add_overlays(portdir, portdir_overlay, prepos, ++ portdir = self._add_overlays(portdir, portdir_overlay, prepos, + ignored_map, ignored_location_map) + if portdir and portdir.strip(): + portdir = os.path.realpath(portdir) +@@ -319,6 +347,21 @@ class RepoConfigLoader(object): + aliases.extend(repo.aliases) + repo.aliases = tuple(sorted(set(aliases))) + ++ if layout_data.get('thin-manifests', '').lower() == 'true': ++ repo.thin_manifest = True ++ ++ manifest_policy = layout_data.get('use-manifests', 'strict').lower() ++ repo.allow_missing_manifest = manifest_policy != 'strict' ++ repo.create_manifest = manifest_policy != 'false' ++ repo.disable_manifest = manifest_policy == 'false' ++ ++ # for compatibility w/ PMS, fallback to pms; but also check if the ++ # cache exists or not. ++ repo.cache_format = layout_data.get('cache-format', 'pms').lower() ++ if repo.cache_format == 'pms' and not os.path.isdir( ++ os.path.join(repo.location, 'metadata', 'cache')): ++ repo.cache_format = None ++ + #Take aliases into account. + new_prepos = {} + for repo_name, repo in prepos.items(): +@@ -342,9 +385,11 @@ class RepoConfigLoader(object): + + # filter duplicates from aliases, by only including + # items where repo.name == key +- prepos_order = [repo.name for key, repo in prepos.items() \ ++ ++ prepos_order = sorted(prepos.items(), key=lambda r:r[1].priority or 0) ++ ++ prepos_order = [repo.name for (key, repo) in prepos_order + if repo.name == key and repo.location is not None] +- prepos_order.sort(key=repo_priority) + + if portdir in location_map: + portdir_repo = prepos[location_map[portdir]] +@@ -488,6 +533,9 @@ class RepoConfigLoader(object): + return None + return self.treemap[repo_name] + ++ def get_repo_for_location(self, location): ++ return self.prepos[self.get_name_for_location(location)] ++ + def __getitem__(self, repo_name): + return self.prepos[repo_name] + +diff --git a/pym/portage/tests/resolver/test_rebuild.py b/pym/portage/tests/resolver/test_rebuild.py +index b9c4d6d..6f1a783 100644 +--- a/pym/portage/tests/resolver/test_rebuild.py ++++ b/pym/portage/tests/resolver/test_rebuild.py +@@ -9,57 +9,58 @@ class RebuildTestCase(TestCase): + + def testRebuild(self): + """ +- Rebuild packages when dependencies that are used at both build-time and +- run-time are upgraded. ++ Rebuild packages when build-time dependencies are upgraded. + """ + + ebuilds = { + "sys-libs/x-1": { }, + "sys-libs/x-1-r1": { }, + "sys-libs/x-2": { }, +- "sys-apps/a-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, +- "sys-apps/a-2": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, +- "sys-apps/b-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, +- "sys-apps/b-2": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, ++ "sys-apps/a-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, ++ "sys-apps/a-2": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, ++ "sys-apps/b-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, ++ "sys-apps/b-2": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, + "sys-apps/c-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, + "sys-apps/c-2": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, + "sys-apps/d-1": { "RDEPEND" : "sys-libs/x"}, + "sys-apps/d-2": { "RDEPEND" : "sys-libs/x"}, +- "sys-apps/e-2": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, +- "sys-apps/f-2": { "DEPEND" : "sys-apps/a", "RDEPEND" : "sys-apps/a"}, ++ "sys-apps/e-2": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, ++ "sys-apps/f-2": { "DEPEND" : "sys-apps/a", "RDEPEND" : ""}, + "sys-apps/g-2": { "DEPEND" : "sys-apps/b sys-libs/x", +- "RDEPEND" : "sys-apps/b"}, ++ "RDEPEND" : ""}, + } + + installed = { + "sys-libs/x-1": { }, +- "sys-apps/a-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, +- "sys-apps/b-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, ++ "sys-apps/a-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, ++ "sys-apps/b-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, + "sys-apps/c-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, + "sys-apps/d-1": { "RDEPEND" : "sys-libs/x"}, +- "sys-apps/e-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : "sys-libs/x"}, +- "sys-apps/f-1": { "DEPEND" : "sys-apps/a", "RDEPEND" : "sys-apps/a"}, +- "sys-apps/g-1": { "DEPEND" : "sys-apps/b sys-libs/x", +- "RDEPEND" : "sys-apps/b"}, ++ "sys-apps/e-1": { "DEPEND" : "sys-libs/x", "RDEPEND" : ""}, ++ "sys-apps/f-1": { "DEPEND" : "sys-apps/a", "RDEPEND" : ""}, ++ "sys-apps/g-1": { "DEPEND" : "sys-apps/b", ++ "RDEPEND" : ""}, + } + + world = ["sys-apps/a", "sys-apps/b", "sys-apps/c", "sys-apps/d", + "sys-apps/e", "sys-apps/f", "sys-apps/g"] + ++ + test_cases = ( + ResolverPlaygroundTestCase( +- ["sys-libs/x"], ++ ["sys-libs/x", "sys-apps/b"], + options = {"--rebuild-if-unbuilt" : True, +- "--rebuild-exclude" : ["sys-apps/b"]}, +- mergelist = ['sys-libs/x-2', 'sys-apps/a-2', 'sys-apps/e-2'], ++ "--rebuild-exclude" : ["sys-apps/c"]}, ++ mergelist = ['sys-libs/x-2', 'sys-apps/a-2', 'sys-apps/b-2', ++ 'sys-apps/e-2', 'sys-apps/g-2'], + ignore_mergelist_order = True, + success = True), + + ResolverPlaygroundTestCase( +- ["sys-libs/x"], ++ ["sys-libs/x", "sys-apps/b"], + options = {"--rebuild-if-unbuilt" : True}, + mergelist = ['sys-libs/x-2', 'sys-apps/a-2', 'sys-apps/b-2', +- 'sys-apps/e-2', 'sys-apps/g-2'], ++ 'sys-apps/c-2', 'sys-apps/e-2', 'sys-apps/g-2'], + ignore_mergelist_order = True, + success = True), + +@@ -72,27 +73,29 @@ class RebuildTestCase(TestCase): + success = True), + + ResolverPlaygroundTestCase( +- ["sys-libs/x"], ++ ["sys-libs/x", "sys-apps/b"], + options = {"--rebuild-if-unbuilt" : True, + "--rebuild-ignore" : ["sys-apps/b"]}, + mergelist = ['sys-libs/x-2', 'sys-apps/a-2', 'sys-apps/b-2', +- 'sys-apps/e-2'], ++ 'sys-apps/c-2', 'sys-apps/e-2'], + ignore_mergelist_order = True, + success = True), + + ResolverPlaygroundTestCase( +- ["=sys-libs/x-1-r1"], ++ ["=sys-libs/x-1-r1", "sys-apps/b"], + options = {"--rebuild-if-unbuilt" : True}, + mergelist = ['sys-libs/x-1-r1', 'sys-apps/a-2', +- 'sys-apps/b-2', 'sys-apps/e-2', 'sys-apps/g-2'], ++ 'sys-apps/b-2', 'sys-apps/c-2', 'sys-apps/e-2', ++ 'sys-apps/g-2'], + ignore_mergelist_order = True, + success = True), + + ResolverPlaygroundTestCase( +- ["=sys-libs/x-1-r1"], ++ ["=sys-libs/x-1-r1", "sys-apps/b"], + options = {"--rebuild-if-new-rev" : True}, + mergelist = ['sys-libs/x-1-r1', 'sys-apps/a-2', +- 'sys-apps/b-2', 'sys-apps/e-2', 'sys-apps/g-2'], ++ 'sys-apps/b-2', 'sys-apps/c-2', 'sys-apps/e-2', ++ 'sys-apps/g-2'], + ignore_mergelist_order = True, + success = True), + +@@ -104,10 +107,11 @@ class RebuildTestCase(TestCase): + success = True), + + ResolverPlaygroundTestCase( +- ["sys-libs/x"], ++ ["sys-libs/x", "sys-apps/b"], + options = {"--rebuild-if-new-ver" : True}, + mergelist = ['sys-libs/x-2', 'sys-apps/a-2', +- 'sys-apps/b-2', 'sys-apps/e-2', 'sys-apps/g-2'], ++ 'sys-apps/b-2', 'sys-apps/c-2', 'sys-apps/e-2', ++ 'sys-apps/g-2'], + ignore_mergelist_order = True, + success = True), + +@@ -119,10 +123,11 @@ class RebuildTestCase(TestCase): + success = True), + + ResolverPlaygroundTestCase( +- ["=sys-libs/x-1"], ++ ["=sys-libs/x-1", "=sys-apps/b-1"], + options = {"--rebuild-if-unbuilt" : True}, + mergelist = ['sys-libs/x-1', 'sys-apps/a-2', +- 'sys-apps/b-2', 'sys-apps/e-2', 'sys-apps/g-2'], ++ 'sys-apps/b-1', 'sys-apps/c-2', 'sys-apps/e-2', ++ 'sys-apps/g-2'], + ignore_mergelist_order = True, + success = True), + ) +diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py +index eb8a0d9..725b0d2 100644 +--- a/pym/portage/util/env_update.py ++++ b/pym/portage/util/env_update.py +@@ -19,12 +19,14 @@ from portage.process import find_binary + from portage.util import atomic_ofstream, ensure_dirs, getconfig, \ + normalize_path, writemsg + from portage.util.listdir import listdir ++from portage.dbapi.vartree import vartree ++from portage.package.ebuild.config import config + + if sys.hexversion >= 0x3000000: + long = int + + def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, +- env=None, writemsg_level=None): ++ env=None, writemsg_level=None, vardbapi=None): + """ + Parse /etc/env.d and use it to generate /etc/profile.env, csh.env, + ld.so.conf, and prelink.conf. Finally, run ldconfig. When ldconfig is +@@ -39,6 +41,41 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, + defaults to portage.settings["ROOT"]. + @type target_root: String (Path) + """ ++ settings = getattr(portage, 'settings', None) ++ if settings is None: ++ settings = config(config_root=target_root, ++ target_root=target_root) ++ ++ if 'no-env-update' in settings.features: ++ return ++ ++ if vardbapi is None: ++ if isinstance(env, config): ++ vardbapi = vartree(settings=env).dbapi ++ else: ++ if target_root is None: ++ target_root = portage.settings["ROOT"] ++ if hasattr(portage, "db") and target_root in portage.db: ++ vardbapi = portage.db[target_root]["vartree"].dbapi ++ else: ++ settings = config(config_root=target_root, ++ target_root=target_root) ++ target_root = settings["ROOT"] ++ if env is None: ++ env = settings ++ vardbapi = vartree(settings=settings).dbapi ++ ++ # Lock the config memory file to prevent symlink creation ++ # in merge_contents from overlapping with env-update. ++ vardbapi._fs_lock() ++ try: ++ return _env_update(makelinks, target_root, prev_mtimes, contents, ++ env, writemsg_level) ++ finally: ++ vardbapi._fs_unlock() ++ ++def _env_update(makelinks, target_root, prev_mtimes, contents, env, ++ writemsg_level): + if writemsg_level is None: + writemsg_level = portage.util.writemsg_level + if target_root is None: +diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py +index 7487d67..a939532 100644 +--- a/pym/portage/xpak.py ++++ b/pym/portage/xpak.py +@@ -1,4 +1,4 @@ +-# Copyright 2001-2010 Gentoo Foundation ++# Copyright 2001-2012 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + + +@@ -241,16 +241,9 @@ def getitem(myid,myitem): + return mydata[myloc[0]:myloc[0]+myloc[1]] + + def xpand(myid,mydest): ++ mydest = normalize_path(mydest) + os.sep + myindex=myid[0] + mydata=myid[1] +- try: +- origdir=os.getcwd() +- except SystemExit as e: +- raise +- except: +- os.chdir("/") +- origdir="/" +- os.chdir(mydest) + myindexlen=len(myindex) + startpos=0 + while ((startpos+8)= 0x2060000 and "good" or "bad")') = good ]] +} + +pkg_setup() { + # Bug #359731 - Die early if get_libdir fails. + [[ -z $(get_libdir) ]] && \ + die "get_libdir returned an empty string" + + if use python2 && use python3 ; then + ewarn "Both python2 and python3 USE flags are enabled, but only one" + ewarn "can be in the shebangs. Using python3." + fi + if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then + ewarn "Attempting to select a compatible default python interpreter" + local x success=0 + for x in /usr/bin/python2.* ; do + x=${x#/usr/bin/python2.} + if [[ $x -ge 6 ]] 2>/dev/null ; then + eselect python set python2.$x + if compatible_python_is_selected ; then + elog "Default python interpreter is now set to python-2.$x" + success=1 + break + fi + fi + done + if [ $success != 1 ] ; then + eerror "Unable to select a compatible default python interpreter!" + die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)." + fi + fi + + if use python3; then + python_set_active_version 3 + elif use python2; then + python_set_active_version 2 + fi +} + +src_prepare() { + if [ -n "${PATCHVER}" ] ; then + if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then + rm "$S/bin/ebuild-helpers/portageq" \ + || die "failed to remove portageq helper symlink" + fi + epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" + fi + epatch "${FILESDIR}"/${PVR}.patch + einfo "Setting portage.VERSION to ${PVR} ..." + sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ + die "Failed to patch portage.VERSION" + sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \ + die "Failed to patch VERSION in doc/fragment/version" + sed -e "1s/VERSION/${PVR}/" -i man/* || \ + die "Failed to patch VERSION in man page headers" + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use python3; then + einfo "Converting shebangs for python3..." + python_convert_shebangs -r 3 . + elif use python2; then + einfo "Converting shebangs for python2..." + python_convert_shebangs -r 2 . + fi +} + +src_compile() { + if use doc; then + cd "${S}"/doc + touch fragment/date + make xhtml xhtml-nochunks || die "failed to make docs" + fi + + if use epydoc; then + einfo "Generating api docs" + mkdir "${WORKDIR}"/api + local my_modules epydoc_opts="" + my_modules="$(find "${S}/pym" -name "*.py" \ + | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ + -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + epydoc -o "${WORKDIR}"/api \ + -qqqqq --no-frames --show-imports $epydoc_opts \ + --name "${PN}" --url "${HOMEPAGE}" \ + ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" + fi +} + +src_test() { + # make files executable, in case they were created by patch + find bin -type f | xargs chmod +x + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + ./pym/portage/tests/runTests || die "test(s) failed" +} + +src_install() { + local libdir=$(get_libdir) + local portage_base="/usr/${libdir}/portage" + local portage_share_config=/usr/share/portage/config + + cd "${S}"/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf || die + + insinto "$portage_share_config" + doins "$S/cnf/make.globals" || die + if [ -f "make.conf.${ARCH}".diff ]; then + patch make.conf "make.conf.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + newins make.conf make.conf.example || die + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + newins make.conf make.conf.example || die + fi + + dosym ..${portage_share_config}/make.globals /etc/make.globals + + insinto /etc/logrotate.d + doins "${S}"/cnf/logrotate.d/elog-save-summary || die + + # BSD and OSX need a sed wrapper so that find/xargs work properly + if use userland_GNU; then + rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" + fi + + local x symlinks files + + cd "$S" || die "cd failed" + for x in $(find bin -type d) ; do + exeinto $portage_base/$x || die "exeinto failed" + cd "$S"/$x || die "cd failed" + files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l) + if [ -n "$files" ] ; then + doexe $files || die "doexe failed" + fi + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + cd "$S" || die "cd failed" + for x in $(find pym/* -type d) ; do + insinto $portage_base/$x || die "insinto failed" + cd "$S"/$x || die "cd failed" + # __pycache__ directories contain no py files + [[ "*.py" != $(echo *.py) ]] || continue + doins *.py || die "doins failed" + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + # Symlinks to directories cause up/downgrade issues and the use of these + # modules outside of portage is probably negligible. + for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do + [ ! -L "${x}" ] && continue + die "symlink to directory will cause upgrade/downgrade issues: '${x}'" + done + + exeinto ${portage_base}/pym/portage/tests + doexe "${S}"/pym/portage/tests/runTests + + doman "${S}"/man/*.[0-9] + if use linguas_pl; then + doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] + doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] + fi + + dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} + use doc && dohtml -r "${S}"/doc/* + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + for x in ebuild egencache emerge portageq quickpkg repoman ; do + dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} + done + + dodir /usr/sbin + local my_syms="archive-conf + dispatch-conf + emaint + emerge-webrsync + env-update + etc-update + fixpackages + regenworld" + local x + for x in ${my_syms}; do + dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} + done + dosym env-update /usr/sbin/update-env + dosym etc-update /usr/sbin/update-etc + + dodir /etc/portage + keepdir /etc/portage +} + +pkg_preinst() { + if ! use build && ! has_version dev-python/pycrypto && \ + ! has_version '>=dev-lang/python-2.6[ssl]' ; then + ewarn "If you are an ebuild developer and you plan to commit ebuilds" + ewarn "with this system then please install dev-python/pycrypto or" + ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order" + ewarn "to enable RMD160 hash support." + ewarn "See bug #198398 for more information." + fi + if [ -f "${ROOT}/etc/make.globals" ]; then + rm "${ROOT}/etc/make.globals" + fi + + [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" + REPO_LAYOUT_CONF_WARN=$? +} + +pkg_postinst() { + # Compile all source files recursively. Any orphans + # will be identified and removed in postrm. + python_mod_optimize /usr/$(get_libdir)/portage/pym + + if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then + ewarn + echo "If you want overlay eclasses to override eclasses from" \ + "other repos then see the portage(5) man page" \ + "for information about the new layout.conf and repos.conf" \ + "configuration files." \ + | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done + ewarn + fi + + einfo + einfo "For help with using portage please consult the Gentoo Handbook" + einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" + einfo +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/portage/pym +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-9999.ebuild new file mode 100644 index 0000000000..6dc535d854 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-9999.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.43.ebuild,v 1.1 2011/03/14 19:03:12 zmedico Exp $ + +# Require EAPI 2 since we now require at least python-2.6 (for python 3 +# syntax support) which also requires EAPI 2. +EAPI=2 +inherit eutils multilib python + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +PROVIDE="virtual/portage" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux" + +python_dep="python3? ( =dev-lang/python-3* ) + !python2? ( !python3? ( + build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) + !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) ) + ) ) + python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) )" + +# The pysqlite blocker is for bug #282760. +DEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 ) + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" + +RDEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 + >=app-shells/bash-3.2_p17 + >=app-admin/eselect-1.2 ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-1.6 ) + elibc_uclibc? ( >=sys-apps/sandbox-1.6 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] = 0x2060000 and "good" or "bad")') = good ]] +} + +pkg_setup() { + if use python2 && use python3 ; then + ewarn "Both python2 and python3 USE flags are enabled, but only one" + ewarn "can be in the shebangs. Using python3." + fi + if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then + ewarn "Attempting to select a compatible default python interpreter" + local x success=0 + for x in /usr/bin/python2.* ; do + x=${x#/usr/bin/python2.} + if [[ $x -ge 6 ]] 2>/dev/null ; then + eselect python set python2.$x + if compatible_python_is_selected ; then + elog "Default python interpreter is now set to python-2.$x" + success=1 + break + fi + fi + done + if [ $success != 1 ] ; then + eerror "Unable to select a compatible default python interpreter!" + die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)." + fi + fi + + if use python3; then + python_set_active_version 3 + elif use python2; then + python_set_active_version 2 + fi +} + +src_unpack() { + SRCDIR="${CROS_WORKON_SRCROOT}/src/third_party/portage_tool" + if [ ! -d "${SRCDIR}" ]; then + die "Missing ${SRCDIR}. Please add it manually to your local manifest." + fi + mkdir -p ${S} + cp -a ${SRCDIR}/* "${S}" || die "cp -a ${SRCDIR}/* ${S}" +} + +src_prepare() { + if [ -n "${PATCHVER}" ] ; then + if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then + rm "$S/bin/ebuild-helpers/portageq" \ + || die "failed to remove portageq helper symlink" + fi + fi + einfo "Setting portage.VERSION to ${PVR} ..." + sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ + die "Failed to patch portage.VERSION" + sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \ + die "Failed to patch VERSION in doc/fragment/version" + sed -e "1s/VERSION/${PVR}/" -i man/* || \ + die "Failed to patch VERSION in man page headers" + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use python3; then + einfo "Converting shebangs for python3..." + python_convert_shebangs -r 3 . + elif use python2; then + einfo "Converting shebangs for python2..." + python_convert_shebangs -r 2 . + fi +} + +src_compile() { + if use doc; then + cd "${S}"/doc + touch fragment/date + make xhtml xhtml-nochunks || die "failed to make docs" + fi + + if use epydoc; then + einfo "Generating api docs" + mkdir "${WORKDIR}"/api + local my_modules epydoc_opts="" + my_modules="$(find "${S}/pym" -name "*.py" \ + | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ + -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + epydoc -o "${WORKDIR}"/api \ + -qqqqq --no-frames --show-imports $epydoc_opts \ + --name "${PN}" --url "${HOMEPAGE}" \ + ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" + fi +} + +src_test() { + # make files executable, in case they were created by patch + find bin -type f | xargs chmod +x + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + ./pym/portage/tests/runTests || die "test(s) failed" +} + +src_install() { + local libdir=$(get_libdir) + local portage_base="/usr/${libdir}/portage" + local portage_share_config=/usr/share/portage/config + + cd "${S}"/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf || die + + insinto "$portage_share_config" + doins "$S/cnf/make.globals" || die + if [ -f "make.conf.${ARCH}".diff ]; then + patch make.conf "make.conf.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + newins make.conf make.conf.example || die + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + newins make.conf make.conf.example || die + fi + + dosym ..${portage_share_config}/make.globals /etc/make.globals + + insinto /etc/logrotate.d + doins "${S}"/cnf/logrotate.d/elog-save-summary || die + + # BSD and OSX need a sed wrapper so that find/xargs work properly + if use userland_GNU; then + rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" + fi + + local x symlinks files + + cd "$S" || die "cd failed" + for x in $(find bin -type d) ; do + exeinto $portage_base/$x || die "exeinto failed" + cd "$S"/$x || die "cd failed" + files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l) + if [ -n "$files" ] ; then + doexe $files || die "doexe failed" + fi + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + cd "$S" || die "cd failed" + for x in $(find pym/* -type d) ; do + insinto $portage_base/$x || die "insinto failed" + cd "$S"/$x || die "cd failed" + # __pycache__ directories contain no py files + [[ "*.py" != $(echo *.py) ]] || continue + doins *.py || die "doins failed" + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + # Symlinks to directories cause up/downgrade issues and the use of these + # modules outside of portage is probably negligible. + for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do + [ ! -L "${x}" ] && continue + die "symlink to directory will cause upgrade/downgrade issues: '${x}'" + done + + exeinto ${portage_base}/pym/portage/tests + doexe "${S}"/pym/portage/tests/runTests + + doman "${S}"/man/*.[0-9] + if use linguas_pl; then + doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] + doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] + fi + + dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} + use doc && dohtml -r "${S}"/doc/* + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + for x in ebuild egencache emerge portageq quickpkg repoman ; do + dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} + done + + dodir /usr/sbin + local my_syms="archive-conf + dispatch-conf + emaint + emerge-webrsync + env-update + etc-update + fixpackages + regenworld" + local x + for x in ${my_syms}; do + dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} + done + dosym env-update /usr/sbin/update-env + dosym etc-update /usr/sbin/update-etc + + dodir /etc/portage + keepdir /etc/portage +} + +pkg_preinst() { + if ! use build && ! has_version dev-python/pycrypto && \ + ! has_version '>=dev-lang/python-2.6[ssl]' ; then + ewarn "If you are an ebuild developer and you plan to commit ebuilds" + ewarn "with this system then please install dev-python/pycrypto or" + ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order" + ewarn "to enable RMD160 hash support." + ewarn "See bug #198398 for more information." + fi + if [ -f "${ROOT}/etc/make.globals" ]; then + rm "${ROOT}/etc/make.globals" + fi + + [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" + REPO_LAYOUT_CONF_WARN=$? +} + +pkg_postinst() { + # Compile all source files recursively. Any orphans + # will be identified and removed in postrm. + python_mod_optimize /usr/$(get_libdir)/portage/pym + + if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then + ewarn + echo "If you want overlay eclasses to override eclasses from" \ + "other repos then see the portage(5) man page" \ + "for information about the new layout.conf and repos.conf" \ + "configuration files." \ + | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done + ewarn + fi + + einfo + einfo "For help with using portage please consult the Gentoo Handbook" + einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" + einfo +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/portage/pym +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/pv/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/pv/Manifest new file mode 100644 index 0000000000..0b3441a8a0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/pv/Manifest @@ -0,0 +1 @@ +DIST pv-1.1.4.tar.gz 92146 RMD160 ac0453e59f9f1d81cc40b55b8870871aa22f9f10 SHA1 2d84e212b543509b675351809d1e0257e679c5fa SHA256 fd43aea3ce9017499cc02c5b3237e0207140b17d6efaddc05fa8cc393c64a904 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/pv/pv-1.1.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/pv/pv-1.1.4-r1.ebuild new file mode 100644 index 0000000000..25c6fbaabc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/pv/pv-1.1.4-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pv/pv-1.1.4-r1.ebuild,v 1.1 2010/12/13 00:52:06 flameeyes Exp $ + +EAPI="2" + +inherit toolchain-funcs + +DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe" +HOMEPAGE="http://www.ivarch.com/programs/pv.shtml" +SRC_URI="mirror://sourceforge/pipeviewer/${P}.tar.gz" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris" +IUSE="nls" + +src_configure() { + econf $(use_enable nls) +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + dodoc README doc/NEWS doc/TODO || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/rollog/rollog-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/rollog/rollog-0.0.1-r3.ebuild new file mode 100644 index 0000000000..edcdd3e05f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/rollog/rollog-0.0.1-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="2107f76d09ee7d41fd20367af4620b46a6443af4" +CROS_WORKON_TREE="f8747f25994455c144df5a4e24cedbbe09a16d7c" +CROS_WORKON_PROJECT="chromiumos/platform/rollog" +CROS_WORKON_LOCALNAME="../platform/rollog" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon + +DESCRIPTION="Utility for implementing rolling logs for bug regression" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_install() { + dobin "${OUT}"/rollog +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/rollog/rollog-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/rollog/rollog-9999.ebuild new file mode 100644 index 0000000000..f6c7caff04 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/rollog/rollog-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/platform/rollog" +CROS_WORKON_LOCALNAME="../platform/rollog" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon + +DESCRIPTION="Utility for implementing rolling logs for bug regression" +HOMEPAGE="http://www.chromium.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + cros-workon_src_compile +} + +src_install() { + dobin "${OUT}"/rollog +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest new file mode 100644 index 0000000000..da193aa420 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest @@ -0,0 +1 @@ +DIST shadow-4.1.2.2.tar.bz2 1697615 RMD160 19b8d3bc37d26d708ecad6a86e6a1f2dcc3c51d3 SHA1 6cbd29104c219ff6776eececb8068f7326d57a45 SHA256 378fbfb0e8bb8c87be239fccd692818871f763206bb7d881744f4fa72dc6b491 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch new file mode 100644 index 0000000000..5489001cc1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch @@ -0,0 +1,52 @@ +http://bugs.gentoo.org/256784 + +From 6f74a20a3002280f23033dea64d7186896d0dfc0 Mon Sep 17 00:00:00 2001 +From: nekral-guest +Date: Sat, 30 Aug 2008 18:31:21 +0000 +Subject: [PATCH] * configure.in: Check if the stat structure has a st_atim or + st_atimensec field. + * libmisc/copydir.c: Conditionally use the stat's st_atim and + st_atimensec fields. + +git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2298 5a98b0ae-9ef6-0310-add3-de5d479b70d7 +--- + ChangeLog | 4 ++++ + libmisc/copydir.c | 9 +++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + ++ * configure.in: Check if the stat structure has a st_atim or ++ st_atimensec field. ++ * libmisc/copydir.c: Conditionally use the stat's st_atim and ++ st_atimensec fields. + +diff --git a/libmisc/copydir.c b/libmisc/copydir.c +index b887303..cdd2037 100644 +--- a/libmisc/copydir.c ++++ b/libmisc/copydir.c +@@ -288,16 +288,21 @@ static int copy_entry (const char *src, const char *dst, + if (LSTAT (src, &sb) == -1) { + /* If we cannot stat the file, do not care. */ + } else { +-#if defined(_BSD_SOURCE) || defined(_SVID_SOURCE) ++#ifdef HAVE_STRUCT_STAT_ST_ATIM + mt[0].tv_sec = sb.st_atim.tv_sec; + mt[0].tv_usec = sb.st_atim.tv_nsec / 1000; + mt[1].tv_sec = sb.st_mtim.tv_sec; + mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; + #else + mt[0].tv_sec = sb.st_atime; +- mt[0].tv_usec = sb.st_atimensec / 1000; + mt[1].tv_sec = sb.st_mtime; ++#ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC ++ mt[0].tv_usec = sb.st_atimensec / 1000; + mt[1].tv_usec = sb.st_mtimensec / 1000; ++#else ++ mt[0].tv_usec = 0; ++ mt[1].tv_usec = 0; ++#endif + #endif + + if (S_ISDIR (sb.st_mode)) { +-- +1.6.1.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch new file mode 100644 index 0000000000..59333feb0b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch @@ -0,0 +1,61 @@ +http://bugs.gentoo.org/256784 + +From 060292366348d55eb90b5c3f4f15768ffc7639d2 Mon Sep 17 00:00:00 2001 +From: nekral-guest +Date: Sun, 7 Sep 2008 00:05:38 +0000 +Subject: [PATCH] * libmisc/copydir.c, configure.in: Check for the presence of + st_mtim and st_mtimensec, as for st_atim and st_atimensec. + +git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2364 5a98b0ae-9ef6-0310-add3-de5d479b70d7 +--- + ChangeLog | 5 +++++ + configure.in | 2 ++ + libmisc/copydir.c | 17 ++++++++++++----- + 3 files changed, 19 insertions(+), 5 deletions(-) + ++2008-09-07 Nicolas François ++ ++ * libmisc/copydir.c, configure.in: Check for the presence of ++ st_mtim and st_mtimensec, as for st_atim and st_atimensec. + +/* configure.in changes are in the 4.1.2.2 configure.in ... */ + +diff --git a/libmisc/copydir.c b/libmisc/copydir.c +index cdd2037..a9aec98 100644 +--- a/libmisc/copydir.c ++++ b/libmisc/copydir.c +@@ -288,19 +288,26 @@ static int copy_entry (const char *src, const char *dst, + if (LSTAT (src, &sb) == -1) { + /* If we cannot stat the file, do not care. */ + } else { +-#ifdef HAVE_STRUCT_STAT_ST_ATIM ++#ifdef HAVE_STRUCT_STAT_ST_ATIM + mt[0].tv_sec = sb.st_atim.tv_sec; + mt[0].tv_usec = sb.st_atim.tv_nsec / 1000; +- mt[1].tv_sec = sb.st_mtim.tv_sec; +- mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; + #else + mt[0].tv_sec = sb.st_atime; +- mt[1].tv_sec = sb.st_mtime; + #ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC + mt[0].tv_usec = sb.st_atimensec / 1000; +- mt[1].tv_usec = sb.st_mtimensec / 1000; + #else + mt[0].tv_usec = 0; ++#endif ++#endif ++ ++#ifdef HAVE_STRUCT_STAT_ST_MTIM ++ mt[1].tv_sec = sb.st_mtim.tv_sec; ++ mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; ++#else ++ mt[1].tv_sec = sb.st_mtime; ++#ifdef HAVE_STRUCT_STAT_ST_MTIMENSEC ++ mt[1].tv_usec = sb.st_mtimensec / 1000; ++#else + mt[1].tv_usec = 0; + #endif + #endif +-- +1.6.1.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/default/useradd b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/default/useradd new file mode 100644 index 0000000000..ae81dbb3a0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/default/useradd @@ -0,0 +1,7 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/bash +SKEL=/etc/skel diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.defs b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.defs new file mode 100644 index 0000000000..4aa7044bec --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.defs @@ -0,0 +1,212 @@ +# +# /etc/login.defs - Configuration control definitions for the login package. +# +# $Id: login.defs,v 1.6 2006/03/12 23:47:08 flameeyes Exp $ +# +# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. +# If unspecified, some arbitrary (and possibly incorrect) value will +# be assumed. All other items are optional - if not specified then +# the described action or option will be inhibited. +# +# Comment lines (lines beginning with "#") and blank lines are ignored. +# +# Modified for Linux. --marekm + +# +# Delay in seconds before being allowed another attempt after a login failure +# +FAIL_DELAY 3 + +# +# Enable display of unknown usernames when login failures are recorded. +# +LOG_UNKFAIL_ENAB no + +# +# Enable logging of successful logins +# +LOG_OK_LOGINS no + +# +# Enable "syslog" logging of su activity - in addition to sulog file logging. +# SYSLOG_SG_ENAB does the same for newgrp and sg. +# +SYSLOG_SU_ENAB yes +SYSLOG_SG_ENAB yes + +# +# If defined, either full pathname of a file containing device names or +# a ":" delimited list of device names. Root logins will be allowed only +# upon these devices. +# +CONSOLE /etc/securetty +#CONSOLE console:tty01:tty02:tty03:tty04 + +# +# If defined, all su activity is logged to this file. +# +#SULOG_FILE /var/log/sulog + +# +# If defined, file which maps tty line to TERM environment parameter. +# Each line of the file is in a format something like "vt100 tty01". +# +#TTYTYPE_FILE /etc/ttytype + +# +# If defined, the command name to display when running "su -". For +# example, if this is defined as "su" then a "ps" will display the +# command is "-su". If not defined, then "ps" would display the +# name of the shell actually being run, e.g. something like "-sh". +# +SU_NAME su + +# +# *REQUIRED* +# Directory where mailboxes reside, _or_ name of file, relative to the +# home directory. If you _do_ define both, MAIL_DIR takes precedence. +# +MAIL_DIR /var/spool/mail + +# +# If defined, file which inhibits all the usual chatter during the login +# sequence. If a full pathname, then hushed mode will be enabled if the +# user's name or shell are found in the file. If not a full pathname, then +# hushed mode will be enabled if the file exists in the user's home directory. +# +HUSHLOGIN_FILE .hushlogin +#HUSHLOGIN_FILE /etc/hushlogins + +# +# *REQUIRED* The default PATH settings, for superuser and normal users. +# +# (they are minimal, add the rest in the shell startup files) +ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin +ENV_PATH PATH=/bin:/usr/bin + +# +# Terminal permissions +# +# TTYGROUP Login tty will be assigned this group ownership. +# TTYPERM Login tty will be set to this permission. +# +# If you have a "write" program which is "setgid" to a special group +# which owns the terminals, define TTYGROUP to the group number and +# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign +# TTYPERM to either 622 or 600. +# +TTYGROUP tty +TTYPERM 0600 + +# +# Login configuration initializations: +# +# ERASECHAR Terminal ERASE character ('\010' = backspace). +# KILLCHAR Terminal KILL character ('\025' = CTRL/U). +# UMASK Default "umask" value. +# +# The ERASECHAR and KILLCHAR are used only on System V machines. +# The ULIMIT is used only if the system supports it. +# (now it works with setrlimit too; ulimit is in 512-byte units) +# +# Prefix these values with "0" to get octal, "0x" to get hexadecimal. +# +ERASECHAR 0177 +KILLCHAR 025 +UMASK 022 + +# +# Password aging controls: +# +# PASS_MAX_DAYS Maximum number of days a password may be used. +# PASS_MIN_DAYS Minimum number of days allowed between password changes. +# PASS_WARN_AGE Number of days warning given before a password expires. +# +PASS_MAX_DAYS 99999 +PASS_MIN_DAYS 0 +PASS_WARN_AGE 7 + +# +# Min/max values for automatic uid selection in useradd +# +UID_MIN 1000 +UID_MAX 60000 + +# +# Min/max values for automatic gid selection in groupadd +# +GID_MIN 100 +GID_MAX 60000 + +# +# Max number of login retries if password is bad +# +LOGIN_RETRIES 3 + +# +# Max time in seconds for login +# +LOGIN_TIMEOUT 60 + +# +# Which fields may be changed by regular users using chfn - use +# any combination of letters "frwh" (full name, room number, work +# phone, home phone). If not defined, no changes are allowed. +# For backward compatibility, "yes" = "rwh" and "no" = "frwh". +# +CHFN_RESTRICT rwh + +# +# List of groups to add to the user's supplementary group set +# when logging in on the console (as determined by the CONSOLE +# setting). Default is none. +# +# Use with caution - it is possible for users to gain permanent +# access to these groups, even when not logged in on the console. +# How to do it is left as an exercise for the reader... +# +#CONSOLE_GROUPS floppy:audio:cdrom + +# +# Should login be allowed if we can't cd to the home directory? +# Default in no. +# +DEFAULT_HOME yes + +# +# If defined, this command is run when removing a user. +# It should remove any at/cron/print jobs etc. owned by +# the user to be removed (passed as the first argument). +# +#USERDEL_CMD /usr/sbin/userdel_local + +# +# When prompting for password without echo, getpass() can optionally +# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' +# characters for each character typed. This feature is designed to +# confuse people looking over your shoulder when you enter a password :-). +# Also, the new getpass() accepts both Backspace (8) and Delete (127) +# keys to delete previous character (to cope with different terminal +# types), Control-U to delete all characters, and beeps when there are +# no more characters to delete, or too many characters entered. +# +# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour - +# exactly one '*' displayed for each character typed. +# +# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace, +# Delete, Control-U and beep continue to work as described above). +# +# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass() +# without any new features. This is the default. +# +GETPASS_ASTERISKS 0 + +# +# Enable setting of the umask group bits to be the same as owner bits +# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is +# the same as gid, and username is the same as the primary group name. +# +# This also enables userdel to remove user groups if no members exist. +# +USERGROUPS_ENAB yes + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd new file mode 100644 index 0000000000..f8f1f86fbc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd @@ -0,0 +1,30 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth include system-auth +auth required pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root +auth required pam_shells.so +auth required pam_nologin.so + +account required pam_access.so +account include system-auth +account required pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_magic_root + +password include system-auth + +@selinux@# pam_selinux.so close should be the first session rule +@selinux@session required pam_selinux.so close +@selinux@ +session include system-auth +session required pam_env.so +session optional pam_lastlog.so +session optional pam_motd.so motd=/etc/motd +session optional pam_mail.so + +# If you want to enable pam_console, uncomment the following line +# and read carefully README.pam_console in /usr/share/doc/pam* +#session optional pam_console.so + +@selinux@# pam_selinux.so open should be the last session rule +@selinux@session required pam_selinux.so multiple open +@selinux@ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.1 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.1 new file mode 100644 index 0000000000..2c784e240a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.1 @@ -0,0 +1,31 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth required pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root +auth required pam_shells.so +auth required pam_nologin.so +auth include system-auth + +account required pam_access.so +account include system-auth +account required pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_magic_root + +password include system-auth + +@selinux@# pam_selinux.so close should be the first session rule +@selinux@session required pam_selinux.so close +@selinux@ +session required pam_env.so +session optional pam_lastlog.so +session optional pam_motd.so motd=/etc/motd +session optional pam_mail.so + +# If you want to enable pam_console, uncomment the following line +# and read carefully README.pam_console in /usr/share/doc/pam* +#session optional pam_console.so + +session include system-auth + +@selinux@# pam_selinux.so open should be the last session rule +@selinux@session required pam_selinux.so multiple open +@selinux@ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.2 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.2 new file mode 100644 index 0000000000..49c3a648b1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.2 @@ -0,0 +1,28 @@ +#%PAM-1.0 + +auth include chromeos-auth +auth required pam_securetty.so +auth required pam_tally.so file=/var/log/faillog onerr=succeed +auth required pam_shells.so +auth required pam_nologin.so +auth include system-auth + +account required pam_access.so +account include system-auth +account required pam_tally.so file=/var/log/faillog onerr=succeed + +password include system-auth + +#%EPAM-Use-Flag:selinux%## pam_selinux.so close should be the first session rule +#%EPAM-Use-Flag:selinux%#session required pam_selinux.so close +#%EPAM-Use-Flag:selinux%# +session required pam_env.so +session optional pam_lastlog.so +session optional pam_motd.so motd=/etc/motd +session optional pam_mail.so + +session include system-auth + +#%EPAM-Use-Flag:selinux%## pam_selinux.so open should be the last session rule +#%EPAM-Use-Flag:selinux%#session required pam_selinux.so multiple open +#%EPAM-Use-Flag:selinux%# diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.3 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.3 new file mode 100644 index 0000000000..13abd2796b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.3 @@ -0,0 +1,6 @@ +auth required pam_securetty.so +auth include system-local-login + +account include system-local-login +password include system-local-login +session include system-local-login diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs.awk b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs.awk new file mode 100644 index 0000000000..56087c647e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs.awk @@ -0,0 +1,32 @@ +# Fixes up login defs for PAM by commenting all non-PAM options and adding a +# comment that it is not supported with PAM. +# +# Call with lib/getdef.c and etc/login.defs as args in the root source directory +# of shadow, ie: +# +# gawk -f login_defs.awk lib/getdef.c etc/login.defs > login.defs.new +# + +(FILENAME == "lib/getdef.c") { + if ($2 == "USE_PAM") + start_printing = 1 + else if ($1 == "#endif") + nextfile + else if (start_printing == 1) + VARS[count++] = substr($1, 3, length($1) - 4) +} + +(FILENAME != "lib/getdef.c") { + print_line = 1 + for (x in VARS) { + regex = "(^|#)" VARS[x] + if ($0 ~ regex) { + print_line = 0 + printf("%s%s\t(NOT SUPPORTED WITH PAM)\n", + ($0 ~ /^#/) ? "" : "#", $0) + } + } + if (print_line) + print $0 +} + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs_pam.sed b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs_pam.sed new file mode 100644 index 0000000000..ba308ba9ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs_pam.sed @@ -0,0 +1,24 @@ +/^FAILLOG_ENAB/b comment +/^LASTLOG_ENAB/b comment +/^MAIL_CHECK_ENAB/b comment +/^OBSCURE_CHECKS_ENAB/b comment +/^PORTTIME_CHECKS_ENAB/b comment +/^QUOTAS_ENAB/b comment +/^MOTD_FILE/b comment +/^FTMP_FILE/b comment +/^NOLOGINS_FILE/b comment +/^ENV_HZ/b comment +/^PASS_MIN_LEN/b comment +/^SU_WHEEL_ONLY/b comment +/^CRACKLIB_DICTPATH/b comment +/^PASS_CHANGE_TRIES/b comment +/^PASS_ALWAYS_WARN/b comment +/^CHFN_AUTH/b comment +/^ENVIRON_FILE/b comment + +b exit + +: comment + s:^:#: + +: exit diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/login b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/login new file mode 100644 index 0000000000..9d2167793c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/login @@ -0,0 +1,12 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth include system-auth +auth required pam_nologin.so + +account include system-auth + +password include system-auth + +session include system-auth +session optional pam_console.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/other b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/other new file mode 100644 index 0000000000..bb0b9647c0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/other @@ -0,0 +1,9 @@ +#%PAM-1.0 + +auth required pam_deny.so + +account required pam_deny.so + +password required pam_deny.so + +session required pam_deny.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/passwd b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/passwd new file mode 100644 index 0000000000..3a98715220 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/passwd @@ -0,0 +1,5 @@ +#%PAM-1.0 + +auth include system-auth +account include system-auth +password include system-auth diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/shadow b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/shadow new file mode 100644 index 0000000000..743b2f0260 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/shadow @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so +auth required pam_permit.so + +account include system-auth + +password required pam_permit.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su new file mode 100644 index 0000000000..d15c7edfc5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su @@ -0,0 +1,32 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so + +# If you want to restrict users begin allowed to su even more, +# create /etc/security/suauth.allow (or to that matter) that is only +# writable by root, and add users that are allowed to su to that +# file, one per line. +#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow + +# Uncomment this to allow users in the wheel group to su without +# entering a passwd. +#auth sufficient pam_wheel.so use_uid trust + +# Alternatively to above, you can implement a list of users that do +# not need to supply a passwd with a list. +#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass + +# Comment this to allow any user, even those not in the 'wheel' +# group to su +auth required pam_wheel.so use_uid + +auth include system-auth + +account include system-auth + +password include system-auth + +session include system-auth +session required pam_env.so +session optional pam_xauth.so + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su-openpam b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su-openpam new file mode 100644 index 0000000000..e9ec7d3dd2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su-openpam @@ -0,0 +1,14 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so + +auth include system-auth + +account include system-auth + +password include system-auth + +session include system-auth +session required pam_env.so +session optional pam_xauth.so + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth new file mode 100644 index 0000000000..b7c37afdad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth @@ -0,0 +1,14 @@ +#%PAM-1.0 + +auth required pam_env.so +auth sufficient pam_unix.so likeauth nullok nodelay +auth required pam_deny.so + +account required pam_unix.so + +password required pam_cracklib.so retry=3 +password sufficient pam_unix.so nullok md5 shadow use_authtok +password required pam_deny.so + +session required pam_limits.so +session required pam_unix.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth-1.1 new file mode 100644 index 0000000000..fe80483120 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth-1.1 @@ -0,0 +1,14 @@ +#%PAM-1.0 + +auth required pam_env.so +auth sufficient pam_unix.so likeauth nullok +auth required pam_deny.so + +account required pam_unix.so + +password required pam_cracklib.so retry=3 +password sufficient pam_unix.so nullok md5 shadow use_authtok +password required pam_deny.so + +session required pam_limits.so +session required pam_unix.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/securetty b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/securetty new file mode 100644 index 0000000000..218b9f4bfc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/securetty @@ -0,0 +1,35 @@ +# /etc/securetty: list of terminals on which root is allowed to login. +# See securetty(5) and login(1). +console + +vc/0 +vc/1 +vc/2 +vc/3 +vc/4 +vc/5 +vc/6 +vc/7 +vc/8 +vc/9 +vc/10 +vc/11 +vc/12 +tty0 +tty1 +tty2 +tty3 +tty4 +tty5 +tty6 +tty7 +tty8 +tty9 +tty10 +tty11 +tty12 + +tts/0 +ttyS0 +ttySAC1 +ttySAC3 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch new file mode 100644 index 0000000000..3446fd7f66 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch @@ -0,0 +1,46 @@ +--- src/Makefile.am 2005-08-01 12:29:59.000000000 +0200 ++++ src.az/Makefile.am 2005-08-01 12:30:44.000000000 +0200 +@@ -45,6 +45,8 @@ noinst_PROGRAMS = id sulogin + + suidbins = su + suidubins = chage chfn chsh expiry gpasswd newgrp passwd ++suidbinperms = 4711 ++suidubinperms = 4711 + + LDADD = $(top_builddir)/libmisc/libmisc.a \ + $(top_builddir)/lib/libshadow.la +@@ -79,8 +81,8 @@ install-am: all-am + ln -sf newgrp $(DESTDIR)$(ubindir)/sg + ln -sf vipw $(DESTDIR)$(usbindir)/vigr + for i in $(suidbins); do \ +- chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \ ++ chmod -f $(suidbinperms) $(DESTDIR)$(bindir)/$$i; \ + done + for i in $(suidubins); do \ +- chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \ ++ chmod -f $(suidubinperms) $(DESTDIR)$(ubindir)/$$i; \ + done +--- src/Makefile.in 2005-08-01 12:31:07.000000000 +0200 ++++ src.az/Makefile.in 2005-08-01 12:33:54.000000000 +0200 +@@ -346,6 +346,8 @@ INCLUDES = \ + + suidbins = su + suidubins = chage chfn chsh expiry gpasswd newgrp passwd ++suidbinperms = 4711 ++suidubinperms = 4711 + LDADD = $(top_builddir)/libmisc/libmisc.a \ + $(top_builddir)/lib/libshadow.la + +@@ -839,10 +841,10 @@ install-am: all-am + ln -sf newgrp $(DESTDIR)$(ubindir)/sg + ln -sf vipw $(DESTDIR)$(usbindir)/vigr + for i in $(suidbins); do \ +- chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \ ++ chmod -f $(suidbinperms) $(DESTDIR)$(bindir)/$$i; \ + done + for i in $(suidubins); do \ +- chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \ ++ chmod -f $(suidubinperms) $(DESTDIR)$(ubindir)/$$i; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch new file mode 100644 index 0000000000..b70dbceffc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch @@ -0,0 +1,30 @@ +Fix compiling with gcc-2.95.x: + +----- +newgrp.c: In function `main': +newgrp.c:459: parse error before `child' +newgrp.c:467: `child' undeclared (first use in this function) +newgrp.c:467: (Each undeclared identifier is reported only once +newgrp.c:467: for each function it appears in.) +newgrp.c:476: `pid' undeclared (first use in this function) +make[2]: *** [newgrp.o] Error 1 +----- + +--- shadow-4.0.12/src/newgrp.c 2005-08-24 13:30:51.000000000 +0200 ++++ shadow-4.0.12.az/src/newgrp.c 2005-08-24 13:31:01.000000000 +0200 +@@ -424,6 +424,7 @@ + if (getdef_bool ("SYSLOG_SG_ENAB")) { + char *loginname = getlogin (); + char *tty = ttyname (0); ++ pid_t child, pid; + + if (loginname != NULL) + loginname = xstrdup (loginname); +@@ -456,7 +457,6 @@ + * avoid any possibility of the parent being stopped when it + * receives SIGCHLD from the terminating subshell. -- JWP + */ +- pid_t child, pid; + + signal (SIGINT, SIG_IGN); + signal (SIGQUIT, SIG_IGN); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch new file mode 100644 index 0000000000..54e1d72e61 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch @@ -0,0 +1,28 @@ +Allow people to add users with dots in their names. + +http://bugs.gentoo.org/22920 + +Index: libmisc/chkname.c +=================================================================== +RCS file: /cvsroot/shadow/libmisc/chkname.c,v +retrieving revision 1.11 +diff -u -p -r1.11 chkname.c +--- libmisc/chkname.c 31 Aug 2005 17:24:57 -0000 1.11 ++++ libmisc/chkname.c 10 Oct 2005 22:20:16 -0000 +@@ -18,7 +18,7 @@ + static int good_name (const char *name) + { + /* +- * User/group names must match [a-z_][a-z0-9_-]*[$] ++ * User/group names must match [a-z_][a-z0-9_-.]*[$] + */ + if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_')) + return 0; +@@ -27,6 +27,7 @@ static int good_name (const char *name) + if (!((*name >= 'a' && *name <= 'z') || + (*name >= '0' && *name <= '9') || + *name == '_' || *name == '-' || ++ *name == '.' || + (*name == '$' && *(name + 1) == '\0'))) + return 0; + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch new file mode 100644 index 0000000000..df322cf28b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch @@ -0,0 +1,18 @@ +Remove arbitrary requirement on the length of groups. Perhaps we +should turn this into a configure option and send upstream ? + +http://bugs.gentoo.org/3485 + +--- libmisc/chkname.c ++++ libmisc/chkname.c +@@ -59,8 +60,10 @@ + * Arbitrary limit for group names - max 16 + * characters (same as on HP-UX 10). + */ ++#if 0 + if (strlen (name) > 16) + return 0; ++#endif + + return good_name (name); + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-nonis.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-nonis.patch new file mode 100644 index 0000000000..0c89e90e21 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-nonis.patch @@ -0,0 +1,53 @@ +--- src/login_nopam.c ++++ src/login_nopam.c +@@ -50,7 +50,9 @@ + #include + #include /* for inet_ntoa() */ + extern struct group *getgrnam (); ++#ifdef USE_NIS + extern int innetgr (); ++#endif + + #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) + #undef MAXHOSTNAMELEN +@@ -178,6 +180,7 @@ static char *myhostname (void) + return (name); + } + ++#ifdef USE_NIS + /* netgroup_match - match group against machine or user */ + static int + netgroup_match (const char *group, const char *machine, const char *user) +@@ -193,6 +196,7 @@ netgroup_match (const char *group, const + + return innetgr (group, machine, user, mydomain); + } ++#endif + + /* user_match - match a username against one token */ + static int user_match (const char *tok, const char *string) +@@ -214,8 +218,10 @@ static int user_match (const char *tok, + *at = 0; + return (user_match (tok, string) + && from_match (at + 1, myhostname ())); ++#ifdef USE_NIS + } else if (tok[0] == '@') { /* netgroup */ + return (netgroup_match (tok + 1, (char *) 0, string)); ++#endif + } else if (string_match (tok, string)) { /* ALL or exact match */ + return (YES); + } else if ((group = getgrnam (tok))) { /* try group membership */ +@@ -271,9 +277,12 @@ static int from_match (const char *tok, + * contain a "." character. If the token is a network number, return YES + * if it matches the head of the string. + */ ++#ifdef USE_NIS + if (tok[0] == '@') { /* netgroup */ + return (netgroup_match (tok + 1, string, (char *) 0)); +- } else if (string_match (tok, string)) { /* ALL or exact match */ ++ } else ++#endif ++ if (string_match (tok, string)) { /* ALL or exact match */ + return (YES); + } else if (tok[0] == '.') { /* domain: match last fields */ + if ((str_len = strlen (string)) > (tok_len = strlen (tok)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch new file mode 100644 index 0000000000..ac9aa8c9df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch @@ -0,0 +1,57 @@ +uClibc svn has l64a() support in it, but not uClibc 0.9.28 release + +--- shadow-4.0.15/libmisc/salt.c ++++ shadow-4.0.15/libmisc/salt.c +@@ -14,6 +14,52 @@ + #include "prototypes.h" + #include "defines.h" + #include "getdef.h" ++ ++#ifndef HAVE_A64L ++ ++/* ++ * l64a - convert a long to a string of radix 64 characters ++ */ ++ ++static const char conv_table[64] = ++{ ++ '.', '/', '0', '1', '2', '3', '4', '5', ++ '6', '7', '8', '9', 'A', 'B', 'C', 'D', ++ 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', ++ 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', ++ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', ++ 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', ++ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', ++ 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' ++}; ++ ++char * ++l64a (n) ++ long int n; ++{ ++ unsigned long int m = (unsigned long int) n; ++ static char result[7]; ++ int cnt; ++ ++ /* The standard says that only 32 bits are used. */ ++ m &= 0xffffffff; ++ ++ if (m == 0ul) ++ /* The value for N == 0 is defined to be the empty string. */ ++ return (char *) ""; ++ ++ for (cnt = 0; m > 0ul; ++cnt) ++ { ++ result[cnt] = conv_table[m & 0x3f]; ++ m >>= 6; ++ } ++ result[cnt] = '\0'; ++ ++ return result; ++} ++ ++#endif /* !HAVE_A64L */ ++ + /* + * Generate 8 base64 ASCII characters of random salt. If MD5_CRYPT_ENAB + * in /etc/login.defs is "yes", the salt string will be prefixed by "$1$" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch new file mode 100644 index 0000000000..3170869f02 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch @@ -0,0 +1,105 @@ +http://bugs.gentoo.org/128715 + +exact implementation details are still in discussion upstream, but this fixes +the behavior to not suck like current code + +Index: src/useradd.c +=================================================================== +RCS file: /cvsroot/shadow/src/useradd.c,v +retrieving revision 1.96 +diff -u -p -r1.96 useradd.c +--- src/useradd.c 30 May 2006 18:28:45 -0000 1.96 ++++ src/useradd.c 10 Jun 2006 22:13:32 -0000 +@@ -114,7 +114,7 @@ static int do_grp_update = 0; /* group f + static char *Prog; + + static int +- bflg = 0, /* new default root of home directory */ ++ bflg = 0, /* new default root of home directory */ + cflg = 0, /* comment (GECOS) field for new account */ + dflg = 0, /* home directory for new account */ + Dflg = 0, /* set/show new user default values */ +@@ -253,6 +253,12 @@ static void get_defaults (void) + const struct group *grp; + + /* ++ * Pull relevant settings from login.defs first. ++ */ ++ if (getdef_bool ("USERGROUPS_ENAB")) ++ nflg = -1; ++ ++ /* + * Open the defaults file for reading. + */ + +@@ -628,6 +634,8 @@ static void usage (void) + " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" + " -m, --create-home create home directory for the new user\n" + " account\n" ++ " -n, --user-group create a new group with the same name as the\n" ++ " new user\n" + " -o, --non-unique allow create user with duplicate\n" + " (non-unique) UID\n" + " -p, --password PASSWORD use encrypted password for the new user\n" +@@ -1009,6 +1017,7 @@ static void process_flags (int argc, cha + {"skel", required_argument, NULL, 'k'}, + {"key", required_argument, NULL, 'K'}, + {"create-home", no_argument, NULL, 'm'}, ++ {"user-group", no_argument, NULL, 'n'}, + {"non-unique", no_argument, NULL, 'o'}, + {"password", required_argument, NULL, 'p'}, + {"shell", required_argument, NULL, 's'}, +@@ -1016,7 +1025,7 @@ static void process_flags (int argc, cha + {NULL, 0, NULL, '\0'} + }; + while ((c = +- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", ++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:", + long_options, NULL)) != -1) { + switch (c) { + case 'b': +@@ -1156,6 +1165,9 @@ static void process_flags (int argc, cha + case 'm': + mflg++; + break; ++ case 'n': ++ nflg = 1; ++ break; + case 'o': + oflg++; + break; +@@ -1203,6 +1215,16 @@ static void process_flags (int argc, cha + usage (); + + /* ++ * Using --gid and --user-group doesn't make sense. ++ */ ++ if (nflg == -1 && gflg) ++ nflg = 0; ++ if (nflg && gflg) { ++ fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog); ++ exit (E_BAD_ARG); ++ } ++ ++ /* + * Either -D or username is required. Defaults can be set with -D + * for the -b, -e, -f, -g, -s options only. + */ +@@ -1725,7 +1747,7 @@ int main (int argc, char **argv) + * to that group, use useradd -g username username. + * --bero + */ +- if (!gflg) { ++ if (nflg) { + if (getgrnam (user_name)) { + fprintf (stderr, + _ +@@ -1759,7 +1781,7 @@ int main (int argc, char **argv) + + /* do we have to add a group for that user? This is why we need to + * open the group files in the open_files() function --gafton */ +- if (!(nflg || gflg)) { ++ if (nflg) { + find_new_gid (); + grp_add (); + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch new file mode 100644 index 0000000000..03eb731fa9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch @@ -0,0 +1,17 @@ +--- etc/login.defs ++++ etc/login.defs +@@ -38 +38 @@ +-MAIL_CHECK_ENAB yes ++MAIL_CHECK_ENAB no +@@ -205 +205 @@ +-SU_WHEEL_ONLY no ++SU_WHEEL_ONLY yes +@@ -210 +210 @@ +-CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict ++CRACKLIB_DICTPATH /usr/@LIBDIR@/cracklib_dict +@@ -227 +227 @@ +-LOGIN_RETRIES 5 ++LOGIN_RETRIES 3 +@@ -279 +279 @@ +-#MD5_CRYPT_ENAB no ++MD5_CRYPT_ENAB yes diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch new file mode 100644 index 0000000000..8fe14329f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch @@ -0,0 +1,42 @@ +--- shadow-4.0.18.1.orig/src/useradd.c 2006-07-28 19:42:48.000000000 +0200 ++++ shadow-4.0.18.1/src/useradd.c 2006-08-04 09:24:34.000000000 +0200 +@@ -203,13 +203,17 @@ + long gid; + char *errptr; + ++ struct group* grp = getgrnam (grname); ++ if (grp) ++ return grp; ++ + gid = strtol (grname, &errptr, 10); + if (*errptr || errno == ERANGE || gid < 0) { + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), Prog, grname); + exit (E_BAD_ARG); + } +- return getgrnam (grname); ++ return getgrgid (gid); + } + + static long get_number (const char *numstr) +--- shadow-4.0.18.1.orig/src/usermod.c 2006-07-28 19:42:48.000000000 +0200 ++++ shadow-4.0.18.1/src/usermod.c 2006-08-04 09:24:21.000000000 +0200 +@@ -165,13 +165,17 @@ + long val; + char *errptr; + ++ struct group* grp = getgrnam (grname); ++ if (grp) ++ return grp; ++ + val = strtol (grname, &errptr, 10); + if (*errptr || errno == ERANGE || val < 0) { + fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, + grname); + exit (E_BAD_ARG); + } +- return getgrnam (grname); ++ return getgrgid (val); + } + + /* diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch new file mode 100644 index 0000000000..1135500758 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch @@ -0,0 +1,22 @@ +--- shadow-4.0.18.2/src/useradd.c ++++ shadow-4.0.18.2/src/useradd.c +@@ -203,14 +203,18 @@ + long gid; + char *errptr; + ++ struct group* grp = getgrnam (grname); ++ if (grp) ++ return grp; ++ + gid = strtol (grname, &errptr, 10); + if (*errptr || errno == ERANGE || gid < 0) { + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), Prog, + grname); + exit (E_BAD_ARG); + } +- return getgrnam (grname); ++ return getgrgid (gid); + } + + static long get_number (const char *numstr) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch new file mode 100644 index 0000000000..8595ec39a9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch @@ -0,0 +1,91 @@ +http://bugs.gentoo.org/128715 + +exact implementation details are still in discussion upstream, but this fixes +the behavior to not suck like current code + +--- src/useradd.c ++++ src/useradd.c +@@ -254,6 +254,12 @@ + char *cp, *ep; + + /* ++ * Pull relevant settings from login.defs first. ++ */ ++ if (getdef_bool ("USERGROUPS_ENAB")) ++ nflg = -1; ++ ++ /* + * Open the defaults file for reading. + */ + +@@ -632,6 +638,8 @@ + " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" + " -m, --create-home create home directory for the new user\n" + " account\n" ++ " -n, --user-group create a new group with the same name as the\n" ++ " new user\n" + " -o, --non-unique allow create user with duplicate\n" + " (non-unique) UID\n" + " -p, --password PASSWORD use encrypted password for the new user\n" +@@ -1001,6 +1009,7 @@ + {"skel", required_argument, NULL, 'k'}, + {"key", required_argument, NULL, 'K'}, + {"create-home", no_argument, NULL, 'm'}, ++ {"user-group", no_argument, NULL, 'n'}, + {"non-unique", no_argument, NULL, 'o'}, + {"password", required_argument, NULL, 'p'}, + {"shell", required_argument, NULL, 's'}, +@@ -1008,7 +1017,7 @@ + {NULL, 0, NULL, '\0'} + }; + while ((c = +- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", ++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:", + long_options, NULL)) != -1) { + switch (c) { + case 'b': +@@ -1145,6 +1154,9 @@ + case 'm': + mflg++; + break; ++ case 'n': ++ nflg = 1; ++ break; + case 'o': + oflg++; + break; +@@ -1192,6 +1204,16 @@ + usage (); + + /* ++ * Using --gid and --user-group doesn't make sense. ++ */ ++ if (nflg == -1 && gflg) ++ nflg = 0; ++ if (nflg && gflg) { ++ fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog); ++ exit (E_BAD_ARG); ++ } ++ ++ /* + * Either -D or username is required. Defaults can be set with -D + * for the -b, -e, -f, -g, -s options only. + */ +@@ -1728,7 +1750,7 @@ + * to that group, use useradd -g username username. + * --bero + */ +- if (!gflg) { ++ if (nflg) { + if (getgrnam (user_name)) { /* local, no need for xgetgrnam */ + fprintf (stderr, + _ +@@ -1762,7 +1784,7 @@ + + /* do we have to add a group for that user? This is why we need to + * open the group files in the open_files() function --gafton */ +- if (!(nflg || gflg)) { ++ if (nflg) { + find_new_gid (); + grp_add (); + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.1-audit.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.1-audit.patch new file mode 100644 index 0000000000..5968279f87 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.1-audit.patch @@ -0,0 +1,22 @@ +--- a/trunk/src/newgrp.c 2008/04/16 22:03:43 1975 ++++ b/trunk/src/newgrp.c 2008/04/16 22:04:46 1976 +@@ -53,6 +53,10 @@ + static char *Prog; + static int is_newgrp; + ++#ifdef WITH_AUDIT ++char audit_buf[80]; ++#endif ++ + /* local function prototypes */ + static void usage (void); + static void check_perms (const struct group *grp, +@@ -349,8 +353,6 @@ + #endif + + #ifdef WITH_AUDIT +- char audit_buf[80]; +- + audit_help_open (); + #endif + setlocale (LC_ALL, ""); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch new file mode 100644 index 0000000000..f10e02d036 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch @@ -0,0 +1,121 @@ +Index: shadow-4.1.2.1/configure.in +=================================================================== +--- shadow-4.1.2.1.orig/configure.in ++++ shadow-4.1.2.1/configure.in +@@ -339,13 +339,29 @@ if test "$with_libpam" != "no"; then + AC_MSG_ERROR(libpam not found) + fi + +- AC_CHECK_LIB(pam_misc, main, +- [pam_misc_lib="yes"], [pam_misc_lib="no"]) +- if test "$pam_misc_lib$with_libpam" = "noyes" ; then +- AC_MSG_ERROR(libpam_misc not found) ++ LIBPAM="-lpam" ++ pam_conv_function="no" ++ ++ AC_CHECK_LIB(pam, openpam_ttyconv, ++ [pam_conv_function="openpam_ttyconv"], ++ AC_CHECK_LIB(pam_misc, misc_conv, ++ [pam_conv_function="misc_conv"; LIBPAM="$LIBPAM -lpam_misc"]) ++ ) ++ ++ if test "$pam_conv_function$with_libpam" = "noyes" ; then ++ AC_MSG_ERROR(PAM conversation function not found) + fi + +- if test "$pam_lib$pam_misc_lib" = "yesyes" ; then ++ pam_headers_found=no ++ AC_CHECK_HEADERS( [security/openpam.h security/pam_misc.h], ++ [ pam_headers_found=yes ; break ], [], ++ [ #include ] ) ++ if test "$pam_headers_found$with_libpam" = "noyes" ; then ++ AC_MSG_ERROR(PAM headers not found) ++ fi ++ ++ ++ if test "$pam_lib$pam_headers_found" = "yesyes" -a "$pam_conv_function" != "no" ; then + with_libpam="yes" + else + with_libpam="no" +@@ -353,9 +369,22 @@ if test "$with_libpam" != "no"; then + fi + dnl Now with_libpam is either yes or no + if test "$with_libpam" = "yes"; then ++ AC_CHECK_DECLS([PAM_ESTABLISH_CRED, ++ PAM_DELETE_CRED, ++ PAM_NEW_AUTHTOK_REQD, ++ PAM_DATA_SILENT], ++ [], [], [#include ]) ++ ++ ++ save_libs=$LIBS ++ LIBS="$LIBS $LIBPAM" ++ AC_CHECK_FUNCS([pam_fail_delay]) ++ LIBS=$save_libs ++ + AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules]) ++ AC_DEFINE_UNQUOTED(SHADOW_PAM_CONVERSATION, [$pam_conv_function],[PAM converstation to use]) + AM_CONDITIONAL(USE_PAM, [true]) +- LIBPAM="-lpam -lpam_misc" ++ + AC_MSG_CHECKING(use login and su access checking if PAM not used) + AC_MSG_RESULT(no) + else +Index: shadow-4.1.2.1/lib/pam_defs.h +=================================================================== +--- shadow-4.1.2.1.orig/lib/pam_defs.h ++++ shadow-4.1.2.1/lib/pam_defs.h +@@ -28,24 +28,31 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#include + #include +-#include ++#ifdef HAVE_SECURITY_PAM_MISC_H ++# include ++#endif ++#ifdef HAVE_SECURITY_OPENPAM_H ++# include ++#endif ++ + + static struct pam_conv conv = { +- misc_conv, ++ SHADOW_PAM_CONVERSATION, + NULL + }; + + /* compatibility with different versions of Linux-PAM */ +-#ifndef PAM_ESTABLISH_CRED ++#if !HAVE_DECL_PAM_ESTABLISH_CRED + #define PAM_ESTABLISH_CRED PAM_CRED_ESTABLISH + #endif +-#ifndef PAM_DELETE_CRED ++#if !HAVE_DECL_PAM_DELETE_CRED + #define PAM_DELETE_CRED PAM_CRED_DELETE + #endif +-#ifndef PAM_NEW_AUTHTOK_REQD ++#if !HAVE_DECL_PAM_NEW_AUTHTOK_REQD + #define PAM_NEW_AUTHTOK_REQD PAM_AUTHTOKEN_REQD + #endif +-#ifndef PAM_DATA_SILENT ++#if !HAVE_DECL_PAM_DATA_SILENT + #define PAM_DATA_SILENT 0 + #endif +Index: shadow-4.1.2.1/src/login.c +=================================================================== +--- shadow-4.1.2.1.orig/src/login.c ++++ shadow-4.1.2.1/src/login.c +@@ -644,9 +644,10 @@ int main (int argc, char **argv) + failed = 0; + + failcount++; ++#ifdef HAVE_PAM_FAIL_DELAY + if (delay > 0) + retcode = pam_fail_delay(pamh, 1000000*delay); +- ++#endif + retcode = pam_authenticate (pamh, 0); + + pam_get_item (pamh, PAM_USER, diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch new file mode 100644 index 0000000000..689884fecb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch @@ -0,0 +1,87 @@ +From 670cce502aadf86b5b5d78059e5474e6171919f3 Mon Sep 17 00:00:00 2001 +From: nekral-guest +Date: Sat, 30 Aug 2008 18:30:58 +0000 +Subject: [PATCH] * lib/groupio.h, lib/prototypes.h, lib/pwio.h, lib/sgetgrent.c: + Include before and . It is necessary + for the definition of uid_t and gid_t. + * lib/pwmem.c: do not include , "pwio.h" is sufficient + here. + +git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2297 5a98b0ae-9ef6-0310-add3-de5d479b70d7 +--- + lib/groupio.h | 1 + + lib/prototypes.h | 1 + + lib/pwio.h | 2 ++ + lib/pwmem.c | 3 +-- + lib/sgetgrent.c | 1 + + 6 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/lib/groupio.h b/lib/groupio.h +index 9f2984c..d229845 100644 +--- a/lib/groupio.h ++++ b/lib/groupio.h +@@ -35,6 +35,7 @@ + #ifndef _GROUPIO_H + #define _GROUPIO_H + ++#include + #include + + extern int gr_close (void); +diff --git a/lib/prototypes.h b/lib/prototypes.h +index f1ffc50..feeedc4 100644 +--- a/lib/prototypes.h ++++ b/lib/prototypes.h +@@ -48,6 +48,7 @@ + #else + #include + #endif ++#include + #include + #include + #include +diff --git a/lib/pwio.h b/lib/pwio.h +index 28f8bbd..52c7bf3 100644 +--- a/lib/pwio.h ++++ b/lib/pwio.h +@@ -35,7 +35,9 @@ + #ifndef _PWIO_H + #define _PWIO_H + ++#include + #include ++ + extern int pw_close (void); + extern const struct passwd *pw_locate (const char *name); + extern const struct passwd *pw_locate_uid (uid_t uid); +diff --git a/lib/pwmem.c b/lib/pwmem.c +index 95a6137..84dee3d 100644 +--- a/lib/pwmem.c ++++ b/lib/pwmem.c +@@ -35,10 +35,9 @@ + + #ident "$Id: shadow-4.1.2.2-id-types.patch,v 1.1 2009/03/15 04:56:23 vapier Exp $" + ++#include + #include "prototypes.h" + #include "defines.h" +-#include +-#include + #include "pwio.h" + + struct passwd *__pw_dup (const struct passwd *pwent) +diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c +index 6f090aa..186ee40 100644 +--- a/lib/sgetgrent.c ++++ b/lib/sgetgrent.c +@@ -35,6 +35,7 @@ + #ident "$Id: shadow-4.1.2.2-id-types.patch,v 1.1 2009/03/15 04:56:23 vapier Exp $" + + #include ++#include + #include + #include "defines.h" + #include "prototypes.h" +-- +1.6.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch new file mode 100644 index 0000000000..e06598cf3c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/260001 +--- a/libmisc/salt.c ++++ b/libmisc/salt.c +@@ -20,9 +20,6 @@ + #include "getdef.h" + + /* local function prototypes */ +-#ifndef HAVE_L64A +-char *l64a(long value); +-#endif /* !HAVE_L64A */ + static void seedRNG (void); + static char *gensalt (size_t salt_size); + #ifdef USE_SHA_CRYPT diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch new file mode 100644 index 0000000000..419a604c3b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch @@ -0,0 +1,93 @@ +From 803bce24e3c902efcfba82dad08f25edf1dd3d6f Mon Sep 17 00:00:00 2001 +From: nekral-guest +Date: Sat, 30 Aug 2008 18:30:36 +0000 +Subject: [PATCH] * configure.in, lib/nscd.h, lib/nscd.c: Added --with-nscd flag to + support systems without nscd. + +git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2296 5a98b0ae-9ef6-0310-add3-de5d479b70d7 +--- + configure.in | 13 +++++++++++-- + lib/nscd.c | 4 ++++ + lib/nscd.h | 4 ++++ + 4 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 044617c..8384a15 100644 +--- a/configure.in ++++ b/configure.in +@@ -38,9 +38,9 @@ AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h \ + dnl shadow now uses the libc's shadow implementation + AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])]) + +-AC_CHECK_FUNCS(l64a fchmod fchown fsync getgroups gethostname getspnam \ ++AC_CHECK_FUNCS(l64a fchmod fchown fsync futimes getgroups gethostname getspnam \ + gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \ +- memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \ ++ lutimes memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \ + getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) + AC_SYS_LARGEFILE + +@@ -235,12 +235,20 @@ AC_ARG_WITH(libcrack, + AC_ARG_WITH(sha-crypt, + [AC_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])], + [with_sha_crypt=$withval], [with_sha_crypt=yes]) ++AC_ARG_WITH(nscd, ++ [AC_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])], ++ [with_nscd=$withval], [with_nscd=yes]) + + AM_CONDITIONAL(USE_SHA_CRYPT, test "x$with_sha_crypt" = "xyes") + if test "$with_sha_crypt" = "yes"; then + AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms]) + fi + ++AM_CONDITIONAL(USE_NSCD, test "x$with_nscd" = "xyes") ++if test "$with_nscd" = "yes"; then ++ AC_DEFINE(USE_NSCD, 1, [Define to support flushing of nscd caches]) ++fi ++ + dnl Check for some functions in libc first, only if not found check for + dnl other libraries. This should prevent linking libnsl if not really + dnl needed (Linux glibc, Irix), but still link it if needed (Solaris). +@@ -457,4 +465,5 @@ echo " SELinux support: $with_selinux" + echo " shadow group support: $enable_shadowgrp" + echo " S/Key support: $with_skey" + echo " SHA passwords encryption: $with_sha_crypt" ++echo " nscd support: $with_nscd" + echo +diff --git a/lib/nscd.c b/lib/nscd.c +index 59b7172..5f54b72 100644 +--- a/lib/nscd.c ++++ b/lib/nscd.c +@@ -1,5 +1,8 @@ + /* Author: Peter Vrabec */ + ++#include ++#ifdef USE_NSCD ++ + /* because of TEMP_FAILURE_RETRY */ + #define _GNU_SOURCE + +@@ -54,4 +57,5 @@ int nscd_flush_cache (const char *service) + + return 0; + } ++#endif + +diff --git a/lib/nscd.h b/lib/nscd.h +index 8bb10a8..a430b00 100644 +--- a/lib/nscd.h ++++ b/lib/nscd.h +@@ -4,6 +4,10 @@ + /* + * nscd_flush_cache - flush specified service buffer in nscd cache + */ ++#ifdef USE_NSCD + extern int nscd_flush_cache (const char *service); ++#else ++#define nscd_flush_cache(service) (0) ++#endif + + #endif +-- +1.6.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch new file mode 100644 index 0000000000..eba90da113 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch @@ -0,0 +1,52 @@ +From 1ed3c6672957f2033f217f90a76f85973f1c85c6 Mon Sep 17 00:00:00 2001 +From: nekral-guest +Date: Sat, 30 Aug 2008 18:29:55 +0000 +Subject: [PATCH] * NEWS: Added support for uclibc. + * configure.in, libmisc/copydir.c: futimes() and lutimes() are not + standard. Check if they are implemented before using them. Do not + set the time of links if lutimes() does not exist, and use + utimes() as a replacement for futimes(). + +git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2294 5a98b0ae-9ef6-0310-add3-de5d479b70d7 +--- + libmisc/copydir.c | 8 ++++++++ + 3 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/libmisc/copydir.c b/libmisc/copydir.c +index abcea4c..b887303 100644 +--- a/libmisc/copydir.c ++++ b/libmisc/copydir.c +@@ -431,12 +431,14 @@ static int copy_symlink (const char *src, const char *dst, + return -1; + } + ++#ifdef HAVE_LUTIMES + /* 2007-10-18: We don't care about + * exit status of lutimes because + * it returns ENOSYS on many system + * - not implemented + */ + lutimes (dst, mt); ++#endif + + return err; + } +@@ -548,9 +550,15 @@ static int copy_file (const char *src, const char *dst, + + (void) close (ifd); + ++#ifdef HAVE_FUTIMES + if (futimes (ofd, mt) != 0) { + return -1; + } ++#else ++ if (utimes(dst, mt) != 0) { ++ return -1; ++ } ++#endif + + if (close (ofd) != 0) { + return -1; +-- +1.6.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch new file mode 100644 index 0000000000..efcb33dbd9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch @@ -0,0 +1,10 @@ +--- shadow-4.1.3/libmisc/chkname.c ++++ shadow-4.1.3/libmisc/chkname.c +@@ -66,6 +66,7 @@ + ( ('0' <= *name) && ('9' >= *name) ) || + ('_' == *name) || + ('-' == *name) || ++ ('.' == *name) || + ( ('$' == *name) && ('\0' == *(name + 1)) ) + )) { + return false; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch new file mode 100644 index 0000000000..7c83f7cd05 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/283725 +https://alioth.debian.org/tracker/index.php?func=detail&aid=311740&group_id=30580&atid=411480 + +--- shadow-4.1.4.2/libmisc/env.c ++++ shadow-4.1.4.2/libmisc/env.c +@@ -251,7 +251,7 @@ + if (strncmp (*cur, *bad, strlen (*bad)) != 0) { + continue; + } +- if (strchr (*cur, '/') != NULL) { ++ if (strchr (*cur, '/') == NULL) { + continue; /* OK */ + } + for (move = cur; NULL != *move; move++) { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch new file mode 100644 index 0000000000..f25c4e10ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch @@ -0,0 +1,21 @@ +http://bugs.gentoo.org/300790 +http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html + +2009-11-05 Nicolas François + + * NEWS, src/groupmod.c: Fixed groupmod when configured with + --enable-account-tools-setuid. + +diff --git a/src/groupmod.c b/src/groupmod.c +index 4205df2..da6d77f 100644 +--- a/src/groupmod.c ++++ b/src/groupmod.c +@@ -724,7 +724,7 @@ int main (int argc, char **argv) + { + struct passwd *pampw; + pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ +- if (NULL == pamh) { ++ if (NULL == pampw) { + fprintf (stderr, + _("%s: Cannot determine your user name.\n"), + Prog); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch new file mode 100644 index 0000000000..0cf74f8975 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/show_bug.cgi?id=301957 +https://alioth.debian.org/scm/browser.php?group_id=30580 + +--- a/src/su.c ++++ b/src/su.c +@@ -342,7 +342,7 @@ + #endif + #endif /* !USE_PAM */ + +- sanitize_env (); ++ /* sanitize_env (); */ + + (void) setlocale (LC_ALL, ""); + (void) bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/metadata.xml new file mode 100644 index 0000000000..68f3ff5a55 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/metadata.xml @@ -0,0 +1,11 @@ + + + +base-system + + Enable support for sys-process/audit + When nousuid is enabled only su from the shadow package + will be installed with the setuid bit (mainly for single user + systems) + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2-r3.ebuild new file mode 120000 index 0000000000..b8cf9aff3a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2-r3.ebuild @@ -0,0 +1 @@ +shadow-4.1.2.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2.ebuild new file mode 100644 index 0000000000..f2997c5ed2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.2.2.ebuild,v 1.16 2009/08/23 10:45:45 vapier Exp $ + +inherit eutils libtool toolchain-funcs autotools pam multilib + +DESCRIPTION="Utilities to deal with user accounts" +HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" +SRC_URI="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="audit cracklib nls pam selinux skey" + +RDEPEND="audit? ( sys-process/audit ) + cracklib? ( >=sys-libs/cracklib-2.7-r3 ) + pam? ( virtual/pam ) + !sys-apps/pam-login + !app-admin/nologin + skey? ( sys-auth/skey ) + selinux? ( >=sys-libs/libselinux-1.28 ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20080219.1 )" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PV}/*.patch + + # tweak the default login.defs + epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch + sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die + + # Make user/group names more flexible #3485 / #22920 + epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch + epatch "${FILESDIR}"/${PN}-4.0.13-long-groupnames.patch + + epatch "${FILESDIR}"/${PN}-4.1.2.1+openpam.patch #232586 + epatch "${FILESDIR}"/${P}-l64a.patch #260001 + epatch "${FILESDIR}"/${P}-id-types.patch + epatch "${FILESDIR}"/${P}-optional-nscd.patch + epatch "${FILESDIR}"/${P}-optional-utimes.patch + + eautoconf + eautoheader + + elibtoolize + epunt_cxx +} + +src_compile() { + tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes + econf \ + --enable-shared=no \ + --enable-static=yes \ + $(use_with audit) \ + $(use_with cracklib libcrack) \ + $(use_with pam libpam) \ + $(use_with skey) \ + $(use_with selinux) \ + $(use_enable nls) \ + $(use_with elibc_glibc nscd) \ + || die "bad configure" + emake || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" suidperms=4711 install || die "install problem" + dosym useradd /usr/sbin/adduser + + # Remove libshadow and libmisc; see bug 37725 and the following + # comment from shadow's README.linux: + # Currently, libshadow.a is for internal use only, so if you see + # -lshadow in a Makefile of some other package, it is safe to + # remove it. + rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} + + insinto /etc + # Using a securetty with devfs device names added + # (compat names kept for non-devfs compatibility) + insopts -m0600 ; doins "${FILESDIR}"/securetty + if ! use pam ; then + insopts -m0600 + doins etc/login.access etc/limits + fi + # Output arch-specific cruft + case $(tc-arch) in + ppc*) echo "hvc0" >> "${D}"/etc/securetty + echo "hvsi0" >> "${D}"/etc/securetty + echo "ttyPSC0" >> "${D}"/etc/securetty;; + hppa) echo "ttyB0" >> "${D}"/etc/securetty;; + arm) echo "ttyFB0" >> "${D}"/etc/securetty;; + sh) echo "ttySC0" >> "${D}"/etc/securetty + echo "ttySC1" >> "${D}"/etc/securetty;; + esac + + # needed for 'adduser -D' + insinto /etc/default + insopts -m0600 + doins "${FILESDIR}"/default/useradd + + # move passwd to / to help recover broke systems #64441 + mv "${D}"/usr/bin/passwd "${D}"/bin/ + dosym /bin/passwd /usr/bin/passwd + + cd "${S}" + insinto /etc + insopts -m0644 + newins etc/login.defs login.defs + + if use pam ; then + dopamd "${FILESDIR}/pam.d-include/"{su,passwd,shadow} + + newpamd "${FILESDIR}/login.pamd.2" login + + for x in chage chsh chfn chpasswd newusers \ + user{add,del,mod} group{add,del,mod} ; do + newpamd "${FILESDIR}"/pam.d-include/shadow ${x} + done + + # comment out login.defs options that pam hates + sed -i -f "${FILESDIR}"/login_defs_pam.sed \ + "${D}"/etc/login.defs + + # remove manpages that pam will install for us + # and/or don't apply when using pam + find "${D}"/usr/share/man \ + '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ + -exec rm {} \; + fi + + # Remove manpages that are handled by other packages + find "${D}"/usr/share/man \ + '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ + -exec rm {} \; + + cd "${S}" + dodoc ChangeLog NEWS TODO + newdoc README README.download + cd doc + dodoc HOWTO README* WISHLIST *.txt +} + +pkg_preinst() { + rm -f "${ROOT}"/etc/pam.d/system-auth.new \ + "${ROOT}/etc/login.defs.new" + + use pam && pam_epam_expand "${D}"/etc/pam.d/login +} + +pkg_postinst() { + # Enable shadow groups (we need ROOT=/ here, as grpconv only + # operate on / ...). + if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then + if grpck -r &>/dev/null; then + grpconv + else + ewarn "Running 'grpck' returned errors. Please run it by hand, and then" + ewarn "run 'grpconv' afterwards!" + fi + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/files/remove_sch5317.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/files/remove_sch5317.patch new file mode 100644 index 0000000000..0f63d96f82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/files/remove_sch5317.patch @@ -0,0 +1,16 @@ +Index: smsc.c +=================================================================== +--- smsc.c (revision 5690) ++++ smsc.c (working copy) +@@ -655,9 +655,11 @@ + {EOT}}}, + {0x83, "SCH5514D", { /* From sensors-detect */ + {EOT}}}, ++#if 0 + {0x85, "SCH5317", { /* From sensors-detect */ + /* The SCH5317 can have either 0x85 or 0x8c as device ID. */ + {EOT}}}, ++#endif + {0x86, "SCH5127", { /* From sensors-detect */ + {EOT}}}, + {0x89, "SCH5027", { /* From sensors-detect (no public datasheet) */ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/superiotool-5690-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/superiotool-5690-r1.ebuild new file mode 100644 index 0000000000..369b240d19 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/superiotool-5690-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2010 Chromium OS Authors +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Superiotool allows you to detect which Super I/O you have on your mainboard, and it can provide detailed information about the register contents of the Super I/O." +HOMEPAGE="http://www.coreboot.org/Superiotool" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-svn-${PV}.tar.bz2" + +S=${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86" + +RDEPEND="sys-apps/pciutils" +DEPEND="${RDEPEND}" + +src_compile() { + cd ${S} + emake CC="$(tc-getCC)" || die "emake failed" +} + +src_install() { + cd ${S} + emake DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/superiotool-5690-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/superiotool-5690-r2.ebuild new file mode 100644 index 0000000000..a517859ff4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/superiotool/superiotool-5690-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 2010 Chromium OS Authors +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +inherit eutils toolchain-funcs + +DESCRIPTION="Superiotool allows you to detect which Super I/O you have on your mainboard, and it can provide detailed information about the register contents of the Super I/O." +HOMEPAGE="http://www.coreboot.org/Superiotool" +SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-svn-${PV}.tar.bz2" + +S=${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86" + +RDEPEND="sys-apps/pciutils" +DEPEND="${RDEPEND}" + +src_prepare() { + cd ${S} + epatch ${FILESDIR}/remove_sch5317.patch +} + +src_compile() { + cd ${S} + emake CC="$(tc-getCC)" || die "emake failed" +} + +src_install() { + cd ${S} + emake DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6-logger_kmsg.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6-logger_kmsg.patch new file mode 100644 index 0000000000..54659757c5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6-logger_kmsg.patch @@ -0,0 +1,94 @@ +=== modified file 'init/main.c' +--- init/main.c 2010-12-13 18:15:24 +0000 ++++ init/main.c 2011-02-07 22:08:27 +0000 +@@ -61,6 +61,7 @@ + + /* Prototypes for static functions */ + #ifndef DEBUG ++static int logger_kmsg (NihLogLevel priority, const char *message); + static void crash_handler (int signum); + static void cad_handler (void *data, NihSignal *signal); + static void kbd_handler (void *data, NihSignal *signal); +@@ -314,10 +315,10 @@ + + #ifndef DEBUG + /* Now that the startup is complete, send all further logging output +- * to syslog instead of to the console. ++ * to kmsg instead of to the console. + */ +- openlog (program_name, LOG_CONS, LOG_DAEMON); +- nih_log_set_logger (nih_logger_syslog); ++ nih_log_set_priority (NIH_LOG_INFO); ++ nih_log_set_logger (logger_kmsg); + #endif /* DEBUG */ + + +@@ -347,6 +348,67 @@ + + #ifndef DEBUG + /** ++ * logger_kmsg: ++ * @priority: priority of message being logged, ++ * @message: message to log. ++ * ++ * Outputs the @message to the kernel log message socket prefixed with an ++ * appropriate tag based on @priority, the program name and terminated with ++ * a new line. ++ * ++ * Returns: zero on success, negative value on error. ++ **/ ++static int ++logger_kmsg (NihLogLevel priority, ++ const char *message) ++{ ++ int tag; ++ FILE *kmsg; ++ ++ nih_assert (message != NULL); ++ ++ switch (priority) { ++ case NIH_LOG_DEBUG: ++ tag = '7'; ++ break; ++ case NIH_LOG_INFO: ++ tag = '6'; ++ break; ++ case NIH_LOG_MESSAGE: ++ tag = '5'; ++ break; ++ case NIH_LOG_WARN: ++ tag = '4'; ++ break; ++ case NIH_LOG_ERROR: ++ tag = '3'; ++ break; ++ case NIH_LOG_FATAL: ++ tag = '2'; ++ break; ++ default: ++ tag = 'd'; ++ } ++ ++ kmsg = fopen ("/dev/kmsg", "w"); ++ if (! kmsg) ++ return -1; ++ ++ if (fprintf (kmsg, "<%c>%s: %s\n", tag, program_name, message) < 0) { ++ int saved_errno = errno; ++ fclose (kmsg); ++ errno = saved_errno; ++ return -1; ++ } ++ ++ if (fclose (kmsg) < 0) ++ return -1; ++ ++ return 0; ++} ++ ++ ++/** + * crash_handler: + * @signum: signal number received. + * + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile.patch new file mode 100644 index 0000000000..3fea7f645c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile.patch @@ -0,0 +1,64 @@ +diff -Naur upstart-0.6.3.orig/init/Makefile.am upstart-0.6.3.new/init/Makefile.am +--- upstart-0.6.3.orig/init/Makefile.am 2009-07-11 10:41:09.000000000 +0000 ++++ upstart-0.6.3.new/init/Makefile.am 2009-10-14 20:29:46.000000000 +0000 +@@ -69,7 +69,7 @@ + ../dbus/com.ubuntu.Upstart.xml + + $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool +- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ ++ $(NIH_DBUS_TOOL) \ + --mode=object --prefix=control --default-interface=com.ubuntu.Upstart0_6 \ + --output=$@ $< + +@@ -81,8 +81,8 @@ + com_ubuntu_Upstart_Job_XML = \ + ../dbus/com.ubuntu.Upstart.Job.xml + +-$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool +- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ ++$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool ++ $(NIH_DBUS_TOOL) \ + --mode=object --prefix=job_class --default-interface=com.ubuntu.Upstart0_6.Job \ + --output=$@ $< + +@@ -95,7 +95,7 @@ + ../dbus/com.ubuntu.Upstart.Instance.xml + + $(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool +- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ ++ $(NIH_DBUS_TOOL) \ + --mode=object --prefix=job --default-interface=com.ubuntu.Upstart0_6.Instance \ + --output=$@ $< + +diff -Naur upstart-0.6.3.orig/util/Makefile.am upstart-0.6.3.new/util/Makefile.am +--- upstart-0.6.3.orig/util/Makefile.am 2009-07-21 11:30:06.000000000 +0000 ++++ upstart-0.6.3.new/util/Makefile.am 2009-10-14 20:30:47.000000000 +0000 +@@ -90,7 +90,7 @@ + ../dbus/com.ubuntu.Upstart.xml + + $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool +- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ ++ $(NIH_DBUS_TOOL) \ + --mode=proxy --prefix=upstart --default-interface=com.ubuntu.Upstart0_6 \ + --output=$@ $< + +@@ -102,8 +102,8 @@ + com_ubuntu_Upstart_Job_XML = \ + ../dbus/com.ubuntu.Upstart.Job.xml + +-$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool +- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ ++$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool ++ $(NIH_DBUS_TOOL) \ + --mode=proxy --prefix=job_class --default-interface=com.ubuntu.Upstart0_6.Job \ + --output=$@ $< + +@@ -116,7 +116,7 @@ + ../dbus/com.ubuntu.Upstart.Instance.xml + + $(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool +- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ ++ $(NIH_DBUS_TOOL) \ + --mode=proxy --prefix=job --default-interface=com.ubuntu.Upstart0_6.Instance \ + --output=$@ $< + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile2.patch new file mode 100644 index 0000000000..f33bce0380 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile2.patch @@ -0,0 +1,21 @@ +diff -Naur upstart-0.6.3.orig/nih-dbus-tool/Makefile.am upstart-0.6.3.new/nih-dbus-tool/Makefile.am +--- upstart-0.6.3.orig/nih-dbus-tool/Makefile.am 2009-07-31 08:15:52.000000000 +0000 ++++ upstart-0.6.3.new/nih-dbus-tool/Makefile.am 2009-10-14 21:53:52.000000000 +0000 +@@ -259,7 +259,7 @@ + $(MKDIR_P) `echo "$@" | \ + sed '/\//!d;s,/[^/]*$$,,' | \ + sort -u` +- $(builddir)/nih-dbus-tool --mode=object --prefix=my --output=$@ $< ++ $(NIH_DBUS_TOOL) --mode=object --prefix=my --output=$@ $< + + + com_netsplit_Nih_Test_proxy_OUTPUTS = \ +@@ -273,7 +273,7 @@ + $(MKDIR_P) `echo "$@" | \ + sed '/\//!d;s,/[^/]*$$,,' | \ + sort -u` +- $(builddir)/nih-dbus-tool --mode=proxy --prefix=proxy --output=$@ $< ++ $(NIH_DBUS_TOOL) --mode=proxy --prefix=proxy --output=$@ $< + + + # These have to be built sources because we can't compile test_*.o without diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.6-introspection.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.6-introspection.patch new file mode 100644 index 0000000000..f02494bb2e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.6-introspection.patch @@ -0,0 +1,712 @@ +=== modified file 'dbus/com.ubuntu.Upstart.Job.xml' +--- dbus/com.ubuntu.Upstart.Job.xml 2009-07-03 16:28:21 +0000 ++++ dbus/com.ubuntu.Upstart.Job.xml 2010-12-10 02:43:11 +0000 +@@ -3,7 +3,7 @@ + + com.ubuntu.Upstart.Job.xml - interface definition for job objects + +- Copyright © 2009 Canonical Ltd. ++ Copyright © 2010 Canonical Ltd. + Author: Scott James Remnant . + + This file is free software; Canonical Ltd gives unlimited permission +@@ -67,5 +67,10 @@ + + + ++ ++ ++ ++ ++ + + + +=== modified file 'init/job_class.c' +--- init/job_class.c 2010-12-13 18:15:24 +0000 ++++ init/job_class.c 2010-12-14 15:30:06 +0000 +@@ -2,7 +2,7 @@ + * + * job_class.c - job class definition handling + * +- * Copyright © 2009 Canonical Ltd. ++ * Copyright © 2010 Canonical Ltd. + * Author: Scott James Remnant . + * + * This program is free software; you can redistribute it and/or modify +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -1161,3 +1162,198 @@ + + return 0; + } ++ ++ ++/** ++ * job_class_get_start_on: ++ * @class: class to obtain events from, ++ * @message: D-Bus connection and message received, ++ * @start_on: pointer for reply array. ++ * ++ * Implements the get method for the start_on property of the ++ * com.ubuntu.Upstart.Job interface. ++ * ++ * Called to obtain the set of events that will start jobs of the given ++ * @class, this is returned as an array of the event tree flattened into ++ * reverse polish form. ++ * ++ * Each array element is an array of strings representing the events, ++ * or a single element containing "/OR" or "/AND" to represent the ++ * operators. ++ * ++ * Returns: zero on success, negative value on raised error. ++ **/ ++int ++job_class_get_start_on (JobClass * class, ++ NihDBusMessage *message, ++ char **** start_on) ++{ ++ size_t len = 0; ++ ++ nih_assert (class != NULL); ++ nih_assert (message != NULL); ++ nih_assert (start_on != NULL); ++ ++ *start_on = nih_alloc (message, sizeof (char ***)); ++ if (! *start_on) ++ nih_return_no_memory_error (-1); ++ ++ len = 0; ++ (*start_on)[len] = NULL; ++ ++ if (class->start_on) { ++ NIH_TREE_FOREACH_POST (&class->start_on->node, iter) { ++ EventOperator *oper = (EventOperator *)iter; ++ ++ *start_on = nih_realloc (*start_on, message, ++ sizeof (char ***) * (len + 2)); ++ if (! *start_on) ++ nih_return_no_memory_error (-1); ++ ++ (*start_on)[len] = nih_str_array_new (*start_on); ++ if (! (*start_on)[len]) ++ nih_return_no_memory_error (-1); ++ ++ switch (oper->type) { ++ case EVENT_OR: ++ if (! nih_str_array_add (&(*start_on)[len], *start_on, ++ NULL, "/OR")) ++ nih_return_no_memory_error (-1); ++ break; ++ case EVENT_AND: ++ if (! nih_str_array_add (&(*start_on)[len], *start_on, ++ NULL, "/AND")) ++ nih_return_no_memory_error (-1); ++ break; ++ case EVENT_MATCH: ++ if (! nih_str_array_add (&(*start_on)[len], *start_on, ++ NULL, oper->name)) ++ nih_return_no_memory_error (-1); ++ if (oper->env) ++ if (! nih_str_array_append (&(*start_on)[len], *start_on, ++ NULL, oper->env)) ++ nih_return_no_memory_error (-1); ++ break; ++ } ++ ++ (*start_on)[++len] = NULL; ++ } ++ } ++ ++ return 0; ++} ++ ++/** ++ * job_class_get_stop_on: ++ * @class: class to obtain events from, ++ * @message: D-Bus connection and message received, ++ * @stop_on: pointer for reply array. ++ * ++ * Implements the get method for the stop_on property of the ++ * com.ubuntu.Upstart.Job interface. ++ * ++ * Called to obtain the set of events that will stop jobs of the given ++ * @class, this is returned as an array of the event tree flattened into ++ * reverse polish form. ++ * ++ * Each array element is an array of strings representing the events, ++ * or a single element containing "/OR" or "/AND" to represent the ++ * operators. ++ * ++ * Returns: zero on success, negative value on raised error. ++ **/ ++int ++job_class_get_stop_on (JobClass * class, ++ NihDBusMessage *message, ++ char **** stop_on) ++{ ++ size_t len = 0; ++ ++ nih_assert (class != NULL); ++ nih_assert (message != NULL); ++ nih_assert (stop_on != NULL); ++ ++ *stop_on = nih_alloc (message, sizeof (char ***)); ++ if (! *stop_on) ++ nih_return_no_memory_error (-1); ++ ++ len = 0; ++ (*stop_on)[len] = NULL; ++ ++ if (class->stop_on) { ++ NIH_TREE_FOREACH_POST (&class->stop_on->node, iter) { ++ EventOperator *oper = (EventOperator *)iter; ++ ++ *stop_on = nih_realloc (*stop_on, message, ++ sizeof (char ***) * (len + 2)); ++ if (! *stop_on) ++ nih_return_no_memory_error (-1); ++ ++ (*stop_on)[len] = nih_str_array_new (*stop_on); ++ if (! (*stop_on)[len]) ++ nih_return_no_memory_error (-1); ++ ++ switch (oper->type) { ++ case EVENT_OR: ++ if (! nih_str_array_add (&(*stop_on)[len], *stop_on, ++ NULL, "/OR")) ++ nih_return_no_memory_error (-1); ++ break; ++ case EVENT_AND: ++ if (! nih_str_array_add (&(*stop_on)[len], *stop_on, ++ NULL, "/AND")) ++ nih_return_no_memory_error (-1); ++ break; ++ case EVENT_MATCH: ++ if (! nih_str_array_add (&(*stop_on)[len], *stop_on, ++ NULL, oper->name)) ++ nih_return_no_memory_error (-1); ++ if (oper->env) ++ if (! nih_str_array_append (&(*stop_on)[len], *stop_on, ++ NULL, oper->env)) ++ nih_return_no_memory_error (-1); ++ break; ++ } ++ ++ (*stop_on)[++len] = NULL; ++ } ++ } ++ ++ return 0; ++} ++ ++/** ++ * job_class_get_emits: ++ * @class: class to obtain events from, ++ * @message: D-Bus connection and message received, ++ * @emits: pointer for reply array. ++ * ++ * Implements the get method for the emits property of the ++ * com.ubuntu.Upstart.Job interface. ++ * ++ * Called to obtain the list of additional events of the given @class ++ * which will be stored as an array in @emits. ++ * ++ * Returns: zero on success, negative value on raised error. ++ **/ ++int ++job_class_get_emits (JobClass * class, ++ NihDBusMessage *message, ++ char *** emits) ++{ ++ nih_assert (class != NULL); ++ nih_assert (message != NULL); ++ nih_assert (emits != NULL); ++ ++ if (class->emits) { ++ *emits = nih_str_array_copy (message, NULL, class->emits); ++ if (! *emits) ++ nih_return_no_memory_error (-1); ++ } else { ++ *emits = nih_str_array_new (message); ++ if (! *emits) ++ nih_return_no_memory_error (-1); ++ } ++ ++ return 0; ++} + +=== modified file 'init/job_class.h' +--- init/job_class.h 2010-12-13 18:15:24 +0000 ++++ init/job_class.h 2010-12-14 15:30:06 +0000 +@@ -1,6 +1,6 @@ + /* upstart + * +- * Copyright © 2009 Canonical Ltd. ++ * Copyright © 2010 Canonical Ltd. + * Author: Scott James Remnant . + * + * This program is free software; you can redistribute it and/or modify +@@ -220,6 +220,16 @@ + char **version) + __attribute__ ((warn_unused_result)); + ++int job_class_get_start_on (JobClass *class, ++ NihDBusMessage *message, ++ char ****start_on); ++int job_class_get_stop_on (JobClass *class, ++ NihDBusMessage *message, ++ char ****stop_on); ++int job_class_get_emits (JobClass *class, ++ NihDBusMessage *message, ++ char ***emits); ++ + NIH_END_EXTERN + + #endif /* INIT_JOB_CLASS_H */ + +=== modified file 'init/tests/test_job_class.c' +--- init/tests/test_job_class.c 2009-07-09 11:50:19 +0000 ++++ init/tests/test_job_class.c 2010-12-14 15:09:52 +0000 +@@ -2,7 +2,7 @@ + * + * test_job_class.c - test suite for init/job_class.c + * +- * Copyright © 2009 Canonical Ltd. ++ * Copyright © 2010 Canonical Ltd. + * Author: Scott James Remnant . + * + * This program is free software; you can redistribute it and/or modify +@@ -3232,6 +3232,415 @@ + } + } + ++void ++test_get_start_on (void) ++{ ++ NihDBusMessage *message = NULL; ++ JobClass *class = NULL; ++ EventOperator *oper = NULL; ++ EventOperator *and_oper = NULL; ++ NihError *error; ++ char ***start_on; ++ int ret; ++ ++ TEST_FUNCTION ("job_class_get_start_on"); ++ ++ /* Check that the job's start_on tree is returned as a flattened ++ * array of string arrays, as a child of the message. ++ */ ++ TEST_FEATURE ("with event tree"); ++ nih_error_init (); ++ job_class_init (); ++ ++ TEST_ALLOC_FAIL { ++ TEST_ALLOC_SAFE { ++ class = job_class_new (NULL, "test"); ++ ++ class->start_on = event_operator_new ( ++ class, EVENT_OR, NULL, NULL); ++ ++ and_oper = event_operator_new ( ++ class, EVENT_AND, NULL, NULL); ++ nih_tree_add (&class->start_on->node, &and_oper->node, ++ NIH_TREE_LEFT); ++ ++ oper = event_operator_new ( ++ class->start_on, EVENT_MATCH, "foo", NULL); ++ oper->env = nih_str_array_new (oper); ++ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "omnomnom")); ++ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "ABER=crombie")); ++ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "HOBBIT=frodo")); ++ ++ nih_tree_add (&class->start_on->node, &oper->node, ++ NIH_TREE_RIGHT); ++ ++ oper = event_operator_new ( ++ class->start_on, EVENT_MATCH, "wibble", NULL); ++ nih_tree_add (&and_oper->node, &oper->node, ++ NIH_TREE_LEFT); ++ ++ oper = event_operator_new ( ++ class->start_on, EVENT_MATCH, "wobble", NULL); ++ nih_tree_add (&and_oper->node, &oper->node, ++ NIH_TREE_RIGHT); ++ ++ message = nih_new (NULL, NihDBusMessage); ++ message->connection = NULL; ++ message->message = NULL; ++ } ++ ++ start_on = NULL; ++ ++ ret = job_class_get_start_on (class, message, &start_on); ++ ++ if (test_alloc_failed) { ++ TEST_LT (ret, 0); ++ ++ error = nih_error_get (); ++ TEST_EQ (error->number, ENOMEM); ++ nih_free (error); ++ ++ nih_free (message); ++ nih_free (class); ++ continue; ++ } ++ ++ TEST_EQ (ret, 0); ++ ++ TEST_ALLOC_PARENT (start_on, message); ++ TEST_ALLOC_SIZE (start_on, sizeof (char **) * 6); ++ ++ TEST_ALLOC_SIZE (start_on[0], sizeof (char *) * 2); ++ TEST_EQ_STR (start_on[0][0], "wibble"); ++ TEST_EQ_P (start_on[0][1], NULL); ++ ++ TEST_ALLOC_SIZE (start_on[1], sizeof (char *) * 2); ++ TEST_EQ_STR (start_on[1][0], "wobble"); ++ TEST_EQ_P (start_on[1][1], NULL); ++ ++ TEST_ALLOC_SIZE (start_on[2], sizeof (char *) * 2); ++ TEST_EQ_STR (start_on[2][0], "/AND"); ++ TEST_EQ_P (start_on[2][1], NULL); ++ ++ TEST_ALLOC_SIZE (start_on[3], sizeof (char *) * 5); ++ TEST_EQ_STR (start_on[3][0], "foo"); ++ TEST_EQ_STR (start_on[3][1], "omnomnom"); ++ TEST_EQ_STR (start_on[3][2], "ABER=crombie"); ++ TEST_EQ_STR (start_on[3][3], "HOBBIT=frodo"); ++ TEST_EQ_P (start_on[3][4], NULL); ++ ++ TEST_ALLOC_SIZE (start_on[4], sizeof (char *) * 2); ++ TEST_EQ_STR (start_on[4][0], "/OR"); ++ TEST_EQ_P (start_on[4][1], NULL); ++ ++ TEST_EQ_P (start_on[5], NULL); ++ ++ nih_free (message); ++ nih_free (class); ++ } ++ ++ ++ /* Check that an empty array is returned when the job has no ++ * start_on operator tree. ++ */ ++ TEST_FEATURE ("with no events"); ++ nih_error_init (); ++ job_class_init (); ++ ++ TEST_ALLOC_FAIL { ++ TEST_ALLOC_SAFE { ++ class = job_class_new (NULL, "test"); ++ ++ message = nih_new (NULL, NihDBusMessage); ++ message->connection = NULL; ++ message->message = NULL; ++ } ++ ++ start_on = NULL; ++ ++ ret = job_class_get_start_on (class, message, &start_on); ++ ++ if (test_alloc_failed) { ++ TEST_LT (ret, 0); ++ ++ error = nih_error_get (); ++ TEST_EQ (error->number, ENOMEM); ++ nih_free (error); ++ ++ nih_free (message); ++ nih_free (class); ++ continue; ++ } ++ ++ TEST_EQ (ret, 0); ++ ++ TEST_ALLOC_PARENT (start_on, message); ++ TEST_ALLOC_SIZE (start_on, sizeof (char **)); ++ TEST_EQ_P (start_on[0], NULL); ++ ++ nih_free (message); ++ nih_free (class); ++ } ++} ++ ++void ++test_get_stop_on (void) ++{ ++ NihDBusMessage *message = NULL; ++ JobClass *class = NULL; ++ EventOperator *oper = NULL; ++ EventOperator *and_oper = NULL; ++ NihError *error; ++ char ***stop_on; ++ int ret; ++ ++ TEST_FUNCTION ("job_class_get_stop_on"); ++ ++ /* Check that the job's stop_on tree is returned as a flattened ++ * array of string arrays, as a child of the message. ++ */ ++ TEST_FEATURE ("with event tree"); ++ nih_error_init (); ++ job_class_init (); ++ ++ TEST_ALLOC_FAIL { ++ TEST_ALLOC_SAFE { ++ class = job_class_new (NULL, "test"); ++ ++ class->stop_on = event_operator_new ( ++ class, EVENT_OR, NULL, NULL); ++ ++ and_oper = event_operator_new ( ++ class, EVENT_AND, NULL, NULL); ++ nih_tree_add (&class->stop_on->node, &and_oper->node, ++ NIH_TREE_LEFT); ++ ++ oper = event_operator_new ( ++ class->stop_on, EVENT_MATCH, "foo", NULL); ++ oper->env = nih_str_array_new (oper); ++ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "omnomnom")); ++ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "ABER=crombie")); ++ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "HOBBIT=frodo")); ++ ++ nih_tree_add (&class->stop_on->node, &oper->node, ++ NIH_TREE_RIGHT); ++ ++ oper = event_operator_new ( ++ class->stop_on, EVENT_MATCH, "wibble", NULL); ++ nih_tree_add (&and_oper->node, &oper->node, ++ NIH_TREE_LEFT); ++ ++ oper = event_operator_new ( ++ class->stop_on, EVENT_MATCH, "wobble", NULL); ++ nih_tree_add (&and_oper->node, &oper->node, ++ NIH_TREE_RIGHT); ++ ++ message = nih_new (NULL, NihDBusMessage); ++ message->connection = NULL; ++ message->message = NULL; ++ } ++ ++ stop_on = NULL; ++ ++ ret = job_class_get_stop_on (class, message, &stop_on); ++ ++ if (test_alloc_failed) { ++ TEST_LT (ret, 0); ++ ++ error = nih_error_get (); ++ TEST_EQ (error->number, ENOMEM); ++ nih_free (error); ++ ++ nih_free (message); ++ nih_free (class); ++ continue; ++ } ++ ++ TEST_EQ (ret, 0); ++ ++ TEST_ALLOC_PARENT (stop_on, message); ++ TEST_ALLOC_SIZE (stop_on, sizeof (char **) * 6); ++ ++ TEST_ALLOC_SIZE (stop_on[0], sizeof (char *) * 2); ++ TEST_EQ_STR (stop_on[0][0], "wibble"); ++ TEST_EQ_P (stop_on[0][1], NULL); ++ ++ TEST_ALLOC_SIZE (stop_on[1], sizeof (char *) * 2); ++ TEST_EQ_STR (stop_on[1][0], "wobble"); ++ TEST_EQ_P (stop_on[1][1], NULL); ++ ++ TEST_ALLOC_SIZE (stop_on[2], sizeof (char *) * 2); ++ TEST_EQ_STR (stop_on[2][0], "/AND"); ++ TEST_EQ_P (stop_on[2][1], NULL); ++ ++ TEST_ALLOC_SIZE (stop_on[3], sizeof (char *) * 5); ++ TEST_EQ_STR (stop_on[3][0], "foo"); ++ TEST_EQ_STR (stop_on[3][1], "omnomnom"); ++ TEST_EQ_STR (stop_on[3][2], "ABER=crombie"); ++ TEST_EQ_STR (stop_on[3][3], "HOBBIT=frodo"); ++ TEST_EQ_P (stop_on[3][4], NULL); ++ ++ TEST_ALLOC_SIZE (stop_on[4], sizeof (char *) * 2); ++ TEST_EQ_STR (stop_on[4][0], "/OR"); ++ TEST_EQ_P (stop_on[4][1], NULL); ++ ++ TEST_EQ_P (stop_on[5], NULL); ++ ++ nih_free (message); ++ nih_free (class); ++ } ++ ++ ++ /* Check that an empty array is returned when the job has no ++ * stop_on operator tree. ++ */ ++ TEST_FEATURE ("with no events"); ++ nih_error_init (); ++ job_class_init (); ++ ++ TEST_ALLOC_FAIL { ++ TEST_ALLOC_SAFE { ++ class = job_class_new (NULL, "test"); ++ ++ message = nih_new (NULL, NihDBusMessage); ++ message->connection = NULL; ++ message->message = NULL; ++ } ++ ++ stop_on = NULL; ++ ++ ret = job_class_get_stop_on (class, message, &stop_on); ++ ++ if (test_alloc_failed) { ++ TEST_LT (ret, 0); ++ ++ error = nih_error_get (); ++ TEST_EQ (error->number, ENOMEM); ++ nih_free (error); ++ ++ nih_free (message); ++ nih_free (class); ++ continue; ++ } ++ ++ TEST_EQ (ret, 0); ++ ++ TEST_ALLOC_PARENT (stop_on, message); ++ TEST_ALLOC_SIZE (stop_on, sizeof (char **)); ++ TEST_EQ_P (stop_on[0], NULL); ++ ++ nih_free (message); ++ nih_free (class); ++ } ++} ++ ++void ++test_get_emits (void) ++{ ++ NihDBusMessage *message = NULL; ++ JobClass *class = NULL; ++ NihError *error; ++ char **emits; ++ int ret; ++ ++ TEST_FUNCTION ("job_class_get_emits"); ++ ++ /* Check that an array of strings is returned from the property ++ * as a child of the message when the job declares that it emits ++ * extra events. ++ */ ++ TEST_FEATURE ("with events"); ++ nih_error_init (); ++ job_class_init (); ++ ++ TEST_ALLOC_FAIL { ++ TEST_ALLOC_SAFE { ++ class = job_class_new (NULL, "test"); ++ class->emits = nih_str_array_new (class); ++ ++ NIH_MUST (nih_str_array_add (&class->emits, class, NULL, "foo")); ++ NIH_MUST (nih_str_array_add (&class->emits, class, NULL, "bar")); ++ NIH_MUST (nih_str_array_add (&class->emits, class, NULL, "baz")); ++ ++ message = nih_new (NULL, NihDBusMessage); ++ message->connection = NULL; ++ message->message = NULL; ++ } ++ ++ emits = NULL; ++ ++ ret = job_class_get_emits (class, message, &emits); ++ ++ if (test_alloc_failed) { ++ TEST_LT (ret, 0); ++ ++ error = nih_error_get (); ++ TEST_EQ (error->number, ENOMEM); ++ nih_free (error); ++ ++ nih_free (message); ++ nih_free (class); ++ continue; ++ } ++ ++ TEST_EQ (ret, 0); ++ ++ TEST_ALLOC_PARENT (emits, message); ++ TEST_ALLOC_SIZE (emits, sizeof (char *) * 4); ++ TEST_EQ_STR (emits[0], "foo"); ++ TEST_EQ_STR (emits[1], "bar"); ++ TEST_EQ_STR (emits[2], "baz"); ++ TEST_EQ_P (emits[3], NULL); ++ ++ nih_free (message); ++ nih_free (class); ++ } ++ ++ ++ /* Check that an empty array is returned from the property ++ * as a child of the message when the job doesn't declare ++ * any particular emitted events. ++ */ ++ TEST_FEATURE ("with no events"); ++ nih_error_init (); ++ job_class_init (); ++ ++ TEST_ALLOC_FAIL { ++ TEST_ALLOC_SAFE { ++ class = job_class_new (NULL, "test"); ++ ++ message = nih_new (NULL, NihDBusMessage); ++ message->connection = NULL; ++ message->message = NULL; ++ } ++ ++ emits = NULL; ++ ++ ret = job_class_get_emits (class, message, &emits); ++ ++ if (test_alloc_failed) { ++ TEST_LT (ret, 0); ++ ++ error = nih_error_get (); ++ TEST_EQ (error->number, ENOMEM); ++ nih_free (error); ++ ++ nih_free (message); ++ nih_free (class); ++ continue; ++ } ++ ++ TEST_EQ (ret, 0); ++ ++ TEST_ALLOC_PARENT (emits, message); ++ TEST_ALLOC_SIZE (emits, sizeof (char *)); ++ TEST_EQ_P (emits[0], NULL); ++ ++ nih_free (message); ++ nih_free (class); ++ } ++} ++ + + int + main (int argc, +@@ -3256,6 +3665,9 @@ + test_get_description (); + test_get_author (); + test_get_version (); ++ test_get_start_on (); ++ test_get_stop_on (); ++ test_get_emits (); + + return 0; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-default-oom_score_adj.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-default-oom_score_adj.patch new file mode 100644 index 0000000000..2c49cfbb09 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-default-oom_score_adj.patch @@ -0,0 +1,13 @@ +=== modified file 'init/job_class.h' +--- init/job_class.h 2011-08-11 21:02:51 +0000 ++++ init/job_class.h 2011-08-11 21:03:25 +0000 +@@ -108,7 +108,7 @@ + * + * The default OOM score adjustment for processes. + **/ +-#define JOB_DEFAULT_OOM_SCORE_ADJ 0 ++#define JOB_DEFAULT_OOM_SCORE_ADJ -1000 + + /** + * JOB_DEFAULT_ENVIRONMENT: + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-fix-shell-redirect.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-fix-shell-redirect.patch new file mode 100644 index 0000000000..4c8d47db64 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-fix-shell-redirect.patch @@ -0,0 +1,237 @@ +=== modified file 'init/job_process.c' +--- init/job_process.c 2011-03-22 17:46:46 +0000 ++++ init/job_process.c 2011-05-12 19:21:16 +0000 +@@ -145,7 +145,8 @@ + nih_local char *script = NULL; + char **e; + size_t argc, envc; +- int error = FALSE, fds[2], trace = FALSE, shell = FALSE; ++ int fds[2] = { -1, -1 }; ++ int error = FALSE, trace = FALSE, shell = FALSE; + + nih_assert (job != NULL); + +@@ -208,12 +209,9 @@ + + shell = TRUE; + +- /* FIXME actually always want it to be /proc/self/fd/3 and +- * dup2() in the child to make it that way ... no way +- * of passing that yet +- */ + cmd = NIH_MUST (nih_sprintf (argv, "%s/%d", +- "/proc/self/fd", fds[0])); ++ "/proc/self/fd", ++ JOB_PROCESS_SCRIPT_FD)); + NIH_MUST (nih_str_array_addp (&argv, NULL, + &argc, cmd)); + } +@@ -259,7 +257,7 @@ + + /* Spawn the process, repeat until fork() works */ + while ((job->pid[process] = job_process_spawn (job->class, argv, +- env, trace)) < 0) { ++ env, trace, fds[0])) < 0) { + NihError *err; + + err = nih_error_get (); +@@ -321,7 +319,8 @@ + * a path. Instruct the shell to close this extra fd and + * not to leak it. + */ +- NIH_ZERO (nih_io_printf (io, "exec %d<&-\n", fds[0])); ++ NIH_ZERO (nih_io_printf (io, "exec %d<&-\n", ++ JOB_PROCESS_SCRIPT_FD)); + + NIH_ZERO (nih_io_write (io, script, strlen (script))); + nih_io_shutdown (io); +@@ -336,7 +335,8 @@ + * @class: job class of process to be spawned, + * @argv: NULL-terminated list of arguments for the process, + * @env: NULL-terminated list of environment variables for the process, +- * @trace: whether to trace this process. ++ * @trace: whether to trace this process, ++ * @script_fd: script file descriptor. + * + * This function spawns a new process using the @class details to set up the + * environment for it; the process is always a session and process group +@@ -352,6 +352,9 @@ + * wait for this and then may use it to set options before continuing the + * process. + * ++ * If @script_fd is not -1, this file descriptor is dup()d to the special fd 9 ++ * (moving any other out of the way if necessary). ++ * + * This function only spawns the process, it is up to the caller to ensure + * that the information is saved into the job and that the process is watched, + * etc. +@@ -367,7 +370,8 @@ + job_process_spawn (JobClass *class, + char * const argv[], + char * const *env, +- int trace) ++ int trace, ++ int script_fd) + { + sigset_t child_set, orig_set; + pid_t pid; +@@ -433,8 +437,26 @@ + * far because read() returned zero. + */ + close (fds[0]); ++ if (fds[1] == JOB_PROCESS_SCRIPT_FD) { ++ int tmp = dup2 (fds[1], fds[0]); ++ if (tmp < 0) ++ job_process_error_abort (fds[1], JOB_PROCESS_ERROR_DUP, 0); ++ close (fds[1]); ++ fds[1] = tmp; ++ } + nih_io_set_cloexec (fds[1]); + ++ /* Move the script fd to special fd 9; the only gotcha is if that ++ * would be our error descriptor, but that's handled above. ++ */ ++ if ((script_fd != -1) && (script_fd != JOB_PROCESS_SCRIPT_FD)) { ++ int tmp = dup2 (script_fd, JOB_PROCESS_SCRIPT_FD); ++ if (tmp < 0) ++ job_process_error_abort (fds[1], JOB_PROCESS_ERROR_DUP, 0); ++ close (script_fd); ++ script_fd = tmp; ++ } ++ + /* Become the leader of a new session and process group, shedding + * any controlling tty (which we shouldn't have had anyway). + */ +@@ -664,6 +684,11 @@ + err->error.number = JOB_PROCESS_ERROR; + + switch (err->type) { ++ case JOB_PROCESS_ERROR_DUP: ++ err->error.message = NIH_MUST (nih_sprintf ( ++ err, _("unable to move script fd: %s"), ++ strerror (err->errnum))); ++ break; + case JOB_PROCESS_ERROR_CONSOLE: + err->error.message = NIH_MUST (nih_sprintf ( + err, _("unable to open console: %s"), + +=== modified file 'init/job_process.h' +--- init/job_process.h 2009-07-09 11:01:53 +0000 ++++ init/job_process.h 2011-05-12 19:21:16 +0000 +@@ -1,5 +1,6 @@ + /* upstart + * ++ * Copyright © 2011 Google Inc. + * Copyright © 2009 Canonical Ltd. + * Author: Scott James Remnant . + * +@@ -32,12 +33,23 @@ + + + /** ++ * JOB_PROCESS_SCRIPT_FD: ++ * ++ * The special fd used to pass the script to the shell process, this can be ++ * anything from 3-9 (0-2 are stdin/out/err, 10 and above aren't guaranteed ++ * by POSIX). ++ **/ ++#define JOB_PROCESS_SCRIPT_FD 9 ++ ++ ++/** + * JobProcessErrorType: + * + * These constants represent the different steps of process spawning that + * can produce an error. + **/ + typedef enum job_process_error_type { ++ JOB_PROCESS_ERROR_DUP, + JOB_PROCESS_ERROR_CONSOLE, + JOB_PROCESS_ERROR_RLIMIT, + JOB_PROCESS_ERROR_PRIORITY, +@@ -80,7 +92,7 @@ + int job_process_run (Job *job, ProcessType process); + + pid_t job_process_spawn (JobClass *class, char * const argv[], +- char * const *env, int trace) ++ char * const *env, int trace, int script_fd) + __attribute__ ((warn_unused_result)); + + void job_process_kill (Job *job, ProcessType process); + +=== modified file 'init/tests/test_job_process.c' +--- init/tests/test_job_process.c 2011-03-16 22:18:22 +0000 ++++ init/tests/test_job_process.c 2011-05-12 19:21:16 +0000 +@@ -822,7 +822,7 @@ + + class = job_class_new (NULL, "test"); + +- pid = job_process_spawn (class, args, NULL, FALSE); ++ pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); + + waitpid (pid, NULL, 0); +@@ -860,7 +860,7 @@ + class = job_class_new (NULL, "test"); + class->console = CONSOLE_NONE; + +- pid = job_process_spawn (class, args, NULL, FALSE); ++ pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); + + waitpid (pid, NULL, 0); +@@ -886,7 +886,7 @@ + class = job_class_new (NULL, "test"); + class->chdir = "/tmp"; + +- pid = job_process_spawn (class, args, NULL, FALSE); ++ pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); + + waitpid (pid, NULL, 0); +@@ -914,7 +914,7 @@ + + class = job_class_new (NULL, "test"); + +- pid = job_process_spawn (class, args, env, FALSE); ++ pid = job_process_spawn (class, args, env, FALSE, -1); + TEST_GT (pid, 0); + + waitpid (pid, NULL, 0); +@@ -939,7 +939,7 @@ + + class = job_class_new (NULL, "test"); + +- pid = job_process_spawn (class, args, NULL, FALSE); ++ pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); + + assert0 (waitid (P_PID, pid, &info, WEXITED | WSTOPPED | WCONTINUED)); +@@ -959,7 +959,7 @@ + + class = job_class_new (NULL, "test"); + +- pid = job_process_spawn (class, args, NULL, TRUE); ++ pid = job_process_spawn (class, args, NULL, TRUE, -1); + TEST_GT (pid, 0); + + assert0 (waitid (P_PID, pid, &info, WEXITED | WSTOPPED | WCONTINUED)); +@@ -988,7 +988,7 @@ + + class = job_class_new (NULL, "test"); + +- pid = job_process_spawn (class, args, NULL, FALSE); ++ pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_LT (pid, 0); + + err = nih_error_get (); +@@ -1013,7 +1013,7 @@ + args[1] = function; + args[2] = NULL; + +- pid = job_process_spawn (class, args, NULL, FALSE); ++ pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); + + /* Ensure process is still running after some period of time. + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-kill-signal.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-kill-signal.patch new file mode 100644 index 0000000000..89568f192d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-kill-signal.patch @@ -0,0 +1,488 @@ +=== modified file 'init/errors.h' +--- init/errors.h 2011-05-05 10:13:49 +0000 ++++ init/errors.h 2011-05-12 20:42:28 +0000 +@@ -40,6 +40,7 @@ + /* Errors while parsing configuration files */ + PARSE_ILLEGAL_INTERVAL, + PARSE_ILLEGAL_EXIT, ++ PARSE_ILLEGAL_SIGNAL, + PARSE_ILLEGAL_UMASK, + PARSE_ILLEGAL_NICE, + PARSE_ILLEGAL_OOM, +@@ -60,6 +61,7 @@ + #define ENVIRON_MISMATCHED_BRACES_STR N_("Mismatched braces") + #define PARSE_ILLEGAL_INTERVAL_STR N_("Illegal interval, expected number of seconds") + #define PARSE_ILLEGAL_EXIT_STR N_("Illegal exit status, expected integer") ++#define PARSE_ILLEGAL_SIGNAL_STR N_("Illegal signal status, expected integer") + #define PARSE_ILLEGAL_UMASK_STR N_("Illegal file creation mask, expected octal integer") + #define PARSE_ILLEGAL_NICE_STR N_("Illegal nice value, expected -20 to 19") + #define PARSE_ILLEGAL_OOM_STR N_("Illegal oom adjustment, expected -16 to 15 or 'never'") + +=== modified file 'init/job_class.c' +--- init/job_class.c 2011-05-05 10:13:49 +0000 ++++ init/job_class.c 2011-05-12 20:42:28 +0000 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #include + #include +@@ -199,6 +200,7 @@ + class->task = FALSE; + + class->kill_timeout = JOB_DEFAULT_KILL_TIMEOUT; ++ class->kill_signal = SIGTERM; + + class->respawn = FALSE; + class->respawn_limit = JOB_DEFAULT_RESPAWN_LIMIT; + +=== modified file 'init/job_class.h' +--- init/job_class.h 2011-05-12 19:31:50 +0000 ++++ init/job_class.h 2011-05-12 20:42:28 +0000 +@@ -85,6 +85,7 @@ + * @expect: what to expect before entering the next state after spawned, + * @task: start requests are not unblocked until instances have finished, + * @kill_timeout: time to wait between sending TERM and KILL signals, ++ * @kill_signal: first signal to send (usually SIGTERM), + * @respawn: instances should be restarted if main process fails, + * @respawn_limit: number of respawns in @respawn_interval that we permit, + * @respawn_interval: barrier for @respawn_limit, +@@ -129,6 +130,7 @@ + int task; + + time_t kill_timeout; ++ int kill_signal; + + int respawn; + int respawn_limit; + +=== modified file 'init/job_process.c' +--- init/job_process.c 2011-05-12 19:31:50 +0000 ++++ init/job_process.c 2011-05-12 20:42:28 +0000 +@@ -802,9 +802,9 @@ + * @process: process to be killed. + * + * This function forces a @job to leave its current state by sending +- * @process the TERM signal, and maybe later the KILL signal. The actual +- * state changes are performed by job_child_reaper when the process +- * has actually terminated. ++ * @process the "kill signal" defined signal (TERM by default), and maybe ++ * later the KILL signal. The actual state changes are performed by ++ * job_child_reaper when the process has actually terminated. + **/ + void + job_process_kill (Job *job, +@@ -815,15 +815,17 @@ + nih_assert (job->kill_timer == NULL); + nih_assert (job->kill_process = -1); + +- nih_info (_("Sending TERM signal to %s %s process (%d)"), ++ nih_info (_("Sending %s signal to %s %s process (%d)"), ++ nih_signal_to_name (job->class->kill_signal), + job_name (job), process_name (process), job->pid[process]); + +- if (system_kill (job->pid[process], FALSE) < 0) { ++ if (system_kill (job->pid[process], job->class->kill_signal) < 0) { + NihError *err; + + err = nih_error_get (); + if (err->number != ESRCH) +- nih_warn (_("Failed to send TERM signal to %s %s process (%d): %s"), ++ nih_warn (_("Failed to send %s signal to %s %s process (%d): %s"), ++ nih_signal_to_name (job->class->kill_signal), + job_name (job), process_name (process), + job->pid[process], err->message); + nih_free (err); +@@ -863,15 +865,17 @@ + job->kill_timer = NULL; + job->kill_process = -1; + +- nih_info (_("Sending KILL signal to %s %s process (%d)"), ++ nih_info (_("Sending %s signal to %s %s process (%d)"), ++ "KILL", + job_name (job), process_name (process), job->pid[process]); + +- if (system_kill (job->pid[process], TRUE) < 0) { ++ if (system_kill (job->pid[process], SIGKILL) < 0) { + NihError *err; + + err = nih_error_get (); + if (err->number != ESRCH) +- nih_warn (_("Failed to send KILL signal to %s %s process (%d): %s"), ++ nih_warn (_("Failed to send %s signal to %s %s process (%d): %s"), ++ "KILL", + job_name (job), process_name (process), + job->pid[process], err->message); + nih_free (err); + +=== modified file 'init/man/init.5' +--- init/man/init.5 2011-05-12 19:31:50 +0000 ++++ init/man/init.5 2011-05-12 20:42:28 +0000 +@@ -563,10 +563,20 @@ + .\" + .SS Miscellaneous + .TP ++.B kill signal \fISIGNAL ++Specifies the stopping signal, ++.I SIGTERM ++by default, a job's main process will receive when stopping the ++running job. ++ ++.nf ++kill signal INT ++.fi ++.\" ++.TP + .B kill timeout \fIINTERVAL + Specifies the interval between sending the job's main process the +-.I SIGTERM +-and ++"stopping" (see above) and + .I SIGKILL + signals when stopping the running job. + .\" + +=== modified file 'init/parse_job.c' +--- init/parse_job.c 2011-05-12 19:31:50 +0000 ++++ init/parse_job.c 2011-05-12 20:42:28 +0000 +@@ -1782,6 +1782,7 @@ + { + size_t a_pos, a_lineno; + int ret = -1; ++ char *endptr; + nih_local char *arg = NULL; + + nih_assert (class != NULL); +@@ -1799,7 +1800,6 @@ + + if (! strcmp (arg, "timeout")) { + nih_local char *timearg = NULL; +- char *endptr; + + /* Update error position to the timeout value */ + *pos = a_pos; +@@ -1816,14 +1816,40 @@ + if (errno || *endptr || (class->kill_timeout < 0)) + nih_return_error (-1, PARSE_ILLEGAL_INTERVAL, + _(PARSE_ILLEGAL_INTERVAL_STR)); +- +- ret = nih_config_skip_comment (file, len, &a_pos, &a_lineno); +- ++ } else if (! strcmp (arg, "signal")) { ++ unsigned long status; ++ nih_local char *sigarg = NULL; ++ int signal; ++ ++ /* Update error position to the exit status */ ++ *pos = a_pos; ++ if (lineno) ++ *lineno = a_lineno; ++ ++ sigarg = nih_config_next_arg (NULL, file, len, &a_pos, ++ &a_lineno); ++ ++ if (! sigarg) ++ goto finish; ++ ++ signal = nih_signal_from_name (sigarg); ++ if (signal < 0) { ++ errno = 0; ++ status = strtoul (sigarg, &endptr, 10); ++ if (errno || *endptr || (status > INT_MAX)) ++ nih_return_error (-1, PARSE_ILLEGAL_SIGNAL, ++ _(PARSE_ILLEGAL_SIGNAL_STR)); ++ } ++ ++ /* Set the signal */ ++ class->kill_signal = signal; + } else { + nih_return_error (-1, NIH_CONFIG_UNKNOWN_STANZA, + _(NIH_CONFIG_UNKNOWN_STANZA_STR)); + } + ++ ret = nih_config_skip_comment (file, len, &a_pos, &a_lineno); ++ + finish: + *pos = a_pos; + if (lineno) + +=== modified file 'init/system.c' +--- init/system.c 2010-02-26 15:29:07 +0000 ++++ init/system.c 2011-05-12 20:42:28 +0000 +@@ -48,27 +48,21 @@ + /** + * system_kill: + * @pid: process id of process, +- * @force: force the death. +- * +- * Kill all processes in the same process group as @pid, which may not +- * necessarily be the group leader. +- * +- * When @force is FALSE, the TERM signal is sent; when it is TRUE, KILL +- * is sent instead. ++ * @signal: signal to send. ++ * ++ * Send all processes in the same process group as @pid, which may not ++ * necessarily be the group leader the @signal. + * + * Returns: zero on success, negative value on raised error. + **/ + int + system_kill (pid_t pid, +- int force) ++ int signal) + { +- int signal; + pid_t pgid; + + nih_assert (pid > 0); + +- signal = (force ? SIGKILL : SIGTERM); +- + pgid = getpgid (pid); + + if (kill (pgid > 0 ? -pgid : pid, signal) < 0) + +=== modified file 'init/system.h' +--- init/system.h 2010-02-26 15:29:07 +0000 ++++ init/system.h 2011-05-12 20:42:28 +0000 +@@ -29,7 +29,7 @@ + + NIH_BEGIN_EXTERN + +-int system_kill (pid_t pid, int force) ++int system_kill (pid_t pid, int signal) + __attribute__ ((warn_unused_result)); + + int system_setup_console (ConsoleType type, int reset) + +=== modified file 'init/tests/test_job_class.c' +--- init/tests/test_job_class.c 2011-05-05 10:13:49 +0000 ++++ init/tests/test_job_class.c 2011-05-12 20:42:28 +0000 +@@ -121,6 +121,7 @@ + TEST_EQ (class->task, FALSE); + + TEST_EQ (class->kill_timeout, 5); ++ TEST_EQ (class->kill_signal, SIGTERM); + + TEST_EQ (class->respawn, FALSE); + TEST_EQ (class->respawn_limit, 10); + +=== modified file 'init/tests/test_parse_job.c' +--- init/tests/test_parse_job.c 2011-05-12 19:31:50 +0000 ++++ init/tests/test_parse_job.c 2011-05-12 20:42:28 +0000 +@@ -4799,6 +4799,39 @@ + } + + ++ /* Check that a kill stanza with the signal argument and signal, ++ * sets the right signal on the jobs class. ++ */ ++ TEST_FEATURE ("with signal and single argument"); ++ strcpy (buf, "kill signal INT\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 2); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->kill_signal, SIGINT); ++ ++ nih_free (job); ++ } ++ ++ + /* Check that the last of multiple kill stanzas is used. + */ + TEST_FEATURE ("with multiple timeout and single argument stanzas"); +@@ -4832,6 +4865,37 @@ + } + + ++ TEST_FEATURE ("with multiple signal and single argument stanzas"); ++ strcpy (buf, "kill signal INT\n"); ++ strcat (buf, "kill signal TERM\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 3); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->kill_signal, SIGTERM); ++ ++ nih_free (job); ++ } ++ ++ + /* Check that a kill stanza without an argument results in a syntax + * error. + */ +@@ -4889,6 +4953,25 @@ + nih_free (err); + + ++ /* Check that a kill stanza with the timeout argument but no timeout ++ * results in a syntax error. ++ */ ++ TEST_FEATURE ("with signal and missing argument"); ++ strcpy (buf, "kill signal\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, NIH_CONFIG_EXPECTED_TOKEN); ++ TEST_EQ (pos, 11); ++ TEST_EQ (lineno, 1); ++ nih_free (err); ++ ++ + /* Check that a kill timeout stanza with a non-integer argument + * results in a syntax error. + */ +@@ -4965,6 +5048,25 @@ + nih_free (err); + + ++ /* Check that a kill signal stanza with an unknown signal argument ++ * results in a syntax error. ++ */ ++ TEST_FEATURE ("with signal and unknown signal argument"); ++ strcpy (buf, "kill signal foo\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, PARSE_ILLEGAL_SIGNAL); ++ TEST_EQ (pos, 12); ++ TEST_EQ (lineno, 1); ++ nih_free (err); ++ ++ + /* Check that a kill stanza with the timeout argument and timeout, + * but with an extra argument afterwards results in a syntax + * error. +@@ -4983,6 +5085,26 @@ + TEST_EQ (pos, 16); + TEST_EQ (lineno, 1); + nih_free (err); ++ ++ ++ /* Check that a kill stanza with the signal argument and signal, ++ * but with an extra argument afterwards results in a syntax ++ * error. ++ */ ++ TEST_FEATURE ("with signal and extra argument"); ++ strcpy (buf, "kill signal INT foo\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, NIH_CONFIG_UNEXPECTED_TOKEN); ++ TEST_EQ (pos, 16); ++ TEST_EQ (lineno, 1); ++ nih_free (err); + } + + void + +=== modified file 'init/tests/test_system.c' +--- init/tests/test_system.c 2009-06-23 09:29:35 +0000 ++++ init/tests/test_system.c 2011-05-12 20:42:28 +0000 +@@ -51,7 +51,7 @@ + setpgid (pid1, pid1); + setpgid (pid2, pid1); + +- ret = system_kill (pid1, FALSE); ++ ret = system_kill (pid1, SIGTERM); + waitpid (pid1, &status, 0); + + TEST_EQ (ret, 0); +@@ -79,7 +79,7 @@ + setpgid (pid1, pid1); + setpgid (pid2, pid1); + +- ret = system_kill (pid1, TRUE); ++ ret = system_kill (pid1, SIGKILL); + waitpid (pid1, &status, 0); + + TEST_EQ (ret, 0); +@@ -114,7 +114,7 @@ + kill (pid1, SIGTERM); + waitpid (pid1, &status, 0); + +- ret = system_kill (pid2, FALSE); ++ ret = system_kill (pid2, SIGTERM); + waitpid (pid2, &status, 0); + + TEST_EQ (ret, 0); + +=== modified file 'po/ChangeLog' +--- po/ChangeLog 2011-03-17 01:03:01 +0000 ++++ po/ChangeLog 2011-05-12 20:42:28 +0000 +@@ -1,3 +1,7 @@ ++2011-05-12 Marc - A. Dahlhaus ++ ++ * POTFILES.in: Add errors.h ++ + 2011-03-16 Scott James Remnant + + * Makevars.template (COPYRIGHT_HOLDER): Update copyright. + +=== modified file 'po/POTFILES.in' +--- po/POTFILES.in 2010-02-04 03:42:29 +0000 ++++ po/POTFILES.in 2011-05-05 09:06:21 +0000 +@@ -3,6 +3,7 @@ + init/conf.c + init/control.c + init/environ.c ++init/errors.h + init/event.c + init/event_operator.c + init/job.c + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-log-verbosity.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-log-verbosity.patch new file mode 100644 index 0000000000..bfb27bef18 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-log-verbosity.patch @@ -0,0 +1,11 @@ +=== modified file 'init/main.c' +--- init/main.c 2010-12-13 18:15:24 +0000 ++++ init/main.c 2011-02-07 22:08:27 +0000 +@@ -314,6 +315,7 @@ + if (system_setup_console (CONSOLE_NONE, FALSE) < 0) + nih_free (nih_error_get ()); + ++ nih_log_set_priority (NIH_LOG_INFO); + nih_log_set_logger (logger_kmsg); + #endif /* DEBUG */ + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-negate-match.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-negate-match.patch new file mode 100644 index 0000000000..35ce8f0dcc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-negate-match.patch @@ -0,0 +1,38 @@ +=== modified file 'init/event_operator.c' +--- init/event_operator.c 2010-11-19 14:34:51 +0000 ++++ init/event_operator.c 2012-08-10 20:16:45 +0000 +@@ -326,7 +326,7 @@ + * matches and no such variable. + */ + if (! (eenv && *eenv)) +- return FALSE; ++ return negate; + + /* Grab the value out by looking for the equals, we don't + * care about the name if we're positional and we've already + +=== modified file 'init/tests/test_event_operator.c' +--- init/tests/test_event_operator.c 2010-02-04 20:08:59 +0000 ++++ init/tests/test_event_operator.c 2012-08-10 20:16:17 +0000 +@@ -763,6 +763,20 @@ + TEST_FALSE (event_operator_match (oper, event, NULL)); + + ++ /* Check that unknown variable names match when negated. */ ++ TEST_FEATURE ("with unknown variable in operator"); ++ event->env = env1; ++ event->env[0] = "FRODO=foo"; ++ event->env[1] = "BILBO=bar"; ++ event->env[2] = NULL; ++ ++ oper->env = env2; ++ oper->env[0] = "MERRY!=baz"; ++ oper->env[1] = NULL; ++ ++ TEST_TRUE (event_operator_match (oper, event, NULL)); ++ ++ + /* Check that the operator environment may be globs. */ + TEST_FEATURE ("with globs in operator environment"); + event->env = env1; + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-oom-score.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-oom-score.patch new file mode 100644 index 0000000000..9e40c1692a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-oom-score.patch @@ -0,0 +1,744 @@ +=== modified file 'init/errors.h' +--- init/errors.h 2009-06-23 09:29:35 +0000 ++++ init/errors.h 2011-08-11 20:56:28 +0000 +@@ -62,7 +62,8 @@ + #define PARSE_ILLEGAL_EXIT_STR N_("Illegal exit status, expected integer") + #define PARSE_ILLEGAL_UMASK_STR N_("Illegal file creation mask, expected octal integer") + #define PARSE_ILLEGAL_NICE_STR N_("Illegal nice value, expected -20 to 19") +-#define PARSE_ILLEGAL_OOM_STR N_("Illegal oom adjustment, expected -16 to 15 or never") ++#define PARSE_ILLEGAL_OOM_STR N_("Illegal oom adjustment, expected -16 to 15 or 'never'") ++#define PARSE_ILLEGAL_OOM_SCORE_STR N_("Illegal oom score adjustment, expected -999 to 1000 or 'never'") + #define PARSE_ILLEGAL_LIMIT_STR N_("Illegal limit, expected 'unlimited' or integer") + #define PARSE_EXPECTED_EVENT_STR N_("Expected event") + #define PARSE_EXPECTED_OPERATOR_STR N_("Expected operator") + +=== modified file 'init/job_class.c' +--- init/job_class.c 2010-12-14 15:30:06 +0000 ++++ init/job_class.c 2011-08-11 21:00:44 +0000 +@@ -2,7 +2,7 @@ + * + * job_class.c - job class definition handling + * +- * Copyright © 2010 Canonical Ltd. ++ * Copyright © 2011 Canonical Ltd. + * Author: Scott James Remnant . + * + * This program is free software; you can redistribute it and/or modify +@@ -55,48 +55,6 @@ + #include "com.ubuntu.Upstart.Job.h" + + +-/** +- * JOB_DEFAULT_KILL_TIMEOUT: +- * +- * The default length of time to wait after sending a process the TERM +- * signal before sending the KILL signal if it hasn't terminated. +- **/ +-#define JOB_DEFAULT_KILL_TIMEOUT 5 +- +-/** +- * JOB_DEFAULT_RESPAWN_LIMIT: +- * +- * The default number of times in JOB_DEFAULT_RESPAWN_INTERVAL seconds that +- * we permit a process to respawn before stoping it +- **/ +-#define JOB_DEFAULT_RESPAWN_LIMIT 10 +- +-/** +- * JOB_DEFAULT_RESPAWN_INTERVAL: +- * +- * The default number of seconds before resetting the respawn timer. +- **/ +-#define JOB_DEFAULT_RESPAWN_INTERVAL 5 +- +-/** +- * JOB_DEFAULT_UMASK: +- * +- * The default file creation mark for processes. +- **/ +-#define JOB_DEFAULT_UMASK 022 +- +-/** +- * JOB_DEFAULT_ENVIRONMENT: +- * +- * Environment variables to always copy from our own environment, these +- * can be overriden in the job definition or by events since they have the +- * lowest priority. +- **/ +-#define JOB_DEFAULT_ENVIRONMENT \ +- "PATH", \ +- "TERM" +- +- + /* Prototypes for static functions */ + static void job_class_add (JobClass *class); + static int job_class_remove (JobClass *class); +@@ -210,8 +168,8 @@ + class->console = CONSOLE_NONE; + + class->umask = JOB_DEFAULT_UMASK; +- class->nice = 0; +- class->oom_adj = 0; ++ class->nice = JOB_DEFAULT_NICE; ++ class->oom_score_adj = JOB_DEFAULT_OOM_SCORE_ADJ; + + for (i = 0; i < RLIMIT_NLIMITS; i++) + class->limits[i] = NULL; + +=== modified file 'init/job_class.h' +--- init/job_class.h 2010-12-14 15:30:06 +0000 ++++ init/job_class.h 2011-08-11 20:59:46 +0000 +@@ -1,6 +1,6 @@ + /* upstart + * +- * Copyright © 2010 Canonical Ltd. ++ * Copyright © 2011 Canonical Ltd. + * Author: Scott James Remnant . + * + * This program is free software; you can redistribute it and/or modify +@@ -67,6 +67,62 @@ + + + /** ++ * JOB_DEFAULT_KILL_TIMEOUT: ++ * ++ * The default length of time to wait after sending a process the TERM ++ * signal before sending the KILL signal if it hasn't terminated. ++ **/ ++#define JOB_DEFAULT_KILL_TIMEOUT 5 ++ ++/** ++ * JOB_DEFAULT_RESPAWN_LIMIT: ++ * ++ * The default number of times in JOB_DEFAULT_RESPAWN_INTERVAL seconds that ++ * we permit a process to respawn before stoping it ++ **/ ++#define JOB_DEFAULT_RESPAWN_LIMIT 10 ++ ++/** ++ * JOB_DEFAULT_RESPAWN_INTERVAL: ++ * ++ * The default number of seconds before resetting the respawn timer. ++ **/ ++#define JOB_DEFAULT_RESPAWN_INTERVAL 5 ++ ++/** ++ * JOB_DEFAULT_UMASK: ++ * ++ * The default file creation mark for processes. ++ **/ ++#define JOB_DEFAULT_UMASK 022 ++ ++/** ++ * JOB_DEFAULT_NICE: ++ * ++ * The default nice level for processes. ++ **/ ++#define JOB_DEFAULT_NICE 0 ++ ++/** ++ * JOB_DEFAULT_OOM_SCORE_ADJ: ++ * ++ * The default OOM score adjustment for processes. ++ **/ ++#define JOB_DEFAULT_OOM_SCORE_ADJ 0 ++ ++/** ++ * JOB_DEFAULT_ENVIRONMENT: ++ * ++ * Environment variables to always copy from our own environment, these ++ * can be overriden in the job definition or by events since they have the ++ * lowest priority. ++ **/ ++#define JOB_DEFAULT_ENVIRONMENT \ ++ "PATH", \ ++ "TERM" ++ ++ ++/** + * JobClass: + * @entry: list header, + * @name: unique name, +@@ -93,7 +149,7 @@ + * @console: how to arrange processes' stdin/out/err file descriptors, + * @umask: file mode creation mask, + * @nice: process priority, +- * @oom_adj: OOM killer adjustment, ++ * @oom_score_adj: OOM killer score adjustment, + * @limits: resource limits indexed by resource, + * @chroot: root directory of process (implies @chdir if not set), + * @chdir: working directory of process, +@@ -141,7 +197,7 @@ + + mode_t umask; + int nice; +- int oom_adj; ++ int oom_score_adj; + struct rlimit *limits[RLIMIT_NLIMITS]; + char *chroot; + char *chdir; + +=== modified file 'init/job_process.c' +--- init/job_process.c 2011-08-11 20:55:33 +0000 ++++ init/job_process.c 2011-08-11 21:00:11 +0000 +@@ -513,16 +513,24 @@ + + /* Adjust the process OOM killer priority. + */ +- if (class->oom_adj) { ++ if (class->oom_score_adj != JOB_DEFAULT_OOM_SCORE_ADJ) { ++ int oom_value; + snprintf (filename, sizeof (filename), +- "/proc/%d/oom_adj", getpid ()); +- ++ "/proc/%d/oom_score_adj", getpid ()); ++ oom_value = class->oom_score_adj; + fd = fopen (filename, "w"); ++ if ((! fd) && (errno == ENOENT)) { ++ snprintf (filename, sizeof (filename), ++ "/proc/%d/oom_adj", getpid ()); ++ oom_value = (class->oom_score_adj ++ * ((class->oom_score_adj < 0) ? 17 : 15)) / 1000; ++ fd = fopen (filename, "w"); ++ } + if (! fd) { + nih_error_raise_system (); + job_process_error_abort (fds[1], JOB_PROCESS_ERROR_OOM_ADJ, 0); + } else { +- fprintf (fd, "%d\n", class->oom_adj); ++ fprintf (fd, "%d\n", oom_value); + + if (fclose (fd)) { + nih_error_raise_system (); + +=== modified file 'init/main.c' +--- init/main.c 2011-08-11 20:55:33 +0000 ++++ init/main.c 2011-08-11 21:00:11 +0000 +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -54,6 +55,7 @@ + #include "paths.h" + #include "events.h" + #include "system.h" ++#include "job_class.h" + #include "job_process.h" + #include "event.h" + #include "conf.h" +@@ -292,6 +294,38 @@ + NULL)); + + ++ /* Adjust our OOM priority to the default, which will be inherited ++ * by all jobs. ++ */ ++ if (JOB_DEFAULT_OOM_SCORE_ADJ) { ++ char filename[PATH_MAX]; ++ int oom_value; ++ FILE *fd; ++ ++ snprintf (filename, sizeof (filename), ++ "/proc/%d/oom_score_adj", getpid ()); ++ oom_value = JOB_DEFAULT_OOM_SCORE_ADJ; ++ fd = fopen (filename, "w"); ++ if ((! fd) && (errno == ENOENT)) { ++ snprintf (filename, sizeof (filename), ++ "/proc/%d/oom_adj", getpid ()); ++ oom_value = (JOB_DEFAULT_OOM_SCORE_ADJ ++ * ((JOB_DEFAULT_OOM_SCORE_ADJ < 0) ? 17 : 15)) / 1000; ++ fd = fopen (filename, "w"); ++ } ++ if (! fd) { ++ nih_warn ("%s: %s", _("Unable to set default oom score"), ++ strerror (errno)); ++ } else { ++ fprintf (fd, "%d\n", oom_value); ++ ++ if (fclose (fd)) ++ nih_warn ("%s: %s", _("Unable to set default oom score"), ++ strerror (errno)); ++ } ++ } ++ ++ + /* Read configuration */ + NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE)); + NIH_MUST (conf_source_new (NULL, CONFDIR, CONF_JOB_DIR)); + +=== modified file 'init/man/init.5' +--- init/man/init.5 2011-03-15 18:36:57 +0000 ++++ init/man/init.5 2011-08-11 20:56:28 +0000 +@@ -1,4 +1,4 @@ +-.TH init 5 2010-12-14 "Upstart" ++.TH init 5 2011-05-12 "Upstart" + .\" + .SH NAME + init \- Upstart init daemon job configuration +@@ -500,15 +500,15 @@ + for more details. + .\" + .TP +-.B oom \fIADJUSTMENT\fR|\fBnever ++.B oom score \fIADJUSTMENT\fR|\fBnever + Normally the OOM killer regards all processes equally, this stanza + advises the kernel to treat this job differently. + + .I ADJUSTMENT + may be an integer value from +-.I -16 ++.I -999 + (very unlikely to be killed by the OOM killer) up to +-.I 14 ++.I 1000 + (very likely to be killed by the OOM killer). It may also be the special + value + .B never + +=== modified file 'init/parse_job.c' +--- init/parse_job.c 2011-01-17 16:37:54 +0000 ++++ init/parse_job.c 2011-08-11 20:56:28 +0000 +@@ -2233,6 +2233,7 @@ + nih_local char *arg = NULL; + char *endptr; + size_t a_pos, a_lineno; ++ int oom_adj; + int ret = -1; + + nih_assert (class != NULL); +@@ -2247,12 +2248,37 @@ + if (! arg) + goto finish; + +- if (! strcmp (arg, "never")) { +- class->oom_adj = -17; ++ if (! strcmp (arg, "score")) { ++ nih_local char *scorearg = NULL; ++ ++ /* Update error position to the score value */ ++ *pos = a_pos; ++ if (lineno) ++ *lineno = a_lineno; ++ ++ scorearg = nih_config_next_arg (NULL, file, len, ++ &a_pos, &a_lineno); ++ if (! scorearg) ++ goto finish; ++ ++ if (! strcmp (scorearg, "never")) { ++ class->oom_score_adj = -1000; ++ } else { ++ errno = 0; ++ class->oom_score_adj = (int)strtol (scorearg, &endptr, 10); ++ if (errno || *endptr || ++ (class->oom_score_adj < -1000) || ++ (class->oom_score_adj > 1000)) ++ nih_return_error (-1, PARSE_ILLEGAL_OOM, ++ _(PARSE_ILLEGAL_OOM_SCORE_STR)); ++ } ++ } else if (! strcmp (arg, "never")) { ++ class->oom_score_adj = -1000; + } else { + errno = 0; +- class->oom_adj = (int)strtol (arg, &endptr, 10); +- if (errno || *endptr || (class->oom_adj < -17) || (class->oom_adj > 15)) ++ oom_adj = (int)strtol (arg, &endptr, 10); ++ class->oom_score_adj = (oom_adj * 1000) / ((oom_adj < 0) ? 17 : 15); ++ if (errno || *endptr || (oom_adj < -17) || (oom_adj > 15)) + nih_return_error (-1, PARSE_ILLEGAL_OOM, + _(PARSE_ILLEGAL_OOM_STR)); + } + +=== modified file 'init/tests/test_job_class.c' +--- init/tests/test_job_class.c 2011-03-16 22:42:48 +0000 ++++ init/tests/test_job_class.c 2011-08-11 20:56:28 +0000 +@@ -133,7 +133,7 @@ + + TEST_EQ (class->umask, 022); + TEST_EQ (class->nice, 0); +- TEST_EQ (class->oom_adj, 0); ++ TEST_EQ (class->oom_score_adj, 0); + + for (i = 0; i < RLIMIT_NLIMITS; i++) + TEST_EQ_P (class->limits[i], NULL); + +=== modified file 'init/tests/test_parse_job.c' +--- init/tests/test_parse_job.c 2010-12-14 16:20:38 +0000 ++++ init/tests/test_parse_job.c 2011-08-11 20:56:28 +0000 +@@ -6161,6 +6161,8 @@ + nih_free (err); + } + ++#define ADJ_TO_SCORE(x) ((x * 1000) / ((x < 0) ? 17 : 15)) ++ + void + test_stanza_oom (void) + { +@@ -6198,11 +6200,39 @@ + + TEST_ALLOC_SIZE (job, sizeof (JobClass)); + +- TEST_EQ (job->oom_adj, 10); +- +- nih_free (job); +- } +- ++ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(10)); ++ ++ nih_free (job); ++ } ++ ++ TEST_FEATURE ("with positive score argument"); ++ strcpy (buf, "oom score 100\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 2); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->oom_score_adj, 100); ++ ++ nih_free (job); ++ } + + /* Check that an oom stanza with a negative timeout results + * in it being stored in the job. +@@ -6231,7 +6261,36 @@ + + TEST_ALLOC_SIZE (job, sizeof (JobClass)); + +- TEST_EQ (job->oom_adj, -10); ++ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(-10)); ++ ++ nih_free (job); ++ } ++ ++ TEST_FEATURE ("with negative score argument"); ++ strcpy (buf, "oom score -100\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 2); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->oom_score_adj, -100); + + nih_free (job); + } +@@ -6264,7 +6323,40 @@ + + TEST_ALLOC_SIZE (job, sizeof (JobClass)); + +- TEST_EQ (job->oom_adj, -17); ++ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(-17)); ++ ++ nih_free (job); ++ } ++ ++ ++ /* Check that an oom score stanza may have the special never ++ * argument which stores -1000 in the job. ++ */ ++ TEST_FEATURE ("with never score argument"); ++ strcpy (buf, "oom score never\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 2); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->oom_score_adj, -1000); + + nih_free (job); + } +@@ -6297,7 +6389,100 @@ + + TEST_ALLOC_SIZE (job, sizeof (JobClass)); + +- TEST_EQ (job->oom_adj, 10); ++ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(10)); ++ ++ nih_free (job); ++ } ++ ++ TEST_FEATURE ("with multiple score stanzas"); ++ strcpy (buf, "oom score -500\n"); ++ strcat (buf, "oom score 500\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 3); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->oom_score_adj, 500); ++ ++ nih_free (job); ++ } ++ ++ /* Check that the last of multiple distinct oom stanzas is ++ * used. ++ */ ++ TEST_FEATURE ("with an oom overriding an oom score stanza"); ++ strcpy (buf, "oom score -10\n"); ++ strcat (buf, "oom 10\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 3); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(10)); ++ ++ nih_free (job); ++ } ++ ++ TEST_FEATURE ("with an oom score overriding an oom stanza"); ++ strcpy (buf, "oom -10\n"); ++ strcat (buf, "oom score 10\n"); ++ ++ TEST_ALLOC_FAIL { ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), ++ &pos, &lineno); ++ ++ if (test_alloc_failed) { ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, ENOMEM); ++ nih_free (err); ++ ++ continue; ++ } ++ ++ TEST_EQ (pos, strlen (buf)); ++ TEST_EQ (lineno, 3); ++ ++ TEST_ALLOC_SIZE (job, sizeof (JobClass)); ++ ++ TEST_EQ (job->oom_score_adj, 10); + + nih_free (job); + } +@@ -6322,6 +6507,25 @@ + nih_free (err); + + ++ /* Check that an oom score stanza without an argument results in a ++ * syntax error. ++ */ ++ TEST_FEATURE ("with missing score argument"); ++ strcpy (buf, "oom score\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, NIH_CONFIG_EXPECTED_TOKEN); ++ TEST_EQ (pos, 9); ++ TEST_EQ (lineno, 1); ++ nih_free (err); ++ ++ + /* Check that an oom stanza with an overly large argument results + * in a syntax error. + */ +@@ -6340,6 +6544,21 @@ + TEST_EQ (lineno, 1); + nih_free (err); + ++ TEST_FEATURE ("with overly large score argument"); ++ strcpy (buf, "oom score 1200\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); ++ TEST_EQ (pos, 10); ++ TEST_EQ (lineno, 1); ++ nih_free (err); ++ + + /* Check that an oom stanza with an overly small argument results + * in a syntax error. +@@ -6359,6 +6578,21 @@ + TEST_EQ (lineno, 1); + nih_free (err); + ++ TEST_FEATURE ("with overly small score argument"); ++ strcpy (buf, "oom score -1200\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); ++ TEST_EQ (pos, 10); ++ TEST_EQ (lineno, 1); ++ nih_free (err); ++ + + /* Check that an oom stanza with a non-integer argument results + * in a syntax error. +@@ -6378,6 +6612,21 @@ + TEST_EQ (lineno, 1); + nih_free (err); + ++ TEST_FEATURE ("with non-integer score argument"); ++ strcpy (buf, "oom score foo\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); ++ TEST_EQ (pos, 10); ++ TEST_EQ (lineno, 1); ++ nih_free (err); ++ + + /* Check that an oom stanza with a partially numeric argument + * results in a syntax error. +@@ -6397,6 +6646,21 @@ + TEST_EQ (lineno, 1); + nih_free (err); + ++ TEST_FEATURE ("with alphanumeric score argument"); ++ strcpy (buf, "oom score 12foo\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); ++ TEST_EQ (pos, 10); ++ TEST_EQ (lineno, 1); ++ nih_free (err); ++ + + /* Check that an oom stanza with a priority but with an extra + * argument afterwards results in a syntax error. +@@ -6415,6 +6679,21 @@ + TEST_EQ (pos, 7); + TEST_EQ (lineno, 1); + nih_free (err); ++ ++ TEST_FEATURE ("with extra score argument"); ++ strcpy (buf, "oom score 500 foo\n"); ++ ++ pos = 0; ++ lineno = 1; ++ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); ++ ++ TEST_EQ_P (job, NULL); ++ ++ err = nih_error_get (); ++ TEST_EQ (err->number, NIH_CONFIG_UNEXPECTED_TOKEN); ++ TEST_EQ (pos, 14); ++ TEST_EQ (lineno, 1); ++ nih_free (err); + } + + void + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-silent-console.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-silent-console.patch new file mode 100644 index 0000000000..f09fa28f37 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-silent-console.patch @@ -0,0 +1,49 @@ +=== modified file 'init/main.c' +--- init/main.c 2011-03-16 22:54:56 +0000 ++++ init/main.c 2011-08-08 21:09:43 +0000 +@@ -173,8 +173,23 @@ + * resetting it to sane defaults unless we're inheriting from another + * init process which we know left it in a sane state. + */ +- if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0) +- nih_free (nih_error_get ()); ++ if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0) { ++ NihError *err; ++ ++ err = nih_error_get (); ++ nih_warn ("%s: %s", _("Unable to initialize console, will try /dev/null"), ++ err->message); ++ nih_free (err); ++ ++ if (system_setup_console (CONSOLE_NONE, FALSE) < 0) { ++ err = nih_error_get (); ++ nih_fatal ("%s: %s", _("Unable to initialize console as /dev/null"), ++ err->message); ++ nih_free (err); ++ ++ exit (1); ++ } ++ } + + /* Set the PATH environment variable */ + setenv ("PATH", PATH, TRUE); +@@ -316,8 +331,16 @@ + /* Now that the startup is complete, send all further logging output + * to kmsg instead of to the console. + */ +- if (system_setup_console (CONSOLE_NONE, FALSE) < 0) +- nih_free (nih_error_get ()); ++ if (system_setup_console (CONSOLE_NONE, FALSE) < 0) { ++ NihError *err; ++ ++ err = nih_error_get (); ++ nih_fatal ("%s: %s", _("Unable to setup standard file descriptors"), ++ err->message); ++ nih_free (err); ++ ++ exit (1); ++ } + + nih_log_set_logger (logger_kmsg); + #endif /* DEBUG */ + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.3.ebuild new file mode 100644 index 0000000000..bfbb715243 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools eutils + +DESCRIPTION="Upstart is an event-based replacement for the init daemon" +HOMEPAGE="http://upstart.ubuntu.com/" +SRC_URI="http://upstart.ubuntu.com/download/0.6/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="examples nls" + +DEPEND=">=dev-libs/expat-2.0.0 + >=sys-apps/dbus-1.2.16 + nls? ( sys-devel/gettext )" + +RDEPEND=">=sys-apps/dbus-1.2.16" + +src_unpack() { + unpack $A + cd "${S}" + + epatch "${FILESDIR}"/${P}-cross-compile.patch # Already upstream + epatch "${FILESDIR}"/${P}-cross-compile2.patch # Not upstream @ 1214 + + eautoreconf +} + +src_compile() { + econf --prefix=/ --includedir='${prefix}/usr/include' $(use_enable nls) || die "econf failed" + + emake NIH_DBUS_TOOL=$(which nih-dbus-tool) \ + || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if ! use examples ; then + elog "Removing example .conf files." + rm "${D}"/etc/init/*.conf + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6-r3.ebuild new file mode 120000 index 0000000000..f8c067eea8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6-r3.ebuild @@ -0,0 +1 @@ +upstart-0.6.6.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6.ebuild new file mode 100644 index 0000000000..a8f6c9c33e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools eutils + +DESCRIPTION="Upstart is an event-based replacement for the init daemon" +HOMEPAGE="http://upstart.ubuntu.com/" +SRC_URI="http://upstart.ubuntu.com/download/0.6/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="examples nls upstartdebug" + +DEPEND=">=dev-libs/expat-2.0.0 + >=sys-apps/dbus-1.2.16 + nls? ( sys-devel/gettext ) + >=sys-libs/libnih-1.0.2" + +RDEPEND=">=sys-apps/dbus-1.2.16 + >=sys-libs/libnih-1.0.2" + + +src_unpack() { + unpack ${A} + cd "${S}" + if use upstartdebug; then + epatch "${FILESDIR}"/upstart-0.6-logger_kmsg.patch + fi + epatch "${FILESDIR}"/upstart-0.6.6-introspection.patch +} + +src_compile() { + econf --prefix=/ --includedir='${prefix}/usr/include' \ + $(use_enable nls) || die "econf failed" + + emake NIH_DBUS_TOOL=$(which nih-dbus-tool) \ + || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if ! use examples ; then + elog "Removing example .conf files." + rm "${D}"/etc/init/*.conf + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2-r4.ebuild new file mode 120000 index 0000000000..fc587be66e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2-r4.ebuild @@ -0,0 +1 @@ +upstart-1.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2.ebuild new file mode 100644 index 0000000000..5206883ede --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools eutils + +DESCRIPTION="Upstart is an event-based replacement for the init daemon" +HOMEPAGE="http://upstart.ubuntu.com/" +SRC_URI="http://upstart.at/download/1.x/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 arm" +IUSE="examples nls upstartdebug" + +DEPEND=">=dev-libs/expat-2.0.0 + >=sys-apps/dbus-1.2.16 + nls? ( sys-devel/gettext ) + >=sys-libs/libnih-1.0.2" + +RDEPEND=">=sys-apps/dbus-1.2.16 + >=sys-libs/libnih-1.0.2" + + +src_unpack() { + unpack ${A} + cd "${S}" + + # 1.3+ has scary user and chroot session support that we just + # don't want to adopt yet, so we're sticking with 1.2 for the + # near future. Backport some bug fixes from lp:upstart + + # -r 1326 - fix bug when /dev/console cannot be opened + # chromium-os:18739 + epatch "${FILESDIR}"/upstart-1.2-silent-console.patch + # -r 1280,1308,1309,1320,1329 - fix shell fd leak (and fix the fix) + epatch "${FILESDIR}"/upstart-1.2-fix-shell-redirect.patch + # -r 1281,1325,1327,1328 - update to use /proc/oom_score + epatch "${FILESDIR}"/upstart-1.2-oom-score.patch + # -r 1282 - add "kill signal" stanza (may be useful for us) + epatch "${FILESDIR}"/upstart-1.2-kill-signal.patch + + # chromium-os:16450, prevent OOM killer by default + epatch "${FILESDIR}"/upstart-1.2-default-oom_score_adj.patch + + # chromium-os:33165, make EXIT_STATUS!=* possible + epatch "${FILESDIR}"/upstart-1.2-negate-match.patch + + # Patch to use kmsg at higher verbosity for logging; this is + # our own patch because we can't just add --verbose to the + # kernel command-line when we need to. + if use upstartdebug; then + epatch "${FILESDIR}"/upstart-1.2-log-verbosity.patch + fi +} + +src_compile() { + econf --prefix=/ --includedir='${prefix}/usr/include' \ + $(use_enable nls) || die "econf failed" + + emake NIH_DBUS_TOOL=$(which nih-dbus-tool) \ + || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if ! use examples ; then + elog "Removing example .conf files." + rm "${D}"/etc/init/*.conf + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/Manifest new file mode 100644 index 0000000000..ab6f1bfc5a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/Manifest @@ -0,0 +1 @@ +DIST pambase-20101024.tar.bz2 3201 RMD160 3b0c5950a7e2cafd3fe93a5663b35e851d5975bf SHA1 89bca8e926290518192f5728aab8794f028931f5 SHA256 89d60dd598d3da0ce1d1bcd7dc325f6c55002a1d4a7d27f9bb024f6732e9fba4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/files/pambase-20101024-disable-nullok.patch b/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/files/pambase-20101024-disable-nullok.patch new file mode 100644 index 0000000000..bceae89e94 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/files/pambase-20101024-disable-nullok.patch @@ -0,0 +1,20 @@ +--- a/system-auth.in ++++ b/system-auth.in +@@ -7,7 +7,7 @@ + #if HAVE_KRB5 + auth KRB5_CONTROL pam_krb5.so KRB5_PARAMS + #endif +-auth required pam_unix.so try_first_pass LIKEAUTH nullok DEBUG ++auth required pam_unix.so try_first_pass LIKEAUTH DEBUG + /* This is needed to make sure that the Kerberos skip-on-success won't cause a bad jump. */ + auth optional pam_permit.so + +@@ -27,7 +27,7 @@ + #if HAVE_KRB5 + password KRB5_CONTROL pam_krb5.so KRB5_PARAMS + #endif +-password required pam_unix.so try_first_pass UNIX_AUTHTOK nullok UNIX_EXTENDED_ENCRYPTION DEBUG ++password required pam_unix.so try_first_pass UNIX_AUTHTOK UNIX_EXTENDED_ENCRYPTION DEBUG + /* This is needed to make sure that the Kerberos skip-on-success won't cause a bad jump. */ + password optional pam_permit.so + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/pambase-20101024-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/pambase-20101024-r2.ebuild new file mode 100644 index 0000000000..aef91d2b0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/pambase-20101024-r2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20101024-r2.ebuild,v 1.4 2012/05/19 21:34:59 flameeyes Exp $ + +EAPI=4 + +inherit eutils + +DESCRIPTION="PAM base configuration files" +HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/" +SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" +IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal" +RESTRICT="binchecks" + +RDEPEND=" + || ( + >=sys-libs/pam-0.99.9.0-r1 + ( sys-auth/openpam + || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) + ) + ) + cracklib? ( >=sys-libs/pam-0.99[cracklib] ) + consolekit? ( >=sys-auth/consolekit-0.3[pam] ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.20[pam] ) + selinux? ( >=sys-libs/pam-0.99[selinux] ) + passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) + mktemp? ( sys-auth/pam_mktemp ) + pam_ssh? ( sys-auth/pam_ssh ) + sha512? ( >=sys-libs/pam-1.0.1 ) + pam_krb5? ( + >=sys-libs/pam-1.1.0 + >=sys-auth/pam_krb5-4.3 + ) + !path, strerror (errno)) + == PED_EXCEPTION_RETRY) + goto retry; ++ else ++ /* Try hard to make sure the file descriptor never leaks */ ++ close (arch_specific->fd); + return 1; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/parted/parted-3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/parted/parted-3.1-r1.ebuild new file mode 100644 index 0000000000..3b1dc15fe2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/parted/parted-3.1-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.1.ebuild,v 1.1 2012/03/04 18:23:21 jer Exp $ + +EAPI="3" + +WANT_AUTOMAKE="1.11" + +inherit autotools eutils + +DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" +HOMEPAGE="http://www.gnu.org/software/parted" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +IUSE="+debug device-mapper nls readline selinux static-libs test" + +# specific version for gettext needed +# to fix bug 85999 +RDEPEND=" + >=sys-fs/e2fsprogs-1.27 + >=sys-libs/ncurses-5.2 + nls? ( >=sys-devel/gettext-0.12.1-r2 ) + readline? ( >=sys-libs/readline-5.2 ) + selinux? ( sys-libs/libselinux ) + device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) ) +" +DEPEND=" + ${RDEPEND} + dev-util/pkgconfig + test? ( >=dev-libs/check-0.9.3 ) +" + +src_prepare() { + # Remove tests known to FAIL instead of SKIP without OS/userland support + sed -i libparted/tests/Makefile.am \ + -e 's|t3000-symlink.sh||g' || die "sed failed" + sed -i tests/Makefile.am \ + -e '/t4100-msdos-partition-limits.sh/d' \ + -e '/t4100-dvh-partition-limits.sh/d' \ + -e '/t6000-dm.sh/d' || die "sed failed" + # there is no configure flag for controlling the dev-libs/check test + sed -i configure.ac \ + -e "s:have_check=[a-z]*:have_check=$(usex test):g" || die + + # Fix a file descriptor leak due to fsync errors. + # See crosbug.com/33674 for details. + epatch "${FILESDIR}/${P}-fix-file-descriptor-leak.patch" || die + + eautoreconf +} + +src_configure() { + econf \ + $(use_with readline) \ + $(use_enable nls) \ + $(use_enable debug) \ + $(use_enable selinux) \ + $(use_enable device-mapper) \ + $(use_enable static-libs static) \ + --disable-rpath +} + +src_test() { + if use debug; then + # Do not die when tests fail - some requirements are not + # properly checked and should not lead to the ebuild failing. + emake check + else + ewarn "Skipping tests because USE=-debug is set." + fi +} + +src_install() { + emake install DESTDIR="${D}" || die "Install failed" + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO + dodoc doc/{API,FAT,USER.jp} + find "${ED}" -name '*.la' -exec rm -f '{}' + +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/bootstub/bootstub-1.0-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/bootstub/bootstub-1.0-r7.ebuild new file mode 100644 index 0000000000..78501f298c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/bootstub/bootstub-1.0-r7.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +CROS_WORKON_COMMIT="5ac54e8d3d305c2c6c7297e8e54d3cf7e4629b29" +CROS_WORKON_TREE="a04ce1e804accdabc6afee4a4ca5ecd9e64d6c72" +inherit eutils toolchain-funcs cros-workon + +DESCRIPTION="Chrome OS embedded bootstub" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64" +IUSE="" +CROS_WORKON_PROJECT="chromiumos/third_party/bootstub" +DEPEND="sys-boot/gnu-efi" + +src_compile() { + emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \ + OBJCOPY="$(tc-getPROG OBJCOPY objcopy)" \ + || die "${SRCPATH} compile failed." +} + +src_install() { + LIBDIR=$(get_libdir) + emake DESTDIR="${D}/${LIBDIR}/bootstub" install || \ + die "${SRCPATH} install failed." +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/bootstub/bootstub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/bootstub/bootstub-9999.ebuild new file mode 100644 index 0000000000..b47f40521d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/bootstub/bootstub-9999.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +inherit eutils toolchain-funcs cros-workon + +DESCRIPTION="Chrome OS embedded bootstub" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +CROS_WORKON_PROJECT="chromiumos/third_party/bootstub" +DEPEND="sys-boot/gnu-efi" + +src_compile() { + emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \ + OBJCOPY="$(tc-getPROG OBJCOPY objcopy)" \ + || die "${SRCPATH} compile failed." +} + +src_install() { + LIBDIR=$(get_libdir) + emake DESTDIR="${D}/${LIBDIR}/bootstub" install || \ + die "${SRCPATH} install failed." +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-bmpblk/chromeos-bmpblk-0.0.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-bmpblk/chromeos-bmpblk-0.0.2-r1.ebuild new file mode 120000 index 0000000000..1c9a8a13be --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-bmpblk/chromeos-bmpblk-0.0.2-r1.ebuild @@ -0,0 +1 @@ +chromeos-bmpblk-0.0.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-bmpblk/chromeos-bmpblk-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-bmpblk/chromeos-bmpblk-0.0.2.ebuild new file mode 100644 index 0000000000..2e17bd4a59 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-bmpblk/chromeos-bmpblk-0.0.2.ebuild @@ -0,0 +1,23 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +inherit cros-binary + +DESCRIPTION="Chrome OS Firmware Bitmap Block" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +BMPBLK_NAME="bmpblk-${PV}.bin" +MIRROR_SITE="http://commondatastorage.googleapis.com/chromeos-localmirror" +CROS_BINARY_URI="$MIRROR_SITE/distfiles/$PN/$BMPBLK_NAME" +CROS_BINARY_SUM="8efb8099517faa6c7600e6bcfae154fdaa48397e" + +src_install() { + insinto /firmware + newins "$CROS_BINARY_STORE_DIR/$BMPBLK_NAME" bmpblk.bin +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-memtest/chromeos-memtest-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-memtest/chromeos-memtest-0.0.1-r5.ebuild new file mode 100644 index 0000000000..c355e7ed77 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-memtest/chromeos-memtest-0.0.1-r5.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="3d4be6e3bfd819856e38a82e35c206fec4551851" +CROS_WORKON_TREE="b8064d188f425c4b2ced6c44a442b631d63568a3" +CROS_WORKON_PROJECT="chromiumos/third_party/memtest" + +DESCRIPTION="The memtest86 memory tester" +HOMEPAGE="http://www.memtest86.com" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="" +DEPEND="" + +CROS_WORKON_LOCALNAME="memtest" + +inherit cros-workon toolchain-funcs + +src_compile() { + local prefix="i686-pc-linux-gnu" + emake -j1 AS=${prefix}-as CC=${prefix}-gcc LD=${prefix}-ld.bfd +} + +src_install() { + insinto "/firmware" + newins memtest x86-memtest +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-memtest/chromeos-memtest-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-memtest/chromeos-memtest-9999.ebuild new file mode 100644 index 0000000000..37f41f76ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-memtest/chromeos-memtest-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/memtest" + +DESCRIPTION="The memtest86 memory tester" +HOMEPAGE="http://www.memtest86.com" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="" +DEPEND="" + +CROS_WORKON_LOCALNAME="memtest" + +inherit cros-workon toolchain-funcs + +src_compile() { + local prefix="i686-pc-linux-gnu" + emake -j1 AS=${prefix}-as CC=${prefix}-gcc LD=${prefix}-ld.bfd +} + +src_install() { + insinto "/firmware" + newins memtest x86-memtest +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-seabios/chromeos-seabios-0.0.1-r45.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-seabios/chromeos-seabios-0.0.1-r45.ebuild new file mode 100644 index 0000000000..fa934cd0f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-seabios/chromeos-seabios-0.0.1-r45.ebuild @@ -0,0 +1,78 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="589e763e493ff2544d2f98cdfaceed6865e066b8" +CROS_WORKON_TREE="aac8fef67a3b7b56c9b6cb32af538d32e9e70b15" +CROS_WORKON_PROJECT="chromiumos/third_party/seabios" + +inherit toolchain-funcs + +DESCRIPTION="Open Source implementation of X86 BIOS" +HOMEPAGE="http://www.coreboot.org/SeaBIOS" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="" +DEPEND=" + virtual/chromeos-coreboot + sys-apps/coreboot-utils +" +CROS_WORKON_LOCALNAME="seabios" + +# This must be inherited *after* EGIT/CROS_WORKON variables defined +inherit cros-workon + +# Directory where the generated files are looked for and placed. +CROS_FIRMWARE_IMAGE_DIR="/firmware" +CROS_FIRMWARE_ROOT="${ROOT%/}${CROS_FIRMWARE_IMAGE_DIR}" + +create_seabios_cbfs() { + local oprom=${CROS_FIRMWARE_ROOT}/pci????,????.rom + local seabios_cbfs=seabios.cbfs + local cbfs_size=$(( 2*1024*1024 )) + local bootblock=$( mktemp ) + + # Create a dummy bootblock to make cbfstool happy + dd if=/dev/zero of=$bootblock count=1 bs=64 + # Create empty CBFS + cbfstool ${seabios_cbfs} create -s ${cbfs_size} -B $bootblock + # Clean up + rm $bootblock + # Add SeaBIOS binary to CBFS + cbfstool ${seabios_cbfs} add-payload -f out/bios.bin.elf -n payload -c lzma + # Add VGA option rom to CBFS + cbfstool ${seabios_cbfs} add -f $oprom -n $( basename $oprom ) -t optionrom + # Add additional configuration + cbfstool ${seabios_cbfs} add -f bootorder -n bootorder -t raw + cbfstool ${seabios_cbfs} add -f boot-menu-wait -n boot-menu-wait -t raw + # Print CBFS inventory + cbfstool ${seabios_cbfs} print + # Fix up CBFS to live at 0xffc00000. The last four bytes of a CBFS + # image are a pointer to the CBFS master header. Per default a CBFS + # lives at 4G - rom size, and the CBFS master header ends up at + # 0xffffffa0. However our CBFS lives at 4G-4M and is 2M in size, so + # the CBFS master header is at 0xffdfffa0 instead. The two lines + # below correct the according byte in that pointer to make all CBFS + # parsing code happy. In the long run we should fix cbfstool and + # remove this workaround. + /bin/echo -ne \\0737 | dd of=${seabios_cbfs} \ + seek=$(( ${cbfs_size} - 2 )) bs=1 conv=notrunc +} + +src_compile() { + export LD="$(tc-getLD).bfd" + export CC="$(tc-getCC) -fuse-ld=bfd" + emake defconfig || die "${P}: configuration failed" + emake || die "${P}: compilation failed" + create_seabios_cbfs +} + +src_install() { + dodir /firmware + insinto /firmware + doins out/bios.bin.elf || die + doins seabios.cbfs || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-seabios/chromeos-seabios-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-seabios/chromeos-seabios-9999.ebuild new file mode 100644 index 0000000000..72fe7a8e77 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-seabios/chromeos-seabios-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/seabios" + +inherit toolchain-funcs + +DESCRIPTION="Open Source implementation of X86 BIOS" +HOMEPAGE="http://www.coreboot.org/SeaBIOS" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND=" + virtual/chromeos-coreboot + sys-apps/coreboot-utils +" +CROS_WORKON_LOCALNAME="seabios" + +# This must be inherited *after* EGIT/CROS_WORKON variables defined +inherit cros-workon + +# Directory where the generated files are looked for and placed. +CROS_FIRMWARE_IMAGE_DIR="/firmware" +CROS_FIRMWARE_ROOT="${ROOT%/}${CROS_FIRMWARE_IMAGE_DIR}" + +create_seabios_cbfs() { + local oprom=${CROS_FIRMWARE_ROOT}/pci????,????.rom + local seabios_cbfs=seabios.cbfs + local cbfs_size=$(( 2*1024*1024 )) + local bootblock=$( mktemp ) + + # Create a dummy bootblock to make cbfstool happy + dd if=/dev/zero of=$bootblock count=1 bs=64 + # Create empty CBFS + cbfstool ${seabios_cbfs} create -s ${cbfs_size} -B $bootblock + # Clean up + rm $bootblock + # Add SeaBIOS binary to CBFS + cbfstool ${seabios_cbfs} add-payload -f out/bios.bin.elf -n payload -c lzma + # Add VGA option rom to CBFS + cbfstool ${seabios_cbfs} add -f $oprom -n $( basename $oprom ) -t optionrom + # Add additional configuration + cbfstool ${seabios_cbfs} add -f bootorder -n bootorder -t raw + cbfstool ${seabios_cbfs} add -f boot-menu-wait -n boot-menu-wait -t raw + # Print CBFS inventory + cbfstool ${seabios_cbfs} print + # Fix up CBFS to live at 0xffc00000. The last four bytes of a CBFS + # image are a pointer to the CBFS master header. Per default a CBFS + # lives at 4G - rom size, and the CBFS master header ends up at + # 0xffffffa0. However our CBFS lives at 4G-4M and is 2M in size, so + # the CBFS master header is at 0xffdfffa0 instead. The two lines + # below correct the according byte in that pointer to make all CBFS + # parsing code happy. In the long run we should fix cbfstool and + # remove this workaround. + /bin/echo -ne \\0737 | dd of=${seabios_cbfs} \ + seek=$(( ${cbfs_size} - 2 )) bs=1 conv=notrunc +} + +src_compile() { + export LD="$(tc-getLD).bfd" + export CC="$(tc-getCC) -fuse-ld=bfd" + emake defconfig || die "${P}: configuration failed" + emake || die "${P}: compilation failed" + create_seabios_cbfs +} + +src_install() { + dodir /firmware + insinto /firmware + doins out/bios.bin.elf || die + doins seabios.cbfs || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/chromeos-u-boot-2011.12-r1312.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/chromeos-u-boot-2011.12-r1312.ebuild new file mode 100644 index 0000000000..eee3373f6e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/chromeos-u-boot-2011.12-r1312.ebuild @@ -0,0 +1,211 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +CROS_WORKON_COMMIT=("f561cd93f05c290bd0280f467c4a10ff224f7bf9" "3e9cf90442632bed695ac0552a76ca0d1154f799") +CROS_WORKON_TREE=("8595e217edc9baad42dd848f58b4cbd0c85c0200" "8b768b506c41afc82139df72f689917b51d7cbb2") +CROS_WORKON_PROJECT=("chromiumos/third_party/u-boot" "chromiumos/platform/vboot_reference") +CROS_WORKON_LOCALNAME=("u-boot" "../platform/vboot_reference") +CROS_WORKON_SUBDIR=("files" "") +VBOOT_REFERENCE_DESTDIR="${S}/vboot_reference" +CROS_WORKON_DESTDIR=("${S}" "${VBOOT_REFERENCE_DESTDIR}") + +# TODO(sjg): Remove cros-board as it violates the idea of having no specific +# board knowledge in the build system. At present it is only needed for the +# netboot hack. +inherit cros-debug toolchain-funcs cros-board flag-o-matic cros-workon + +DESCRIPTION="Das U-Boot boot loader" +HOMEPAGE="http://www.denx.de/wiki/U-Boot" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="dev profiling factory-mode" + +DEPEND="!sys-boot/x86-firmware-fdts + !sys-boot/exynos-u-boot + !sys-boot/tegra2-public-firmware-fdts + " + +RDEPEND="${DEPEND} + " + +UB_BUILD_DIR="${WORKDIR}/build" +UB_BUILD_DIR_NB="${UB_BUILD_DIR%/}_nb" + +U_BOOT_CONFIG_USE_PREFIX="u_boot_config_use_" +ALL_CONFIGS=( + beaglebone + coreboot + daisy + seaboard + waluigi +) +IUSE_CONFIGS=${ALL_CONFIGS[@]/#/${U_BOOT_CONFIG_USE_PREFIX}} + +IUSE="${IUSE} ${IUSE_CONFIGS}" + +REQUIRED_USE="${REQUIRED_USE} ^^ ( ${IUSE_CONFIGS} )" + +# @FUNCTION: get_current_u_boot_config +# @DESCRIPTION: +# Finds the config for the current board by searching USE for an entry +# signifying which version to use. +get_current_u_boot_config() { + local use_config + for use_config in ${IUSE_CONFIGS}; do + if use ${use_config}; then + echo "chromeos_${use_config#${U_BOOT_CONFIG_USE_PREFIX}}_config" + return + fi + done + die "Unable to determine current U-Boot config." +} + +# @FUNCTION: netboot_required +# @DESCRIPTION: +# Checks if netboot image also needs to be generated. +netboot_required() { + # Build netbootable image for Link unconditionally for now. + # TODO (vbendeb): come up with a better scheme of determining what + # platforms should always generate the netboot capable + # legacy image. + local board=$(get_current_board_with_variant) + + use factory-mode || [[ "${board}" == "link" ]] || \ + [[ "${board}" == "daisy_spring" ]] +} + +# @FUNCTION: get_config_var +# @USAGE: +# @DESCRIPTION: +# Returns the value of the requested variable in the specified config +# if present. This can only be called after make config. +get_config_var() { + local config="${1%_config}" + local var="${2}" + local boards_cfg="${S}/boards.cfg" + local i + case "${var}" in + ARCH) i=2;; + CPU) i=3;; + BOARD) i=4;; + VENDOR) i=5;; + SOC) i=6;; + *) die "Unsupported field: ${var}" + esac + awk -v i=$i -v cfg="${config}" '$1 == cfg { print $i }' "${boards_cfg}" +} + +umake() { + # Add `ARCH=` to reset ARCH env and let U-Boot choose it. + ARCH= emake "${COMMON_MAKE_FLAGS[@]}" "$@" +} + +src_configure() { + export LDFLAGS=$(raw-ldflags) + tc-export BUILD_CC + + CROS_U_BOOT_CONFIG="$(get_current_u_boot_config)" + elog "Using U-Boot config: ${CROS_U_BOOT_CONFIG}" + + # Firmware related binaries are compiled with 32-bit toolchain + # on 64-bit platforms + if [[ ${CHOST} == x86_64-* ]]; then + CROSS_PREFIX="i686-pc-linux-gnu-" + else + CROSS_PREFIX="${CHOST}-" + fi + + COMMON_MAKE_FLAGS=( + "CROSS_COMPILE=${CROSS_PREFIX}" + "VBOOT_SOURCE=${VBOOT_REFERENCE_DESTDIR}" + DEV_TREE_SEPARATE=1 + "HOSTCC=${BUILD_CC}" + HOSTSTRIP=true + ) + if use dev; then + # Avoid hiding the errors and warnings + COMMON_MAKE_FLAGS+=( -s ) + else + COMMON_MAKE_FLAGS+=( + -k + WERROR=y + ) + fi + if use x86 || use amd64 || use cros-debug; then + COMMON_MAKE_FLAGS+=( VBOOT_DEBUG=1 ) + fi + if use profiling; then + COMMON_MAKE_FLAGS+=( VBOOT_PERFORMANCE=1 ) + fi + + BUILD_FLAGS=( + "O=${UB_BUILD_DIR}" + ) + + umake "${BUILD_FLAGS[@]}" distclean + umake "${BUILD_FLAGS[@]}" ${CROS_U_BOOT_CONFIG} + + if netboot_required; then + BUILD_NB_FLAGS=( + "O=${UB_BUILD_DIR_NB}" + BUILD_FACTORY_IMAGE=1 + ) + umake "${BUILD_NB_FLAGS[@]}" distclean + umake "${BUILD_NB_FLAGS[@]}" ${CROS_U_BOOT_CONFIG} + fi +} + +src_compile() { + umake "${BUILD_FLAGS[@]}" all + + if netboot_required; then + umake "${BUILD_NB_FLAGS[@]}" all + fi +} + +src_install() { + local inst_dir="/firmware" + local files_to_copy=( + System.map + u-boot.bin + u-boot.img + ) + local ub_vendor="$(get_config_var ${CROS_U_BOOT_CONFIG} VENDOR)" + local ub_board="$(get_config_var ${CROS_U_BOOT_CONFIG} BOARD)" + local ub_arch="$(get_config_var ${CROS_U_BOOT_CONFIG} ARCH)" + + insinto "${inst_dir}" + + # Daisy and its variants need an SPL binary. + if use u_boot_config_use_daisy; then + files_to_copy+=( spl/${ub_board}-spl.bin ) + newins "${UB_BUILD_DIR}/spl/u-boot-spl" "${ub_board}-spl.elf" + fi + + doins "${files_to_copy[@]/#/${UB_BUILD_DIR}/}" + newins "${UB_BUILD_DIR}/u-boot" u-boot.elf + + if netboot_required; then + newins "${UB_BUILD_DIR_NB}/u-boot.bin" u-boot_netboot.bin + newins "${UB_BUILD_DIR_NB}/u-boot" u-boot_netboot.elf + fi + + insinto "${inst_dir}/dts" + local dts_dir dts_dirs=( + "board/${ub_vendor}/dts" + "board/${ub_vendor}/${ub_board}" + "arch/${ub_arch}/dts" + "cros/dts" + ) + for dts_dir in "${dts_dirs[@]}"; do + files_to_copy=$(find ${dts_dir} -regex '.*\.dtsi?') + if [[ -n ${files_to_copy} ]]; then + elog "Installing device tree files in ${dts_dir}" + doins ${files_to_copy} + fi + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/chromeos-u-boot-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/chromeos-u-boot-9999.ebuild new file mode 100644 index 0000000000..c7ec85d820 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/chromeos-u-boot-9999.ebuild @@ -0,0 +1,209 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +CROS_WORKON_PROJECT=("chromiumos/third_party/u-boot" "chromiumos/platform/vboot_reference") +CROS_WORKON_LOCALNAME=("u-boot" "../platform/vboot_reference") +CROS_WORKON_SUBDIR=("files" "") +VBOOT_REFERENCE_DESTDIR="${S}/vboot_reference" +CROS_WORKON_DESTDIR=("${S}" "${VBOOT_REFERENCE_DESTDIR}") + +# TODO(sjg): Remove cros-board as it violates the idea of having no specific +# board knowledge in the build system. At present it is only needed for the +# netboot hack. +inherit cros-debug toolchain-funcs cros-board flag-o-matic cros-workon + +DESCRIPTION="Das U-Boot boot loader" +HOMEPAGE="http://www.denx.de/wiki/U-Boot" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="dev profiling factory-mode" + +DEPEND="!sys-boot/x86-firmware-fdts + !sys-boot/exynos-u-boot + !sys-boot/tegra2-public-firmware-fdts + " + +RDEPEND="${DEPEND} + " + +UB_BUILD_DIR="${WORKDIR}/build" +UB_BUILD_DIR_NB="${UB_BUILD_DIR%/}_nb" + +U_BOOT_CONFIG_USE_PREFIX="u_boot_config_use_" +ALL_CONFIGS=( + beaglebone + coreboot + daisy + seaboard + waluigi +) +IUSE_CONFIGS=${ALL_CONFIGS[@]/#/${U_BOOT_CONFIG_USE_PREFIX}} + +IUSE="${IUSE} ${IUSE_CONFIGS}" + +REQUIRED_USE="${REQUIRED_USE} ^^ ( ${IUSE_CONFIGS} )" + +# @FUNCTION: get_current_u_boot_config +# @DESCRIPTION: +# Finds the config for the current board by searching USE for an entry +# signifying which version to use. +get_current_u_boot_config() { + local use_config + for use_config in ${IUSE_CONFIGS}; do + if use ${use_config}; then + echo "chromeos_${use_config#${U_BOOT_CONFIG_USE_PREFIX}}_config" + return + fi + done + die "Unable to determine current U-Boot config." +} + +# @FUNCTION: netboot_required +# @DESCRIPTION: +# Checks if netboot image also needs to be generated. +netboot_required() { + # Build netbootable image for Link unconditionally for now. + # TODO (vbendeb): come up with a better scheme of determining what + # platforms should always generate the netboot capable + # legacy image. + local board=$(get_current_board_with_variant) + + use factory-mode || [[ "${board}" == "link" ]] || \ + [[ "${board}" == "daisy_spring" ]] +} + +# @FUNCTION: get_config_var +# @USAGE: +# @DESCRIPTION: +# Returns the value of the requested variable in the specified config +# if present. This can only be called after make config. +get_config_var() { + local config="${1%_config}" + local var="${2}" + local boards_cfg="${S}/boards.cfg" + local i + case "${var}" in + ARCH) i=2;; + CPU) i=3;; + BOARD) i=4;; + VENDOR) i=5;; + SOC) i=6;; + *) die "Unsupported field: ${var}" + esac + awk -v i=$i -v cfg="${config}" '$1 == cfg { print $i }' "${boards_cfg}" +} + +umake() { + # Add `ARCH=` to reset ARCH env and let U-Boot choose it. + ARCH= emake "${COMMON_MAKE_FLAGS[@]}" "$@" +} + +src_configure() { + export LDFLAGS=$(raw-ldflags) + tc-export BUILD_CC + + CROS_U_BOOT_CONFIG="$(get_current_u_boot_config)" + elog "Using U-Boot config: ${CROS_U_BOOT_CONFIG}" + + # Firmware related binaries are compiled with 32-bit toolchain + # on 64-bit platforms + if [[ ${CHOST} == x86_64-* ]]; then + CROSS_PREFIX="i686-pc-linux-gnu-" + else + CROSS_PREFIX="${CHOST}-" + fi + + COMMON_MAKE_FLAGS=( + "CROSS_COMPILE=${CROSS_PREFIX}" + "VBOOT_SOURCE=${VBOOT_REFERENCE_DESTDIR}" + DEV_TREE_SEPARATE=1 + "HOSTCC=${BUILD_CC}" + HOSTSTRIP=true + ) + if use dev; then + # Avoid hiding the errors and warnings + COMMON_MAKE_FLAGS+=( -s ) + else + COMMON_MAKE_FLAGS+=( + -k + WERROR=y + ) + fi + if use x86 || use amd64 || use cros-debug; then + COMMON_MAKE_FLAGS+=( VBOOT_DEBUG=1 ) + fi + if use profiling; then + COMMON_MAKE_FLAGS+=( VBOOT_PERFORMANCE=1 ) + fi + + BUILD_FLAGS=( + "O=${UB_BUILD_DIR}" + ) + + umake "${BUILD_FLAGS[@]}" distclean + umake "${BUILD_FLAGS[@]}" ${CROS_U_BOOT_CONFIG} + + if netboot_required; then + BUILD_NB_FLAGS=( + "O=${UB_BUILD_DIR_NB}" + BUILD_FACTORY_IMAGE=1 + ) + umake "${BUILD_NB_FLAGS[@]}" distclean + umake "${BUILD_NB_FLAGS[@]}" ${CROS_U_BOOT_CONFIG} + fi +} + +src_compile() { + umake "${BUILD_FLAGS[@]}" all + + if netboot_required; then + umake "${BUILD_NB_FLAGS[@]}" all + fi +} + +src_install() { + local inst_dir="/firmware" + local files_to_copy=( + System.map + u-boot.bin + u-boot.img + ) + local ub_vendor="$(get_config_var ${CROS_U_BOOT_CONFIG} VENDOR)" + local ub_board="$(get_config_var ${CROS_U_BOOT_CONFIG} BOARD)" + local ub_arch="$(get_config_var ${CROS_U_BOOT_CONFIG} ARCH)" + + insinto "${inst_dir}" + + # Daisy and its variants need an SPL binary. + if use u_boot_config_use_daisy; then + files_to_copy+=( spl/${ub_board}-spl.bin ) + newins "${UB_BUILD_DIR}/spl/u-boot-spl" "${ub_board}-spl.elf" + fi + + doins "${files_to_copy[@]/#/${UB_BUILD_DIR}/}" + newins "${UB_BUILD_DIR}/u-boot" u-boot.elf + + if netboot_required; then + newins "${UB_BUILD_DIR_NB}/u-boot.bin" u-boot_netboot.bin + newins "${UB_BUILD_DIR_NB}/u-boot" u-boot_netboot.elf + fi + + insinto "${inst_dir}/dts" + local dts_dir dts_dirs=( + "board/${ub_vendor}/dts" + "board/${ub_vendor}/${ub_board}" + "arch/${ub_arch}/dts" + "cros/dts" + ) + for dts_dir in "${dts_dirs[@]}"; do + files_to_copy=$(find ${dts_dir} -regex '.*\.dtsi?') + if [[ -n ${files_to_copy} ]]; then + elog "Installing device tree files in ${dts_dir}" + doins ${files_to_copy} + fi + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/files/chromeos-version.sh new file mode 100755 index 0000000000..be6d9933b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/chromeos-u-boot/files/chromeos-version.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +# Create a temporary makefile: +# - declare a dummy "e" target (which u-boot itself doesn't define) +# - that echos out the u-boot version +# - include the main u-boot makefile +# This lets the u-boot makefile logic do all its crazy stuff without +# worrying about it (which we would if we tried to sed/grep it out). +# +# The make command will read the temporary makefile from stdin and +# parse the e target. +printf 'e:;@echo $(U_BOOT_VERSION)\ninclude '$1'/Makefile\n' | make -f - e diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-1.97-r12.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-1.97-r12.ebuild new file mode 100644 index 0000000000..cdbbbf97b8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-1.97-r12.ebuild @@ -0,0 +1,49 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +CROS_WORKON_COMMIT="d1c858167c0caae45f8a07147c4e19f74edc7708" +CROS_WORKON_TREE="a626b63d9eb83c6985625569fa10d3b820ae9dd4" +inherit eutils toolchain-funcs cros-workon + +DESCRIPTION="GNU GRUB 2 boot loader" +HOMEPAGE="http://www.gnu.org/software/grub/" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64" +IUSE="truetype" +CROS_WORKON_PROJECT="chromiumos/third_party/grub2" + +RDEPEND=">=sys-libs/ncurses-5.2-r5 + dev-libs/lzo + truetype? ( media-libs/freetype )" +DEPEND="${RDEPEND} + dev-lang/ruby" +PROVIDE="virtual/bootloader" + +export STRIP_MASK="*/grub/*/*.mod" + +CROS_WORKON_LOCALNAME="grub2" + +src_configure() { + econf \ + --disable-werror \ + --disable-grub-mkfont \ + --disable-grub-fstest \ + --disable-efiemu \ + --sbindir=/sbin \ + --bindir=/bin \ + --libdir=/$(get_libdir) \ + --with-platform=efi \ + --target=x86_64 \ + --program-prefix= +} + +src_compile() { + emake -j1 || die "${SRCPATH} compile failed." +} + +src_install() { + emake DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild new file mode 100644 index 0000000000..cf4fd82ab4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild @@ -0,0 +1,47 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +inherit eutils toolchain-funcs cros-workon + +DESCRIPTION="GNU GRUB 2 boot loader" +HOMEPAGE="http://www.gnu.org/software/grub/" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="truetype" +CROS_WORKON_PROJECT="chromiumos/third_party/grub2" + +RDEPEND=">=sys-libs/ncurses-5.2-r5 + dev-libs/lzo + truetype? ( media-libs/freetype )" +DEPEND="${RDEPEND} + dev-lang/ruby" +PROVIDE="virtual/bootloader" + +export STRIP_MASK="*/grub/*/*.mod" + +CROS_WORKON_LOCALNAME="grub2" + +src_configure() { + econf \ + --disable-werror \ + --disable-grub-mkfont \ + --disable-grub-fstest \ + --disable-efiemu \ + --sbindir=/sbin \ + --bindir=/bin \ + --libdir=/$(get_libdir) \ + --with-platform=efi \ + --target=x86_64 \ + --program-prefix= +} + +src_compile() { + emake -j1 || die "${SRCPATH} compile failed." +} + +src_install() { + emake DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/Manifest new file mode 100644 index 0000000000..097017d6ae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/Manifest @@ -0,0 +1,2 @@ +DIST syslinux-3.83.tar.bz2 3184349 RMD160 b4cff023c44a421a5f788f4cf556b537986117f9 SHA1 0dbbdd5a36362ce0e3284d9f4047a355d527d5d0 SHA256 9ec84d6dcc188f082a875b69796b196f98ea8c0102b55b03123616a285c2d9f9 +DIST syslinux-4.03.tar.bz2 4381187 RMD160 11dcf7d0bf58dd8cb4fc573212f9206bfb81a472 SHA1 24e260facca404f075485a635f0ddffd6f97fd1a SHA256 c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.72-nopie.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.72-nopie.patch new file mode 100644 index 0000000000..2662d17b43 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.72-nopie.patch @@ -0,0 +1,12 @@ +diff -ur a/com32/MCONFIG b/com32/MCONFIG +--- a/com32/MCONFIG 2008-09-26 01:46:02.000000000 +0200 ++++ b/com32/MCONFIG 2008-10-28 16:10:16.107964907 +0100 +@@ -19,6 +19,8 @@ + GCCOPT := $(call gcc_ok,-std=gnu99,) \ + $(call gcc_ok,-m32,) \ + $(call gcc_ok,-fno-stack-protector,) \ ++ $(call gcc_ok,-nopie,) \ ++ $(call gcc_ok,-fno-pie,) \ + -mregparm=3 -DREGPARM=3 -march=i386 -Os + + com32 = $(topdir)/com32 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch new file mode 100644 index 0000000000..a8d0270500 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch @@ -0,0 +1,36 @@ +diff -ur a/linux/Makefile b/linux/Makefile +--- a/linux/Makefile 2008-09-26 01:46:02.000000000 +0200 ++++ b/linux/Makefile 2008-10-28 15:56:25.818399544 +0100 +@@ -20,7 +20,7 @@ + OPTFLAGS = -g -Os + INCLUDES = -I. -I.. -I../libinstaller + CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) +-LDFLAGS = -s ++LDFLAGS = + + SRCS = syslinux.c \ + ../libinstaller/syslxmod.c \ +diff -ur a/mtools/Makefile b/mtools/Makefile +--- a/mtools/Makefile 2008-09-26 01:46:02.000000000 +0200 ++++ b/mtools/Makefile 2008-10-28 15:56:45.113477480 +0100 +@@ -4,7 +4,7 @@ + OPTFLAGS = -g -Os + INCLUDES = -I. -I.. -I../libfat -I../libinstaller + CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) +-LDFLAGS = -s ++LDFLAGS = + + SRCS = syslinux.c \ + ../libinstaller/syslxmod.c \ +diff -ur a/utils/Makefile b/utils/Makefile +--- a/utils/Makefile 2008-09-26 01:46:02.000000000 +0200 ++++ b/utils/Makefile 2008-10-28 15:56:55.843968018 +0100 +@@ -18,7 +18,7 @@ + include $(topdir)/MCONFIG + + CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 +-LDFLAGS = -O2 -s ++LDFLAGS = -O2 + + TARGETS = mkdiskimage isohybrid gethostip + ASIS = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_banner.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_banner.patch new file mode 100644 index 0000000000..79a4bf2301 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_banner.patch @@ -0,0 +1,155 @@ +diff -U5 -r syslinux-3.82-orig/core/diskstart.inc syslinux-3.82/core/diskstart.inc +--- syslinux-3.82-orig/core/diskstart.inc 2009-06-09 10:19:25.000000000 -0700 ++++ syslinux-3.82/core/diskstart.inc 2009-06-17 17:49:03.000000000 -0700 +@@ -506,12 +506,12 @@ + sti ; In case of broken INT 13h BIOSes + + ; + ; Tell the user we got this far + ; +- mov si,syslinux_banner +- call writestr_early ++ ;mov si,syslinux_banner ++ ;call writestr_early + + ; + ; Tell the user if we're using EBIOS or CBIOS + ; + print_bios: +@@ -519,11 +519,11 @@ + cmp byte [getlinsec.jmp+1],(getlinsec_ebios-(getlinsec.jmp+2)) + jne .cbios + mov si,ebios_name + .cbios: + mov [BIOSName],si +- call writestr_early ++ ;call writestr_early + + section .bss + %define HAVE_BIOSNAME 1 + BIOSName resw 1 + +@@ -659,12 +659,12 @@ + all_read: + ; + ; Let the user (and programmer!) know we got this far. This used to be + ; in Sector 1, but makes a lot more sense here. + ; +- mov si,copyright_str +- call writestr_early ++ ;mov si,copyright_str ++ ;call writestr_early + + + ; + ; Insane hack to expand the DOS superblock to dwords + ; +diff -U5 -r syslinux-3.82-orig/core/isolinux.asm syslinux-3.82/core/isolinux.asm +--- syslinux-3.82-orig/core/isolinux.asm 2009-06-09 10:19:25.000000000 -0700 ++++ syslinux-3.82/core/isolinux.asm 2009-06-17 17:49:03.000000000 -0700 +@@ -284,18 +284,18 @@ + mov [BIOSType],si + mov eax,[si] + mov [GetlinsecPtr],eax + + ; Show signs of life +- mov si,syslinux_banner +- call writestr_early ++ ;mov si,syslinux_banner ++ ;call writestr_early + %ifdef DEBUG_MESSAGES +- mov si,copyright_str ++ ;mov si,copyright_str + %else +- mov si,[BIOSName] ++ ;mov si,[BIOSName] + %endif +- call writestr_early ++ ;call writestr_early + + ; + ; Before modifying any memory, get the checksum of bytes + ; 64-2048 + ; +@@ -679,17 +679,17 @@ + .norge: jmp short .norge + + ; Information message (DS:SI) output + ; Prefix with "isolinux: " + ; +-writemsg: push ax +- push si +- mov si,isolinux_str +- call writestr_early +- pop si +- call writestr_early +- pop ax ++writemsg: ;push ax ++ ;push si ++ ;mov si,isolinux_str ++ ;call writestr_early ++ ;pop si ++ ;call writestr_early ++ ;pop ax + ret + + ; + ; Write a character to the screen. There is a more "sophisticated" + ; version of this in the subsequent code, so we patch the pointer +diff -U5 -r syslinux-3.82-orig/core/localboot.inc syslinux-3.82/core/localboot.inc +--- syslinux-3.82-orig/core/localboot.inc 2009-06-09 10:19:25.000000000 -0700 ++++ syslinux-3.82/core/localboot.inc 2009-06-17 17:49:03.000000000 -0700 +@@ -27,13 +27,13 @@ + local_boot: + call vgaclearmode + RESET_STACK_AND_SEGS dx ; dx <- 0 + mov fs,dx + mov gs,dx +- mov si,localboot_msg +- call writestr ++ ;mov si,localboot_msg ++ ;call writestr + call cleanup_hardware + cmp ax,-1 + je .int18 + + ; Load boot sector from the specified BIOS device and jump to it. + mov dl,al +diff -U5 -r syslinux-3.82-orig/core/ui.inc syslinux-3.82/core/ui.inc +--- syslinux-3.82-orig/core/ui.inc 2009-06-09 10:19:25.000000000 -0700 ++++ syslinux-3.82/core/ui.inc 2009-06-17 17:49:03.000000000 -0700 +@@ -240,28 +240,28 @@ + call get_msg_file + jmp short fk_wrcmd + + print_version: + push di ; Command line write pointer +- mov si,syslinux_banner +- call writestr ++ ;mov si,syslinux_banner ++ ;call writestr + %ifdef HAVE_BIOSNAME + mov si,[BIOSName] + call writestr + %endif +- mov si,copyright_str +- call writestr ++ ;mov si,copyright_str ++ ;call writestr + + ; ... fall through ... + + ; Write the boot prompt and command line again and + ; wait for input. Note that this expects the cursor + ; to already have been CRLF'd, and that the old value + ; of DI (the command line write pointer) is on the stack. + fk_wrcmd: +- mov si,boot_prompt +- call writestr ++ ;mov si,boot_prompt ++ ;call writestr + pop di ; Command line write pointer + push di + mov byte [di],0 ; Null-terminate command line + mov si,command_line + call writestr ; Write command line so far diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_cursor.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_cursor.patch new file mode 100644 index 0000000000..8297f0becc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_cursor.patch @@ -0,0 +1,31 @@ +diff --git syslinux-3.82-orig/core/diskstart.inc syslinux-3.82-new/core/diskstart.inc +index f7ae1da..25b7131 100644 +--- syslinux-3.82-orig/core/diskstart.inc ++++ syslinux-3.82-new/core/diskstart.inc +@@ -510,6 +510,7 @@ ldlinux_ent: + ; + ;mov si,syslinux_banner + ;call writestr_early ++ call disable_cursor + + ; + ; Tell the user if we're using EBIOS or CBIOS +@@ -593,6 +594,18 @@ verify_checksum: + + ; + ; ++; disable_cursor: Disable cursor emulation. ++; This assumes we're on page 0. ++; ++disable_cursor: ++ pushad ++ mov ch, 020h ; Set bit 5 to disable cursor ++ mov ah, 01h ; Set text-mode cursor shape ++ int 10h ; Video BIOS services ++ popad ++ ret ++ ++; + ; writestr_early: write a null-terminated string to the console + ; This assumes we're on page 0. This is only used for early + ; messages, so it should be OK. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_win32.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_win32.patch new file mode 100644 index 0000000000..59bcfb1b5e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-disable_win32.patch @@ -0,0 +1,24 @@ +diff -Naur -b syslinux-3.83.orig/Makefile syslinux-3.83.new/Makefile +--- syslinux-3.83.orig/Makefile 2009-10-05 15:06:06.000000000 -0700 ++++ syslinux-3.83.new/Makefile 2010-04-27 13:57:38.000000000 -0700 +@@ -42,7 +42,7 @@ + mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \ + mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \ + core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \ +- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \ ++ gpxe/gpxelinux.0 dos/syslinux.com \ + $(MODULES) + + # BSUBDIRs build the on-target binary components. +@@ -66,9 +66,9 @@ + # Things to install in /usr/lib/syslinux + INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \ + core/isolinux-debug.bin \ +- dos/syslinux.com dos/copybs.com win32/syslinux.exe \ ++ dos/syslinux.com dos/copybs.com \ + mbr/*.bin $(MODULES) +-INSTALL_AUX_OPT = win32/syslinux.exe ++INSTALL_AUX_OPT = + + # These directories manage their own installables + INSTALLSUBDIRS = com32 utils diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-nopic.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-nopic.patch new file mode 100644 index 0000000000..2b59438911 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-nopic.patch @@ -0,0 +1,36 @@ +diff -ur syslinux-3.83/MCONFIG.embedded syslinux-3.83.good/MCONFIG.embedded +--- syslinux-3.83/MCONFIG.embedded 2009-10-05 15:06:06.000000000 -0700 ++++ syslinux-3.83.good/MCONFIG.embedded 2010-06-24 15:55:42.000000000 -0700 +@@ -28,7 +28,7 @@ + LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc) + + LD += -m elf_i386 +-CFLAGS = $(GCCOPT) -g -W -Wall -Wno-sign-compare $(OPTFLAGS) $(INCLUDES) ++CFLAGS = $(GCCOPT) -fno-pic -g -W -Wall -Wno-sign-compare $(OPTFLAGS) $(INCLUDES) + SFLAGS = $(CFLAGS) -D__ASSEMBLY__ + + .SUFFIXES: .c .o .S .s .i .elf .com .bin .asm .lst .c32 .lss +diff -ur syslinux-3.83/com32/lib/MCONFIG syslinux-3.83.good/com32/lib/MCONFIG +--- syslinux-3.83/com32/lib/MCONFIG 2009-10-05 15:06:06.000000000 -0700 ++++ syslinux-3.83.good/com32/lib/MCONFIG 2010-06-24 15:48:04.000000000 -0700 +@@ -26,7 +26,7 @@ + -falign-labels=0 -ffast-math -fomit-frame-pointer + WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline + +-CFLAGS = $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS) ++CFLAGS = -fno-pic $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS) + LDFLAGS = -m elf32_i386 + + .SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss +diff -ur syslinux-3.83/gpxe/src/Makefile syslinux-3.83.good/gpxe/src/Makefile +--- syslinux-3.83/gpxe/src/Makefile 2009-10-05 15:06:06.000000000 -0700 ++++ syslinux-3.83.good/gpxe/src/Makefile 2010-06-24 15:54:31.000000000 -0700 +@@ -4,7 +4,7 @@ + # + + CLEANUP := +-CFLAGS := ++CFLAGS := -fno-pic + ASFLAGS := + LDFLAGS := + MAKEDEPS := Makefile diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-x86_64.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-x86_64.patch new file mode 100644 index 0000000000..1a80ea1e23 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-3.83-x86_64.patch @@ -0,0 +1,111 @@ +diff --git a/syslinux-3.83/MCONFIG.embedded b/syslinux-3.83.patch/MCONFIG.embedded +index 3237cd7..4451929 100644 +--- a/syslinux-3.83/MCONFIG.embedded ++++ b/syslinux-3.83.patch/MCONFIG.embedded +@@ -28,6 +28,7 @@ GCCOPT := $(call gcc_ok,-m32,) \ + LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc) + + LD += -m elf_i386 ++LDOPTS = -m elf_i386 + CFLAGS = $(GCCOPT) -fno-pic -g -W -Wall -Wno-sign-compare $(OPTFLAGS) $(INCLUDES) + SFLAGS = $(CFLAGS) -D__ASSEMBLY__ + +diff --git a/syslinux-3.83/core/Makefile b/syslinux-3.83.patch/core/Makefile +index 65418c4..1d11bd1 100644 +--- a/syslinux-3.83/core/Makefile ++++ b/syslinux-3.83.patch/core/Makefile +@@ -78,7 +78,7 @@ iso%.bin: iso%.elf checksumiso.pl + -l $(@:.o=.lsr) -o $@ $< + + %.elf: %.o syslinux.ld +- $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< > $(@:.elf=.map) ++ $(LD) $(LDOPTS) $(LDFLAGS) -T syslinux.ld -M -o $@ $< > $(@:.elf=.map) + $(OBJDUMP) -h $@ > $(@:.elf=.sec) + $(PERL) lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst) + +diff --git a/syslinux-3.83/dos/Makefile b/syslinux-3.83.patch/dos/Makefile +index fa2ed0a..225a6d3 100644 +--- a/syslinux-3.83/dos/Makefile ++++ b/syslinux-3.83.patch/dos/Makefile +@@ -49,7 +49,7 @@ spotless: clean + installer: + + syslinux.elf: $(OBJS) libcom.a +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDOPTS) $(LDFLAGS) -o $@ $^ + + libcom.a: $(LIBOBJS) + -rm -f $@ +diff --git a/syslinux-3.83/mbr/Makefile b/syslinux-3.83.patch/mbr/Makefile +index c3eb97a..01d50cc 100644 +--- a/syslinux-3.83/mbr/Makefile ++++ b/syslinux-3.83.patch/mbr/Makefile +@@ -33,7 +33,7 @@ all: mbr.bin altmbr.bin gptmbr.bin isohdpfx.bin isohdppx.bin \ + + .PRECIOUS: %.elf + %.elf: %.o mbr.ld +- $(LD) $(LDFLAGS) -T mbr.ld -e _start -o $@ $< ++ $(LD) $(LDOPTS) $(LDFLAGS) -T mbr.ld -e _start -o $@ $< + + %.bin: %.elf checksize.pl + $(OBJCOPY) -O binary $< $@ +diff --git a/syslinux-3.83/memdisk/Makefile b/syslinux-3.83.patch/memdisk/Makefile +index d185d87..2bf477d 100644 +--- a/syslinux-3.83/memdisk/Makefile ++++ b/syslinux-3.83.patch/memdisk/Makefile +@@ -72,13 +72,13 @@ memdisk16.o: memdisk16.asm + $(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $< + + memdisk_%.o: memdisk_%.bin +- $(LD) -r -b binary -o $@ $< ++ $(LD) $(LDOPTS) -r -b binary -o $@ $< + + memdisk16.elf: $(OBJS16) +- $(LD) -Ttext 0 -o $@ $^ ++ $(LD) $(LDOPTS) -Ttext 0 -o $@ $^ + + memdisk32.elf: memdisk.ld $(OBJS32) +- $(LD) -o $@ -T $^ ++ $(LD) $(LDOPTS) -o $@ -T $^ + + %.bin: %.elf + $(OBJCOPY) -O binary $< $@ +diff --git a/syslinux-3.83/memdump/Makefile b/syslinux-3.83.patch/memdump/Makefile +index 05f2638..a324dc7 100644 +--- a/syslinux-3.83/memdump/Makefile ++++ b/syslinux-3.83.patch/memdump/Makefile +@@ -43,7 +43,7 @@ spotless: clean + installer: + + memdump.elf: $(OBJS) libcom.a +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDOPTS) $(LDFLAGS) -o $@ $^ + + libcom.a: $(LIBOBJS) + -rm -f $@ +diff --git a/syslinux-3.83/modules/Makefile b/syslinux-3.83.patch/modules/Makefile +index 77020ea..a380aa2 100644 +--- a/syslinux-3.83/modules/Makefile ++++ b/syslinux-3.83.patch/modules/Makefile +@@ -27,7 +27,7 @@ all: $(BINS) + + .PRECIOUS: %.elf + %.elf: c32entry.o %.o $(LIB) +- $(LD) -Ttext 0x101000 -e _start -o $@ $^ ++ $(LD) $(LDOPTS) -Ttext 0x101000 -e _start -o $@ $^ + + %.c32: %.elf + $(OBJCOPY) -O binary $< $@ +diff --git a/syslinux-3.83/sample/Makefile b/syslinux-3.83.patch/sample/Makefile +index 9fa21c2..e6b4544 100644 +--- a/syslinux-3.83/sample/Makefile ++++ b/syslinux-3.83.patch/sample/Makefile +@@ -36,7 +36,7 @@ all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 \ + + .PRECIOUS: %.elf + %.elf: c32entry.o %.o $(LIB) +- $(LD) -Ttext 0x101000 -e _start -o $@ $^ ++ $(LD) $(LDOPTS) -Ttext 0x101000 -e _start -o $@ $^ + + %.c32: %.elf + $(OBJCOPY) -O binary $< $@ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-4.00-nopie.patch b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-4.00-nopie.patch new file mode 100644 index 0000000000..1db5d1d882 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/files/syslinux-4.00-nopie.patch @@ -0,0 +1,12 @@ +diff -ur a/com32/MCONFIG b/com32/MCONFIG +--- a/com32/MCONFIG 2010-02-16 23:53:51.000000000 +0100 ++++ b/com32/MCONFIG 2010-02-18 22:28:18.791609195 +0100 +@@ -24,6 +24,8 @@ + GCCOPT += $(call gcc_ok,-freg-struct-return,) + GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os + GCCOPT += $(call gcc_ok,-fPIE,-fPIC) ++GCCOPT += $(call gcc_ok,-nopie,) ++GCCOPT += $(call gcc_ok,-fno-pie,) + GCCOPT += $(call gcc_ok,-fno-exceptions,) + GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,) + GCCOPT += $(call gcc_ok,-fno-strict-aliasing,) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-3.83-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-3.83-r5.ebuild new file mode 100644 index 0000000000..a6a9f187c4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-3.83-r5.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.83.ebuild,v 1.3 2010/02/26 12:10:54 fauli Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" +HOMEPAGE="http://syslinux.zytor.com/" +SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* amd64 x86" +IUSE="" + +RDEPEND="sys-fs/mtools + dev-perl/Crypt-PasswdMD5 + dev-perl/Digest-SHA1" +DEPEND="${RDEPEND} + dev-lang/nasm" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.72-nopie.patch + # Don't prestrip, makes portage angry + epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch + + # Don't try to build win32/syslinux.exe + epatch "${FILESDIR}/"${P}-disable_win32.patch + + # Disable the text banner for quieter boot. + epatch "${FILESDIR}/"${P}-disable_banner.patch + + # Disable the blinking cursor as early as possible. + epatch "${FILESDIR}/"${P}-disable_cursor.patch + + # Don't compile w/ PIC + epatch "${FILESDIR}/"${P}-nopic.patch + + # Make it work when the compiler is 64 bit by default. + epatch "${FILESDIR}/"${P}-x86_64.patch + + rm -f gethostip #bug 137081 +} + +src_compile() { + # By default, syslinux wants you to use pre-built binaries + # and only compile part of the package. Since we want to rebuild + # everything from scratch we need to remove the prebuilts or else + # some things don't get built with standard make. + emake spotless || die "make spotless failed" + + # The syslinux build can't tolerate "-Wl,-O*" + export LDFLAGS=$(raw-ldflags) + + if [ "${ROOT}" != "/" ]; then + tc-export CC CXX AR RANLIB LD NM + # Force GNU ld if gold is installed + if ${LD}.bfd --version > /dev/null 2>&1; then + LD=${LD}.bfd + fi + emake CC="$CC" CXX="$CXX" AR="$AR" RANLIB="$RANLIB" LD="$LD" \ + NM="$NM" || die "make failed" + else + emake || die "make failed" + fi + +} + +src_install() { + emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die + dodoc README NEWS TODO doc/* +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.03.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.03.ebuild new file mode 100644 index 0000000000..29c6a17af0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.03.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.03.ebuild,v 1.3 2010/12/09 09:56:19 phajdan.jr Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" +HOMEPAGE="http://syslinux.zytor.com/" +SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* amd64 x86" +IUSE="custom-cflags" + +RDEPEND="sys-fs/mtools + dev-perl/Crypt-PasswdMD5 + dev-perl/Digest-SHA1" +DEPEND="${RDEPEND} + dev-lang/nasm" + +S=${WORKDIR}/${P/_/-} + +# This ebuild is a departure from the old way of rebuilding everything in syslinux +# This departure is necessary since hpa doesn't support the rebuilding of anything other +# than the installers. + +# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore + +src_unpack() { + unpack ${A} + cd "${S}" + # Fix building on hardened + epatch "${FILESDIR}"/${PN}-4.00-nopie.patch + + rm -f gethostip #bug 137081 + + # Don't prestrip or override user LDFLAGS, bug #305783 + local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ + sample/Makefile utils/Makefile" + sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed" + + if use custom-cflags; then + sed -i ${SYSLINUX_MAKEFILES} \ + -e 's|-g -Os||g' \ + -e 's|-Os||g' \ + -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \ + || die "sed custom-cflags failed" + fi + +} + +src_compile() { + emake CC=$(tc-getCC) installer || die +} + +src_install() { + emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die + dodoc README NEWS doc/* || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/Manifest new file mode 100644 index 0000000000..27b0a1571d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/Manifest @@ -0,0 +1,2 @@ +DIST binutils-2.21.1-patches-1.0.tar.bz2 9168 RMD160 b475a318e371d550d01678da18ac8f4d58c149ec SHA1 1a835aa2ed8c268075a96b6694256410bfaf859d SHA256 f0c3ad8f984242dbc8a4f45b9594fb12dc9a45d348930038ac24c5726aafa716 +DIST binutils-2.21.1.tar.bz2 18997755 RMD160 de5ce1d7cb0d44e3ec18c557beefb2a292d59a60 SHA1 525255ca6874b872540c9967a1d26acfbc7c8230 SHA256 cdecfa69f02aa7b05fbcdf678e33137151f361313b2f3e48aba925f64eabf654 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.22-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.22-r16.ebuild new file mode 100644 index 0000000000..00f4e97d21 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.22-r16.ebuild @@ -0,0 +1,308 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +CROS_WORKON_COMMIT="9c1580ea72a5a3b15d90a9baf82c2f7707b793c4" +CROS_WORKON_TREE="2a7750a0cddd72df341d61250ade80d6270afbd7" +CROS_WORKON_PROJECT=chromiumos/third_party/binutils + +inherit eutils libtool flag-o-matic gnuconfig multilib versionator cros-workon + +KEYWORDS="amd64 arm x86" + +BVER=${PV} + +# Version names +if [[ "${PV}" == "9999" ]] ; then + BINUTILS_VERSION="binutils-2.22" +else + BINUTILS_VERSION="${P}" +fi + +BINUTILS_PKG_VERSION="${BINUTILS_VERSION}_cos_gg" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://sources.redhat.com/binutils/" +LICENSE="|| ( GPL-3 LGPL-3 )" +IUSE="hardened mounted_binutils multislot multitarget nls test vanilla" +if use multislot ; then + SLOT="${CTARGET}-${BVER}" +elif is_cross ; then + SLOT="${CTARGET}" +else + SLOT="0" +fi + +RDEPEND=">=sys-devel/binutils-config-1.9" +DEPEND="${RDEPEND} + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext ) + sys-devel/flex" + +S_BINUTILS="${WORKDIR}/${BINUTILS_VERSION}" + +RESTRICT="fetch strip" + +MY_BUILDDIR_BINUTILS="${WORKDIR}/build" + +GITDIR=${WORKDIR}/gitdir + +LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER} +INCPATH=${LIBPATH}/include +DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER} +if is_cross ; then + BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER} +else + BINPATH=/usr/${CTARGET}/binutils-bin/${BVER} +fi + +src_unpack() { + if use mounted_binutils ; then + BINUTILS_DIR="/usr/local/toolchain_root/binutils" + if [[ ! -d ${BINUTILS_DIR} ]] ; then + die "binutils dirs not mounted at: ${BINUTILS_DIR}" + fi + else + cros-workon_src_unpack + mv "${S}" "${GITDIR}" + BINUTILS_DIR="${GITDIR}" + if [ -d "${GITDIR}/.git" ]; then + CL=$(cd "${BINUTILS_DIR}"; git log --pretty=format:%s -n1 | egrep -o '[0-9]+') + fi + fi + if [[ ! -z ${CL} ]] ; then + BINUTILS_PKG_VERSION="${BINUTILS_PKG_VERSION}_${CL}" + fi + ln -s ${BINUTILS_DIR} ${S_BINUTILS} + + mkdir -p "${MY_BUILDDIR_BINUTILS}" +} + + +src_compile() { + # keep things sane + strip-flags + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR_BINUTILS}" + local myconf="" + is_cross && myconf="${myconf} --with-sysroot=/usr/${CTARGET}" + myconf="--prefix=/usr \ + --host=${CHOST} \ + --target=${CTARGET} \ + --datadir=${DATAPATH} \ + --infodir=${DATAPATH}/info \ + --mandir=${DATAPATH}/man \ + --bindir=${BINPATH} \ + --libdir=${LIBPATH} \ + --libexecdir=${LIBPATH} \ + --includedir=${INCPATH} \ + --enable-64-bit-bfd \ + --enable-gold \ + --enable-shared \ + --disable-werror \ + --enable-secureplt \ + --enable-plugins \ + --without-included-gettext \ + --build=${CBUILD} \ + --with-bugurl=http://code.google.com/p/chromium-os/issues/entry \ + ${myconf} ${EXTRA_ECONF}" + + binutils_conf="${myconf} --with-pkgversion=${BINUTILS_PKG_VERSION}" + + echo ./configure ${binutils_conf} + "${S_BINUTILS}"/configure ${binutils_conf} || die "configure failed" + + emake all || die "emake failed" + + # only build info pages if we user wants them, and if + # we have makeinfo (may not exist when we bootstrap) + if type -p makeinfo > /dev/null ; then + emake info || die "make info failed" + fi + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 | xargs rm -f +} + +src_test() { + cd "${MY_BUILDDIR_BINUTILS}" + make check || die "check failed :(" +} + +src_install() { + local x d + + cd "${MY_BUILDDIR_BINUTILS}" + emake DESTDIR="${D}" tooldir="${LIBPATH}" install || die + rm -rf "${D}"/${LIBPATH}/bin + + # Newer versions of binutils get fancy with ${LIBPATH} #171905 + cd "${D}"/${LIBPATH} + for d in ../* ; do + [[ ${d} == ../${BVER} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${D}"/${BINPATH} + for x in * ; do + mv ${x} ${x/${CTARGET}-} + done + + if [[ -d ${D}/usr/${CHOST}/${CTARGET} ]] ; then + mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH} + mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/ + rm -r "${D}"/usr/${CHOST}/{include,lib} + fi + fi + insinto ${INCPATH} + doins "${S_BINUTILS}/include/libiberty.h" + if [[ -d ${D}/${LIBPATH}/lib ]] ; then + mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/ + rm -r "${D}"/${LIBPATH}/lib + fi + + # Now, some binutils are tricky and actually provide + # for multiple TARGETS. Really, we're talking just + # 32bit/64bit support (like mips/ppc/sparc). Here + # we want to tell binutils-config that it's cool if + # it generates multiple sets of binutil symlinks. + # e.g. sparc gets {sparc,sparc64}-unknown-linux-gnu + local targ=${CTARGET/-*} src="" dst="" + local FAKE_TARGETS=${CTARGET} + case ${targ} in + mips*) src="mips" dst="mips64";; + powerpc*) src="powerpc" dst="powerpc64";; + s390*) src="s390" dst="s390x";; + sparc*) src="sparc" dst="sparc64";; + esac + case ${targ} in + mips64*|powerpc64*|s390x*|sparc64*) targ=${src} src=${dst} dst=${targ};; + esac + [[ -n ${src}${dst} ]] && FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/${src}/${dst}}" + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${BVER}" + LIBPATH="${LIBPATH}" + FAKE_TARGETS="${FAKE_TARGETS}" + EOF + newins "${T}"/env.d ${CTARGET}-${BVER} + + # Handle documentation + if ! is_cross ; then + cd "${S_BINUTILS}" + dodoc README + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + docinto opcodes + dodoc opcodes/ChangeLog* + fi + # Remove shared info pages + rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info} + # Trim all empty dirs + find "${D}" -type d | xargs rmdir >& /dev/null + + if use hardened ; then + LDWRAPPER=ldwrapper.hardened + else + LDWRAPPER=ldwrapper + fi + + mv "${D}/${BINPATH}/ld.bfd" "${D}/${BINPATH}/ld.bfd.real" || die + exeinto "${BINPATH}" + newexe "${FILESDIR}/${LDWRAPPER}" "ld.bfd" || die + + mv "${D}/${BINPATH}/ld.gold" "${D}/${BINPATH}/ld.gold.real" || die + exeinto "${BINPATH}" + newexe "${FILESDIR}/${LDWRAPPER}" "ld.gold" || die + + # Set default to be ld.bfd in regular installation + dosym ld.bfd "${BINPATH}/ld" + + # Make a fake installation for gold with gold as the default linker + # so we can turn gold on/off with binutils-config + LASTDIR=${LIBPATH##/*/} + dosym "${LASTDIR}" "${LIBPATH}-gold" + LASTDIR=${DATAPATH##/*/} + dosym "${LASTDIR}" "${DATAPATH}-gold" + + mkdir "${D}/${BINPATH}-gold" + cd "${D}"/${BINPATH} + LASTDIR=${BINPATH##/*/} + for x in * ; do + dosym "../${LASTDIR}/${x}" "${BINPATH}-gold/${x}" + done + dosym ld.gold "${BINPATH}-gold/ld" + + # Install gold binutils-config configuration file + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${BVER}-gold" + LIBPATH="${LIBPATH}-gold" + FAKE_TARGETS="${FAKE_TARGETS}" + EOF + newins "${T}"/env.d ${CTARGET}-${BVER}-gold + + # Move the locale directory to where it is supposed to be + mv "${D}/usr/share/locale" "${D}/${DATAPATH}/" +} + +pkg_postinst() { + binutils-config ${CTARGET}-${BVER} +} + +pkg_postrm() { + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + env -i binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then + binutils-config ${CTARGET}-${BVER} + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.23.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.23.1.ebuild new file mode 100644 index 0000000000..1df00d62f0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.23.1.ebuild @@ -0,0 +1,9 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.23.1.ebuild,v 1.1 2012/11/15 19:43:36 vapier Exp $ + +PATCHVER="1.0" +ELF2FLT_VER="" +inherit toolchain-binutils + +KEYWORDS="" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-9999.ebuild new file mode 100644 index 0000000000..f95e456941 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-9999.ebuild @@ -0,0 +1,306 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +CROS_WORKON_PROJECT=chromiumos/third_party/binutils + +inherit eutils libtool flag-o-matic gnuconfig multilib versionator cros-workon + +KEYWORDS="~amd64 ~arm ~x86" + +BVER=${PV} + +# Version names +if [[ "${PV}" == "9999" ]] ; then + BINUTILS_VERSION="binutils-2.22" +else + BINUTILS_VERSION="${P}" +fi + +BINUTILS_PKG_VERSION="${BINUTILS_VERSION}_cos_gg" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://sources.redhat.com/binutils/" +LICENSE="|| ( GPL-3 LGPL-3 )" +IUSE="hardened mounted_binutils multislot multitarget nls test vanilla" +if use multislot ; then + SLOT="${CTARGET}-${BVER}" +elif is_cross ; then + SLOT="${CTARGET}" +else + SLOT="0" +fi + +RDEPEND=">=sys-devel/binutils-config-1.9" +DEPEND="${RDEPEND} + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext ) + sys-devel/flex" + +S_BINUTILS="${WORKDIR}/${BINUTILS_VERSION}" + +RESTRICT="fetch strip" + +MY_BUILDDIR_BINUTILS="${WORKDIR}/build" + +GITDIR=${WORKDIR}/gitdir + +LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER} +INCPATH=${LIBPATH}/include +DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER} +if is_cross ; then + BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER} +else + BINPATH=/usr/${CTARGET}/binutils-bin/${BVER} +fi + +src_unpack() { + if use mounted_binutils ; then + BINUTILS_DIR="/usr/local/toolchain_root/binutils" + if [[ ! -d ${BINUTILS_DIR} ]] ; then + die "binutils dirs not mounted at: ${BINUTILS_DIR}" + fi + else + cros-workon_src_unpack + mv "${S}" "${GITDIR}" + BINUTILS_DIR="${GITDIR}" + if [ -d "${GITDIR}/.git" ]; then + CL=$(cd "${BINUTILS_DIR}"; git log --pretty=format:%s -n1 | egrep -o '[0-9]+') + fi + fi + if [[ ! -z ${CL} ]] ; then + BINUTILS_PKG_VERSION="${BINUTILS_PKG_VERSION}_${CL}" + fi + ln -s ${BINUTILS_DIR} ${S_BINUTILS} + + mkdir -p "${MY_BUILDDIR_BINUTILS}" +} + + +src_compile() { + # keep things sane + strip-flags + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR_BINUTILS}" + local myconf="" + is_cross && myconf="${myconf} --with-sysroot=/usr/${CTARGET}" + myconf="--prefix=/usr \ + --host=${CHOST} \ + --target=${CTARGET} \ + --datadir=${DATAPATH} \ + --infodir=${DATAPATH}/info \ + --mandir=${DATAPATH}/man \ + --bindir=${BINPATH} \ + --libdir=${LIBPATH} \ + --libexecdir=${LIBPATH} \ + --includedir=${INCPATH} \ + --enable-64-bit-bfd \ + --enable-gold \ + --enable-shared \ + --disable-werror \ + --enable-secureplt \ + --enable-plugins \ + --without-included-gettext \ + --build=${CBUILD} \ + --with-bugurl=http://code.google.com/p/chromium-os/issues/entry \ + ${myconf} ${EXTRA_ECONF}" + + binutils_conf="${myconf} --with-pkgversion=${BINUTILS_PKG_VERSION}" + + echo ./configure ${binutils_conf} + "${S_BINUTILS}"/configure ${binutils_conf} || die "configure failed" + + emake all || die "emake failed" + + # only build info pages if we user wants them, and if + # we have makeinfo (may not exist when we bootstrap) + if type -p makeinfo > /dev/null ; then + emake info || die "make info failed" + fi + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 | xargs rm -f +} + +src_test() { + cd "${MY_BUILDDIR_BINUTILS}" + make check || die "check failed :(" +} + +src_install() { + local x d + + cd "${MY_BUILDDIR_BINUTILS}" + emake DESTDIR="${D}" tooldir="${LIBPATH}" install || die + rm -rf "${D}"/${LIBPATH}/bin + + # Newer versions of binutils get fancy with ${LIBPATH} #171905 + cd "${D}"/${LIBPATH} + for d in ../* ; do + [[ ${d} == ../${BVER} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${D}"/${BINPATH} + for x in * ; do + mv ${x} ${x/${CTARGET}-} + done + + if [[ -d ${D}/usr/${CHOST}/${CTARGET} ]] ; then + mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH} + mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/ + rm -r "${D}"/usr/${CHOST}/{include,lib} + fi + fi + insinto ${INCPATH} + doins "${S_BINUTILS}/include/libiberty.h" + if [[ -d ${D}/${LIBPATH}/lib ]] ; then + mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/ + rm -r "${D}"/${LIBPATH}/lib + fi + + # Now, some binutils are tricky and actually provide + # for multiple TARGETS. Really, we're talking just + # 32bit/64bit support (like mips/ppc/sparc). Here + # we want to tell binutils-config that it's cool if + # it generates multiple sets of binutil symlinks. + # e.g. sparc gets {sparc,sparc64}-unknown-linux-gnu + local targ=${CTARGET/-*} src="" dst="" + local FAKE_TARGETS=${CTARGET} + case ${targ} in + mips*) src="mips" dst="mips64";; + powerpc*) src="powerpc" dst="powerpc64";; + s390*) src="s390" dst="s390x";; + sparc*) src="sparc" dst="sparc64";; + esac + case ${targ} in + mips64*|powerpc64*|s390x*|sparc64*) targ=${src} src=${dst} dst=${targ};; + esac + [[ -n ${src}${dst} ]] && FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/${src}/${dst}}" + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${BVER}" + LIBPATH="${LIBPATH}" + FAKE_TARGETS="${FAKE_TARGETS}" + EOF + newins "${T}"/env.d ${CTARGET}-${BVER} + + # Handle documentation + if ! is_cross ; then + cd "${S_BINUTILS}" + dodoc README + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + docinto opcodes + dodoc opcodes/ChangeLog* + fi + # Remove shared info pages + rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info} + # Trim all empty dirs + find "${D}" -type d | xargs rmdir >& /dev/null + + if use hardened ; then + LDWRAPPER=ldwrapper.hardened + else + LDWRAPPER=ldwrapper + fi + + mv "${D}/${BINPATH}/ld.bfd" "${D}/${BINPATH}/ld.bfd.real" || die + exeinto "${BINPATH}" + newexe "${FILESDIR}/${LDWRAPPER}" "ld.bfd" || die + + mv "${D}/${BINPATH}/ld.gold" "${D}/${BINPATH}/ld.gold.real" || die + exeinto "${BINPATH}" + newexe "${FILESDIR}/${LDWRAPPER}" "ld.gold" || die + + # Set default to be ld.bfd in regular installation + dosym ld.bfd "${BINPATH}/ld" + + # Make a fake installation for gold with gold as the default linker + # so we can turn gold on/off with binutils-config + LASTDIR=${LIBPATH##/*/} + dosym "${LASTDIR}" "${LIBPATH}-gold" + LASTDIR=${DATAPATH##/*/} + dosym "${LASTDIR}" "${DATAPATH}-gold" + + mkdir "${D}/${BINPATH}-gold" + cd "${D}"/${BINPATH} + LASTDIR=${BINPATH##/*/} + for x in * ; do + dosym "../${LASTDIR}/${x}" "${BINPATH}-gold/${x}" + done + dosym ld.gold "${BINPATH}-gold/ld" + + # Install gold binutils-config configuration file + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${BVER}-gold" + LIBPATH="${LIBPATH}-gold" + FAKE_TARGETS="${FAKE_TARGETS}" + EOF + newins "${T}"/env.d ${CTARGET}-${BVER}-gold + + # Move the locale directory to where it is supposed to be + mv "${D}/usr/share/locale" "${D}/${DATAPATH}/" +} + +pkg_postinst() { + binutils-config ${CTARGET}-${BVER} +} + +pkg_postrm() { + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + env -i binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then + binutils-config ${CTARGET}-${BVER} + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/aswrapper b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/aswrapper new file mode 100755 index 0000000000..ee6641cbb6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/aswrapper @@ -0,0 +1,11 @@ +#!/bin/sh + +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This files wraps as. +# In addition, it adds --allow-incbin to the command line before invoking as. +# This flag is necessary on link commands that use the .incbin directive. + +exec "$(readlink -f "${0}").real" --allow-incbin "$@" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/chromeos-version.sh new file mode 100755 index 0000000000..ff99b230d6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/chromeos-version.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +exec sed -n '/^ *VERSION=/{s:.*=::;p;q}' \ + "$(find "$1" -path '*/bfd/configure')" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper new file mode 100755 index 0000000000..48d754694a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper @@ -0,0 +1,10 @@ +#!/bin/bash + +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This files wraps ld and ld.gold. +# In addition, it adds --hash-style=gnu to the linker command line. + +exec "$(readlink -f "${0}").real" --hash-style=gnu "$@" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper.hardened b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper.hardened new file mode 100755 index 0000000000..c38fb10078 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper.hardened @@ -0,0 +1,14 @@ +#!/bin/sh + +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This files wraps ld and ld.gold. +# In addition, it inserts hardened flags (-z now and -z relro) to the linker +# before invoking it. It also adds --hash-style=gnu to the linker command line. +# +# There is a similar wrapper around gcc that adds -fPIE, -fstack-protector-all, +# -D_FORTIFY_SOURCE=2 and -pie to the compile command line. + +exec "$(readlink -f "${0}").real" -z now -z relro --hash-style=gnu "$@" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/clang-3.2_pre170392.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/clang-3.2_pre170392.ebuild new file mode 100644 index 0000000000..e95e27f3e6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/clang-3.2_pre170392.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# This package is originated from +# http://sources.gentoo.org/sys-devel/clang/clang-9999.ebuild +# +# Note that we use downloading sources from SVN because llvm.org has +# not released this version yet. + +EAPI=4 + +RESTRICT_PYTHON_ABIS="3.*" +SUPPORT_PYTHON_ABIS="1" + +inherit subversion eutils multilib python + +SVN_COMMIT=${PV#*_pre} + +DESCRIPTION="C language family frontend for LLVM" +HOMEPAGE="http://clang.llvm.org/" +SRC_URI="" +ESVN_REPO_URI="http://llvm.org/svn/llvm-project/cfe/trunk@${SVN_COMMIT}" + +LICENSE="UoI-NCSA" +SLOT="0" +KEYWORDS="amd64" +IUSE="debug multitarget +static-analyzer test" + +DEPEND="static-analyzer? ( dev-lang/perl )" +RDEPEND="~sys-devel/llvm-${PV}[multitarget=]" + +S="${WORKDIR}/llvm" + +src_unpack() { + # Fetching LLVM and subprojects + ESVN_PROJECT=llvm subversion_fetch "http://llvm.org/svn/llvm-project/llvm/trunk@${SVN_COMMIT}" + ESVN_PROJECT=compiler-rt S="${S}"/projects/compiler-rt subversion_fetch "http://llvm.org/svn/llvm-project/compiler-rt/trunk@${SVN_COMMIT}" + ESVN_PROJECT=clang S="${S}"/tools/clang subversion_fetch +} + +src_prepare() { + if [ "/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.x-google" != $(gcc-config -B) ]; then + ewarn "Beware sheriff: gcc's binaries are not in '/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.x-google'" + ewarn "and are instead in $(gcc-config -B). This may lead to an unusable clang." + ewarn "Please test clang with a simple hello_world.cc file and update this message" + fi + + # Same as llvm doc patches + epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch + + # multilib-strict + sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \ + -i tools/clang/lib/Headers/Makefile \ + || die "clang Makefile failed" + sed -e "/PROJ_resources/s#lib/clang#$(get_libdir)/clang#" \ + -i tools/clang/runtime/compiler-rt/Makefile \ + || die "compiler-rt Makefile failed" + # fix the static analyzer for in-tree install + sed -e 's/import ScanView/from clang \0/' \ + -i tools/clang/tools/scan-view/scan-view \ + || die "scan-view sed failed" + sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \ + -i tools/clang/tools/scan-build/scan-build \ + || die "scan-build sed failed" + # Set correct path for gold plugin + sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \ + -i tools/clang/lib/Driver/Tools.cpp \ + || die "gold plugin path sed failed" + # Specify python version + python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view + python_convert_shebangs -r 2 test/Scripts + python_convert_shebangs 2 projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + + # From llvm src_prepare + einfo "Fixing install dirs" + sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ + -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ + -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \ + -i Makefile.config.in || die "Makefile.config sed failed" + + einfo "Fixing rpath and CFLAGS" + sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \ + -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ + -i Makefile.rules || die "rpath sed failed" + + # Use system llc (from llvm ebuild) for tests + sed -e "/^llc_props =/s/os.path.join(llvm_tools_dir, 'llc')/'llc'/" \ + -i tools/clang/test/lit.cfg || die "test path sed failed" + + # User patches + epatch_user +} + +src_configure() { + local CONF_FLAGS="--enable-shared + --with-optimize-option= + $(use_enable !debug optimized) + $(use_enable debug assertions) + $(use_enable debug expensive-checks)" + + # Setup the search path to include the Prefix includes + if use prefix ; then + CONF_FLAGS="${CONF_FLAGS} \ + --with-c-include-dirs=${EPREFIX}/usr/include:/usr/include" + fi + + if use multitarget; then + CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" + else + CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp" + fi + + if use amd64; then + CONF_FLAGS="${CONF_FLAGS} --enable-pic" + fi + + # clang prefers clang over gcc, so we may need to force that + tc-export CC CXX + econf ${CONF_FLAGS} +} + +src_compile() { + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only +} + +src_test() { + cd "${S}"/tools/clang || die "cd clang failed" + + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + testing() { + if ! emake -j1 VERBOSE=1 test; then + has test $FEATURES && die "Make test failed. See above for details." + has test $FEATURES || eerror "Make test failed. See above for details." + fi + } + python_execute_function testing +} + +src_install() { + cd "${S}"/tools/clang || die "cd clang failed" + emake KEEP_SYMBOLS=1 DESTDIR="${D}" install + + if use static-analyzer ; then + dobin tools/scan-build/ccc-analyzer + dosym ccc-analyzer /usr/bin/c++-analyzer + dobin tools/scan-build/scan-build + + insinto /usr/share/${PN} + doins tools/scan-build/scanview.css + doins tools/scan-build/sorttable.js + + cd tools/scan-view || die "cd scan-view failed" + dobin scan-view + install-scan-view() { + insinto "$(python_get_sitedir)"/clang + doins Reporter.py Resources ScanView.py startfile.py + touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py + } + python_execute_function install-scan-view + fi + + # AddressSanitizer symbolizer (currently separate) + dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + + # Fix install_names on Darwin. The build system is too complicated + # to just fix this, so we correct it post-install + if [[ ${CHOST} == *-darwin* ]] ; then + for lib in libclang.dylib ; do + ebegin "fixing install_name of $lib" + install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \ + "${ED}"/usr/lib/llvm/${lib} + eend $? + done + for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do + ebegin "fixing references in ${f##*/}" + install_name_tool \ + -change "@rpath/libclang.dylib" \ + "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ + -change "@executable_path/../lib/libLLVM-${PV}.dylib" \ + "${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \ + -change "${S}"/Release/lib/libclang.dylib \ + "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ + "${ED}"/$f + eend $? + done + fi +} + +pkg_postinst() { + python_mod_optimize clang +} + +pkg_postrm() { + python_mod_cleanup clang +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/clang-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/clang-9999.ebuild new file mode 100644 index 0000000000..f1e6f86406 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/clang-9999.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# This package is originated from +# http://sources.gentoo.org/sys-devel/clang/clang-9999.ebuild +# +# Note that we use downloading sources from SVN because llvm.org has +# not released this version yet. + +EAPI=4 + +RESTRICT_PYTHON_ABIS="3.*" +SUPPORT_PYTHON_ABIS="1" + +inherit subversion eutils multilib python + +DESCRIPTION="C language family frontend for LLVM" +HOMEPAGE="http://clang.llvm.org/" +SRC_URI="" +ESVN_REPO_URI="http://llvm.org/svn/llvm-project/cfe/trunk" + +LICENSE="UoI-NCSA" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug multitarget +static-analyzer test" + +DEPEND="static-analyzer? ( dev-lang/perl )" +RDEPEND="~sys-devel/llvm-${PV}[multitarget=]" + +S="${WORKDIR}/llvm" + +src_unpack() { + # Fetching LLVM and subprojects + ESVN_PROJECT=llvm subversion_fetch "http://llvm.org/svn/llvm-project/llvm/trunk" + ESVN_PROJECT=compiler-rt S="${S}"/projects/compiler-rt subversion_fetch "http://llvm.org/svn/llvm-project/compiler-rt/trunk" + ESVN_PROJECT=clang S="${S}"/tools/clang subversion_fetch +} + +src_prepare() { + if [ "/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.x-google" != $(gcc-config -B) ]; then + ewarn "Beware sheriff: gcc's binaries are not in '/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.x-google'" + ewarn "and are instead in $(gcc-config -B). This may lead to an unusable clang." + ewarn "Please test clang with a simple hello_world.cc file and update this message" + fi + + # Same as llvm doc patches + epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch + + # multilib-strict + sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \ + -i tools/clang/lib/Headers/Makefile \ + || die "clang Makefile failed" + sed -e "/PROJ_resources/s#lib/clang#$(get_libdir)/clang#" \ + -i tools/clang/runtime/compiler-rt/Makefile \ + || die "compiler-rt Makefile failed" + # fix the static analyzer for in-tree install + sed -e 's/import ScanView/from clang \0/' \ + -i tools/clang/tools/scan-view/scan-view \ + || die "scan-view sed failed" + sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \ + -i tools/clang/tools/scan-build/scan-build \ + || die "scan-build sed failed" + # Set correct path for gold plugin + sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \ + -i tools/clang/lib/Driver/Tools.cpp \ + || die "gold plugin path sed failed" + # Specify python version + python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view + python_convert_shebangs -r 2 test/Scripts + python_convert_shebangs 2 projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + + # From llvm src_prepare + einfo "Fixing install dirs" + sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ + -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ + -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \ + -i Makefile.config.in || die "Makefile.config sed failed" + + einfo "Fixing rpath and CFLAGS" + sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \ + -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ + -i Makefile.rules || die "rpath sed failed" + + # Use system llc (from llvm ebuild) for tests + sed -e "/^llc_props =/s/os.path.join(llvm_tools_dir, 'llc')/'llc'/" \ + -i tools/clang/test/lit.cfg || die "test path sed failed" + + # User patches + epatch_user +} + +src_configure() { + local CONF_FLAGS="--enable-shared + --with-optimize-option= + $(use_enable !debug optimized) + $(use_enable debug assertions) + $(use_enable debug expensive-checks)" + + # Setup the search path to include the Prefix includes + if use prefix ; then + CONF_FLAGS="${CONF_FLAGS} \ + --with-c-include-dirs=${EPREFIX}/usr/include:/usr/include" + fi + + if use multitarget; then + CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" + else + CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp" + fi + + if use amd64; then + CONF_FLAGS="${CONF_FLAGS} --enable-pic" + fi + + # clang prefers clang over gcc, so we may need to force that + tc-export CC CXX + econf ${CONF_FLAGS} +} + +src_compile() { + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only +} + +src_test() { + cd "${S}"/tools/clang || die "cd clang failed" + + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + testing() { + if ! emake -j1 VERBOSE=1 test; then + has test $FEATURES && die "Make test failed. See above for details." + has test $FEATURES || eerror "Make test failed. See above for details." + fi + } + python_execute_function testing +} + +src_install() { + cd "${S}"/tools/clang || die "cd clang failed" + emake KEEP_SYMBOLS=1 DESTDIR="${D}" install + + if use static-analyzer ; then + dobin tools/scan-build/ccc-analyzer + dosym ccc-analyzer /usr/bin/c++-analyzer + dobin tools/scan-build/scan-build + + insinto /usr/share/${PN} + doins tools/scan-build/scanview.css + doins tools/scan-build/sorttable.js + + cd tools/scan-view || die "cd scan-view failed" + dobin scan-view + install-scan-view() { + insinto "$(python_get_sitedir)"/clang + doins Reporter.py Resources ScanView.py startfile.py + touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py + } + python_execute_function install-scan-view + fi + + # AddressSanitizer symbolizer (currently separate) + dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + + # Fix install_names on Darwin. The build system is too complicated + # to just fix this, so we correct it post-install + if [[ ${CHOST} == *-darwin* ]] ; then + for lib in libclang.dylib ; do + ebegin "fixing install_name of $lib" + install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \ + "${ED}"/usr/lib/llvm/${lib} + eend $? + done + for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do + ebegin "fixing references in ${f##*/}" + install_name_tool \ + -change "@rpath/libclang.dylib" \ + "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ + -change "@executable_path/../lib/libLLVM-${PV}.dylib" \ + "${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \ + -change "${S}"/Release/lib/libclang.dylib \ + "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ + "${ED}"/$f + eend $? + done + fi +} + +pkg_postinst() { + python_mod_optimize clang +} + +pkg_postrm() { + python_mod_cleanup clang +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/files/clang-2.7-fixdoc.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/files/clang-2.7-fixdoc.patch new file mode 100644 index 0000000000..8058ec46bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/files/clang-2.7-fixdoc.patch @@ -0,0 +1,53 @@ +diff -Naur llvm-2.7.orig//tools/clang/docs/Makefile llvm-2.7/tools/clang/docs/Makefile +--- llvm-2.7.orig//tools/clang/docs/Makefile 2010-04-26 18:38:45.000000000 +0200 ++++ llvm-2.7/tools/clang/docs/Makefile 2010-04-26 18:41:08.000000000 +0200 +@@ -46,13 +46,12 @@ + # 'make generated BUILD_FOR_WEBSITE=1' + generated:: doxygen + +-install-html: $(PROJ_OBJ_DIR)/html.tar.gz ++install-html: + $(Echo) Installing HTML documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img + $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html + # $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) + + $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) + $(Echo) Packaging HTML documentation +@@ -64,12 +63,11 @@ + install-doxygen: doxygen + $(Echo) Installing doxygen documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; + +-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz ++doxygen: regendoc + + regendoc: + $(Echo) Building doxygen documentation +diff -Naur llvm-2.7.orig//tools/clang/docs/tools/Makefile llvm-2.7/tools/clang/docs/tools/Makefile +--- llvm-2.7.orig//tools/clang/docs/tools/Makefile 2010-04-26 18:38:45.000000000 +0200 ++++ llvm-2.7/tools/clang/docs/tools/Makefile 2010-04-26 18:41:29.000000000 +0200 +@@ -24,7 +24,7 @@ + CLANG_VERSION := trunk + + # If we are in BUILD_FOR_WEBSITE mode, default to the all target. +-all:: html man ps ++all:: html man + + clean: + rm -f pod2htm*.*~~ $(HTML) $(MAN) $(PS) +@@ -58,7 +58,7 @@ + ifdef ONLY_MAN_DOCS + INSTALL_TARGETS := install-man + else +-INSTALL_TARGETS := install-html install-man install-ps ++INSTALL_TARGETS := install-html install-man + endif + + .SUFFIXES: diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch new file mode 100644 index 0000000000..e1beff3f16 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch @@ -0,0 +1,21 @@ +Bug #387309 + +--- llvm/tools/clang/lib/Driver/ToolChains.cpp.orig 2011-11-09 23:10:04.000000000 +0100 ++++ llvm/tools/clang/lib/Driver/ToolChains.cpp 2011-11-09 23:11:04.000000000 +0100 +@@ -1586,12 +1586,13 @@ + // This is of the form /foo/bar/include/c++/4.5.2/ + if (CxxIncludeRoot.back() == '/') + llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the / ++ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the g++-v4 ++ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include + StringRef Version = llvm::sys::path::filename(CxxIncludeRoot); + llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the version +- llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the c++ +- llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include ++ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the ARCH + GccInstallPath = CxxIncludeRoot.str(); +- GccInstallPath.append("/lib/gcc/"); ++ GccInstallPath.append("/"); + GccInstallPath.append(CXX_INCLUDE_ARCH); + GccInstallPath.append("/"); + GccInstallPath.append(Version); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/90_all_gcc-4.7-x32.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/90_all_gcc-4.7-x32.patch new file mode 100644 index 0000000000..6eda63f983 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/90_all_gcc-4.7-x32.patch @@ -0,0 +1,2989 @@ +this patch was created from: + +git diff -p 475e5d65b13bfb798ff1f2c45ab46619ab050283^..remotes/origin/hjl/x32/gcc-4_7-branch + +hjlu's 4.7 branch is pretty much all backports from code in trunk + +--- a/boehm-gc/configure ++++ b/boehm-gc/configure +@@ -6786,7 +6786,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/boehm-gc/include/private/gcconfig.h ++++ b/boehm-gc/include/private/gcconfig.h +@@ -1974,8 +1974,13 @@ + + # ifdef X86_64 + # define MACH_TYPE "X86_64" +-# define ALIGNMENT 8 +-# define CPP_WORDSZ 64 ++# ifdef __ILP32__ ++# define ALIGNMENT 4 ++# define CPP_WORDSZ 32 ++# else ++# define ALIGNMENT 8 ++# define CPP_WORDSZ 64 ++# endif + # ifndef HBLKSIZE + # define HBLKSIZE 4096 + # endif +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -349,6 +349,10 @@ GNATMAKE_OBJS = a-except.o ali.o ali-util.o aspects.o s-casuti.o alloc.o \ + ifeq ($(strip $(filter-out %x86_64, $(arch))),) + ifeq ($(strip $(MULTISUBDIR)),/32) + arch:=i686 ++ else ++ ifeq ($(strip $(MULTISUBDIR)),/x32) ++ arch:=x32 ++ endif + endif + endif + +@@ -2131,6 +2135,43 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),) + LIBRARY_VERSION := $(LIB_VERSION) + endif + ++ifeq ($(strip $(filter-out %x32 linux%,$(arch) $(osys))),) ++ LIBGNAT_TARGET_PAIRS = \ ++ a-exetim.adbgregs[REG_ESP] += 4096 + 4 * sizeof (unsigned long); + #elif defined (__x86_64__) +- unsigned long *pc = (unsigned long *)mcontext->gregs[REG_RIP]; +- /* The pattern is "orq $0x0,(%rsp)" for a probe in 64-bit mode. */ +- if (signo == SIGSEGV && pc && (*pc & 0xffffffffff) == 0x00240c8348) ++ unsigned long long *pc = (unsigned long long *)mcontext->gregs[REG_RIP]; ++ if (signo == SIGSEGV && pc ++ /* The pattern is "orq $0x0,(%rsp)" for a probe in 64-bit mode. */ ++ && ((*pc & 0xffffffffffLL) == 0x00240c8348LL ++ /* The pattern may also be "orl $0x0,(%esp)" for a probe in ++ x32 mode. */ ++ || (*pc & 0xffffffffLL) == 0x00240c83LL)) + mcontext->gregs[REG_RSP] += 4096 + 4 * sizeof (unsigned long); + #elif defined (__ia64__) + /* ??? The IA-64 unwinder doesn't compensate for signals. */ +--- a/gcc/ada/link.c ++++ b/gcc/ada/link.c +@@ -187,7 +187,11 @@ unsigned char __gnat_using_gnu_linker = 1; + const char *__gnat_object_library_extension = ".a"; + unsigned char __gnat_separate_run_path_options = 0; + #if defined (__x86_64) ++# if defined (__LP64__) + const char *__gnat_default_libgcc_subdir = "lib64"; ++# else ++const char *__gnat_default_libgcc_subdir = "libx32"; ++# endif + #else + const char *__gnat_default_libgcc_subdir = "lib"; + #endif +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -486,6 +486,10 @@ fi + + case ${target} in + i[34567]86-*-*) ++ if test "x$with_abi" != x; then ++ echo "This target does not support --with-abi." ++ exit 1 ++ fi + if test "x$enable_cld" = xyes; then + tm_defines="${tm_defines} USE_IX86_CLD=1" + fi +@@ -495,7 +499,24 @@ i[34567]86-*-*) + tm_file="vxworks-dummy.h ${tm_file}" + ;; + x86_64-*-*) +- tm_file="i386/biarch64.h ${tm_file}" ++ case ${with_abi} in ++ "") ++ if test "x$with_multilib_list" = xmx32; then ++ tm_file="i386/biarchx32.h ${tm_file}" ++ else ++ tm_file="i386/biarch64.h ${tm_file}" ++ fi ++ ;; ++ 64 | m64) ++ tm_file="i386/biarch64.h ${tm_file}" ++ ;; ++ x32 | mx32) ++ tm_file="i386/biarchx32.h ${tm_file}" ++ ;; ++ *) ++ echo "Unknown ABI used in --with-abi=$with_abi" ++ exit 1 ++ esac + if test "x$enable_cld" = xyes; then + tm_defines="${tm_defines} USE_IX86_CLD=1" + fi +@@ -3201,7 +3222,7 @@ case "${target}" in + ;; + + i[34567]86-*-* | x86_64-*-*) +- supported_defaults="arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64" ++ supported_defaults="abi arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64" + for which in arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64; do + eval "val=\$with_$which" + case ${val} in +--- a/gcc/config/arm/arm.opt ++++ b/gcc/config/arm/arm.opt +@@ -59,7 +59,7 @@ Target Report Mask(ABORT_NORETURN) + Generate a call to abort if a noreturn function returns + + mapcs +-Target RejectNegative Mask(APCS_FRAME) MaskExists Undocumented ++Target RejectNegative Mask(APCS_FRAME) Undocumented + + mapcs-float + Target Report Mask(APCS_FLOAT) +--- a/gcc/config/cris/linux.opt ++++ b/gcc/config/cris/linux.opt +@@ -23,7 +23,7 @@ mlinux + Target Report RejectNegative Undocumented + + mno-gotplt +-Target Report RejectNegative Mask(AVOID_GOTPLT) MaskExists ++Target Report RejectNegative Mask(AVOID_GOTPLT) + Together with -fpic and -fPIC, do not use GOTPLT references + + ; There's a small added setup cost with using GOTPLT references +--- a/gcc/config/host-linux.c ++++ b/gcc/config/host-linux.c +@@ -68,8 +68,10 @@ + # define TRY_EMPTY_VM_SPACE 0x10000000000 + #elif defined(__ia64) + # define TRY_EMPTY_VM_SPACE 0x2000000100000000 +-#elif defined(__x86_64) ++#elif defined(__x86_64) && defined(__LP64__) + # define TRY_EMPTY_VM_SPACE 0x1000000000 ++#elif defined(__x86_64) ++# define TRY_EMPTY_VM_SPACE 0x60000000 + #elif defined(__i386) + # define TRY_EMPTY_VM_SPACE 0x60000000 + #elif defined(__powerpc__) +--- a/gcc/config/i386/biarch64.h ++++ b/gcc/config/i386/biarch64.h +@@ -25,5 +25,5 @@ a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +-#define TARGET_64BIT_DEFAULT OPTION_MASK_ISA_64BIT ++#define TARGET_64BIT_DEFAULT (OPTION_MASK_ISA_64BIT | OPTION_MASK_ABI_64) + #define TARGET_BI_ARCH 1 +--- /dev/null ++++ b/gcc/config/i386/biarchx32.h +@@ -0,0 +1,28 @@ ++/* Make configure files to produce biarch compiler defaulting to x32 mode. ++ This file must be included very first, while the OS specific file later ++ to overwrite otherwise wrong defaults. ++ Copyright (C) 2012 Free Software Foundation, Inc. ++ ++This file is part of GCC. ++ ++GCC is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 3, or (at your option) ++any later version. ++ ++GCC is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++Under Section 7 of GPL version 3, you are granted additional ++permissions described in the GCC Runtime Library Exception, version ++3.1, as published by the Free Software Foundation. ++ ++You should have received a copy of the GNU General Public License and ++a copy of the GCC Runtime Library Exception along with this program; ++see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++. */ ++ ++#define TARGET_64BIT_DEFAULT (OPTION_MASK_ISA_64BIT | OPTION_MASK_ABI_X32) ++#define TARGET_BI_ARCH 2 +--- a/gcc/config/i386/constraints.md ++++ b/gcc/config/i386/constraints.md +@@ -18,7 +18,7 @@ + ;; . + + ;;; Unused letters: +-;;; B H T W ++;;; B H T + ;;; h k v + + ;; Integer register constraints. +@@ -193,6 +193,16 @@ + instructions)." + (match_operand 0 "x86_64_immediate_operand")) + ++;; We use W prefix to denote any number of ++;; constant-or-symbol-reference constraints ++ ++(define_constraint "Wz" ++ "32-bit unsigned integer constant, or a symbolic reference known ++ to fit that range (for zero-extending conversion operations that ++ require non-VOIDmode immediate operands)." ++ (and (match_operand 0 "x86_64_zext_immediate_operand") ++ (match_test "GET_MODE (op) != VOIDmode"))) ++ + (define_constraint "Z" + "32-bit unsigned integer constant, or a symbolic reference known + to fit that range (for immediate operands in zero-extending x86-64 +--- a/gcc/config/i386/gnu-user64.h ++++ b/gcc/config/i386/gnu-user64.h +@@ -58,8 +58,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" ++#if TARGET_BI_ARCH == 2 ++#define SPEC_64 "m64" ++#define SPEC_X32 "m32|m64:;" ++#else + #define SPEC_64 "m32|mx32:;" + #define SPEC_X32 "mx32" ++#endif + #else + #define SPEC_32 "m64|mx32:;" + #define SPEC_64 "m64" +@@ -95,7 +100,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" + + #if TARGET_64BIT_DEFAULT ++#if TARGET_BI_ARCH == 2 ++#define MULTILIB_DEFAULTS { "mx32" } ++#else + #define MULTILIB_DEFAULTS { "m64" } ++#endif + #else + #define MULTILIB_DEFAULTS { "m32" } + #endif +--- a/gcc/config/i386/i386-opts.h ++++ b/gcc/config/i386/i386-opts.h +@@ -71,6 +71,11 @@ enum cmodel { + CM_LARGE_PIC /* No assumptions. */ + }; + ++enum pmode { ++ PMODE_SI, /* Pmode == SImode. */ ++ PMODE_DI /* Pmode == DImode. */ ++}; ++ + enum asm_dialect { + ASM_ATT, + ASM_INTEL +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -2445,6 +2445,8 @@ static rtx (*ix86_gen_andsp) (rtx, rtx, rtx); + static rtx (*ix86_gen_allocate_stack_worker) (rtx, rtx); + static rtx (*ix86_gen_adjust_stack_and_probe) (rtx, rtx, rtx); + static rtx (*ix86_gen_probe_stack_range) (rtx, rtx, rtx); ++static rtx (*ix86_gen_tls_global_dynamic_64) (rtx, rtx, rtx); ++static rtx (*ix86_gen_tls_local_dynamic_base_64) (rtx, rtx); + + /* Preferred alignment for stack boundary in bits. */ + unsigned int ix86_preferred_stack_boundary; +@@ -2655,7 +2657,6 @@ ix86_target_string (HOST_WIDE_INT isa, int flags, const char *arch, + preceding options while match those first. */ + static struct ix86_target_opts isa_opts[] = + { +- { "-m64", OPTION_MASK_ISA_64BIT }, + { "-mfma4", OPTION_MASK_ISA_FMA4 }, + { "-mfma", OPTION_MASK_ISA_FMA }, + { "-mxop", OPTION_MASK_ISA_XOP }, +@@ -2727,6 +2728,7 @@ ix86_target_string (HOST_WIDE_INT isa, int flags, const char *arch, + size_t len; + size_t line_len; + size_t sep_len; ++ const char *abi; + + memset (opts, '\0', sizeof (opts)); + +@@ -2744,6 +2746,21 @@ ix86_target_string (HOST_WIDE_INT isa, int flags, const char *arch, + opts[num++][1] = tune; + } + ++ /* Add -m32/-m64/-mx32. */ ++ if ((isa & OPTION_MASK_ISA_64BIT) != 0) ++ { ++ if ((isa & OPTION_MASK_ABI_64) != 0) ++ abi = "-m64"; ++ else ++ abi = "-mx32"; ++ isa &= ~ (OPTION_MASK_ISA_64BIT ++ | OPTION_MASK_ABI_64 ++ | OPTION_MASK_ABI_X32); ++ } ++ else ++ abi = "-m32"; ++ opts[num++][0] = abi; ++ + /* Pick out the options in isa options. */ + for (i = 0; i < ARRAY_SIZE (isa_opts); i++) + { +@@ -3090,6 +3107,46 @@ ix86_option_override_internal (bool main_args_p) + sw = "attribute"; + } + ++ /* Turn off both OPTION_MASK_ABI_64 and OPTION_MASK_ABI_X32 if ++ TARGET_64BIT_DEFAULT is true and TARGET_64BIT is false. */ ++ if (TARGET_64BIT_DEFAULT && !TARGET_64BIT) ++ ix86_isa_flags &= ~(OPTION_MASK_ABI_64 | OPTION_MASK_ABI_X32); ++#ifdef TARGET_BI_ARCH ++ else ++ { ++#if TARGET_BI_ARCH == 1 ++ /* When TARGET_BI_ARCH == 1, by default, OPTION_MASK_ABI_64 ++ is on and OPTION_MASK_ABI_X32 is off. We turn off ++ OPTION_MASK_ABI_64 if OPTION_MASK_ABI_X32 is turned on by ++ -mx32. */ ++ if (TARGET_X32) ++ ix86_isa_flags &= ~OPTION_MASK_ABI_64; ++#else ++ /* When TARGET_BI_ARCH == 2, by default, OPTION_MASK_ABI_X32 is ++ on and OPTION_MASK_ABI_64 is off. We turn off ++ OPTION_MASK_ABI_X32 if OPTION_MASK_ABI_64 is turned on by ++ -m64. */ ++ if (TARGET_LP64) ++ ix86_isa_flags &= ~OPTION_MASK_ABI_X32; ++#endif ++ } ++#endif ++ ++ if (TARGET_X32) ++ { ++ /* Always turn on OPTION_MASK_ISA_64BIT and turn off ++ OPTION_MASK_ABI_64 for TARGET_X32. */ ++ ix86_isa_flags |= OPTION_MASK_ISA_64BIT; ++ ix86_isa_flags &= ~OPTION_MASK_ABI_64; ++ } ++ else if (TARGET_LP64) ++ { ++ /* Always turn on OPTION_MASK_ISA_64BIT and turn off ++ OPTION_MASK_ABI_X32 for TARGET_LP64. */ ++ ix86_isa_flags |= OPTION_MASK_ISA_64BIT; ++ ix86_isa_flags &= ~OPTION_MASK_ABI_X32; ++ } ++ + #ifdef SUBTARGET_OVERRIDE_OPTIONS + SUBTARGET_OVERRIDE_OPTIONS; + #endif +@@ -3098,9 +3155,6 @@ ix86_option_override_internal (bool main_args_p) + SUBSUBTARGET_OVERRIDE_OPTIONS; + #endif + +- if (TARGET_X32) +- ix86_isa_flags |= OPTION_MASK_ISA_64BIT; +- + /* -fPIC is the default for x86_64. */ + if (TARGET_MACHO && TARGET_64BIT) + flag_pic = 2; +@@ -3169,6 +3223,17 @@ ix86_option_override_internal (bool main_args_p) + else + ix86_arch_specified = 1; + ++ if (global_options_set.x_ix86_pmode) ++ { ++ if ((TARGET_LP64 && ix86_pmode == PMODE_SI) ++ || (!TARGET_64BIT && ix86_pmode == PMODE_DI)) ++ error ("address mode %qs not supported in the %s bit mode", ++ TARGET_64BIT ? "short" : "long", ++ TARGET_64BIT ? "64" : "32"); ++ } ++ else ++ ix86_pmode = TARGET_LP64 ? PMODE_DI : PMODE_SI; ++ + if (!global_options_set.x_ix86_abi) + ix86_abi = DEFAULT_ABI; + +@@ -3743,11 +3808,33 @@ ix86_option_override_internal (bool main_args_p) + if (TARGET_64BIT) + { + ix86_gen_leave = gen_leave_rex64; ++ if (Pmode == DImode) ++ { ++ ix86_gen_monitor = gen_sse3_monitor64_di; ++ ix86_gen_tls_global_dynamic_64 = gen_tls_global_dynamic_64_di; ++ ix86_gen_tls_local_dynamic_base_64 ++ = gen_tls_local_dynamic_base_64_di; ++ } ++ else ++ { ++ ix86_gen_monitor = gen_sse3_monitor64_si; ++ ix86_gen_tls_global_dynamic_64 = gen_tls_global_dynamic_64_si; ++ ix86_gen_tls_local_dynamic_base_64 ++ = gen_tls_local_dynamic_base_64_si; ++ } ++ } ++ else ++ { ++ ix86_gen_leave = gen_leave; ++ ix86_gen_monitor = gen_sse3_monitor; ++ } ++ ++ if (Pmode == DImode) ++ { + ix86_gen_add3 = gen_adddi3; + ix86_gen_sub3 = gen_subdi3; + ix86_gen_sub3_carry = gen_subdi3_carry; + ix86_gen_one_cmpl2 = gen_one_cmpldi2; +- ix86_gen_monitor = gen_sse3_monitor64; + ix86_gen_andsp = gen_anddi3; + ix86_gen_allocate_stack_worker = gen_allocate_stack_worker_probe_di; + ix86_gen_adjust_stack_and_probe = gen_adjust_stack_and_probedi; +@@ -3755,12 +3842,10 @@ ix86_option_override_internal (bool main_args_p) + } + else + { +- ix86_gen_leave = gen_leave; + ix86_gen_add3 = gen_addsi3; + ix86_gen_sub3 = gen_subsi3; + ix86_gen_sub3_carry = gen_subsi3_carry; + ix86_gen_one_cmpl2 = gen_one_cmplsi2; +- ix86_gen_monitor = gen_sse3_monitor; + ix86_gen_andsp = gen_andsi3; + ix86_gen_allocate_stack_worker = gen_allocate_stack_worker_probe_si; + ix86_gen_adjust_stack_and_probe = gen_adjust_stack_and_probesi; +@@ -7220,8 +7305,8 @@ function_value_64 (enum machine_mode orig_mode, enum machine_mode mode, + } + else if (POINTER_TYPE_P (valtype)) + { +- /* Pointers are always returned in Pmode. */ +- mode = Pmode; ++ /* Pointers are always returned in word_mode. */ ++ mode = word_mode; + } + + ret = construct_container (mode, orig_mode, valtype, 1, +@@ -7292,7 +7377,8 @@ ix86_function_value (const_tree valtype, const_tree fntype_or_decl, + return ix86_function_value_1 (valtype, fntype_or_decl, orig_mode, mode); + } + +-/* Pointer function arguments and return values are promoted to Pmode. */ ++/* Pointer function arguments and return values are promoted to ++ word_mode. */ + + static enum machine_mode + ix86_promote_function_mode (const_tree type, enum machine_mode mode, +@@ -7302,7 +7388,7 @@ ix86_promote_function_mode (const_tree type, enum machine_mode mode, + if (type != NULL_TREE && POINTER_TYPE_P (type)) + { + *punsignedp = POINTERS_EXTEND_UNSIGNED; +- return Pmode; ++ return word_mode; + } + return default_promote_function_mode (type, mode, punsignedp, fntype, + for_return); +@@ -7580,12 +7666,13 @@ setup_incoming_varargs_64 (CUMULATIVE_ARGS *cum) + + for (i = cum->regno; i < max; i++) + { +- mem = gen_rtx_MEM (Pmode, ++ mem = gen_rtx_MEM (word_mode, + plus_constant (save_area, i * UNITS_PER_WORD)); + MEM_NOTRAP_P (mem) = 1; + set_mem_alias_set (mem, set); +- emit_move_insn (mem, gen_rtx_REG (Pmode, +- x86_64_int_parameter_registers[i])); ++ emit_move_insn (mem, ++ gen_rtx_REG (word_mode, ++ x86_64_int_parameter_registers[i])); + } + + if (ix86_varargs_fpr_size) +@@ -8640,8 +8727,11 @@ gen_push (rtx arg) + m->fs.cfa_offset += UNITS_PER_WORD; + m->fs.sp_offset += UNITS_PER_WORD; + ++ if (REG_P (arg) && GET_MODE (arg) != word_mode) ++ arg = gen_rtx_REG (word_mode, REGNO (arg)); ++ + return gen_rtx_SET (VOIDmode, +- gen_rtx_MEM (Pmode, ++ gen_rtx_MEM (word_mode, + gen_rtx_PRE_DEC (Pmode, + stack_pointer_rtx)), + arg); +@@ -8652,9 +8742,12 @@ gen_push (rtx arg) + static rtx + gen_pop (rtx arg) + { ++ if (REG_P (arg) && GET_MODE (arg) != word_mode) ++ arg = gen_rtx_REG (word_mode, REGNO (arg)); ++ + return gen_rtx_SET (VOIDmode, + arg, +- gen_rtx_MEM (Pmode, ++ gen_rtx_MEM (word_mode, + gen_rtx_POST_INC (Pmode, + stack_pointer_rtx))); + } +@@ -9121,7 +9214,7 @@ ix86_emit_save_regs (void) + for (regno = FIRST_PSEUDO_REGISTER - 1; regno-- > 0; ) + if (!SSE_REGNO_P (regno) && ix86_save_reg (regno, true)) + { +- insn = emit_insn (gen_push (gen_rtx_REG (Pmode, regno))); ++ insn = emit_insn (gen_push (gen_rtx_REG (word_mode, regno))); + RTX_FRAME_RELATED_P (insn) = 1; + } + } +@@ -9201,7 +9294,7 @@ ix86_emit_save_regs_using_mov (HOST_WIDE_INT cfa_offset) + for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++) + if (!SSE_REGNO_P (regno) && ix86_save_reg (regno, true)) + { +- ix86_emit_save_reg_using_mov (Pmode, regno, cfa_offset); ++ ix86_emit_save_reg_using_mov (word_mode, regno, cfa_offset); + cfa_offset -= UNITS_PER_WORD; + } + } +@@ -9276,7 +9369,7 @@ pro_epilogue_adjust_stack (rtx dest, rtx src, rtx offset, + rtx insn; + bool add_frame_related_expr = false; + +- if (! TARGET_64BIT) ++ if (Pmode == SImode) + insn = gen_pro_epilogue_adjust_stack_si_add (dest, src, offset); + else if (x86_64_immediate_operand (offset, DImode)) + insn = gen_pro_epilogue_adjust_stack_di_add (dest, src, offset); +@@ -10138,7 +10231,7 @@ ix86_expand_prologue (void) + to implement macro RETURN_ADDR_RTX and intrinsic function + expand_builtin_return_addr etc. */ + t = plus_constant (crtl->drap_reg, -UNITS_PER_WORD); +- t = gen_frame_mem (Pmode, t); ++ t = gen_frame_mem (word_mode, t); + insn = emit_insn (gen_push (t)); + RTX_FRAME_RELATED_P (insn) = 1; + +@@ -10310,7 +10403,7 @@ ix86_expand_prologue (void) + emit_insn (ix86_gen_allocate_stack_worker (eax, eax)); + + /* Use the fact that AX still contains ALLOCATE. */ +- adjust_stack_insn = (TARGET_64BIT ++ adjust_stack_insn = (Pmode == DImode + ? gen_pro_epilogue_adjust_stack_di_sub + : gen_pro_epilogue_adjust_stack_si_sub); + +@@ -10335,14 +10428,18 @@ ix86_expand_prologue (void) + if (r10_live && eax_live) + { + t = choose_baseaddr (m->fs.sp_offset - allocate); +- emit_move_insn (r10, gen_frame_mem (Pmode, t)); ++ emit_move_insn (gen_rtx_REG (word_mode, R10_REG), ++ gen_frame_mem (word_mode, t)); + t = choose_baseaddr (m->fs.sp_offset - allocate - UNITS_PER_WORD); +- emit_move_insn (eax, gen_frame_mem (Pmode, t)); ++ emit_move_insn (gen_rtx_REG (word_mode, AX_REG), ++ gen_frame_mem (word_mode, t)); + } + else if (eax_live || r10_live) + { + t = choose_baseaddr (m->fs.sp_offset - allocate); +- emit_move_insn ((eax_live ? eax : r10), gen_frame_mem (Pmode, t)); ++ emit_move_insn (gen_rtx_REG (word_mode, ++ (eax_live ? AX_REG : R10_REG)), ++ gen_frame_mem (word_mode, t)); + } + } + gcc_assert (m->fs.sp_offset == frame.stack_pointer_offset); +@@ -10512,7 +10609,7 @@ ix86_emit_restore_regs_using_pop (void) + + for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++) + if (!SSE_REGNO_P (regno) && ix86_save_reg (regno, false)) +- ix86_emit_restore_reg_using_pop (gen_rtx_REG (Pmode, regno)); ++ ix86_emit_restore_reg_using_pop (gen_rtx_REG (word_mode, regno)); + } + + /* Emit code and notes for the LEAVE instruction. */ +@@ -10555,11 +10652,11 @@ ix86_emit_restore_regs_using_mov (HOST_WIDE_INT cfa_offset, + for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++) + if (!SSE_REGNO_P (regno) && ix86_save_reg (regno, maybe_eh_return)) + { +- rtx reg = gen_rtx_REG (Pmode, regno); ++ rtx reg = gen_rtx_REG (word_mode, regno); + rtx insn, mem; + + mem = choose_baseaddr (cfa_offset); +- mem = gen_frame_mem (Pmode, mem); ++ mem = gen_frame_mem (word_mode, mem); + insn = emit_move_insn (reg, mem); + + if (m->fs.cfa_reg == crtl->drap_reg && regno == REGNO (crtl->drap_reg)) +@@ -11164,8 +11261,8 @@ ix86_expand_split_stack_prologue (void) + { + rtx rax; + +- rax = gen_rtx_REG (Pmode, AX_REG); +- emit_move_insn (rax, reg10); ++ rax = gen_rtx_REG (word_mode, AX_REG); ++ emit_move_insn (rax, gen_rtx_REG (word_mode, R10_REG)); + use_reg (&call_fusage, rax); + } + +@@ -11244,8 +11341,8 @@ ix86_expand_split_stack_prologue (void) + /* If we are in 64-bit mode and this function uses a static chain, + we saved %r10 in %rax before calling _morestack. */ + if (TARGET_64BIT && DECL_STATIC_CHAIN (cfun->decl)) +- emit_move_insn (gen_rtx_REG (Pmode, R10_REG), +- gen_rtx_REG (Pmode, AX_REG)); ++ emit_move_insn (gen_rtx_REG (word_mode, R10_REG), ++ gen_rtx_REG (word_mode, AX_REG)); + + /* If this function calls va_start, we need to store a pointer to + the arguments on the old stack, because they may not have been +@@ -11375,10 +11472,14 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) + { + addr = XEXP (addr, 0); + +- /* Strip subreg. */ ++ /* Adjust SUBREGs. */ + if (GET_CODE (addr) == SUBREG + && GET_MODE (SUBREG_REG (addr)) == SImode) + addr = SUBREG_REG (addr); ++ else if (GET_MODE (addr) == DImode) ++ addr = gen_rtx_SUBREG (SImode, addr, 0); ++ else if (GET_MODE (addr) != VOIDmode) ++ return 0; + } + } + +@@ -11434,6 +11535,12 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) + scale = 1 << scale; + break; + ++ case ZERO_EXTEND: ++ op = XEXP (op, 0); ++ if (GET_CODE (op) != UNSPEC) ++ return 0; ++ /* FALLTHRU */ ++ + case UNSPEC: + if (XINT (op, 1) == UNSPEC_TP + && TARGET_TLS_DIRECT_SEG_REFS +@@ -11503,6 +11610,12 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) + return 0; + } + ++/* Address override works only on the (%reg) part of %fs:(%reg). */ ++ if (seg != SEG_DEFAULT ++ && ((base && GET_MODE (base) != word_mode) ++ || (index && GET_MODE (index) != word_mode))) ++ return 0; ++ + /* Extract the integral value of scale. */ + if (scale_rtx) + { +@@ -12455,15 +12568,20 @@ legitimize_pic_address (rtx orig, rtx reg) + /* Load the thread pointer. If TO_REG is true, force it into a register. */ + + static rtx +-get_thread_pointer (bool to_reg) ++get_thread_pointer (enum machine_mode tp_mode, bool to_reg) + { + rtx tp = gen_rtx_UNSPEC (ptr_mode, gen_rtvec (1, const0_rtx), UNSPEC_TP); + +- if (GET_MODE (tp) != Pmode) +- tp = convert_to_mode (Pmode, tp, 1); ++ if (GET_MODE (tp) != tp_mode) ++ { ++ gcc_assert (GET_MODE (tp) == SImode); ++ gcc_assert (tp_mode == DImode); ++ ++ tp = gen_rtx_ZERO_EXTEND (tp_mode, tp); ++ } + + if (to_reg) +- tp = copy_addr_to_reg (tp); ++ tp = copy_to_mode_reg (tp_mode, tp); + + return tp; + } +@@ -12515,6 +12633,7 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + { + rtx dest, base, off; + rtx pic = NULL_RTX, tp = NULL_RTX; ++ enum machine_mode tp_mode = Pmode; + int type; + + switch (model) +@@ -12540,7 +12659,7 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + else + emit_insn (gen_tls_dynamic_gnu2_32 (dest, x, pic)); + +- tp = get_thread_pointer (true); ++ tp = get_thread_pointer (Pmode, true); + dest = force_reg (Pmode, gen_rtx_PLUS (Pmode, tp, dest)); + + set_unique_reg_note (get_last_insn (), REG_EQUAL, x); +@@ -12554,7 +12673,8 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + rtx rax = gen_rtx_REG (Pmode, AX_REG), insns; + + start_sequence (); +- emit_call_insn (gen_tls_global_dynamic_64 (rax, x, caddr)); ++ emit_call_insn (ix86_gen_tls_global_dynamic_64 (rax, x, ++ caddr)); + insns = get_insns (); + end_sequence (); + +@@ -12589,7 +12709,7 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + else + emit_insn (gen_tls_dynamic_gnu2_32 (base, tmp, pic)); + +- tp = get_thread_pointer (true); ++ tp = get_thread_pointer (Pmode, true); + set_unique_reg_note (get_last_insn (), REG_EQUAL, + gen_rtx_MINUS (Pmode, tmp, tp)); + } +@@ -12602,7 +12722,8 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + rtx rax = gen_rtx_REG (Pmode, AX_REG), insns, eqv; + + start_sequence (); +- emit_call_insn (gen_tls_local_dynamic_base_64 (rax, caddr)); ++ emit_call_insn (ix86_gen_tls_local_dynamic_base_64 (rax, ++ caddr)); + insns = get_insns (); + end_sequence (); + +@@ -12645,6 +12766,9 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + return dest; + } + ++ /* Generate DImode references to avoid %fs:(%reg32) ++ problems and linker IE->LE relaxation bug. */ ++ tp_mode = DImode; + pic = NULL; + type = UNSPEC_GOTNTPOFF; + } +@@ -12667,22 +12791,23 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + type = UNSPEC_INDNTPOFF; + } + +- off = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, x), type); +- off = gen_rtx_CONST (Pmode, off); ++ off = gen_rtx_UNSPEC (tp_mode, gen_rtvec (1, x), type); ++ off = gen_rtx_CONST (tp_mode, off); + if (pic) +- off = gen_rtx_PLUS (Pmode, pic, off); +- off = gen_const_mem (Pmode, off); ++ off = gen_rtx_PLUS (tp_mode, pic, off); ++ off = gen_const_mem (tp_mode, off); + set_mem_alias_set (off, ix86_GOT_alias_set ()); + + if (TARGET_64BIT || TARGET_ANY_GNU_TLS) + { +- base = get_thread_pointer (for_mov || !TARGET_TLS_DIRECT_SEG_REFS); +- off = force_reg (Pmode, off); +- return gen_rtx_PLUS (Pmode, base, off); ++ base = get_thread_pointer (tp_mode, ++ for_mov || !TARGET_TLS_DIRECT_SEG_REFS); ++ off = force_reg (tp_mode, off); ++ return gen_rtx_PLUS (tp_mode, base, off); + } + else + { +- base = get_thread_pointer (true); ++ base = get_thread_pointer (Pmode, true); + dest = gen_reg_rtx (Pmode); + emit_insn (gen_subsi3 (dest, base, off)); + } +@@ -12696,12 +12821,13 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) + + if (TARGET_64BIT || TARGET_ANY_GNU_TLS) + { +- base = get_thread_pointer (for_mov || !TARGET_TLS_DIRECT_SEG_REFS); ++ base = get_thread_pointer (Pmode, ++ for_mov || !TARGET_TLS_DIRECT_SEG_REFS); + return gen_rtx_PLUS (Pmode, base, off); + } + else + { +- base = get_thread_pointer (true); ++ base = get_thread_pointer (Pmode, true); + dest = gen_reg_rtx (Pmode); + emit_insn (gen_subsi3 (dest, base, off)); + } +@@ -13756,6 +13882,7 @@ get_some_local_dynamic_name (void) + Z -- likewise, with special suffixes for x87 instructions. + * -- print a star (in certain assembler syntax) + A -- print an absolute memory reference. ++ E -- print address with DImode register names if TARGET_64BIT. + w -- print the operand as if it's a "word" (HImode) even if it isn't. + s -- print a shift double count, followed by the assemblers argument + delimiter. +@@ -13780,6 +13907,7 @@ get_some_local_dynamic_name (void) + ; -- print a semicolon (after prefixes due to bug in older gas). + ~ -- print "i" if TARGET_AVX2, "f" otherwise. + @ -- print a segment register of thread base pointer load ++ ^ -- print addr32 prefix if TARGET_64BIT and Pmode != word_mode + */ + + void +@@ -13831,7 +13959,14 @@ ix86_print_operand (FILE *file, rtx x, int code) + ix86_print_operand (file, x, 0); + return; + ++ case 'E': ++ /* Wrap address in an UNSPEC to declare special handling. */ ++ if (TARGET_64BIT) ++ x = gen_rtx_UNSPEC (DImode, gen_rtvec (1, x), UNSPEC_LEA_ADDR); + ++ output_address (x); ++ return; ++ + case 'L': + if (ASSEMBLER_DIALECT == ASM_ATT) + putc ('l', file); +@@ -14283,6 +14418,11 @@ ix86_print_operand (FILE *file, rtx x, int code) + putc (TARGET_AVX2 ? 'i' : 'f', file); + return; + ++ case '^': ++ if (TARGET_64BIT && Pmode != word_mode) ++ fputs ("addr32 ", file); ++ return; ++ + default: + output_operand_lossage ("invalid operand code '%c'", code); + } +@@ -14422,8 +14562,8 @@ ix86_print_operand (FILE *file, rtx x, int code) + static bool + ix86_print_operand_punct_valid_p (unsigned char code) + { +- return (code == '@' || code == '*' || code == '+' +- || code == '&' || code == ';' || code == '~'); ++ return (code == '@' || code == '*' || code == '+' || code == '&' ++ || code == ';' || code == '~' || code == '^'); + } + + /* Print a memory operand whose address is ADDR. */ +@@ -14436,6 +14576,7 @@ ix86_print_operand_address (FILE *file, rtx addr) + int scale; + int ok; + bool vsib = false; ++ int code = 0; + + if (GET_CODE (addr) == UNSPEC && XINT (addr, 1) == UNSPEC_VSIBADDR) + { +@@ -14446,6 +14587,12 @@ ix86_print_operand_address (FILE *file, rtx addr) + addr = XVECEXP (addr, 0, 0); + vsib = true; + } ++ else if (GET_CODE (addr) == UNSPEC && XINT (addr, 1) == UNSPEC_LEA_ADDR) ++ { ++ gcc_assert (TARGET_64BIT); ++ ok = ix86_decompose_address (XVECEXP (addr, 0, 0), &parts); ++ code = 'q'; ++ } + else + ok = ix86_decompose_address (addr, &parts); + +@@ -14516,15 +14663,15 @@ ix86_print_operand_address (FILE *file, rtx addr) + } + else + { +- int code = 0; +- +- /* Print SImode registers for zero-extended addresses to force +- addr32 prefix. Otherwise print DImode registers to avoid it. */ +- if (TARGET_64BIT) +- code = ((GET_CODE (addr) == ZERO_EXTEND +- || GET_CODE (addr) == AND) +- ? 'l' +- : 'q'); ++ /* Print SImode register names for zero-extended ++ addresses to force addr32 prefix. */ ++ if (TARGET_64BIT ++ && (GET_CODE (addr) == ZERO_EXTEND ++ || GET_CODE (addr) == AND)) ++ { ++ gcc_assert (!code); ++ code = 'l'; ++ } + + if (ASSEMBLER_DIALECT == ASM_ATT) + { +@@ -20299,7 +20446,7 @@ ix86_split_to_parts (rtx operand, rtx *parts, enum machine_mode mode) + gcc_assert (ok); + + operand = copy_rtx (operand); +- PUT_MODE (operand, Pmode); ++ PUT_MODE (operand, word_mode); + parts[0] = parts[1] = parts[2] = parts[3] = operand; + return size; + } +@@ -20452,7 +20599,7 @@ ix86_split_long_move (rtx operands[]) + if (push_operand (operands[0], VOIDmode)) + { + operands[0] = copy_rtx (operands[0]); +- PUT_MODE (operands[0], Pmode); ++ PUT_MODE (operands[0], word_mode); + } + else + operands[0] = gen_lowpart (DImode, operands[0]); +@@ -21007,14 +21154,9 @@ ix86_adjust_counter (rtx countreg, HOST_WIDE_INT value) + rtx + ix86_zero_extend_to_Pmode (rtx exp) + { +- rtx r; +- if (GET_MODE (exp) == VOIDmode) +- return force_reg (Pmode, exp); +- if (GET_MODE (exp) == Pmode) +- return copy_to_mode_reg (Pmode, exp); +- r = gen_reg_rtx (Pmode); +- emit_insn (gen_zero_extendsidi2 (r, exp)); +- return r; ++ if (GET_MODE (exp) != Pmode) ++ exp = convert_to_mode (Pmode, exp, 1); ++ return force_reg (Pmode, exp); + } + + /* Divide COUNTREG by SCALE. */ +@@ -22042,11 +22184,11 @@ ix86_expand_movmem (rtx dst, rtx src, rtx count_exp, rtx align_exp, + gcc_unreachable (); + case loop: + need_zero_guard = true; +- size_needed = GET_MODE_SIZE (Pmode); ++ size_needed = GET_MODE_SIZE (word_mode); + break; + case unrolled_loop: + need_zero_guard = true; +- size_needed = GET_MODE_SIZE (Pmode) * (TARGET_64BIT ? 4 : 2); ++ size_needed = GET_MODE_SIZE (word_mode) * (TARGET_64BIT ? 4 : 2); + break; + case rep_prefix_8_byte: + size_needed = 8; +@@ -22212,13 +22354,13 @@ ix86_expand_movmem (rtx dst, rtx src, rtx count_exp, rtx align_exp, + break; + case loop: + expand_set_or_movmem_via_loop (dst, src, destreg, srcreg, NULL, +- count_exp, Pmode, 1, expected_size); ++ count_exp, word_mode, 1, expected_size); + break; + case unrolled_loop: + /* Unroll only by factor of 2 in 32bit mode, since we don't have enough + registers for 4 temporaries anyway. */ + expand_set_or_movmem_via_loop (dst, src, destreg, srcreg, NULL, +- count_exp, Pmode, TARGET_64BIT ? 4 : 2, ++ count_exp, word_mode, TARGET_64BIT ? 4 : 2, + expected_size); + break; + case rep_prefix_8_byte: +@@ -22430,11 +22572,11 @@ ix86_expand_setmem (rtx dst, rtx count_exp, rtx val_exp, rtx align_exp, + gcc_unreachable (); + case loop: + need_zero_guard = true; +- size_needed = GET_MODE_SIZE (Pmode); ++ size_needed = GET_MODE_SIZE (word_mode); + break; + case unrolled_loop: + need_zero_guard = true; +- size_needed = GET_MODE_SIZE (Pmode) * 4; ++ size_needed = GET_MODE_SIZE (word_mode) * 4; + break; + case rep_prefix_8_byte: + size_needed = 8; +@@ -22605,11 +22747,11 @@ ix86_expand_setmem (rtx dst, rtx count_exp, rtx val_exp, rtx align_exp, + break; + case loop: + expand_set_or_movmem_via_loop (dst, NULL, destreg, NULL, promoted_val, +- count_exp, Pmode, 1, expected_size); ++ count_exp, word_mode, 1, expected_size); + break; + case unrolled_loop: + expand_set_or_movmem_via_loop (dst, NULL, destreg, NULL, promoted_val, +- count_exp, Pmode, 4, expected_size); ++ count_exp, word_mode, 4, expected_size); + break; + case rep_prefix_8_byte: + expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp, +@@ -22972,13 +23114,13 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1, + && !local_symbolic_operand (XEXP (fnaddr, 0), VOIDmode)) + fnaddr = gen_rtx_MEM (QImode, construct_plt_address (XEXP (fnaddr, 0))); + else if (sibcall +- ? !sibcall_insn_operand (XEXP (fnaddr, 0), Pmode) +- : !call_insn_operand (XEXP (fnaddr, 0), Pmode)) ++ ? !sibcall_insn_operand (XEXP (fnaddr, 0), word_mode) ++ : !call_insn_operand (XEXP (fnaddr, 0), word_mode)) + { + fnaddr = XEXP (fnaddr, 0); +- if (GET_MODE (fnaddr) != Pmode) +- fnaddr = convert_to_mode (Pmode, fnaddr, 1); +- fnaddr = gen_rtx_MEM (QImode, copy_to_mode_reg (Pmode, fnaddr)); ++ if (GET_MODE (fnaddr) != word_mode) ++ fnaddr = convert_to_mode (word_mode, fnaddr, 1); ++ fnaddr = gen_rtx_MEM (QImode, copy_to_mode_reg (word_mode, fnaddr)); + } + + vec_len = 0; +@@ -24291,10 +24433,13 @@ ix86_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value) + /* Load the function address to r11. Try to load address using + the shorter movl instead of movabs. We may want to support + movq for kernel mode, but kernel does not use trampolines at +- the moment. */ +- if (x86_64_zext_immediate_operand (fnaddr, VOIDmode)) ++ the moment. FNADDR is a 32bit address and may not be in ++ DImode when ptr_mode == SImode. Always use movl in this ++ case. */ ++ if (ptr_mode == SImode ++ || x86_64_zext_immediate_operand (fnaddr, VOIDmode)) + { +- fnaddr = copy_to_mode_reg (DImode, fnaddr); ++ fnaddr = copy_to_mode_reg (Pmode, fnaddr); + + mem = adjust_address (m_tramp, HImode, offset); + emit_move_insn (mem, gen_int_mode (0xbb41, HImode)); +@@ -24313,9 +24458,9 @@ ix86_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value) + offset += 10; + } + +- /* Load static chain using movabs to r10. Use the +- shorter movl instead of movabs for x32. */ +- if (TARGET_X32) ++ /* Load static chain using movabs to r10. Use the shorter movl ++ instead of movabs when ptr_mode == SImode. */ ++ if (ptr_mode == SImode) + { + opcode = 0xba41; + size = 6; +@@ -31952,7 +32097,7 @@ x86_this_parameter (tree function) + parm_regs = x86_64_ms_abi_int_parameter_registers; + else + parm_regs = x86_64_int_parameter_registers; +- return gen_rtx_REG (DImode, parm_regs[aggr]); ++ return gen_rtx_REG (Pmode, parm_regs[aggr]); + } + + nregs = ix86_function_regparm (type, function); +--- a/gcc/config/i386/i386.h ++++ b/gcc/config/i386/i386.h +@@ -42,7 +42,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* Redefines for option macros. */ + + #define TARGET_64BIT OPTION_ISA_64BIT +-#define TARGET_X32 OPTION_ISA_X32 + #define TARGET_MMX OPTION_ISA_MMX + #define TARGET_3DNOW OPTION_ISA_3DNOW + #define TARGET_3DNOW_A OPTION_ISA_3DNOW_A +@@ -76,7 +75,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define TARGET_RDRND OPTION_ISA_RDRND + #define TARGET_F16C OPTION_ISA_F16C + +-#define TARGET_LP64 (TARGET_64BIT && !TARGET_X32) ++#define TARGET_LP64 OPTION_ABI_64 ++#define TARGET_X32 OPTION_ABI_X32 + + /* SSE4.1 defines round instructions */ + #define OPTION_MASK_ISA_ROUND OPTION_MASK_ISA_SSE4_1 +@@ -1760,7 +1760,7 @@ do { \ + /* Specify the machine mode that pointers have. + After generation of rtl, the compiler makes no further distinction + between pointers and any other objects of this machine mode. */ +-#define Pmode (TARGET_64BIT ? DImode : SImode) ++#define Pmode (ix86_pmode == PMODE_DI ? DImode : SImode) + + /* A C expression whose value is zero if pointers that need to be extended + from being `POINTER_SIZE' bits wide to `Pmode' are sign-extended and +--- a/gcc/config/i386/i386.md ++++ b/gcc/config/i386/i386.md +@@ -38,6 +38,7 @@ + ;; Z -- likewise, with special suffixes for x87 instructions. + ;; * -- print a star (in certain assembler syntax) + ;; A -- print an absolute memory reference. ++;; E -- print address with DImode register names if TARGET_64BIT. + ;; w -- print the operand as if it's a "word" (HImode) even if it isn't. + ;; s -- print a shift double count, followed by the assemblers argument + ;; delimiter. +@@ -60,7 +61,9 @@ + ;; Y -- print condition for XOP pcom* instruction. + ;; + -- print a branch hint as 'cs' or 'ds' prefix + ;; ; -- print a semicolon (after prefixes due to bug in older gas). ++;; ~ -- print "i" if TARGET_AVX2, "f" otherwise. + ;; @ -- print a segment register of thread base pointer load ++;; ^ -- print addr32 prefix if TARGET_64BIT and Pmode != word_mode + + (define_c_enum "unspec" [ + ;; Relocation specifiers +@@ -109,6 +112,7 @@ + UNSPEC_CALL_NEEDS_VZEROUPPER + UNSPEC_PAUSE + UNSPEC_XBEGIN_ABORT ++ UNSPEC_LEA_ADDR + + ;; For SSE/MMX support: + UNSPEC_FIX_NOTRUNC +@@ -892,6 +896,11 @@ + ;; pointer-sized quantities. Exactly one of the two alternatives will match. + (define_mode_iterator P [(SI "Pmode == SImode") (DI "Pmode == DImode")]) + ++;; This mode iterator allows :W to be used for patterns that operate on ++;; word_mode sized quantities. ++(define_mode_iterator W ++ [(SI "word_mode == SImode") (DI "word_mode == DImode")]) ++ + ;; This mode iterator allows :PTR to be used for patterns that operate on + ;; ptr_mode sized quantities. + (define_mode_iterator PTR +@@ -1700,8 +1709,8 @@ + (set_attr "mode" "SI")]) + + (define_insn "*push2_prologue" +- [(set (match_operand:P 0 "push_operand" "=<") +- (match_operand:P 1 "general_no_elim_operand" "r*m")) ++ [(set (match_operand:W 0 "push_operand" "=<") ++ (match_operand:W 1 "general_no_elim_operand" "r*m")) + (clobber (mem:BLK (scratch)))] + "" + "push{}\t%1" +@@ -1709,16 +1718,16 @@ + (set_attr "mode" "")]) + + (define_insn "*pop1" +- [(set (match_operand:P 0 "nonimmediate_operand" "=r*m") +- (match_operand:P 1 "pop_operand" ">"))] ++ [(set (match_operand:W 0 "nonimmediate_operand" "=r*m") ++ (match_operand:W 1 "pop_operand" ">"))] + "" + "pop{}\t%0" + [(set_attr "type" "pop") + (set_attr "mode" "")]) + + (define_insn "*pop1_epilogue" +- [(set (match_operand:P 0 "nonimmediate_operand" "=r*m") +- (match_operand:P 1 "pop_operand" ">")) ++ [(set (match_operand:W 0 "nonimmediate_operand" "=r*m") ++ (match_operand:W 1 "pop_operand" ">")) + (clobber (mem:BLK (scratch)))] + "" + "pop{}\t%0" +@@ -1958,7 +1967,7 @@ + return "#"; + + case TYPE_LEA: +- return "lea{q}\t{%a1, %0|%0, %a1}"; ++ return "lea{q}\t{%E1, %0|%0, %E1}"; + + default: + gcc_assert (!flag_pic || LEGITIMATE_PIC_OPERAND_P (operands[1])); +@@ -1967,7 +1976,7 @@ + else if (which_alternative == 2) + return "movabs{q}\t{%1, %0|%0, %1}"; + else if (ix86_use_lea_for_mov (insn, operands)) +- return "lea{q}\t{%a1, %0|%0, %a1}"; ++ return "lea{q}\t{%E1, %0|%0, %E1}"; + else + return "mov{q}\t{%1, %0|%0, %1}"; + } +@@ -2199,12 +2208,12 @@ + return "movd\t{%1, %0|%0, %1}"; + + case TYPE_LEA: +- return "lea{l}\t{%a1, %0|%0, %a1}"; ++ return "lea{l}\t{%E1, %0|%0, %E1}"; + + default: + gcc_assert (!flag_pic || LEGITIMATE_PIC_OPERAND_P (operands[1])); + if (ix86_use_lea_for_mov (insn, operands)) +- return "lea{l}\t{%a1, %0|%0, %a1}"; ++ return "lea{l}\t{%E1, %0|%0, %E1}"; + else + return "mov{l}\t{%1, %0|%0, %1}"; + } +@@ -3382,7 +3391,7 @@ + "=r,o,?*Ym,?*y,?*Yi,?*x") + (zero_extend:DI + (match_operand:SI 1 "nonimmediate_operand" +- "rm,0,r ,m ,r ,m")))] ++ "rmWz,0,r ,m ,r ,m")))] + "TARGET_64BIT" + "@ + mov{l}\t{%1, %k0|%k0, %1} +@@ -5437,7 +5446,7 @@ + [(set (match_operand:SI 0 "register_operand" "=r") + (subreg:SI (match_operand:DI 1 "lea_address_operand" "p") 0))] + "TARGET_64BIT" +- "lea{l}\t{%a1, %0|%0, %a1}" ++ "lea{l}\t{%E1, %0|%0, %E1}" + "&& reload_completed && ix86_avoid_lea_for_addr (insn, operands)" + [(const_int 0)] + { +@@ -5451,7 +5460,7 @@ + [(set (match_operand:SWI48 0 "register_operand" "=r") + (match_operand:SWI48 1 "lea_address_operand" "p"))] + "" +- "lea{}\t{%a1, %0|%0, %a1}" ++ "lea{}\t{%E1, %0|%0, %E1}" + "reload_completed && ix86_avoid_lea_for_addr (insn, operands)" + [(const_int 0)] + { +@@ -5466,7 +5475,7 @@ + (zero_extend:DI + (subreg:SI (match_operand:DI 1 "lea_address_operand" "j") 0)))] + "TARGET_64BIT" +- "lea{l}\t{%a1, %k0|%k0, %a1}" ++ "lea{l}\t{%E1, %k0|%k0, %E1}" + [(set_attr "type" "lea") + (set_attr "mode" "SI")]) + +@@ -5475,7 +5484,7 @@ + (zero_extend:DI + (match_operand:SI 1 "lea_address_operand" "j")))] + "TARGET_64BIT" +- "lea{l}\t{%a1, %k0|%k0, %a1}" ++ "lea{l}\t{%E1, %k0|%k0, %E1}" + [(set_attr "type" "lea") + (set_attr "mode" "SI")]) + +@@ -5485,7 +5494,7 @@ + (subreg:DI (match_operand:SI 1 "lea_address_operand" "p") 0) + (match_operand:DI 2 "const_32bit_mask" "n")))] + "TARGET_64BIT" +- "lea{l}\t{%a1, %k0|%k0, %a1}" ++ "lea{l}\t{%E1, %k0|%k0, %E1}" + [(set_attr "type" "lea") + (set_attr "mode" "SI")]) + +@@ -5495,7 +5504,7 @@ + (match_operand:DI 1 "lea_address_operand" "p") + (match_operand:DI 2 "const_32bit_mask" "n")))] + "TARGET_64BIT" +- "lea{l}\t{%a1, %k0|%k0, %a1}" ++ "lea{l}\t{%E1, %k0|%k0, %E1}" + [(set_attr "type" "lea") + (set_attr "mode" "SI")]) + +@@ -11130,10 +11139,15 @@ + (set_attr "modrm" "0")]) + + (define_expand "indirect_jump" +- [(set (pc) (match_operand 0 "indirect_branch_operand" ""))]) ++ [(set (pc) (match_operand 0 "indirect_branch_operand" ""))] ++ "" ++{ ++ if (TARGET_X32) ++ operands[0] = convert_memory_address (word_mode, operands[0]); ++}) + + (define_insn "*indirect_jump" +- [(set (pc) (match_operand:P 0 "indirect_branch_operand" "rw"))] ++ [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rw"))] + "" + "jmp\t%A0" + [(set_attr "type" "ibr") +@@ -11175,12 +11189,13 @@ + operands[0] = expand_simple_binop (Pmode, code, op0, op1, NULL_RTX, 0, + OPTAB_DIRECT); + } +- else if (TARGET_X32) +- operands[0] = convert_memory_address (Pmode, operands[0]); ++ ++ if (TARGET_X32) ++ operands[0] = convert_memory_address (word_mode, operands[0]); + }) + + (define_insn "*tablejump_1" +- [(set (pc) (match_operand:P 0 "indirect_branch_operand" "rw")) ++ [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rw")) + (use (label_ref (match_operand 1 "" "")))] + "" + "jmp\t%A0" +@@ -11268,7 +11283,7 @@ + }) + + (define_insn_and_split "*call_vzeroupper" +- [(call (mem:QI (match_operand:P 0 "call_insn_operand" "zw")) ++ [(call (mem:QI (match_operand:W 0 "call_insn_operand" "zw")) + (match_operand 1 "" "")) + (unspec [(match_operand 2 "const_int_operand" "")] + UNSPEC_CALL_NEEDS_VZEROUPPER)] +@@ -11280,7 +11295,7 @@ + [(set_attr "type" "call")]) + + (define_insn "*call" +- [(call (mem:QI (match_operand:P 0 "call_insn_operand" "zw")) ++ [(call (mem:QI (match_operand:W 0 "call_insn_operand" "zw")) + (match_operand 1 "" ""))] + "!SIBLING_CALL_P (insn)" + "* return ix86_output_call_insn (insn, operands[0]);" +@@ -11332,7 +11347,7 @@ + [(set_attr "type" "call")]) + + (define_insn_and_split "*sibcall_vzeroupper" +- [(call (mem:QI (match_operand:P 0 "sibcall_insn_operand" "Uz")) ++ [(call (mem:QI (match_operand:W 0 "sibcall_insn_operand" "Uz")) + (match_operand 1 "" "")) + (unspec [(match_operand 2 "const_int_operand" "")] + UNSPEC_CALL_NEEDS_VZEROUPPER)] +@@ -11344,7 +11359,7 @@ + [(set_attr "type" "call")]) + + (define_insn "*sibcall" +- [(call (mem:QI (match_operand:P 0 "sibcall_insn_operand" "Uz")) ++ [(call (mem:QI (match_operand:W 0 "sibcall_insn_operand" "Uz")) + (match_operand 1 "" ""))] + "SIBLING_CALL_P (insn)" + "* return ix86_output_call_insn (insn, operands[0]);" +@@ -11441,7 +11456,7 @@ + + (define_insn_and_split "*call_value_vzeroupper" + [(set (match_operand 0 "" "") +- (call (mem:QI (match_operand:P 1 "call_insn_operand" "zw")) ++ (call (mem:QI (match_operand:W 1 "call_insn_operand" "zw")) + (match_operand 2 "" ""))) + (unspec [(match_operand 3 "const_int_operand" "")] + UNSPEC_CALL_NEEDS_VZEROUPPER)] +@@ -11454,7 +11469,7 @@ + + (define_insn "*call_value" + [(set (match_operand 0 "" "") +- (call (mem:QI (match_operand:P 1 "call_insn_operand" "zw")) ++ (call (mem:QI (match_operand:W 1 "call_insn_operand" "zw")) + (match_operand 2 "" "")))] + "!SIBLING_CALL_P (insn)" + "* return ix86_output_call_insn (insn, operands[1]);" +@@ -11462,7 +11477,7 @@ + + (define_insn_and_split "*sibcall_value_vzeroupper" + [(set (match_operand 0 "" "") +- (call (mem:QI (match_operand:P 1 "sibcall_insn_operand" "Uz")) ++ (call (mem:QI (match_operand:W 1 "sibcall_insn_operand" "Uz")) + (match_operand 2 "" ""))) + (unspec [(match_operand 3 "const_int_operand" "")] + UNSPEC_CALL_NEEDS_VZEROUPPER)] +@@ -11475,7 +11490,7 @@ + + (define_insn "*sibcall_value" + [(set (match_operand 0 "" "") +- (call (mem:QI (match_operand:P 1 "sibcall_insn_operand" "Uz")) ++ (call (mem:QI (match_operand:W 1 "sibcall_insn_operand" "Uz")) + (match_operand 2 "" "")))] + "SIBLING_CALL_P (insn)" + "* return ix86_output_call_insn (insn, operands[1]);" +@@ -12580,7 +12595,7 @@ + [(set (match_operand:SI 0 "register_operand" "=a") + (unspec:SI + [(match_operand:SI 1 "register_operand" "b") +- (match_operand:SI 2 "tls_symbolic_operand" "") ++ (match_operand 2 "tls_symbolic_operand" "") + (match_operand:SI 3 "constant_call_address_operand" "z")] + UNSPEC_TLS_GD)) + (clobber (match_scratch:SI 4 "=d")) +@@ -12589,7 +12604,7 @@ + "!TARGET_64BIT && TARGET_GNU_TLS" + { + output_asm_insn +- ("lea{l}\t{%a2@tlsgd(,%1,1), %0|%0, %a2@tlsgd[%1*1]}", operands); ++ ("lea{l}\t{%E2@tlsgd(,%1,1), %0|%0, %E2@tlsgd[%1*1]}", operands); + if (TARGET_SUN_TLS) + #ifdef HAVE_AS_IX86_TLSGDPLT + return "call\t%a2@tlsgdplt"; +@@ -12605,26 +12620,26 @@ + [(parallel + [(set (match_operand:SI 0 "register_operand" "") + (unspec:SI [(match_operand:SI 2 "register_operand" "") +- (match_operand:SI 1 "tls_symbolic_operand" "") ++ (match_operand 1 "tls_symbolic_operand" "") + (match_operand:SI 3 "constant_call_address_operand" "")] + UNSPEC_TLS_GD)) + (clobber (match_scratch:SI 4 "")) + (clobber (match_scratch:SI 5 "")) + (clobber (reg:CC FLAGS_REG))])]) + +-(define_insn "*tls_global_dynamic_64" +- [(set (match_operand:DI 0 "register_operand" "=a") +- (call:DI +- (mem:QI (match_operand:DI 2 "constant_call_address_operand" "z")) +- (match_operand:DI 3 "" ""))) +- (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")] +- UNSPEC_TLS_GD)] ++(define_insn "*tls_global_dynamic_64_" ++ [(set (match_operand:P 0 "register_operand" "=a") ++ (call:P ++ (mem:QI (match_operand:P 2 "constant_call_address_operand" "z")) ++ (match_operand:P 3 "" ""))) ++ (unspec:P [(match_operand 1 "tls_symbolic_operand" "")] ++ UNSPEC_TLS_GD)] + "TARGET_64BIT" + { + if (!TARGET_X32) + fputs (ASM_BYTE "0x66\n", asm_out_file); + output_asm_insn +- ("lea{q}\t{%a1@tlsgd(%%rip), %%rdi|rdi, %a1@tlsgd[rip]}", operands); ++ ("lea{q}\t{%E1@tlsgd(%%rip), %%rdi|rdi, %E1@tlsgd[rip]}", operands); + fputs (ASM_SHORT "0x6666\n", asm_out_file); + fputs ("\trex64\n", asm_out_file); + if (TARGET_SUN_TLS) +@@ -12635,14 +12650,15 @@ + (set (attr "length") + (symbol_ref "TARGET_X32 ? 15 : 16"))]) + +-(define_expand "tls_global_dynamic_64" ++(define_expand "tls_global_dynamic_64_" + [(parallel +- [(set (match_operand:DI 0 "register_operand" "") +- (call:DI +- (mem:QI (match_operand:DI 2 "constant_call_address_operand" "")) ++ [(set (match_operand:P 0 "register_operand" "") ++ (call:P ++ (mem:QI (match_operand:P 2 "constant_call_address_operand" "")) + (const_int 0))) +- (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")] +- UNSPEC_TLS_GD)])]) ++ (unspec:P [(match_operand 1 "tls_symbolic_operand" "")] ++ UNSPEC_TLS_GD)])] ++ "TARGET_64BIT") + + (define_insn "*tls_local_dynamic_base_32_gnu" + [(set (match_operand:SI 0 "register_operand" "=a") +@@ -12679,12 +12695,12 @@ + (clobber (match_scratch:SI 4 "")) + (clobber (reg:CC FLAGS_REG))])]) + +-(define_insn "*tls_local_dynamic_base_64" +- [(set (match_operand:DI 0 "register_operand" "=a") +- (call:DI +- (mem:QI (match_operand:DI 1 "constant_call_address_operand" "z")) +- (match_operand:DI 2 "" ""))) +- (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)] ++(define_insn "*tls_local_dynamic_base_64_" ++ [(set (match_operand:P 0 "register_operand" "=a") ++ (call:P ++ (mem:QI (match_operand:P 1 "constant_call_address_operand" "z")) ++ (match_operand:P 2 "" ""))) ++ (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)] + "TARGET_64BIT" + { + output_asm_insn +@@ -12696,13 +12712,14 @@ + [(set_attr "type" "multi") + (set_attr "length" "12")]) + +-(define_expand "tls_local_dynamic_base_64" ++(define_expand "tls_local_dynamic_base_64_" + [(parallel +- [(set (match_operand:DI 0 "register_operand" "") +- (call:DI +- (mem:QI (match_operand:DI 1 "constant_call_address_operand" "")) ++ [(set (match_operand:P 0 "register_operand" "") ++ (call:P ++ (mem:QI (match_operand:P 1 "constant_call_address_operand" "")) + (const_int 0))) +- (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)])]) ++ (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)])] ++ "TARGET_64BIT") + + ;; Local dynamic of a single variable is a lose. Show combine how + ;; to convert that back to global dynamic. +@@ -12714,7 +12731,7 @@ + (match_operand:SI 2 "constant_call_address_operand" "z")] + UNSPEC_TLS_LD_BASE) + (const:SI (unspec:SI +- [(match_operand:SI 3 "tls_symbolic_operand" "")] ++ [(match_operand 3 "tls_symbolic_operand" "")] + UNSPEC_DTPOFF)))) + (clobber (match_scratch:SI 4 "=d")) + (clobber (match_scratch:SI 5 "=c")) +@@ -12812,7 +12829,7 @@ + (define_insn "tls_initial_exec_64_sun" + [(set (match_operand:DI 0 "register_operand" "=a") + (unspec:DI +- [(match_operand:DI 1 "tls_symbolic_operand" "")] ++ [(match_operand 1 "tls_symbolic_operand" "")] + UNSPEC_TLS_IE_SUN)) + (clobber (reg:CC FLAGS_REG))] + "TARGET_64BIT && TARGET_SUN_TLS" +@@ -12829,7 +12846,7 @@ + [(set (match_dup 3) + (plus:SI (match_operand:SI 2 "register_operand" "") + (const:SI +- (unspec:SI [(match_operand:SI 1 "tls_symbolic_operand" "")] ++ (unspec:SI [(match_operand 1 "tls_symbolic_operand" "")] + UNSPEC_TLSDESC)))) + (parallel + [(set (match_operand:SI 0 "register_operand" "") +@@ -12847,10 +12864,10 @@ + [(set (match_operand:SI 0 "register_operand" "=r") + (plus:SI (match_operand:SI 1 "register_operand" "b") + (const:SI +- (unspec:SI [(match_operand:SI 2 "tls_symbolic_operand" "")] ++ (unspec:SI [(match_operand 2 "tls_symbolic_operand" "")] + UNSPEC_TLSDESC))))] + "!TARGET_64BIT && TARGET_GNU2_TLS" +- "lea{l}\t{%a2@TLSDESC(%1), %0|%0, %a2@TLSDESC[%1]}" ++ "lea{l}\t{%E2@TLSDESC(%1), %0|%0, %E2@TLSDESC[%1]}" + [(set_attr "type" "lea") + (set_attr "mode" "SI") + (set_attr "length" "6") +@@ -12858,7 +12875,7 @@ + + (define_insn "*tls_dynamic_gnu2_call_32" + [(set (match_operand:SI 0 "register_operand" "=a") +- (unspec:SI [(match_operand:SI 1 "tls_symbolic_operand" "") ++ (unspec:SI [(match_operand 1 "tls_symbolic_operand" "") + (match_operand:SI 2 "register_operand" "0") + ;; we have to make sure %ebx still points to the GOT + (match_operand:SI 3 "register_operand" "b") +@@ -12874,13 +12891,13 @@ + (define_insn_and_split "*tls_dynamic_gnu2_combine_32" + [(set (match_operand:SI 0 "register_operand" "=&a") + (plus:SI +- (unspec:SI [(match_operand:SI 3 "tls_modbase_operand" "") ++ (unspec:SI [(match_operand 3 "tls_modbase_operand" "") + (match_operand:SI 4 "" "") + (match_operand:SI 2 "register_operand" "b") + (reg:SI SP_REG)] + UNSPEC_TLSDESC) + (const:SI (unspec:SI +- [(match_operand:SI 1 "tls_symbolic_operand" "")] ++ [(match_operand 1 "tls_symbolic_operand" "")] + UNSPEC_DTPOFF)))) + (clobber (reg:CC FLAGS_REG))] + "!TARGET_64BIT && TARGET_GNU2_TLS" +@@ -12912,7 +12929,7 @@ + (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")] + UNSPEC_TLSDESC))] + "TARGET_64BIT && TARGET_GNU2_TLS" +- "lea{q}\t{%a1@TLSDESC(%%rip), %0|%0, %a1@TLSDESC[rip]}" ++ "lea{q}\t{%E1@TLSDESC(%%rip), %0|%0, %E1@TLSDESC[rip]}" + [(set_attr "type" "lea") + (set_attr "mode" "DI") + (set_attr "length" "7") +@@ -12934,7 +12951,7 @@ + (define_insn_and_split "*tls_dynamic_gnu2_combine_64" + [(set (match_operand:DI 0 "register_operand" "=&a") + (plus:DI +- (unspec:DI [(match_operand:DI 2 "tls_modbase_operand" "") ++ (unspec:DI [(match_operand 2 "tls_modbase_operand" "") + (match_operand:DI 3 "" "") + (reg:DI SP_REG)] + UNSPEC_TLSDESC) +@@ -15733,17 +15750,17 @@ + "ix86_current_function_needs_cld = 1;") + + (define_insn "*strmovdi_rex_1" +- [(set (mem:DI (match_operand:DI 2 "register_operand" "0")) +- (mem:DI (match_operand:DI 3 "register_operand" "1"))) +- (set (match_operand:DI 0 "register_operand" "=D") +- (plus:DI (match_dup 2) +- (const_int 8))) +- (set (match_operand:DI 1 "register_operand" "=S") +- (plus:DI (match_dup 3) +- (const_int 8)))] ++ [(set (mem:DI (match_operand:P 2 "register_operand" "0")) ++ (mem:DI (match_operand:P 3 "register_operand" "1"))) ++ (set (match_operand:P 0 "register_operand" "=D") ++ (plus:P (match_dup 2) ++ (const_int 8))) ++ (set (match_operand:P 1 "register_operand" "=S") ++ (plus:P (match_dup 3) ++ (const_int 8)))] + "TARGET_64BIT + && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "movsq" ++ "%^movsq" + [(set_attr "type" "str") + (set_attr "memory" "both") + (set_attr "mode" "DI")]) +@@ -15758,7 +15775,7 @@ + (plus:P (match_dup 3) + (const_int 4)))] + "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "movs{l|d}" ++ "%^movs{l|d}" + [(set_attr "type" "str") + (set_attr "memory" "both") + (set_attr "mode" "SI")]) +@@ -15773,7 +15790,7 @@ + (plus:P (match_dup 3) + (const_int 2)))] + "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "movsw" ++ "%^movsw" + [(set_attr "type" "str") + (set_attr "memory" "both") + (set_attr "mode" "HI")]) +@@ -15788,7 +15805,7 @@ + (plus:P (match_dup 3) + (const_int 1)))] + "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "movsb" ++ "%^movsb" + [(set_attr "type" "str") + (set_attr "memory" "both") + (set (attr "prefix_rex") +@@ -15811,20 +15828,20 @@ + "ix86_current_function_needs_cld = 1;") + + (define_insn "*rep_movdi_rex64" +- [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0)) +- (set (match_operand:DI 0 "register_operand" "=D") +- (plus:DI (ashift:DI (match_operand:DI 5 "register_operand" "2") +- (const_int 3)) +- (match_operand:DI 3 "register_operand" "0"))) +- (set (match_operand:DI 1 "register_operand" "=S") +- (plus:DI (ashift:DI (match_dup 5) (const_int 3)) +- (match_operand:DI 4 "register_operand" "1"))) ++ [(set (match_operand:P 2 "register_operand" "=c") (const_int 0)) ++ (set (match_operand:P 0 "register_operand" "=D") ++ (plus:P (ashift:P (match_operand:P 5 "register_operand" "2") ++ (const_int 3)) ++ (match_operand:P 3 "register_operand" "0"))) ++ (set (match_operand:P 1 "register_operand" "=S") ++ (plus:P (ashift:P (match_dup 5) (const_int 3)) ++ (match_operand:P 4 "register_operand" "1"))) + (set (mem:BLK (match_dup 3)) + (mem:BLK (match_dup 4))) + (use (match_dup 5))] + "TARGET_64BIT + && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "rep{%;} movsq" ++ "%^rep{%;} movsq" + [(set_attr "type" "str") + (set_attr "prefix_rep" "1") + (set_attr "memory" "both") +@@ -15843,7 +15860,7 @@ + (mem:BLK (match_dup 4))) + (use (match_dup 5))] + "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "rep{%;} movs{l|d}" ++ "%^rep{%;} movs{l|d}" + [(set_attr "type" "str") + (set_attr "prefix_rep" "1") + (set_attr "memory" "both") +@@ -15860,7 +15877,7 @@ + (mem:BLK (match_dup 4))) + (use (match_dup 5))] + "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "rep{%;} movsb" ++ "%^rep{%;} movsb" + [(set_attr "type" "str") + (set_attr "prefix_rep" "1") + (set_attr "memory" "both") +@@ -15921,14 +15938,14 @@ + "ix86_current_function_needs_cld = 1;") + + (define_insn "*strsetdi_rex_1" +- [(set (mem:DI (match_operand:DI 1 "register_operand" "0")) ++ [(set (mem:DI (match_operand:P 1 "register_operand" "0")) + (match_operand:DI 2 "register_operand" "a")) +- (set (match_operand:DI 0 "register_operand" "=D") +- (plus:DI (match_dup 1) +- (const_int 8)))] ++ (set (match_operand:P 0 "register_operand" "=D") ++ (plus:P (match_dup 1) ++ (const_int 8)))] + "TARGET_64BIT + && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])" +- "stosq" ++ "%^stosq" + [(set_attr "type" "str") + (set_attr "memory" "store") + (set_attr "mode" "DI")]) +@@ -15940,7 +15957,7 @@ + (plus:P (match_dup 1) + (const_int 4)))] + "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])" +- "stos{l|d}" ++ "%^stos{l|d}" + [(set_attr "type" "str") + (set_attr "memory" "store") + (set_attr "mode" "SI")]) +@@ -15952,7 +15969,7 @@ + (plus:P (match_dup 1) + (const_int 2)))] + "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])" +- "stosw" ++ "%^stosw" + [(set_attr "type" "str") + (set_attr "memory" "store") + (set_attr "mode" "HI")]) +@@ -15964,7 +15981,7 @@ + (plus:P (match_dup 1) + (const_int 1)))] + "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])" +- "stosb" ++ "%^stosb" + [(set_attr "type" "str") + (set_attr "memory" "store") + (set (attr "prefix_rex") +@@ -15985,18 +16002,18 @@ + "ix86_current_function_needs_cld = 1;") + + (define_insn "*rep_stosdi_rex64" +- [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0)) +- (set (match_operand:DI 0 "register_operand" "=D") +- (plus:DI (ashift:DI (match_operand:DI 4 "register_operand" "1") +- (const_int 3)) +- (match_operand:DI 3 "register_operand" "0"))) ++ [(set (match_operand:P 1 "register_operand" "=c") (const_int 0)) ++ (set (match_operand:P 0 "register_operand" "=D") ++ (plus:P (ashift:P (match_operand:P 4 "register_operand" "1") ++ (const_int 3)) ++ (match_operand:P 3 "register_operand" "0"))) + (set (mem:BLK (match_dup 3)) + (const_int 0)) + (use (match_operand:DI 2 "register_operand" "a")) + (use (match_dup 4))] + "TARGET_64BIT + && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])" +- "rep{%;} stosq" ++ "%^rep{%;} stosq" + [(set_attr "type" "str") + (set_attr "prefix_rep" "1") + (set_attr "memory" "store") +@@ -16013,7 +16030,7 @@ + (use (match_operand:SI 2 "register_operand" "a")) + (use (match_dup 4))] + "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])" +- "rep{%;} stos{l|d}" ++ "%^rep{%;} stos{l|d}" + [(set_attr "type" "str") + (set_attr "prefix_rep" "1") + (set_attr "memory" "store") +@@ -16029,7 +16046,7 @@ + (use (match_operand:QI 2 "register_operand" "a")) + (use (match_dup 4))] + "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])" +- "rep{%;} stosb" ++ "%^rep{%;} stosb" + [(set_attr "type" "str") + (set_attr "prefix_rep" "1") + (set_attr "memory" "store") +@@ -16150,7 +16167,7 @@ + (clobber (match_operand:P 1 "register_operand" "=D")) + (clobber (match_operand:P 2 "register_operand" "=c"))] + "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "repz{%;} cmpsb" ++ "%^repz{%;} cmpsb" + [(set_attr "type" "str") + (set_attr "mode" "QI") + (set (attr "prefix_rex") +@@ -16190,7 +16207,7 @@ + (clobber (match_operand:P 1 "register_operand" "=D")) + (clobber (match_operand:P 2 "register_operand" "=c"))] + "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])" +- "repz{%;} cmpsb" ++ "%^repz{%;} cmpsb" + [(set_attr "type" "str") + (set_attr "mode" "QI") + (set (attr "prefix_rex") +@@ -16231,7 +16248,7 @@ + (clobber (match_operand:P 1 "register_operand" "=D")) + (clobber (reg:CC FLAGS_REG))] + "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])" +- "repnz{%;} scasb" ++ "%^repnz{%;} scasb" + [(set_attr "type" "str") + (set_attr "mode" "QI") + (set (attr "prefix_rex") +@@ -16663,7 +16680,7 @@ + + default: + operands[2] = SET_SRC (XVECEXP (PATTERN (insn), 0, 0)); +- return "lea{}\t{%a2, %0|%0, %a2}"; ++ return "lea{}\t{%E2, %0|%0, %E2}"; + } + } + [(set (attr "type") +@@ -17391,131 +17408,131 @@ + ;; alternative when no register is available later. + + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG)) + (clobber (mem:BLK (scratch)))])] + "(TARGET_SINGLE_PUSH || optimize_insn_for_size_p ()) +- && INTVAL (operands[0]) == -GET_MODE_SIZE (Pmode)" ++ && INTVAL (operands[0]) == -GET_MODE_SIZE (word_mode)" + [(clobber (match_dup 1)) +- (parallel [(set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1)) ++ (parallel [(set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) + (clobber (mem:BLK (scratch)))])]) + + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG)) + (clobber (mem:BLK (scratch)))])] + "(TARGET_DOUBLE_PUSH || optimize_insn_for_size_p ()) +- && INTVAL (operands[0]) == -2*GET_MODE_SIZE (Pmode)" ++ && INTVAL (operands[0]) == -2*GET_MODE_SIZE (word_mode)" + [(clobber (match_dup 1)) +- (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1)) +- (parallel [(set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1)) ++ (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) ++ (parallel [(set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) + (clobber (mem:BLK (scratch)))])]) + + ;; Convert esp subtractions to push. + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG))])] + "(TARGET_SINGLE_PUSH || optimize_insn_for_size_p ()) +- && INTVAL (operands[0]) == -GET_MODE_SIZE (Pmode)" ++ && INTVAL (operands[0]) == -GET_MODE_SIZE (word_mode)" + [(clobber (match_dup 1)) +- (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))]) ++ (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))]) + + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG))])] + "(TARGET_DOUBLE_PUSH || optimize_insn_for_size_p ()) +- && INTVAL (operands[0]) == -2*GET_MODE_SIZE (Pmode)" ++ && INTVAL (operands[0]) == -2*GET_MODE_SIZE (word_mode)" + [(clobber (match_dup 1)) +- (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1)) +- (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))]) ++ (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) ++ (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))]) + + ;; Convert epilogue deallocator to pop. + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG)) + (clobber (mem:BLK (scratch)))])] + "(TARGET_SINGLE_POP || optimize_insn_for_size_p ()) +- && INTVAL (operands[0]) == GET_MODE_SIZE (Pmode)" +- [(parallel [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG)))) ++ && INTVAL (operands[0]) == GET_MODE_SIZE (word_mode)" ++ [(parallel [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG)))) + (clobber (mem:BLK (scratch)))])]) + + ;; Two pops case is tricky, since pop causes dependency + ;; on destination register. We use two registers if available. + (define_peephole2 +- [(match_scratch:P 1 "r") +- (match_scratch:P 2 "r") ++ [(match_scratch:W 1 "r") ++ (match_scratch:W 2 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG)) + (clobber (mem:BLK (scratch)))])] + "(TARGET_DOUBLE_POP || optimize_insn_for_size_p ()) +- && INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)" +- [(parallel [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG)))) ++ && INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)" ++ [(parallel [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG)))) + (clobber (mem:BLK (scratch)))]) +- (set (match_dup 2) (mem:P (post_inc:P (reg:P SP_REG))))]) ++ (set (match_dup 2) (mem:W (post_inc:P (reg:P SP_REG))))]) + + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG)) + (clobber (mem:BLK (scratch)))])] + "optimize_insn_for_size_p () +- && INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)" +- [(parallel [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG)))) ++ && INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)" ++ [(parallel [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG)))) + (clobber (mem:BLK (scratch)))]) +- (set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))]) ++ (set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))]) + + ;; Convert esp additions to pop. + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG))])] +- "INTVAL (operands[0]) == GET_MODE_SIZE (Pmode)" +- [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))]) ++ "INTVAL (operands[0]) == GET_MODE_SIZE (word_mode)" ++ [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))]) + + ;; Two pops case is tricky, since pop causes dependency + ;; on destination register. We use two registers if available. + (define_peephole2 +- [(match_scratch:P 1 "r") +- (match_scratch:P 2 "r") ++ [(match_scratch:W 1 "r") ++ (match_scratch:W 2 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG))])] +- "INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)" +- [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG)))) +- (set (match_dup 2) (mem:P (post_inc:P (reg:P SP_REG))))]) ++ "INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)" ++ [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG)))) ++ (set (match_dup 2) (mem:W (post_inc:P (reg:P SP_REG))))]) + + (define_peephole2 +- [(match_scratch:P 1 "r") ++ [(match_scratch:W 1 "r") + (parallel [(set (reg:P SP_REG) + (plus:P (reg:P SP_REG) + (match_operand:P 0 "const_int_operand" ""))) + (clobber (reg:CC FLAGS_REG))])] + "optimize_insn_for_size_p () +- && INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)" +- [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG)))) +- (set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))]) ++ && INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)" ++ [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG)))) ++ (set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))]) + + ;; Convert compares with 1 to shorter inc/dec operations when CF is not + ;; required and register dies. Similarly for 128 to -128. +@@ -17626,7 +17643,7 @@ + ;; leal (%edx,%eax,4), %eax + + (define_peephole2 +- [(match_scratch:P 5 "r") ++ [(match_scratch:W 5 "r") + (parallel [(set (match_operand 0 "register_operand" "") + (ashift (match_operand 1 "register_operand" "") + (match_operand 2 "const_int_operand" ""))) +@@ -17652,16 +17669,16 @@ + enum machine_mode op1mode = GET_MODE (operands[1]); + enum machine_mode mode = op1mode == DImode ? DImode : SImode; + int scale = 1 << INTVAL (operands[2]); +- rtx index = gen_lowpart (Pmode, operands[1]); +- rtx base = gen_lowpart (Pmode, operands[5]); ++ rtx index = gen_lowpart (word_mode, operands[1]); ++ rtx base = gen_lowpart (word_mode, operands[5]); + rtx dest = gen_lowpart (mode, operands[3]); + +- operands[1] = gen_rtx_PLUS (Pmode, base, +- gen_rtx_MULT (Pmode, index, GEN_INT (scale))); ++ operands[1] = gen_rtx_PLUS (word_mode, base, ++ gen_rtx_MULT (word_mode, index, GEN_INT (scale))); + operands[5] = base; +- if (mode != Pmode) ++ if (mode != word_mode) + operands[1] = gen_rtx_SUBREG (mode, operands[1], 0); +- if (op1mode != Pmode) ++ if (op1mode != word_mode) + operands[5] = gen_rtx_SUBREG (op1mode, operands[5], 0); + operands[0] = dest; + }) +@@ -18052,7 +18069,7 @@ + { + rtx (*insn)(rtx); + +- insn = (TARGET_64BIT ++ insn = (Pmode == DImode + ? gen_lwp_slwpcbdi + : gen_lwp_slwpcbsi); + +--- a/gcc/config/i386/i386.opt ++++ b/gcc/config/i386/i386.opt +@@ -159,6 +159,20 @@ Enum(cmodel) String(32) Value(CM_32) + EnumValue + Enum(cmodel) String(kernel) Value(CM_KERNEL) + ++maddress-mode= ++Target RejectNegative Joined Enum(pmode) Var(ix86_pmode) Init(PMODE_SI) ++Use given address mode ++ ++Enum ++Name(pmode) Type(enum pmode) ++Known address mode (for use with the -maddress-mode= option): ++ ++EnumValue ++Enum(pmode) String(short) Value(PMODE_SI) ++ ++EnumValue ++Enum(pmode) String(long) Value(PMODE_DI) ++ + mcpu= + Target RejectNegative Joined Undocumented Alias(mtune=) Warn(%<-mcpu=%> is deprecated; use %<-mtune=%> or %<-march=%> instead) + +@@ -204,7 +218,7 @@ EnumValue + Enum(fpmath_unit) String(both) Value({(enum fpmath_unit) (FPMATH_SSE | FPMATH_387)}) + + mhard-float +-Target RejectNegative Mask(80387) MaskExists Save ++Target RejectNegative Mask(80387) Save + Use hardware fp + + mieee-fp +@@ -411,11 +425,11 @@ Target RejectNegative Negative(m64) Report InverseMask(ISA_64BIT) Var(ix86_isa_f + Generate 32bit i386 code + + m64 +-Target RejectNegative Negative(mx32) Report Mask(ISA_64BIT) Var(ix86_isa_flags) Save ++Target RejectNegative Negative(mx32) Report Mask(ABI_64) Var(ix86_isa_flags) Save + Generate 64bit x86-64 code + + mx32 +-Target RejectNegative Negative(m32) Report Mask(ISA_X32) Var(ix86_isa_flags) Save ++Target RejectNegative Negative(m32) Report Mask(ABI_X32) Var(ix86_isa_flags) Save + Generate 32bit x86-64 code + + mmmx +@@ -455,11 +469,11 @@ Target Report Mask(ISA_SSE4_2) Var(ix86_isa_flags) Save + Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1 and SSE4.2 built-in functions and code generation + + msse4 +-Target RejectNegative Report Mask(ISA_SSE4_2) MaskExists Var(ix86_isa_flags) Save ++Target RejectNegative Report Mask(ISA_SSE4_2) Var(ix86_isa_flags) Save + Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1 and SSE4.2 built-in functions and code generation + + mno-sse4 +-Target RejectNegative Report InverseMask(ISA_SSE4_1) MaskExists Var(ix86_isa_flags) Save ++Target RejectNegative Report InverseMask(ISA_SSE4_1) Var(ix86_isa_flags) Save + Do not support SSE4.1 and SSE4.2 built-in functions and code generation + + msse5 +--- a/gcc/config/i386/predicates.md ++++ b/gcc/config/i386/predicates.md +@@ -1,5 +1,5 @@ + ;; Predicate definitions for IA-32 and x86-64. +-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ++;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + ;; Free Software Foundation, Inc. + ;; + ;; This file is part of GCC. +@@ -341,6 +341,16 @@ + (match_operand 0 "general_operand"))) + + ;; Return true if OP is general operand representable on x86_64 ++;; as zero extended constant. This predicate is used in zero-extending ++;; conversion operations that require non-VOIDmode immediate operands. ++(define_predicate "x86_64_zext_general_operand" ++ (if_then_else (match_test "TARGET_64BIT") ++ (ior (match_operand 0 "nonimmediate_operand") ++ (and (match_operand 0 "x86_64_zext_immediate_operand") ++ (match_test "GET_MODE (op) != VOIDmode"))) ++ (match_operand 0 "general_operand"))) ++ ++;; Return true if OP is general operand representable on x86_64 + ;; as either sign extended or zero extended constant. + (define_predicate "x86_64_szext_general_operand" + (if_then_else (match_test "TARGET_64BIT") +@@ -483,11 +493,11 @@ + (match_operand 0 "local_symbolic_operand"))) + + ;; Test for various thread-local symbols. +-(define_predicate "tls_symbolic_operand" ++(define_special_predicate "tls_symbolic_operand" + (and (match_code "symbol_ref") + (match_test "SYMBOL_REF_TLS_MODEL (op)"))) + +-(define_predicate "tls_modbase_operand" ++(define_special_predicate "tls_modbase_operand" + (and (match_code "symbol_ref") + (match_test "op == ix86_tls_module_base ()"))) + +@@ -558,20 +568,23 @@ + + ;; Test for a valid operand for indirect branch. + (define_predicate "indirect_branch_operand" +- (if_then_else (match_test "TARGET_X32") +- (match_operand 0 "register_operand") +- (match_operand 0 "nonimmediate_operand"))) ++ (ior (match_operand 0 "register_operand") ++ (and (not (match_test "TARGET_X32")) ++ (match_operand 0 "memory_operand")))) + + ;; Test for a valid operand for a call instruction. +-(define_predicate "call_insn_operand" +- (ior (match_operand 0 "constant_call_address_operand") ++;; Allow constant call address operands in Pmode only. ++(define_special_predicate "call_insn_operand" ++ (ior (match_test "constant_call_address_operand ++ (op, mode == VOIDmode ? mode : Pmode)") + (match_operand 0 "call_register_no_elim_operand") + (and (not (match_test "TARGET_X32")) + (match_operand 0 "memory_operand")))) + + ;; Similarly, but for tail calls, in which we cannot allow memory references. +-(define_predicate "sibcall_insn_operand" +- (ior (match_operand 0 "constant_call_address_operand") ++(define_special_predicate "sibcall_insn_operand" ++ (ior (match_test "constant_call_address_operand ++ (op, mode == VOIDmode ? mode : Pmode)") + (match_operand 0 "register_no_elim_operand"))) + + ;; Match exactly zero. +--- a/gcc/config/i386/sse.md ++++ b/gcc/config/i386/sse.md +@@ -8126,8 +8126,8 @@ + "monitor\t%0, %1, %2" + [(set_attr "length" "3")]) + +-(define_insn "sse3_monitor64" +- [(unspec_volatile [(match_operand:DI 0 "register_operand" "a") ++(define_insn "sse3_monitor64_" ++ [(unspec_volatile [(match_operand:P 0 "register_operand" "a") + (match_operand:SI 1 "register_operand" "c") + (match_operand:SI 2 "register_operand" "d")] + UNSPECV_MONITOR)] +--- a/gcc/config/m68k/m68k.opt ++++ b/gcc/config/m68k/m68k.opt +@@ -136,7 +136,7 @@ Target RejectNegative + Generate code for a Fido A + + mhard-float +-Target RejectNegative Mask(HARD_FLOAT) MaskExists ++Target RejectNegative Mask(HARD_FLOAT) + Generate code which uses hardware floating point instructions + + mid-shared-library +--- a/gcc/config/mep/mep.opt ++++ b/gcc/config/mep/mep.opt +@@ -55,7 +55,7 @@ Target Mask(COP) + Enable MeP Coprocessor + + mcop32 +-Target Mask(COP) MaskExists RejectNegative ++Target Mask(COP) RejectNegative + Enable MeP Coprocessor with 32-bit registers + + mcop64 +--- a/gcc/config/pa/pa-hpux.opt ++++ b/gcc/config/pa/pa-hpux.opt +@@ -23,7 +23,7 @@ Variable + int flag_pa_unix = TARGET_HPUX_11_31 ? 2003 : TARGET_HPUX_11_11 ? 1998 : TARGET_HPUX_10_10 ? 1995 : 1993 + + msio +-Target RejectNegative Mask(SIO) MaskExists ++Target RejectNegative Mask(SIO) + Generate cpp defines for server IO + + munix=93 +--- a/gcc/config/pa/pa64-hpux.opt ++++ b/gcc/config/pa/pa64-hpux.opt +@@ -19,7 +19,7 @@ + ; . + + mgnu-ld +-Target RejectNegative Mask(GNU_LD) MaskExists ++Target RejectNegative Mask(GNU_LD) + Assume code will be linked by GNU ld + + mhp-ld +--- a/gcc/config/picochip/picochip.opt ++++ b/gcc/config/picochip/picochip.opt +@@ -43,4 +43,4 @@ Target Mask(INEFFICIENT_WARNINGS) + Generate warnings when inefficient code is known to be generated. + + minefficient +-Target Mask(INEFFICIENT_WARNINGS) MaskExists Undocumented ++Target Mask(INEFFICIENT_WARNINGS) Undocumented +--- a/gcc/config/rs6000/sysv4.opt ++++ b/gcc/config/rs6000/sysv4.opt +@@ -66,7 +66,7 @@ Target Report RejectNegative Mask(LITTLE_ENDIAN) + Produce little endian code + + mlittle +-Target Report RejectNegative Mask(LITTLE_ENDIAN) MaskExists ++Target Report RejectNegative Mask(LITTLE_ENDIAN) + Produce little endian code + + mbig-endian +--- a/gcc/config/sh/sh.opt ++++ b/gcc/config/sh/sh.opt +@@ -316,7 +316,7 @@ Target Report RejectNegative Mask(RELAX) + Shorten address references during linking + + mrenesas +-Target Mask(HITACHI) MaskExists ++Target Mask(HITACHI) + Follow Renesas (formerly Hitachi) / SuperH calling conventions + + msoft-atomic +--- a/gcc/config/sparc/long-double-switch.opt ++++ b/gcc/config/sparc/long-double-switch.opt +@@ -19,7 +19,7 @@ + ; . + + mlong-double-128 +-Target Report RejectNegative Mask(LONG_DOUBLE_128) MaskExists ++Target Report RejectNegative Mask(LONG_DOUBLE_128) + Use 128-bit long double + + mlong-double-64 +--- a/gcc/config/sparc/sparc.opt ++++ b/gcc/config/sparc/sparc.opt +@@ -30,7 +30,7 @@ Target Report Mask(FPU) + Use hardware FP + + mhard-float +-Target RejectNegative Mask(FPU) MaskExists ++Target RejectNegative Mask(FPU) + Use hardware FP + + msoft-float +--- a/gcc/config/v850/v850.opt ++++ b/gcc/config/v850/v850.opt +@@ -102,7 +102,7 @@ Target RejectNegative Mask(V850E1) + Compile for the v850e1 processor + + mv850es +-Target RejectNegative Mask(V850E1) MaskExists ++Target RejectNegative Mask(V850E1) + Compile for the v850es variant of the v850e1 + + mv850e2 +--- a/gcc/config/vax/vax.opt ++++ b/gcc/config/vax/vax.opt +@@ -31,7 +31,7 @@ Target RejectNegative Mask(G_FLOAT) + Generate GFLOAT double precision code + + mg-float +-Target RejectNegative Mask(G_FLOAT) MaskExists ++Target RejectNegative Mask(G_FLOAT) + Generate GFLOAT double precision code + + mgnu +--- a/gcc/configure ++++ b/gcc/configure +@@ -13756,7 +13756,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -636,7 +636,7 @@ Objective-C and Objective-C++ Dialects}. + -mveclibabi=@var{type} -mvect8-ret-in-mem @gol + -mpc32 -mpc64 -mpc80 -mstackrealign @gol + -momit-leaf-frame-pointer -mno-red-zone -mno-tls-direct-seg-refs @gol +--mcmodel=@var{code-model} -mabi=@var{name} @gol ++-mcmodel=@var{code-model} -mabi=@var{name} -maddress-mode=@var{mode} @gol + -m32 -m64 -mx32 -mlarge-data-threshold=@var{num} @gol + -msse2avx -mfentry -m8bit-idiv @gol + -mavx256-split-unaligned-load -mavx256-split-unaligned-store} +@@ -13763,6 +13763,18 @@ be statically or dynamically linked. + @opindex mcmodel=large + Generate code for the large model: This model makes no assumptions + about addresses and sizes of sections. ++ ++@item -maddress-mode=long ++@opindex maddress-mode=long ++Generate code for long address mode. This is only supported for 64-bit ++and x32 environments. It is the default address mode for 64-bit ++environments. ++ ++@item -maddress-mode=short ++@opindex maddress-mode=short ++Generate code for short address mode. This is only supported for 32-bit ++and x32 environments. It is the default address mode for 32-bit and ++x32 environments. + @end table + + @node i386 and x86-64 Windows Options +--- a/gcc/doc/options.texi ++++ b/gcc/doc/options.texi +@@ -346,8 +346,6 @@ the value 1 when the option is active and 0 otherwise. If you use @code{Var} + to attach the option to a different variable, the associated macros are + called @code{OPTION_MASK_@var{name}} and @code{OPTION_@var{name}} respectively. + +-You can disable automatic bit allocation using @code{MaskExists}. +- + @item InverseMask(@var{othername}) + @itemx InverseMask(@var{othername}, @var{thisname}) + The option is the inverse of another option that has the +@@ -355,15 +353,6 @@ The option is the inverse of another option that has the + the options-processing script will declare a @code{TARGET_@var{thisname}} + macro that is 1 when the option is active and 0 otherwise. + +-@item MaskExists +-The mask specified by the @code{Mask} property already exists. +-No @code{MASK} or @code{TARGET} definitions should be added to +-@file{options.h} in response to this option record. +- +-The main purpose of this property is to support synonymous options. +-The first option should use @samp{Mask(@var{name})} and the others +-should use @samp{Mask(@var{name}) MaskExists}. +- + @item Enum(@var{name}) + The option's argument is a string from the set of strings associated + with the corresponding @samp{Enum} record. The string is checked and +--- a/gcc/dwarf2out.c ++++ b/gcc/dwarf2out.c +@@ -10178,7 +10178,9 @@ dbx_reg_number (const_rtx rtl) + } + #endif + +- return DBX_REGISTER_NUMBER (regno); ++ regno = DBX_REGISTER_NUMBER (regno); ++ gcc_assert (regno != INVALID_REGNUM); ++ return regno; + } + + /* Optionally add a DW_OP_piece term to a location description expression. +--- a/gcc/emit-rtl.c ++++ b/gcc/emit-rtl.c +@@ -964,6 +964,22 @@ void + set_reg_attrs_from_value (rtx reg, rtx x) + { + int offset; ++ bool can_be_reg_pointer = true; ++ ++ /* Don't call mark_reg_pointer for incompatible pointer sign ++ extension. */ ++ while (GET_CODE (x) == SIGN_EXTEND ++ || GET_CODE (x) == ZERO_EXTEND ++ || GET_CODE (x) == TRUNCATE ++ || (GET_CODE (x) == SUBREG && subreg_lowpart_p (x))) ++ { ++#if defined(POINTERS_EXTEND_UNSIGNED) && !defined(HAVE_ptr_extend) ++ if ((GET_CODE (x) == SIGN_EXTEND && POINTERS_EXTEND_UNSIGNED) ++ || (GET_CODE (x) != SIGN_EXTEND && ! POINTERS_EXTEND_UNSIGNED)) ++ can_be_reg_pointer = false; ++#endif ++ x = XEXP (x, 0); ++ } + + /* Hard registers can be reused for multiple purposes within the same + function, so setting REG_ATTRS, REG_POINTER and REG_POINTER_ALIGN +@@ -977,14 +993,14 @@ set_reg_attrs_from_value (rtx reg, rtx x) + if (MEM_OFFSET_KNOWN_P (x)) + REG_ATTRS (reg) = get_reg_attrs (MEM_EXPR (x), + MEM_OFFSET (x) + offset); +- if (MEM_POINTER (x)) ++ if (can_be_reg_pointer && MEM_POINTER (x)) + mark_reg_pointer (reg, 0); + } + else if (REG_P (x)) + { + if (REG_ATTRS (x)) + update_reg_offset (reg, x, offset); +- if (REG_POINTER (x)) ++ if (can_be_reg_pointer && REG_POINTER (x)) + mark_reg_pointer (reg, REGNO_POINTER_ALIGN (REGNO (x))); + } + } +--- a/gcc/opth-gen.awk ++++ b/gcc/opth-gen.awk +@@ -298,16 +298,25 @@ print ""; + + for (i = 0; i < n_opts; i++) { + name = opt_args("Mask", flags[i]) +- vname = var_name(flags[i]) +- mask = "MASK_" +- mask_1 = "1" +- if (vname != "") { +- mask = "OPTION_MASK_" +- if (host_wide_int[vname] == "yes") +- mask_1 = "HOST_WIDE_INT_1" ++ if (name == "") { ++ opt = opt_args("InverseMask", flags[i]) ++ if (opt ~ ",") ++ name = nth_arg(0, opt) ++ else ++ name = opt + } +- if (name != "" && !flag_set_p("MaskExists", flags[i])) ++ if (name != "" && mask_bits[name] == 0) { ++ mask_bits[name] = 1 ++ vname = var_name(flags[i]) ++ mask = "MASK_" ++ mask_1 = "1" ++ if (vname != "") { ++ mask = "OPTION_MASK_" ++ if (host_wide_int[vname] == "yes") ++ mask_1 = "HOST_WIDE_INT_1" ++ } + print "#define " mask name " (" mask_1 " << " masknum[vname]++ ")" ++ } + } + for (i = 0; i < n_extra_masks; i++) { + print "#define MASK_" extra_masks[i] " (1 << " masknum[""]++ ")" +@@ -330,17 +339,26 @@ print "" + + for (i = 0; i < n_opts; i++) { + name = opt_args("Mask", flags[i]) +- vname = var_name(flags[i]) +- macro = "OPTION_" +- mask = "OPTION_MASK_" +- if (vname == "") { +- vname = "target_flags" +- macro = "TARGET_" +- mask = "MASK_" ++ if (name == "") { ++ opt = opt_args("InverseMask", flags[i]) ++ if (opt ~ ",") ++ name = nth_arg(0, opt) ++ else ++ name = opt + } +- if (name != "" && !flag_set_p("MaskExists", flags[i])) ++ if (name != "" && mask_macros[name] == 0) { ++ mask_macros[name] = 1 ++ vname = var_name(flags[i]) ++ macro = "OPTION_" ++ mask = "OPTION_MASK_" ++ if (vname == "") { ++ vname = "target_flags" ++ macro = "TARGET_" ++ mask = "MASK_" ++ } + print "#define " macro name \ + " ((" vname " & " mask name ") != 0)" ++ } + } + for (i = 0; i < n_extra_masks; i++) { + print "#define TARGET_" extra_masks[i] \ +--- a/gcc/reginfo.c ++++ b/gcc/reginfo.c +@@ -1222,17 +1222,7 @@ reg_scan_mark_refs (rtx x, rtx insn) + /* If this is setting a register from a register or from a simple + conversion of a register, propagate REG_EXPR. */ + if (REG_P (dest) && !REG_ATTRS (dest)) +- { +- rtx src = SET_SRC (x); +- +- while (GET_CODE (src) == SIGN_EXTEND +- || GET_CODE (src) == ZERO_EXTEND +- || GET_CODE (src) == TRUNCATE +- || (GET_CODE (src) == SUBREG && subreg_lowpart_p (src))) +- src = XEXP (src, 0); +- +- set_reg_attrs_from_value (dest, src); +- } ++ set_reg_attrs_from_value (dest, SET_SRC (x)); + + /* ... fall through ... */ + +--- /dev/null ++++ b/gcc/testsuite/gcc.dg/torture/pr52530.c +@@ -0,0 +1,30 @@ ++/* { dg-do run } */ ++ ++extern void abort (void); ++ ++struct foo ++{ ++ int *f; ++ int i; ++}; ++ ++int baz; ++ ++void __attribute__ ((noinline)) ++bar (struct foo x) ++{ ++ *(x.f) = x.i; ++} ++ ++int ++main () ++{ ++ struct foo x = { &baz, 0xdeadbeef }; ++ ++ bar (x); ++ ++ if (baz != 0xdeadbeef) ++ abort (); ++ ++ return 0; ++} +--- a/gcc/testsuite/gcc.target/i386/pr52146.c ++++ b/gcc/testsuite/gcc.target/i386/pr52146.c +@@ -15,4 +15,4 @@ test2 (void) + *apic_tpr_addr = 0; + } + +-/* { dg-final { scan-assembler-not "-18874240" } } */ ++/* { dg-final { scan-assembler-not "\[,\\t \]+-18874240" } } */ +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/pr52876.c +@@ -0,0 +1,25 @@ ++/* { dg-do run { target { x32 } } } */ ++/* { dg-options "-O2 -mx32 -maddress-mode=long" } */ ++ ++extern void abort (void); ++ ++long long li; ++ ++long long ++__attribute__ ((noinline)) ++testfunc (void* addr) ++{ ++ li = (long long)(int)addr; ++ li &= 0xffffffff; ++ return li; ++} ++ ++int main (void) ++{ ++ volatile long long rv_test; ++ rv_test = testfunc((void*)0x87651234); ++ if (rv_test != 0x87651234ULL) ++ abort (); ++ ++ return 0; ++} +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/pr52882.c +@@ -0,0 +1,19 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O" } */ ++ ++struct S1 { ++ int f0; ++ int f1; ++}; ++ ++int fn1 (); ++void fn2 (struct S1); ++ ++void ++fn3 () { ++ struct S1 a = { 1, 0 }; ++ if (fn1 ()) ++ fn2 (a); ++ for (; a.f1;) { ++ } ++} +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/pr52883.c +@@ -0,0 +1,25 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O" } */ ++ ++int a, b, d, e, f, i, j, k, l, m; ++unsigned c; ++int g[] = { }, h[0]; ++ ++int ++fn1 () { ++ return 0; ++} ++ ++void ++fn2 () { ++ c = 0; ++ e = 0; ++ for (;; e = 0) ++ if (f > j) { ++ k = fn1 (); ++ l = (d || k) * b; ++ m = l * a; ++ h[0] = m <= i; ++ } else ++ i = g[c]; ++} +--- a/libffi/configure ++++ b/libffi/configure +@@ -6282,7 +6282,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libffi/src/x86/ffi64.c ++++ b/libffi/src/x86/ffi64.c +@@ -426,7 +426,7 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) + /* If the return value is passed in memory, add the pointer as the + first integer argument. */ + if (ret_in_memory) +- reg_args->gpr[gprcount++] = (long) rvalue; ++ reg_args->gpr[gprcount++] = (unsigned long) rvalue; + + avn = cif->nargs; + arg_types = cif->arg_types; +@@ -501,9 +501,11 @@ ffi_prep_closure_loc (ffi_closure* closure, + tramp = (volatile unsigned short *) &closure->tramp[0]; + + tramp[0] = 0xbb49; /* mov , %r11 */ +- *(void * volatile *) &tramp[1] = ffi_closure_unix64; ++ *((unsigned long long * volatile) &tramp[1]) ++ = (unsigned long) ffi_closure_unix64; + tramp[5] = 0xba49; /* mov , %r10 */ +- *(void * volatile *) &tramp[6] = codeloc; ++ *((unsigned long long * volatile) &tramp[6]) ++ = (unsigned long) codeloc; + + /* Set the carry bit iff the function uses any sse registers. + This is clc or stc, together with the first byte of the jmp. */ +@@ -542,7 +544,7 @@ ffi_closure_unix64_inner(ffi_closure *closure, void *rvalue, + { + /* The return value goes in memory. Arrange for the closure + return value to go directly back to the original caller. */ +- rvalue = (void *) reg_args->gpr[gprcount++]; ++ rvalue = (void *) (unsigned long) reg_args->gpr[gprcount++]; + /* We don't have to do anything in asm for the return. */ + ret = FFI_TYPE_VOID; + } +--- a/libffi/src/x86/ffitarget.h ++++ b/libffi/src/x86/ffitarget.h +@@ -53,9 +53,15 @@ typedef unsigned long long ffi_arg; + typedef long long ffi_sarg; + #endif + #else ++#if defined __x86_64__ && !defined __LP64__ ++#define FFI_SIZEOF_ARG 8 ++typedef unsigned long long ffi_arg; ++typedef long long ffi_sarg; ++#else + typedef unsigned long ffi_arg; + typedef signed long ffi_sarg; + #endif ++#endif + + typedef enum ffi_abi { + FFI_FIRST_ABI = 0, +--- a/libgcc/unwind-dw2.c ++++ b/libgcc/unwind-dw2.c +@@ -294,7 +294,8 @@ _Unwind_SetGRValue (struct _Unwind_Context *context, int index, + { + index = DWARF_REG_TO_UNWIND_COLUMN (index); + gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); +- gcc_assert (dwarf_reg_size_table[index] == sizeof (_Unwind_Context_Reg_Val)); ++ /* Return column size may be smaller than _Unwind_Context_Reg_Val. */ ++ gcc_assert (dwarf_reg_size_table[index] <= sizeof (_Unwind_Context_Reg_Val)); + + context->by_value[index] = 1; + context->reg[index] = _Unwind_Get_Unwind_Context_Reg_Val (val); +--- a/libgfortran/configure ++++ b/libgfortran/configure +@@ -8071,7 +8071,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libgomp/configure ++++ b/libgomp/configure +@@ -6596,7 +6596,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libgomp/configure.tgt ++++ b/libgomp/configure.tgt +@@ -59,7 +59,7 @@ if test $enable_linux_futex = yes; then + i[456]86-*-linux*) + config_path="linux/x86 linux posix" + case " ${CC} ${CFLAGS} " in +- *" -m64 "*) ++ *" -m64 "*|*" -mx32 "*) + ;; + *) + if test -z "$with_arch"; then +--- a/libitm/configure ++++ b/libitm/configure +@@ -7285,7 +7285,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libitm/configure.tgt ++++ b/libitm/configure.tgt +@@ -53,7 +53,7 @@ case "${target_cpu}" in + + i[3456]86) + case " ${CC} ${CFLAGS} " in +- *" -m64 "*) ++ *" -m64 "*|*" -mx32 "*) + ;; + *) + if test -z "$with_arch"; then +--- a/libjava/classpath/configure ++++ b/libjava/classpath/configure +@@ -7592,7 +7592,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libjava/configure ++++ b/libjava/configure +@@ -8843,7 +8843,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libmudflap/configure ++++ b/libmudflap/configure +@@ -6393,7 +6393,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libobjc/configure ++++ b/libobjc/configure +@@ -6079,7 +6079,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libquadmath/configure ++++ b/libquadmath/configure +@@ -6264,7 +6264,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libssp/configure ++++ b/libssp/configure +@@ -6401,7 +6401,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -7120,7 +7119,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1232,7 +1232,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/lto-plugin/configure ++++ b/lto-plugin/configure +@@ -6060,7 +6060,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" +--- a/zlib/configure ++++ b/zlib/configure +@@ -5869,7 +5869,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" ++ case `/usr/bin/file conftest.o` in ++ *x86-64*) ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; ++ *) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ esac + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/chromeos-version.sh new file mode 100755 index 0000000000..c3f4eb7464 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/chromeos-version.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. +# +# The reason we extract the version from the ChangeLog instead of BASE-VER is +# because BASE-VER contains a custom google string that lacks the x.y.z info. + + +exec awk '$1 == "*" && $2 == "GCC" && $4 == "released." { print $3; exit }' \ + "$1"/ChangeLog diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/sysroot_wrapper b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/sysroot_wrapper new file mode 100755 index 0000000000..e72a7155d5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/sysroot_wrapper @@ -0,0 +1,22 @@ +#!/bin/bash + +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This script ensures that "--sysroot" is passed to whatever it is wrapping. +# To use: +# mv .real +# ln -s + +SYSROOT_WRAPPER_LOG=/tmp/sysroot_wrapper.error +if [ -n "$SYSROOT" ] ; then + exec "${0}.real" --sysroot="$SYSROOT" "$@" +else + if [[ ! -f $SYSROOT_WRAPPER_LOG ]]; then + touch $SYSROOT_WRAPPER_LOG + chmod a+w $SYSROOT_WRAPPER_LOG + fi + echo "Invocation with missing SYSROOT: ${0} $@" >> $SYSROOT_WRAPPER_LOG + exec "${0}.real" "$@" +fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/sysroot_wrapper.hardened b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/sysroot_wrapper.hardened new file mode 100755 index 0000000000..d568e07af0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/files/sysroot_wrapper.hardened @@ -0,0 +1,292 @@ +#!/usr/bin/python + +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This script is a meta-driver for the toolchain. It transforms the command +# line to allow the following: +# 1. This script ensures that '--sysroot' is passed to whatever it is wrapping. +# +# 2. It adds hardened flags to gcc invocation. The hardened flags are: +# -fstack-protector-strong +# -fPIE +# -pie +# -D_FORTIFY_SOURCE=2 +# +# It can disable -fPIE -pie by checking if -nopie is passed to gcc. In this +# case it removes -nopie as it is a non-standard flag. +# +# 3. Enable clang diagnostics with -clang option +# +# 4. Add new -print-cmdline option to print the command line before executon +# +# This is currently implemented as two loops on the list of arguments. The +# first loop # identifies hardening flags, as well as determining if clang +# invocation is specified. The second loop build command line for clang +# invocation as well adjusting gcc command line. +# +# This implementation ensure compile time of default path remains mostly +# the same. +# +# There is a similar hardening wrapper that wraps ld and adds -z now -z relro +# to the link command line (see ldwrapper). +# +# To use: +# mv .real +# ln -s + +import os +import re +import sys + +# Full hardening. Some/all of these may be discarded depending on +# other flags. +flags_to_add = set(['-fstack-protector-strong', '-fPIE', '-pie', + '-D_FORTIFY_SOURCE=2', '-frecord-gcc-switches']) +disable_flags = set(['-mno-movbe', '-mno-ssse3']) + +# Only FORTIFY_SOURCE hardening flag is applicable for clang parser. +clang_cmdline = ['-fsyntax-only', '-Qunused-arguments', '-D_FORTIFY_SOURCE=2'] + +# If -clang is present. +clang_compile_requested = 0 + +# If -print-cmdline is present. +print_cmdline = 0 + +# If ccache should be used automatically. +use_ccache = True # @CCACHE_DEFAULT@ Keep this comment for code. + +fstack = set(['-D__KERNEL__', '-fno-stack-protector', '-nodefaultlibs', + '-nostdlib']) +fPIE = set(['-D__KERNEL__', '-fPIC', '-fPIE', '-fno-PIC', '-fno-PIE', + '-fno-pic', '-fno-pie', '-fpic', '-fpie', '-nopie', '-nostartfiles', + '-nostdlib', '-pie', '-static']) +pie = set(['-D__KERNEL__', '-A', '-fno-PIC', '-fno-PIE', '-fno-pic', '-fno-pie', + '-nopie', '-nostartfiles', '-nostdlib', '-pie', '-r', '--shared', '-shared', + '-static']) +sse = set(['-msse3', '-mssse3', '-msse4.1', '-msse4.2', '-msse4', '-msse4a']) +wrapper_only_options = set(['-clang', '-print-cmdline', '-nopie', '-noccache']) + +myargs = sys.argv[1:] +if fstack.intersection(myargs): + flags_to_add.remove('-fstack-protector-strong') + flags_to_add.add('-fno-stack-protector') +if fPIE.intersection(myargs): + flags_to_add.remove('-fPIE') +if pie.intersection(myargs): + flags_to_add.remove('-pie') +if sse.intersection(myargs): + disable_flags.remove('-mno-ssse3') +clang_compile_requested = '-clang' in myargs +print_cmdline = '-print-cmdline' in myargs +if '-noccache' in myargs: + # Only explicitly disable so we can set defaults up top. + use_ccache = False +cmdline = [x for x in myargs if x not in wrapper_only_options] + +if not clang_compile_requested: + gcc_cmdline = cmdline +else: + import subprocess + # Gcc flags to remove from the clang command line. + # TODO: Once clang supports gcc compatibility mode, remove + # these checks. + # + # Use of -Qunused-arguments allows this set to be small, just those + # that clang still warns about. + clang_unsupported = set(['-pass-exit-codes', '-Ofast', '-Wclobbered', + '-fvisibility=internal', '-Woverride-init', '-Wunsafe-loop-optimizations', + '-Wlogical-op', '-Wmissing-parameter-type', '-Wold-style-declaration']) + clang_unsupported_prefixes = ('-Wstrict-aliasing=') + + # Clang may use different options for the same or similar functionality. + gcc_to_clang = { + '-Wno-error=unused-but-set-variable': '-Wno-error=unused-variable', + '-Wno-error=maybe-uninitialized': '-Wno-error=uninitialized', + } + + # If these options are specified, do not run clang, even if -clang is + # specified. + # This is mainly for utilities that depend on compiler output. + skip_clang_prefixes = ('-print-', '-dump', '@') + skip_clang_set = set(['-', '-E', '-M', '-x']) + + # Reset gcc cmdline too. Only change is to remove -Xclang-only + # options if specified. + gcc_cmdline = [] + + skip_clang = False + for flag in cmdline: + if flag.startswith(skip_clang_prefixes) or flag in skip_clang_set or flag.endswith('.S'): + skip_clang = True + elif not (flag in clang_unsupported or + flag.startswith(clang_unsupported_prefixes)): + # Strip off -Xclang-only= if present. + if flag.startswith('-Xclang-only='): + opt = flag.partition('=')[2] + clang_cmdline.append(opt) + # No need to add to gcc_cmdline. + continue + elif flag in gcc_to_clang.keys(): + clang_cmdline.append(gcc_to_clang[flag]) + else: + clang_cmdline.append(flag) + gcc_cmdline.append(flag) + +if re.match(r'i.86|x86_64', os.path.basename(sys.argv[0])): + gcc_cmdline.extend(disable_flags) + + +def get_proc_cmdline(pid): + with open('/proc/%i/cmdline' % pid) as fp: + return fp.read().replace('\0', ' ') + return None + + +def get_proc_status(pid, item): + with open('/proc/%i/status' % pid) as fp: + for line in fp: + m = re.match(r'%s:\s*(.*)' % re.escape(item), line) + if m: + return m.group(1) + return None + + +def log_parent_process_tree(log, ppid): + depth = 0 + + while ppid > 1: + cmdline = get_proc_cmdline(ppid) + log.warning(' %*s {%5i}: %s' % (depth, '', ppid, cmdline)) + + ppid = get_proc_status(ppid, 'PPid') + if not ppid: + break + ppid = int(ppid) + depth += 2 + + +sysroot = os.environ.get('SYSROOT', '') +if sysroot: + clang_cmdline.append('--sysroot=%s' % sysroot) + gcc_cmdline.append('--sysroot=%s' % sysroot) +else: + import logging + import logging.handlers + import traceback + + log_file = '/tmp/sysroot_wrapper.error' + + log = logging.getLogger('sysroot_wrapper') + log.setLevel(logging.DEBUG) + + handler = logging.handlers.RotatingFileHandler(log_file, maxBytes=0x20000000, + backupCount=1) + formatter = logging.Formatter('%(asctime)s %(message)s') + handler.setFormatter(formatter) + log.addHandler(handler) + + log.warning('Invocation with missing SYSROOT: %s' % ' '.join(sys.argv)) + try: + log_parent_process_tree(log, os.getppid()) + except IOError: + log.error('%s' % traceback.format_exc()) + + try: + # The logging module does not support setting permissions. + os.chmod(log_file, 0666) + except OSError: + pass + +if clang_compile_requested and not skip_clang: + clang_comp = os.environ.get('CLANG', '/usr/bin/clang') + + # Specify the target for clang. + gcc_comp = os.path.basename(sys.argv[0]) + arch = gcc_comp.split('-')[0] + if arch == 'i386' or arch == 'i486' or arch == 'i586' or arch == 'i686': + clang_cmdline.insert(0, '-m32') + elif arch == 'x86_64': + clang_cmdline.insert(0, '-m64') + elif arch.startswith('arm'): + clang_cmdline.insert(0, 'armv7a-cros-linux-gnueabi') + clang_cmdline.insert(0, '-target') + + # Check for clang or clang++. + if sys.argv[0].endswith('++'): + clang_comp += '++' + + if print_cmdline: + print '%s %s\n' % (clang_comp, ' '.join(clang_cmdline)) + + p = subprocess.Popen([clang_comp] + clang_cmdline) + p.wait() + if p.returncode != 0: + sys.exit(p.returncode) + +execargs = [] +real_gcc = '%s.real' % sys.argv[0] +if use_ccache: + # Portage likes to set this for us when it has FEATURES=-ccache. + # The other vars we need to setup manually because of tools like + # scons that scrubs the env before we get executed. + os.environ.pop('CCACHE_DISABLE', None) + + # We should be able to share the objects across compilers as + # the pre-processed output will differ. This allows boards + # that share compiler flags (like x86 boards) to share caches. + ccache_dir = '/var/cache/distfiles/ccache' + os.environ['CCACHE_DIR'] = ccache_dir + + # If RESTRICT=sandbox is enabled, then sandbox won't be setup, + # and the env vars won't be available for appending. + if 'SANDBOX_WRITE' in os.environ: + os.environ['SANDBOX_WRITE'] += ':%s' % ccache_dir + + # We need to get ccache to make relative paths from within the + # sysroot. This lets us share cached files across boards (if + # all other things are equal of course like CFLAGS) as well as + # across versions. A quick test is something like: + # $ export CFLAGS='-O2 -g -pipe' CXXFLAGS='-O2 -g -pipe' + # $ BOARD=x86-alex + # $ cros_workon-$BOARD stop cros-disks + # $ emerge-$BOARD cros-disks + # $ cros_workon-$BOARD start cros-disks + # $ emerge-$BOARD cros-disks + # $ BOARD=amd64-generic + # $ cros_workon-$BOARD stop cros-disks + # $ emerge-$BOARD cros-disks + # $ cros_workon-$BOARD start cros-disks + # $ emerge-$BOARD cros-disks + # All of those will get cache hits (ignoring the first one + # which will seed the cache) due to this setting. + if sysroot: + os.environ['CCACHE_BASEDIR'] = sysroot + + # Minor speed up as we don't care about this in general. + #os.environ['CCACHE_NOSTATS'] = 'no' + # Useful for debugging. + #os.environ['CCACHE_LOG'] = '/dev/stderr' + + # We take care of nuking the cache in the gcc ebuild whenever + # it revbumps in a way that matters, so disable ccache's check. + os.environ['CCACHE_COMPILERCHECK'] = 'none' + + # Make sure we keep the cached files group writable. + os.environ['CCACHE_UMASK'] = '002' + + argv0 = '/usr/bin/ccache' + execargs += ['ccache'] + #gcc_cmdline += ['-noccache'] +else: + argv0 = real_gcc + +execargs += [real_gcc] + list(flags_to_add) + gcc_cmdline + +if print_cmdline: + print '[%s] %s' % (argv0, ' '.join(execargs)) + +sys.stdout.flush() +os.execv(argv0, execargs) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/gcc-4.7.1-r41.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/gcc-4.7.1-r41.ebuild new file mode 100644 index 0000000000..23e6b9cb9e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/gcc-4.7.1-r41.ebuild @@ -0,0 +1,548 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.3-r3.ebuild,v 1.1 2010/06/19 01:53:09 zorry Exp $ + +EAPI=1 +CROS_WORKON_COMMIT="164c96f2f2c2aec1854ec2866d1ad865b2326251" +CROS_WORKON_TREE="896542d4852cae24c8117b2a0706e0e8c2a51fdd" +CROS_WORKON_LOCALNAME=gcc +CROS_WORKON_PROJECT=chromiumos/third_party/gcc + +inherit eutils cros-workon binutils-funcs + +GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files" + +DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14." + +LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" +KEYWORDS="amd64 arm x86" + +RDEPEND=">=sys-libs/zlib-1.1.4 + >=sys-devel/gcc-config-1.6 + virtual/libiconv + >=dev-libs/gmp-4.2.1 + >=dev-libs/mpc-0.8.1 + >=dev-libs/mpfr-2.3.2 + graphite? ( + >=dev-libs/ppl-0.10 + >=dev-libs/cloog-ppl-0.15.4 + ) + !build? ( + gcj? ( + gtk? ( + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXtst + x11-proto/xproto + x11-proto/xextproto + >=x11-libs/gtk+-2.2 + x11-libs/pango + ) + >=media-libs/libart_lgpl-2.1 + app-arch/zip + app-arch/unzip + ) + >=sys-libs/ncurses-5.2-r2 + nls? ( sys-devel/gettext ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) + >=sys-apps/texinfo-4.8 + >=sys-devel/bison-1.875 + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) + ppc? ( >=${CATEGORY}/binutils-2.17 ) + ppc64? ( >=${CATEGORY}/binutils-2.17 ) + >=${CATEGORY}/binutils-2.15.94" +PDEPEND=">=sys-devel/gcc-config-1.4" +if [[ ${CATEGORY} != cross-* ]] ; then + PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" +fi + +RESTRICT="mirror strip" + +IUSE="gcj git_gcc graphite gtk hardened hardfp mounted_gcc multilib multislot + nls cxx openmp tests +thumb upstream_gcc vanilla +wrapper_ccache" + +is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] ; } + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} = ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +if use multislot ; then + SLOT="${CTARGET}-${PV}" +else + SLOT="${CTARGET}" +fi + +PREFIX=/usr + +src_unpack() { + if use mounted_gcc ; then + if [[ ! -d "$(get_gcc_dir)" ]] ; then + die "gcc dir not mounted/present at: $(get_gcc_dir)" + fi + elif use upstream_gcc ; then + GCC_MIRROR=ftp://mirrors.kernel.org/gnu/gcc + GCC_TARBALL=${GCC_MIRROR}/${P}/${P}.tar.bz2 + wget $GCC_TARBALL + tar xf ${GCC_TARBALL##*/} + elif use git_gcc ; then + git clone "${CROS_WORKON_REPO}/${CROS_WORKON_PROJECT}.git" "${S}" + if [[ -n ${GCC_GITHASH} ]] ; then + einfo "Checking out: ${GCC_GITHASH}" + pushd "$(get_gcc_dir)" >/dev/null + git checkout ${GCC_GITHASH} || \ + die "Couldn't checkout ${GCC_GITHASH}" + popd >/dev/null + fi + else + cros-workon_src_unpack + cd "${S}" + [[ ${ABI} == "x32" ]] && epatch "${FILESDIR}"/90_all_gcc-4.7-x32.patch + fi + + COST_PKG_VERSION="$("${FILESDIR}"/chromeos-version.sh "${S}")_cos_gg" + + if [[ -d ${S}/.git ]]; then + COST_PKG_VERSION+="_$(cd ${S}; git describe --always)" + elif [[ -n ${VCSID} ]]; then + COST_PKG_VERSION+="_${VCSID}" + fi +} + +src_compile() +{ + src_configure + cd $(get_gcc_build_dir) || "Build dir $(get_gcc_build_dir) not found" + GCC_CFLAGS="$(portageq envvar CFLAGS)" + TARGET_FLAGS="" + + if use hardened + then + TARGET_FLAGS="${TARGET_FLAGS} -fstack-protector-strong -D_FORTIFY_SOURCE=2" + fi + + # Do not link libgcc with gold. That is known to fail on internal linker + # errors. See crosbug.com/16719 + local LD_NON_GOLD="$(get_binutils_path_ld ${CTARGET})/ld" + + emake CFLAGS="${GCC_CFLAGS}" \ + LDFLAGS="-Wl,-O1" \ + STAGE1_CFLAGS="-O2 -pipe" \ + BOOT_CFLAGS="-O2" \ + CFLAGS_FOR_TARGET="$(get_make_var CFLAGS_FOR_TARGET) ${TARGET_FLAGS}" \ + CXXFLAGS_FOR_TARGET="$(get_make_var CXXFLAGS_FOR_TARGET) ${TARGET_FLAGS}" \ + LD_FOR_TARGET="${LD_NON_GOLD}" \ + all || die +} + +# Logic copied from Gentoo's toolchain.eclass. +toolchain_src_install() { + BINPATH=$(get_bin_dir) # cros to Gentoo glue + + # These should be symlinks + dodir /usr/bin + cd "${D}"${BINPATH} + for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do + # For some reason, g77 gets made instead of ${CTARGET}-g77... + # this should take care of that + [[ -f ${x} ]] && mv ${x} ${CTARGET}-${x} + + if [[ -f ${CTARGET}-${x} ]] ; then + if ! is_crosscompile ; then + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} + fi + + # Create version-ed symlinks + dosym ${BINPATH}/${CTARGET}-${x} \ + /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + + if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then + rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} + ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + done +} + +src_install() +{ + cd $(get_gcc_build_dir) || "Build dir $(get_gcc_build_dir) not found" + emake DESTDIR="${D}" install || die "Could not install gcc" + + find "${D}" -name libiberty.a -exec rm -f "{}" \; + + # Move the libraries to the proper location + gcc_movelibs + + # Move pretty-printers to gdb datadir to shut ldconfig up + gcc_move_pretty_printers + + GCC_CONFIG_VER=$(get_gcc_base_ver) + dodir /etc/env.d/gcc + insinto /etc/env.d/gcc + + local LDPATH=$(get_lib_dir) + for SUBDIR in 32 64 ; do + if [[ -d ${D}/${LDPATH}/${SUBDIR} ]] + then + LDPATH="${LDPATH}:${LDPATH}/${SUBDIR}" + fi + done + + cat <<-EOF > env.d +LDPATH="${LDPATH}" +MANPATH="$(get_data_dir)/man" +INFOPATH="$(get_data_dir)/info" +STDCXX_INCDIR="$(get_stdcxx_incdir)" +CTARGET=${CTARGET} +GCC_PATH="$(get_bin_dir)" +GCC_VER="$(get_gcc_base_ver)" +EOF + newins env.d $(get_gcc_config_file) + cd - + + toolchain_src_install + + if is_crosscompile ; then + if use hardened + then + SYSROOT_WRAPPER_FILE=sysroot_wrapper.hardened + else + SYSROOT_WRAPPER_FILE=sysroot_wrapper + fi + + exeinto "$(get_bin_dir)" + doexe "${FILESDIR}/${SYSROOT_WRAPPER_FILE}" || die + sed -i \ + -e "/^use_ccache = .*@CCACHE_DEFAULT@/s:=[^#]*:= $(usex wrapper_ccache True False) :" \ + "${D}$(get_bin_dir)/${SYSROOT_WRAPPER_FILE}" || die + for x in c++ cpp g++ gcc; do + if [[ -f "${CTARGET}-${x}" ]]; then + mv "${CTARGET}-${x}" "${CTARGET}-${x}.real" + dosym "${SYSROOT_WRAPPER_FILE}" "$(get_bin_dir)/${CTARGET}-${x}" || die + fi + done + fi + + if use tests + then + TEST_INSTALL_DIR="usr/local/dejagnu/gcc" + dodir ${TEST_INSTALL_DIR} + cd ${D}/${TEST_INSTALL_DIR} + tar -czf "tests.tar.gz" ${WORKDIR} + fi +} + +pkg_preinst() +{ + # We handle ccache ourselves in the sysroot wrapper. + rm -f /usr/lib/ccache/bin/*-* + + local ccache_dir="/var/cache/distfiles/ccache" + local vcsid_file="${ccache_dir}/.gcc.vcsid.${CTARGET}" + # Clean out the ccache whenever the gcc code changes. + # If we are using a live ebuild, nuke it everytime just + # to be safe. + [[ ${PV} == "9999" ]] && rm -f "${vcsid_file}" + local old_vcsid=$(cat "${vcsid_file}" 2>/dev/null) + if [[ ${old_vcsid} != ${CROS_WORKON_COMMIT} ]] ; then + # Don't just delete the whole dir as that would punt + # the vcsid tag files from other targets too. + rm -rf "${ccache_dir}"/* + fi + mkdir -p -m 2775 "${ccache_dir}" + echo "${CROS_WORKON_COMMIT}" > "${vcsid_file}" + + # Use a 10G limit as our bots have finite resources. A full + # x86-generic build uses ~6GB, while an amd64-generic uses + # ~8GB, so this limit should be sufficient. + CCACHE_UMASK=002 CCACHE_DIR=${ccache_dir} ccache -F 0 -M 11G + + # Make sure the dirs have perms for emerge builders. + chown -R ${PORTAGE_USERNAME}:portage "${ccache_dir}" +} + +pkg_postinst() +{ + gcc-config $(get_gcc_config_file) +} + +pkg_postrm() +{ + if is_crosscompile ; then + if [[ -z $(ls "${ROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then + rm -f "${ROOT}"/etc/env.d/gcc/config-${CTARGET} + rm -f "${ROOT}"/etc/env.d/??gcc-${CTARGET} + rm -f "${ROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64} + fi + fi +} + +src_configure() +{ + if use mounted_gcc && [[ -f $(get_gcc_build_dir)/Makefile ]] ; then + return + fi + + # Set configuration based on path variables + local DATAPATH=$(get_data_dir) + local confgcc="$(use_enable multilib) + --prefix=${PREFIX} \ + --bindir=$(get_bin_dir) \ + --datadir=${DATAPATH} \ + --mandir=${DATAPATH}/man \ + --infodir=${DATAPATH}/info \ + --includedir=$(get_lib_dir)/include \ + --with-gxx-include-dir=$(get_stdcxx_incdir) + --with-python-dir=${DATAPATH#${PREFIX}}/python" + confgcc="${confgcc} --host=${CHOST}" + confgcc="${confgcc} --target=${CTARGET}" + confgcc="${confgcc} --build=${CBUILD}" + + # Language options for stage1/stage2. + if ! use cxx + then + GCC_LANG="c" + else + GCC_LANG="c,c++" + fi + confgcc="${confgcc} --enable-languages=${GCC_LANG}" + + if use hardfp && [[ ${CTARGET} == arm* ]] ; + then + confgcc="${confgcc} --with-float=hard" + fi + + if use thumb && [[ ${CTARGET} == arm* ]] ; + then + confgcc="${confgcc} --with-mode=thumb" + fi + + if is_crosscompile ; then + local needed_libc="glibc" + if [[ -n ${needed_libc} ]] ; then + if ! has_version ${CATEGORY}/${needed_libc} ; then + confgcc="${confgcc} --disable-shared --disable-threads --without-headers" + elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then + confgcc="${confgcc} --disable-shared --with-sysroot=/usr/${CTARGET}" + else + confgcc="${confgcc} --with-sysroot=/usr/${CTARGET}" + fi + fi + else + confgcc="${confgcc} --enable-shared --enable-threads=posix" + fi + + confgcc="${confgcc} $(get_gcc_configure_options ${CTARGET})" + + EXTRA_ECONF="--with-bugurl=http://code.google.com/p/chromium-os/issues/entry\ + --with-pkgversion=${COST_PKG_VERSION} --enable-linker-build-id" + confgcc="${confgcc} ${EXTRA_ECONF}" + + # Build in a separate build tree + mkdir -p $(get_gcc_build_dir) || \ + die "Could not create build dir $(get_gcc_build_dir)" + cd $(get_gcc_build_dir) || die "Build dir $(get_gcc_build_dir) not found" + + # and now to do the actual configuration + addwrite /dev/zero + echo "Running this:" + echo "configure ${confgcc}" + echo "$(get_gcc_dir)"/configure "$@" + "$(get_gcc_dir)"/configure ${confgcc} || die "failed to run configure" +} + +get_gcc_configure_options() +{ + local CTARGET=$1; shift + local confgcc=$(get_gcc_common_options) + case ${CTARGET} in + arm*) #264534 + local arm_arch="${CTARGET%%-*}" + # Only do this if arm_arch is armv* + if [[ ${arm_arch} == armv* ]] ; then + # Convert armv7{a,r,m} to armv7-{a,r,m} + [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-} + # Remove endian ('l' / 'eb') + [[ ${arm_arch} == *l ]] && arm_arch=${arm_arch%l} + [[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb} + confgcc="${confgcc} --with-arch=${arm_arch}" + confgcc="${confgcc} --disable-esp" + fi + ;; + i?86*) + # Hardened is enabled for x86, but disabled for ARM. + confgcc="${confgcc} --enable-esp" + confgcc="${confgcc} --with-arch=atom" + confgcc="${confgcc} --with-tune=atom" + # Remove this once crash2 supports larger symbols. + # http://code.google.com/p/chromium-os/issues/detail?id=23321 + confgcc="${confgcc} --enable-frame-pointer" + ;; + x86_64*-gnux32) + confgcc="${confgcc} --with-abi=x32 --with-multilib-list=mx32" + ;; + esac + echo ${confgcc} +} + +get_gcc_common_options() +{ + local confgcc + confgcc="${confgcc} --disable-libmudflap" + confgcc="${confgcc} --disable-libssp" + confgcc+=" $(use_enable openmp libgomp)" + confgcc="${confgcc} --enable-__cxa_atexit" + confgcc="${confgcc} --enable-checking=release" + confgcc="${confgcc} --disable-libquadmath" + echo ${confgcc} +} + +get_gcc_dir() +{ + local GCCDIR + if use mounted_gcc ; then + GCCDIR=${GCC_SOURCE_PATH:=/usr/local/toolchain_root/gcc} + elif use upstream_gcc ; then + GCCDIR=${P} + else + GCCDIR=${S} + fi + echo "${GCCDIR}" +} + +get_gcc_build_dir() +{ + echo "$(get_gcc_dir)-build-${CTARGET}" +} + +get_gcc_base_ver() +{ + cat "$(get_gcc_dir)/gcc/BASE-VER" +} + +get_stdcxx_incdir() +{ + echo "$(get_lib_dir)/include/g++-v4" +} + +get_lib_dir() +{ + echo "${PREFIX}/lib/gcc/${CTARGET}/$(get_gcc_base_ver)" +} + +get_bin_dir() +{ + if is_crosscompile ; then + echo ${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/$(get_gcc_base_ver) + else + echo ${PREFIX}/${CTARGET}/gcc-bin/$(get_gcc_base_ver) + fi +} + +get_data_dir() +{ + echo "${PREFIX}/share/gcc-data/${CTARGET}/$(get_gcc_base_ver)" +} + +get_gcc_config_file() +{ + echo ${CTARGET}-${PV} +} + +# Grab a variable from the build system (taken from linux-info.eclass) +get_make_var() { + local var=$1 makefile=${2:-$(get_gcc_build_dir)/Makefile} + echo -e "e:\\n\\t@echo \$(${var})\\ninclude ${makefile}" | \ + r=${makefile%/*} emake --no-print-directory -s -f - 2>/dev/null +} +XGCC() { get_make_var GCC_FOR_TARGET ; } + +gcc_move_pretty_printers() { + LIBPATH=$(get_lib_dir) # cros to Gentoo glue + + local py gdbdir=/usr/share/gdb/auto-load${LIBPATH} + pushd "${D}"${LIBPATH} >/dev/null + for py in $(find . -name '*-gdb.py') ; do + local multidir=${py%/*} + insinto "${gdbdir}/${multidir}" + sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128 + doins "${py}" || die + rm "${py}" || die + done + popd >/dev/null +} + +# make sure the libtool archives have libdir set to where they actually +# -are-, and not where they -used- to be. also, any dependencies we have +# on our own .la files need to be updated. +fix_libtool_libdir_paths() { + pushd "${D}" >/dev/null + + pushd "./${1}" >/dev/null + local dir="${PWD#${D%/}}" + local allarchives=$(echo *.la) + allarchives="\(${allarchives// /\\|}\)" + popd >/dev/null + + sed -i \ + -e "/^libdir=/s:=.*:='${dir}':" \ + ./${dir}/*.la + sed -i \ + -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \ + $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \ + ./${dir}/*.la + + popd >/dev/null +} + +gcc_movelibs() { + LIBPATH=$(get_lib_dir) # cros to Gentoo glue + + local multiarg removedirs="" + for multiarg in $($(XGCC) -print-multi-lib) ; do + multiarg=${multiarg#*;} + multiarg=${multiarg//@/ -} + + local OS_MULTIDIR=$($(XGCC) ${multiarg} --print-multi-os-directory) + local MULTIDIR=$($(XGCC) ${multiarg} --print-multi-directory) + local TODIR=${D}${LIBPATH}/${MULTIDIR} + local FROMDIR= + + [[ -d ${TODIR} ]] || mkdir -p ${TODIR} + + for FROMDIR in \ + ${LIBPATH}/${OS_MULTIDIR} \ + ${LIBPATH}/../${MULTIDIR} \ + ${PREFIX}/lib/${OS_MULTIDIR} \ + ${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR} + do + removedirs="${removedirs} ${FROMDIR}" + FROMDIR=${D}${FROMDIR} + if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then + local files=$(find "${FROMDIR}" -maxdepth 1 ! -type d 2>/dev/null) + if [[ -n ${files} ]] ; then + mv ${files} "${TODIR}" + fi + fi + done + fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}" + done + + # We remove directories separately to avoid this case: + # mv SRC/lib/../lib/*.o DEST + # rmdir SRC/lib/../lib/ + # mv SRC/lib/../lib32/*.o DEST # Bork + for FROMDIR in ${removedirs} ; do + rmdir "${D}"${FROMDIR} >& /dev/null + done + find "${D}" -type d | xargs rmdir >& /dev/null +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/gcc-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/gcc-9999.ebuild new file mode 100644 index 0000000000..7fd839dbc5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gcc/gcc-9999.ebuild @@ -0,0 +1,546 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.3-r3.ebuild,v 1.1 2010/06/19 01:53:09 zorry Exp $ + +EAPI=1 +CROS_WORKON_LOCALNAME=gcc +CROS_WORKON_PROJECT=chromiumos/third_party/gcc + +inherit eutils cros-workon binutils-funcs + +GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files" + +DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14." + +LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=">=sys-libs/zlib-1.1.4 + >=sys-devel/gcc-config-1.6 + virtual/libiconv + >=dev-libs/gmp-4.2.1 + >=dev-libs/mpc-0.8.1 + >=dev-libs/mpfr-2.3.2 + graphite? ( + >=dev-libs/ppl-0.10 + >=dev-libs/cloog-ppl-0.15.4 + ) + !build? ( + gcj? ( + gtk? ( + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXtst + x11-proto/xproto + x11-proto/xextproto + >=x11-libs/gtk+-2.2 + x11-libs/pango + ) + >=media-libs/libart_lgpl-2.1 + app-arch/zip + app-arch/unzip + ) + >=sys-libs/ncurses-5.2-r2 + nls? ( sys-devel/gettext ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) + >=sys-apps/texinfo-4.8 + >=sys-devel/bison-1.875 + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) + ppc? ( >=${CATEGORY}/binutils-2.17 ) + ppc64? ( >=${CATEGORY}/binutils-2.17 ) + >=${CATEGORY}/binutils-2.15.94" +PDEPEND=">=sys-devel/gcc-config-1.4" +if [[ ${CATEGORY} != cross-* ]] ; then + PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" +fi + +RESTRICT="mirror strip" + +IUSE="gcj git_gcc graphite gtk hardened hardfp mounted_gcc multilib multislot + nls cxx openmp tests +thumb upstream_gcc vanilla +wrapper_ccache" + +is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] ; } + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} = ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +if use multislot ; then + SLOT="${CTARGET}-${PV}" +else + SLOT="${CTARGET}" +fi + +PREFIX=/usr + +src_unpack() { + if use mounted_gcc ; then + if [[ ! -d "$(get_gcc_dir)" ]] ; then + die "gcc dir not mounted/present at: $(get_gcc_dir)" + fi + elif use upstream_gcc ; then + GCC_MIRROR=ftp://mirrors.kernel.org/gnu/gcc + GCC_TARBALL=${GCC_MIRROR}/${P}/${P}.tar.bz2 + wget $GCC_TARBALL + tar xf ${GCC_TARBALL##*/} + elif use git_gcc ; then + git clone "${CROS_WORKON_REPO}/${CROS_WORKON_PROJECT}.git" "${S}" + if [[ -n ${GCC_GITHASH} ]] ; then + einfo "Checking out: ${GCC_GITHASH}" + pushd "$(get_gcc_dir)" >/dev/null + git checkout ${GCC_GITHASH} || \ + die "Couldn't checkout ${GCC_GITHASH}" + popd >/dev/null + fi + else + cros-workon_src_unpack + cd "${S}" + [[ ${ABI} == "x32" ]] && epatch "${FILESDIR}"/90_all_gcc-4.7-x32.patch + fi + + COST_PKG_VERSION="$("${FILESDIR}"/chromeos-version.sh "${S}")_cos_gg" + + if [[ -d ${S}/.git ]]; then + COST_PKG_VERSION+="_$(cd ${S}; git describe --always)" + elif [[ -n ${VCSID} ]]; then + COST_PKG_VERSION+="_${VCSID}" + fi +} + +src_compile() +{ + src_configure + cd $(get_gcc_build_dir) || "Build dir $(get_gcc_build_dir) not found" + GCC_CFLAGS="$(portageq envvar CFLAGS)" + TARGET_FLAGS="" + + if use hardened + then + TARGET_FLAGS="${TARGET_FLAGS} -fstack-protector-strong -D_FORTIFY_SOURCE=2" + fi + + # Do not link libgcc with gold. That is known to fail on internal linker + # errors. See crosbug.com/16719 + local LD_NON_GOLD="$(get_binutils_path_ld ${CTARGET})/ld" + + emake CFLAGS="${GCC_CFLAGS}" \ + LDFLAGS="-Wl,-O1" \ + STAGE1_CFLAGS="-O2 -pipe" \ + BOOT_CFLAGS="-O2" \ + CFLAGS_FOR_TARGET="$(get_make_var CFLAGS_FOR_TARGET) ${TARGET_FLAGS}" \ + CXXFLAGS_FOR_TARGET="$(get_make_var CXXFLAGS_FOR_TARGET) ${TARGET_FLAGS}" \ + LD_FOR_TARGET="${LD_NON_GOLD}" \ + all || die +} + +# Logic copied from Gentoo's toolchain.eclass. +toolchain_src_install() { + BINPATH=$(get_bin_dir) # cros to Gentoo glue + + # These should be symlinks + dodir /usr/bin + cd "${D}"${BINPATH} + for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do + # For some reason, g77 gets made instead of ${CTARGET}-g77... + # this should take care of that + [[ -f ${x} ]] && mv ${x} ${CTARGET}-${x} + + if [[ -f ${CTARGET}-${x} ]] ; then + if ! is_crosscompile ; then + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} + fi + + # Create version-ed symlinks + dosym ${BINPATH}/${CTARGET}-${x} \ + /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + + if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then + rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} + ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + done +} + +src_install() +{ + cd $(get_gcc_build_dir) || "Build dir $(get_gcc_build_dir) not found" + emake DESTDIR="${D}" install || die "Could not install gcc" + + find "${D}" -name libiberty.a -exec rm -f "{}" \; + + # Move the libraries to the proper location + gcc_movelibs + + # Move pretty-printers to gdb datadir to shut ldconfig up + gcc_move_pretty_printers + + GCC_CONFIG_VER=$(get_gcc_base_ver) + dodir /etc/env.d/gcc + insinto /etc/env.d/gcc + + local LDPATH=$(get_lib_dir) + for SUBDIR in 32 64 ; do + if [[ -d ${D}/${LDPATH}/${SUBDIR} ]] + then + LDPATH="${LDPATH}:${LDPATH}/${SUBDIR}" + fi + done + + cat <<-EOF > env.d +LDPATH="${LDPATH}" +MANPATH="$(get_data_dir)/man" +INFOPATH="$(get_data_dir)/info" +STDCXX_INCDIR="$(get_stdcxx_incdir)" +CTARGET=${CTARGET} +GCC_PATH="$(get_bin_dir)" +GCC_VER="$(get_gcc_base_ver)" +EOF + newins env.d $(get_gcc_config_file) + cd - + + toolchain_src_install + + if is_crosscompile ; then + if use hardened + then + SYSROOT_WRAPPER_FILE=sysroot_wrapper.hardened + else + SYSROOT_WRAPPER_FILE=sysroot_wrapper + fi + + exeinto "$(get_bin_dir)" + doexe "${FILESDIR}/${SYSROOT_WRAPPER_FILE}" || die + sed -i \ + -e "/^use_ccache = .*@CCACHE_DEFAULT@/s:=[^#]*:= $(usex wrapper_ccache True False) :" \ + "${D}$(get_bin_dir)/${SYSROOT_WRAPPER_FILE}" || die + for x in c++ cpp g++ gcc; do + if [[ -f "${CTARGET}-${x}" ]]; then + mv "${CTARGET}-${x}" "${CTARGET}-${x}.real" + dosym "${SYSROOT_WRAPPER_FILE}" "$(get_bin_dir)/${CTARGET}-${x}" || die + fi + done + fi + + if use tests + then + TEST_INSTALL_DIR="usr/local/dejagnu/gcc" + dodir ${TEST_INSTALL_DIR} + cd ${D}/${TEST_INSTALL_DIR} + tar -czf "tests.tar.gz" ${WORKDIR} + fi +} + +pkg_preinst() +{ + # We handle ccache ourselves in the sysroot wrapper. + rm -f /usr/lib/ccache/bin/*-* + + local ccache_dir="/var/cache/distfiles/ccache" + local vcsid_file="${ccache_dir}/.gcc.vcsid.${CTARGET}" + # Clean out the ccache whenever the gcc code changes. + # If we are using a live ebuild, nuke it everytime just + # to be safe. + [[ ${PV} == "9999" ]] && rm -f "${vcsid_file}" + local old_vcsid=$(cat "${vcsid_file}" 2>/dev/null) + if [[ ${old_vcsid} != ${CROS_WORKON_COMMIT} ]] ; then + # Don't just delete the whole dir as that would punt + # the vcsid tag files from other targets too. + rm -rf "${ccache_dir}"/* + fi + mkdir -p -m 2775 "${ccache_dir}" + echo "${CROS_WORKON_COMMIT}" > "${vcsid_file}" + + # Use a 10G limit as our bots have finite resources. A full + # x86-generic build uses ~6GB, while an amd64-generic uses + # ~8GB, so this limit should be sufficient. + CCACHE_UMASK=002 CCACHE_DIR=${ccache_dir} ccache -F 0 -M 11G + + # Make sure the dirs have perms for emerge builders. + chown -R ${PORTAGE_USERNAME}:portage "${ccache_dir}" +} + +pkg_postinst() +{ + gcc-config $(get_gcc_config_file) +} + +pkg_postrm() +{ + if is_crosscompile ; then + if [[ -z $(ls "${ROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then + rm -f "${ROOT}"/etc/env.d/gcc/config-${CTARGET} + rm -f "${ROOT}"/etc/env.d/??gcc-${CTARGET} + rm -f "${ROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64} + fi + fi +} + +src_configure() +{ + if use mounted_gcc && [[ -f $(get_gcc_build_dir)/Makefile ]] ; then + return + fi + + # Set configuration based on path variables + local DATAPATH=$(get_data_dir) + local confgcc="$(use_enable multilib) + --prefix=${PREFIX} \ + --bindir=$(get_bin_dir) \ + --datadir=${DATAPATH} \ + --mandir=${DATAPATH}/man \ + --infodir=${DATAPATH}/info \ + --includedir=$(get_lib_dir)/include \ + --with-gxx-include-dir=$(get_stdcxx_incdir) + --with-python-dir=${DATAPATH#${PREFIX}}/python" + confgcc="${confgcc} --host=${CHOST}" + confgcc="${confgcc} --target=${CTARGET}" + confgcc="${confgcc} --build=${CBUILD}" + + # Language options for stage1/stage2. + if ! use cxx + then + GCC_LANG="c" + else + GCC_LANG="c,c++" + fi + confgcc="${confgcc} --enable-languages=${GCC_LANG}" + + if use hardfp && [[ ${CTARGET} == arm* ]] ; + then + confgcc="${confgcc} --with-float=hard" + fi + + if use thumb && [[ ${CTARGET} == arm* ]] ; + then + confgcc="${confgcc} --with-mode=thumb" + fi + + if is_crosscompile ; then + local needed_libc="glibc" + if [[ -n ${needed_libc} ]] ; then + if ! has_version ${CATEGORY}/${needed_libc} ; then + confgcc="${confgcc} --disable-shared --disable-threads --without-headers" + elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then + confgcc="${confgcc} --disable-shared --with-sysroot=/usr/${CTARGET}" + else + confgcc="${confgcc} --with-sysroot=/usr/${CTARGET}" + fi + fi + else + confgcc="${confgcc} --enable-shared --enable-threads=posix" + fi + + confgcc="${confgcc} $(get_gcc_configure_options ${CTARGET})" + + EXTRA_ECONF="--with-bugurl=http://code.google.com/p/chromium-os/issues/entry\ + --with-pkgversion=${COST_PKG_VERSION} --enable-linker-build-id" + confgcc="${confgcc} ${EXTRA_ECONF}" + + # Build in a separate build tree + mkdir -p $(get_gcc_build_dir) || \ + die "Could not create build dir $(get_gcc_build_dir)" + cd $(get_gcc_build_dir) || die "Build dir $(get_gcc_build_dir) not found" + + # and now to do the actual configuration + addwrite /dev/zero + echo "Running this:" + echo "configure ${confgcc}" + echo "$(get_gcc_dir)"/configure "$@" + "$(get_gcc_dir)"/configure ${confgcc} || die "failed to run configure" +} + +get_gcc_configure_options() +{ + local CTARGET=$1; shift + local confgcc=$(get_gcc_common_options) + case ${CTARGET} in + arm*) #264534 + local arm_arch="${CTARGET%%-*}" + # Only do this if arm_arch is armv* + if [[ ${arm_arch} == armv* ]] ; then + # Convert armv7{a,r,m} to armv7-{a,r,m} + [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-} + # Remove endian ('l' / 'eb') + [[ ${arm_arch} == *l ]] && arm_arch=${arm_arch%l} + [[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb} + confgcc="${confgcc} --with-arch=${arm_arch}" + confgcc="${confgcc} --disable-esp" + fi + ;; + i?86*) + # Hardened is enabled for x86, but disabled for ARM. + confgcc="${confgcc} --enable-esp" + confgcc="${confgcc} --with-arch=atom" + confgcc="${confgcc} --with-tune=atom" + # Remove this once crash2 supports larger symbols. + # http://code.google.com/p/chromium-os/issues/detail?id=23321 + confgcc="${confgcc} --enable-frame-pointer" + ;; + x86_64*-gnux32) + confgcc="${confgcc} --with-abi=x32 --with-multilib-list=mx32" + ;; + esac + echo ${confgcc} +} + +get_gcc_common_options() +{ + local confgcc + confgcc="${confgcc} --disable-libmudflap" + confgcc="${confgcc} --disable-libssp" + confgcc+=" $(use_enable openmp libgomp)" + confgcc="${confgcc} --enable-__cxa_atexit" + confgcc="${confgcc} --enable-checking=release" + confgcc="${confgcc} --disable-libquadmath" + echo ${confgcc} +} + +get_gcc_dir() +{ + local GCCDIR + if use mounted_gcc ; then + GCCDIR=${GCC_SOURCE_PATH:=/usr/local/toolchain_root/gcc} + elif use upstream_gcc ; then + GCCDIR=${P} + else + GCCDIR=${S} + fi + echo "${GCCDIR}" +} + +get_gcc_build_dir() +{ + echo "$(get_gcc_dir)-build-${CTARGET}" +} + +get_gcc_base_ver() +{ + cat "$(get_gcc_dir)/gcc/BASE-VER" +} + +get_stdcxx_incdir() +{ + echo "$(get_lib_dir)/include/g++-v4" +} + +get_lib_dir() +{ + echo "${PREFIX}/lib/gcc/${CTARGET}/$(get_gcc_base_ver)" +} + +get_bin_dir() +{ + if is_crosscompile ; then + echo ${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/$(get_gcc_base_ver) + else + echo ${PREFIX}/${CTARGET}/gcc-bin/$(get_gcc_base_ver) + fi +} + +get_data_dir() +{ + echo "${PREFIX}/share/gcc-data/${CTARGET}/$(get_gcc_base_ver)" +} + +get_gcc_config_file() +{ + echo ${CTARGET}-${PV} +} + +# Grab a variable from the build system (taken from linux-info.eclass) +get_make_var() { + local var=$1 makefile=${2:-$(get_gcc_build_dir)/Makefile} + echo -e "e:\\n\\t@echo \$(${var})\\ninclude ${makefile}" | \ + r=${makefile%/*} emake --no-print-directory -s -f - 2>/dev/null +} +XGCC() { get_make_var GCC_FOR_TARGET ; } + +gcc_move_pretty_printers() { + LIBPATH=$(get_lib_dir) # cros to Gentoo glue + + local py gdbdir=/usr/share/gdb/auto-load${LIBPATH} + pushd "${D}"${LIBPATH} >/dev/null + for py in $(find . -name '*-gdb.py') ; do + local multidir=${py%/*} + insinto "${gdbdir}/${multidir}" + sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128 + doins "${py}" || die + rm "${py}" || die + done + popd >/dev/null +} + +# make sure the libtool archives have libdir set to where they actually +# -are-, and not where they -used- to be. also, any dependencies we have +# on our own .la files need to be updated. +fix_libtool_libdir_paths() { + pushd "${D}" >/dev/null + + pushd "./${1}" >/dev/null + local dir="${PWD#${D%/}}" + local allarchives=$(echo *.la) + allarchives="\(${allarchives// /\\|}\)" + popd >/dev/null + + sed -i \ + -e "/^libdir=/s:=.*:='${dir}':" \ + ./${dir}/*.la + sed -i \ + -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \ + $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \ + ./${dir}/*.la + + popd >/dev/null +} + +gcc_movelibs() { + LIBPATH=$(get_lib_dir) # cros to Gentoo glue + + local multiarg removedirs="" + for multiarg in $($(XGCC) -print-multi-lib) ; do + multiarg=${multiarg#*;} + multiarg=${multiarg//@/ -} + + local OS_MULTIDIR=$($(XGCC) ${multiarg} --print-multi-os-directory) + local MULTIDIR=$($(XGCC) ${multiarg} --print-multi-directory) + local TODIR=${D}${LIBPATH}/${MULTIDIR} + local FROMDIR= + + [[ -d ${TODIR} ]] || mkdir -p ${TODIR} + + for FROMDIR in \ + ${LIBPATH}/${OS_MULTIDIR} \ + ${LIBPATH}/../${MULTIDIR} \ + ${PREFIX}/lib/${OS_MULTIDIR} \ + ${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR} + do + removedirs="${removedirs} ${FROMDIR}" + FROMDIR=${D}${FROMDIR} + if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then + local files=$(find "${FROMDIR}" -maxdepth 1 ! -type d 2>/dev/null) + if [[ -n ${files} ]] ; then + mv ${files} "${TODIR}" + fi + fi + done + fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}" + done + + # We remove directories separately to avoid this case: + # mv SRC/lib/../lib/*.o DEST + # rmdir SRC/lib/../lib/ + # mv SRC/lib/../lib32/*.o DEST # Bork + for FROMDIR in ${removedirs} ; do + rmdir "${D}"${FROMDIR} >& /dev/null + done + find "${D}" -type d | xargs rmdir >& /dev/null +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/Manifest new file mode 100644 index 0000000000..d807c0efda --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/Manifest @@ -0,0 +1,2 @@ +DIST gdb-7.1-patches-1.tar.lzma 9207 RMD160 61d829abcfe7186f679ead31540fc9c2c9f0aad9 SHA1 35ca21761d451481a1ff0caa12c95eb9eb0f4e67 SHA256 d2efe1ee66110e4e0c55bbe4365380bdb6e159c45ea849a1e329ac293b4e7e3c +DIST gdb-7.1.tar.bz2 17977195 RMD160 800d224496240a360c996e588490f2d87367c4e3 SHA1 417e2e637a296ea0e1cdddf56233311b8708fa19 SHA256 142c27d7970a4e652dc225d61d887777ae00cf22fdd75cd1e8e4e13bfbd85352 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/files/chromeos-version.sh new file mode 100755 index 0000000000..366df78d2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/files/chromeos-version.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +exec sed 's:-gg:_p:' "$1"/gdb/version.in diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-7.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-7.2-r2.ebuild new file mode 100644 index 0000000000..cd43f6dac1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-7.2-r2.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.3 2011/08/23 16:21:56 vapier Exp $ + +EAPI="3" + +inherit flag-o-matic eutils + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +RPM= +MY_PV=${PV} +case ${PV} in +*.*.*.*.*.*) + # fedora version: gdb-6.8.50.20090302-8.fc11.src.rpm + inherit versionator rpm + gvcr() { get_version_component_range "$@"; } + MY_PV=$(gvcr 1-4) + RPM="${PN}-${MY_PV}-$(gvcr 5).fc$(gvcr 6).src.rpm" + SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}" + ;; +*.*.50.*) + # weekly snapshots + SRC_URI="ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2" + ;; +7.2 | 9999*) + # live git tree + EGIT_REPO_URI="http://git.chromium.org/chromiumos/third_party/gdb.git" + EGIT_COMMIT=c4aa8d2c86b0fbfd969fd80fbc91727740a2dd27 + inherit git + SRC_URI="" + ;; +*) + # Normal upstream release + SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2 + ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2" + ;; +esac + +PATCH_VER="" +DESCRIPTION="GNU debugger" +HOMEPAGE="http://sourceware.org/gdb/" +SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}" + +LICENSE="GPL-2 LGPL-2" +is_cross \ + && SLOT="${CTARGET}" \ + || SLOT="0" +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd" +fi +IUSE="expat multitarget nls python test vanilla mounted_sources" + +RDEPEND=">=sys-libs/ncurses-5.2-r2 + sys-libs/readline + expat? ( dev-libs/expat ) + python? ( =dev-lang/python-2* )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/yacc + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_unpack () { + if use mounted_sources ; then + : ${GDBDIR:=/usr/local/toolchain_root/gdb/gdb-7.2.x} + if [[ ! -d ${GDBDIR} ]] ; then + die "gdb dir not mounted/present at: ${GDBDIR}" + fi + cp -R ${GDBDIR} ${S} + else + git_src_unpack + fi +} + +src_prepare() { + [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec + use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + strip-linguas -u bfd/po opcodes/po +} + +gdb_branding() { + printf "Gentoo ${PV} " + if [[ -n ${PATCH_VER} ]] ; then + printf "p${PATCH_VER}" + else + printf "vanilla" + fi +} + +src_configure() { + strip-unsupported-flags + econf \ + --with-pkgversion="$(gdb_branding)" \ + --with-bugurl='http://bugs.gentoo.org/' \ + --disable-werror \ + --enable-64-bit-bfd \ + --with-system-readline \ + --with-separate-debug-dir=/usr/lib/debug \ + $(is_cross && echo --with-sysroot=/usr/${CTARGET}) \ + $(use_with expat) \ + $(use_enable nls) \ + $(use multitarget && echo --enable-targets=all) \ + $(use_with python python "${EPREFIX}/usr/bin/python2") +} + +src_test() { + emake check || ewarn "tests failed" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + {include,lib}dir=/nukeme/pretty/pretty/please \ + install || die + rm -r "${D}"/nukeme || die + + # Don't install docs when building a cross-gdb + if [[ ${CTARGET} != ${CHOST} ]] ; then + rm -r "${D}"/usr/share + return 0 + fi + + dodoc README + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/ChangeLog gdb/PROBLEMS + docinto sim + dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING + + if [[ -n ${PATCH_VER} ]] ; then + dodoc "${WORKDIR}"/extra/gdbinit.sample + fi + + # Remove shared info pages + rm -f "${D}"/usr/share/info/{annotate,bfd,configure,standards}.info* +} + +pkg_postinst() { + # portage sucks and doesnt unmerge files in /etc + rm -vf "${ROOT}"/etc/skel/.gdbinit +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-9999.ebuild new file mode 100644 index 0000000000..e0f3245fdd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-9999.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.3 2011/08/23 16:21:56 vapier Exp $ + +EAPI="3" + +inherit flag-o-matic eutils + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +RPM= +MY_PV=${PV} +case ${PV} in +*.*.*.*.*.*) + # fedora version: gdb-6.8.50.20090302-8.fc11.src.rpm + inherit versionator rpm + gvcr() { get_version_component_range "$@"; } + MY_PV=$(gvcr 1-4) + RPM="${PN}-${MY_PV}-$(gvcr 5).fc$(gvcr 6).src.rpm" + SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}" + ;; +*.*.50.*) + # weekly snapshots + SRC_URI="ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2" + ;; +*) + # live git tree + EGIT_REPO_URI="http://git.chromium.org/chromiumos/third_party/gdb.git" + EGIT_COMMIT=c4aa8d2c86b0fbfd969fd80fbc91727740a2dd27 + inherit git + SRC_URI="" + ;; +*) + # Normal upstream release + SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2 + ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2" + ;; +esac + +PATCH_VER="" +DESCRIPTION="GNU debugger" +HOMEPAGE="http://sourceware.org/gdb/" +SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}" + +LICENSE="GPL-2 LGPL-2" +is_cross \ + && SLOT="${CTARGET}" \ + || SLOT="0" +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd" +fi +IUSE="expat multitarget nls python test vanilla mounted_sources" + +RDEPEND=">=sys-libs/ncurses-5.2-r2 + sys-libs/readline + expat? ( dev-libs/expat ) + python? ( =dev-lang/python-2* )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/yacc + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_unpack () { + if use mounted_sources ; then + : ${GDBDIR:=/usr/local/toolchain_root/gdb/gdb-7.2.x} + if [[ ! -d ${GDBDIR} ]] ; then + die "gdb dir not mounted/present at: ${GDBDIR}" + fi + cp -R ${GDBDIR} ${S} + else + git_src_unpack + fi +} + +src_prepare() { + [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec + use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + strip-linguas -u bfd/po opcodes/po +} + +gdb_branding() { + printf "Gentoo ${PV} " + if [[ -n ${PATCH_VER} ]] ; then + printf "p${PATCH_VER}" + else + printf "vanilla" + fi +} + +src_configure() { + strip-unsupported-flags + econf \ + --with-pkgversion="$(gdb_branding)" \ + --with-bugurl='http://bugs.gentoo.org/' \ + --disable-werror \ + --enable-64-bit-bfd \ + --with-system-readline \ + --with-separate-debug-dir=/usr/lib/debug \ + $(is_cross && echo --with-sysroot=/usr/${CTARGET}) \ + $(use_with expat) \ + $(use_enable nls) \ + $(use multitarget && echo --enable-targets=all) \ + $(use_with python python "${EPREFIX}/usr/bin/python2") +} + +src_test() { + emake check || ewarn "tests failed" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + {include,lib}dir=/nukeme/pretty/pretty/please \ + install || die + rm -r "${D}"/nukeme || die + + # Don't install docs when building a cross-gdb + if [[ ${CTARGET} != ${CHOST} ]] ; then + rm -r "${D}"/usr/share + return 0 + fi + + dodoc README + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/ChangeLog gdb/PROBLEMS + docinto sim + dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING + + if [[ -n ${PATCH_VER} ]] ; then + dodoc "${WORKDIR}"/extra/gdbinit.sample + fi + + # Remove shared info pages + rm -f "${D}"/usr/share/info/{annotate,bfd,configure,standards}.info* +} + +pkg_postinst() { + # portage sucks and doesnt unmerge files in /etc + rm -vf "${ROOT}"/etc/skel/.gdbinit +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/Manifest new file mode 100644 index 0000000000..45fbc53801 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/Manifest @@ -0,0 +1 @@ +DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch new file mode 100644 index 0000000000..6174a3fbc4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch @@ -0,0 +1,64 @@ +From e25389b66b5ced3a2b5461077dcc9a505d334e3d Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Tue, 13 Mar 2012 14:12:21 -0400 +Subject: [PATCH 1/2] r600: Add some intrinsic definitions + +--- + include/llvm/Intrinsics.td | 1 + + include/llvm/IntrinsicsR600.td | 35 +++++++++++++++++++++++++++++++++++ + 2 files changed, 36 insertions(+), 0 deletions(-) + create mode 100644 include/llvm/IntrinsicsR600.td + +diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td +index 069f907..e90dd85 100644 +--- a/include/llvm/Intrinsics.td ++++ b/include/llvm/Intrinsics.td +@@ -469,3 +469,4 @@ + include "llvm/IntrinsicsHexagon.td" + include "llvm/IntrinsicsNVVM.td" + include "llvm/IntrinsicsMips.td" ++include "llvm/IntrinsicsR600.td" +diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td +new file mode 100644 +index 0000000..789fecb +--- /dev/null ++++ b/include/llvm/IntrinsicsR600.td +@@ -0,0 +1,35 @@ ++//===- IntrinsicsR600.td - Defines R600 intrinsics ---------*- tablegen -*-===// ++// ++// The LLVM Compiler Infrastructure ++// ++// This file is distributed under the University of Illinois Open Source ++// License. See LICENSE.TXT for details. ++// ++//===----------------------------------------------------------------------===// ++// ++// This file defines all of the R600-specific intrinsics. ++// ++//===----------------------------------------------------------------------===// ++// ++// Authors: Tom Stellard ++// ++ ++let TargetPrefix = "r600" in { ++ ++class R600ReadPreloadRegisterIntrinsic ++ : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>, ++ GCCBuiltin; ++ ++multiclass R600ReadPreloadRegisterIntrinsic_xyz { ++ def _x : R600ReadPreloadRegisterIntrinsic; ++ def _y : R600ReadPreloadRegisterIntrinsic; ++ def _z : R600ReadPreloadRegisterIntrinsic; ++} ++ ++defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < ++ "__builtin_r600_read_ngroups">; ++defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < ++ "__builtin_r600_read_tgid">; ++defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz < ++ "__builtin_r600_read_tidig">; ++} // End TargetPrefix = "r600" +-- +1.7.7.6 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch new file mode 100644 index 0000000000..db176dd56a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch @@ -0,0 +1,27 @@ +From 17667fa3450470f7c89fc2ba4631d908cf510749 Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Wed, 14 Mar 2012 11:19:35 -0400 +Subject: [PATCH 2/2] r600: Add get_global_size and get_local_size intrinsics + +--- + include/llvm/IntrinsicsR600.td | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td +index 789fecb..0473acb 100644 +--- a/include/llvm/IntrinsicsR600.td ++++ b/include/llvm/IntrinsicsR600.td +@@ -26,6 +26,10 @@ multiclass R600ReadPreloadRegisterIntrinsic_xyz { + def _z : R600ReadPreloadRegisterIntrinsic; + } + ++defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz < ++ "__builtin_r600_read_global_size">; ++defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz < ++ "__builtin_r600_read_local_size">; + defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < + "__builtin_r600_read_ngroups">; + defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < +-- +1.7.7.6 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch new file mode 100644 index 0000000000..c485e9ba68 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch @@ -0,0 +1,43 @@ +Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h +=================================================================== +--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2011-07-25 23:24:55.000000000 +0000 ++++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2011-12-02 13:06:48.000000000 +0000 +@@ -34,6 +34,10 @@ + + } // End llvm namespace + ++// Generated files will use "namespace PPC". To avoid symbol clash, ++// undefine PPC here. PPC may be predefined on some hosts. ++#undef PPC ++ + // Defines symbolic names for PowerPC registers. This defines a mapping from + // register name to register number. + // +Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h +=================================================================== +--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2011-07-26 00:24:13.000000000 +0000 ++++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2011-12-02 13:06:48.000000000 +0000 +@@ -14,6 +14,10 @@ + #ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H + #define LLVM_TARGET_POWERPC_PPCPREDICATES_H + ++// Generated files will use "namespace PPC". To avoid symbol clash, ++// undefine PPC here. PPC may be predefined on some hosts. ++#undef PPC ++ + namespace llvm { + namespace PPC { + /// Predicate - These are "(BI << 5) | BO" for various predicates. +Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h +=================================================================== +--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2011-07-25 19:53:23.000000000 +0000 ++++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2011-12-02 16:21:23.000000000 +0000 +@@ -12,6 +12,8 @@ + + #include "llvm/MC/MCFixup.h" + ++#undef PPC ++ + namespace llvm { + namespace PPC { + enum Fixups { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch new file mode 100644 index 0000000000..de2d46b618 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch @@ -0,0 +1,65 @@ +From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001 +From: Ben Longbons +Date: Fri, 29 Jun 2012 12:58:34 -0700 +Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue + lines in a function." + +This meants that the debugger could find meaningful line information. + +This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. +--- + lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++----- + test/DebugInfo/X86/ending-run.ll | 6 ++---- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +index 3e79a6d..24aedfb 100644 +--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp ++++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { + if (!MI->isDebugValue()) { + DebugLoc DL = MI->getDebugLoc(); + if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { +- unsigned Flags = 0; ++ unsigned Flags = DWARF2_FLAG_IS_STMT; + PrevInstLoc = DL; + if (DL == PrologEndLoc) { + Flags |= DWARF2_FLAG_PROLOGUE_END; + PrologEndLoc = DebugLoc(); + } +- if (PrologEndLoc.isUnknown()) +- Flags |= DWARF2_FLAG_IS_STMT; +- + if (!DL.isUnknown()) { + const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); + recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); +@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { + MF->getFunction()->getContext()); + recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), + FnStartDL.getScope(MF->getFunction()->getContext()), +- 0); ++ DWARF2_FLAG_IS_STMT); + } + } + +diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll +index 6935c47..0cd3de1 100644 +--- a/test/DebugInfo/X86/ending-run.ll ++++ b/test/DebugInfo/X86/ending-run.ll +@@ -1,11 +1,9 @@ + ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj + ; RUN: llvm-dwarfdump %t | FileCheck %s + +-; Check that the line table starts at 7, not 4, but that the first +-; statement isn't until line 8. ++; Check that the line table starts at 7, not 4. + +-; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt +-; CHECK: 0x0000000000000000 7 0 1 0 ++; CHECK: 0x0000000000000000 7 0 1 0 is_stmt + ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end + + define i32 @callee(i32 %x) nounwind uwtable ssp { +-- +1.7.10 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.1-no-sample.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.1-no-sample.patch new file mode 100644 index 0000000000..b63213f834 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.1-no-sample.patch @@ -0,0 +1,22 @@ +diff -aur llvm-3.1.src.orig/configure llvm-3.1.src/configure +--- llvm-3.1.src.orig/configure 2012-05-11 13:48:57.000000000 -0700 ++++ llvm-3.1.src/configure 2012-10-08 14:34:48.591805189 -0700 +@@ -3486,8 +3486,6 @@ + do + if test -d ${srcdir}/projects/${i} ; then + case ${i} in +- sample) subdirs="$subdirs projects/sample" +- ;; + privbracket) subdirs="$subdirs projects/privbracket" + ;; + llvm-stacker) subdirs="$subdirs projects/llvm-stacker" +diff -aur llvm-3.1.src.orig/projects/Makefile llvm-3.1.src/projects/Makefile +--- llvm-3.1.src.orig/projects/Makefile 2010-09-09 08:49:32.000000000 -0700 ++++ llvm-3.1.src/projects/Makefile 2012-10-08 14:51:55.783370351 -0700 +@@ -24,5 +24,6 @@ + ifeq ($(ARCH), Sparc) + DIRS := $(filter-out sample, $(DIRS)) + endif ++DIRS := $(filter-out sample, $(DIRS)) + + include $(PROJ_SRC_ROOT)/Makefile.rules diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch new file mode 100644 index 0000000000..3a622b53da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch @@ -0,0 +1,45 @@ +--- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200 ++++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200 +@@ -52,11 +52,10 @@ + # 'make generated BUILD_FOR_WEBSITE=1' + generated:: $(generated_targets) + +-install-html: $(PROJ_OBJ_DIR)/html.tar.gz ++install-html: + $(Echo) Installing HTML documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html + $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) + + $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) + $(Echo) Packaging HTML documentation +@@ -68,12 +67,11 @@ + install-doxygen: doxygen + $(Echo) Installing doxygen documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; + +-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz ++doxygen: regendoc + + regendoc: + $(Echo) Building doxygen documentation +@@ -99,7 +97,6 @@ + install-ocamldoc: ocamldoc + $(Echo) Installing ocamldoc documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; +@@ -109,7 +106,6 @@ + $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* + $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc + $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar +- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ + + regen-ocamldoc: + $(Echo) Building ocamldoc documentation diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/xconfigure.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/xconfigure.patch new file mode 100644 index 0000000000..090a56f5a1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/xconfigure.patch @@ -0,0 +1,34 @@ +diff -aur llvm-3.1.src.orig/configure llvm-3.1.src/configure +--- llvm-3.1.src.orig/configure 2012-05-11 13:48:57.000000000 -0700 ++++ llvm-3.1.src/configure 2012-10-08 13:38:31.363732213 -0700 +@@ -1952,13 +1952,13 @@ + + + +-if test ${srcdir} != "." ; then +- if test -f ${srcdir}/include/llvm/Config/config.h ; then +- { { echo "$as_me:$LINENO: error: Already configured in ${srcdir}" >&5 +-echo "$as_me: error: Already configured in ${srcdir}" >&2;} +- { (exit 1); exit 1; }; } +- fi +-fi ++#if test ${srcdir} != "." ; then ++# if test -f ${srcdir}/include/llvm/Config/config.h ; then ++# { { echo "$as_me:$LINENO: error: Already configured in ${srcdir}" >&5 ++#echo "$as_me: error: Already configured in ${srcdir}" >&2;} ++# { (exit 1); exit 1; }; } ++# fi ++#fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4798,7 +4798,7 @@ + test -z "$BUILD_CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5 + echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +- ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ ac_build_link='${BUILD_CC-cc} -o conftest $HOST_CFLAGS $HOST_CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_build_exeext= +Only in llvm-3.1.src/: configure.orig diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/xmakefile.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/xmakefile.patch new file mode 100644 index 0000000000..49e4f794aa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/files/xmakefile.patch @@ -0,0 +1,16 @@ +diff -aur llvm-3.1.src.orig/Makefile llvm-3.1.src/Makefile +--- llvm-3.1.src.orig/Makefile 2012-01-16 18:56:49.000000000 -0800 ++++ llvm-3.1.src/Makefile 2012-10-08 13:39:18.854266324 -0700 +@@ -114,6 +114,11 @@ + unset CXXFLAGS ; \ + unset SDKROOT ; \ + unset UNIVERSAL_SDK_PATH ; \ ++ AR=$(HOST_AR) ;\ ++ AS=$(HOST_AS) ;\ ++ LD=$(HOST_LD) ;\ ++ CC=$(HOST_CC) ;\ ++ CXX=$(HOST_CXX) ;\ + $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \ + --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \ + --disable-polly ; \ +Only in llvm-3.1.src/: Makefile.orig diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-3.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-3.2-r1.ebuild new file mode 100644 index 0000000000..33b6806f61 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-3.2-r1.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r2.ebuild,v 1.3 2012/08/05 14:04:09 ryao Exp $ + +EAPI="4" +PYTHON_DEPEND="2" +inherit eutils flag-o-matic multilib toolchain-funcs python pax-utils + +DESCRIPTION="Low Level Virtual Machine" +HOMEPAGE="http://llvm.org/" +SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz" + +LICENSE="UoI-NCSA" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug gold +libffi multitarget ocaml test udis86 vim-syntax" + +DEPEND="dev-lang/perl + >=sys-devel/make-3.79 + >=sys-devel/flex-2.5.4 + >=sys-devel/bison-1.875d + || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) + || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) + gold? ( >=sys-devel/binutils-2.22[cxx] ) + libffi? ( virtual/pkgconfig + virtual/libffi ) + ocaml? ( dev-lang/ocaml ) + udis86? ( amd64? ( dev-libs/udis86[pic] ) + !amd64? ( dev-libs/udis86 ) )" +RDEPEND="dev-lang/perl + libffi? ( virtual/libffi ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + +S=${WORKDIR}/${P}.src + +pkg_setup() { + # Required for test and build + python_set_active_version 2 + python_pkg_setup + + # need to check if the active compiler is ok + + broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 " + broken_gcc_x86=" 3.4.0 3.4.2 " + broken_gcc_amd64=" 3.4.6 " + + gcc_vers=$(gcc-fullversion) + + if [[ ${broken_gcc} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm." + elog "Check http://www.llvm.org/docs/GettingStarted.html for" + elog "possible solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm on x86" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]]; + then + elog "Your version of gcc is known to miscompile llvm in amd64" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi +} + +src_prepare() { + # unfortunately ./configure won't listen to --mandir and the-like, so take + # care of this. + einfo "Fixing install dirs" + sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ + -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ + -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \ + -i Makefile.config.in || die "Makefile.config sed failed" + sed -e "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \ + -i tools/llvm-config/llvm-config.cpp || die "llvm-config sed failed" + + einfo "Fixing rpath and CFLAGS" + sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ + -i Makefile.rules || die "rpath sed failed" + if use gold; then + sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -i tools/gold/Makefile || die "gold rpath sed failed" + fi + + # Specify python version + python_convert_shebangs -r 2 test/Scripts + + epatch "${FILESDIR}"/${P}-nodoctargz.patch + epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch + epatch "${FILESDIR}"/${PN}-3.1-fix_debug_line_info.patch + + # Apply r600 OpenCL-related patches, bug #425688 + epatch "${FILESDIR}"/cl-patches/*.patch + + # Make llvm cross-compile + epatch "${FILESDIR}"/xconfigure.patch + epatch "${FILESDIR}"/xmakefile.patch + epatch "${FILESDIR}"/${PN}-3.1-no-sample.patch + + # User patches + epatch_user +} + +src_configure() { + local CONF_FLAGS="--enable-shared + --with-optimize-option= + $(use_enable !debug optimized) + $(use_enable debug assertions) + $(use_enable debug expensive-checks)" + + if use multitarget; then + CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" + else + CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp" + fi + + if use amd64; then + CONF_FLAGS="${CONF_FLAGS} --enable-pic" + fi + + if use gold; then + CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/" + fi + if use ocaml; then + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml" + else + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none" + fi + + if use udis86; then + CONF_FLAGS="${CONF_FLAGS} --with-udis86" + fi + + if use libffi; then + append-cppflags "$(pkg-config --cflags libffi)" + fi + CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)" + + # llvm prefers clang over gcc, so we may need to force that + tc-export CC CXX + econf ${CONF_FLAGS} +} + +src_compile() { + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 + + pax-mark m Release/bin/lli + if use test; then + pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests + fi +} + +src_install() { + emake KEEP_SYMBOLS=1 DESTDIR="${D}" install + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins utils/vim/*.vim + fi + + # Fix install_names on Darwin. The build system is too complicated + # to just fix this, so we correct it post-install + local lib= f= odylib= + if [[ ${CHOST} == *-darwin* ]] ; then + for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.dylib ; do + # libEnhancedDisassembly is Darwin10 only, so non-fatal + [[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue + ebegin "fixing install_name of $lib" + install_name_tool \ + -id "${EPREFIX}"/usr/lib/${PN}/${lib} \ + "${ED}"/usr/lib/${PN}/${lib} + eend $? + done + for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do + odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib) + ebegin "fixing install_name reference to ${odylib} of ${f##*/}" + install_name_tool \ + -change "${odylib}" \ + "${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ + "${f}" + eend $? + done + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-3.2_pre170392.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-3.2_pre170392.ebuild new file mode 100644 index 0000000000..fd1f4b9607 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-3.2_pre170392.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# This package is originated from +# http://sources.gentoo.org/sys-devel/llvm/llvm-9999.ebuild + +EAPI="4" +PYTHON_DEPEND="2" +inherit subversion eutils flag-o-matic multilib toolchain-funcs python pax-utils + +SVN_COMMIT=${PV#*_pre} + +DESCRIPTION="Low Level Virtual Machine" +HOMEPAGE="http://llvm.org/" +SRC_URI="" +ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk@${SVN_COMMIT}" + +LICENSE="UoI-NCSA" +SLOT="0" +KEYWORDS="amd64" +IUSE="debug doc gold +libffi multitarget ocaml test udis86 vim-syntax" + +DEPEND="dev-lang/perl + >=sys-devel/make-3.79 + >=sys-devel/flex-2.5.4 + >=sys-devel/bison-1.875d + || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) + || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) + gold? ( >=sys-devel/binutils-2.22[cxx] ) + libffi? ( dev-util/pkgconfig + virtual/libffi ) + ocaml? ( dev-lang/ocaml ) + udis86? ( amd64? ( dev-libs/udis86[pic] ) + !amd64? ( dev-libs/udis86 ) )" +RDEPEND="dev-lang/perl + libffi? ( virtual/libffi ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + +pkg_setup() { + # Required for test and build + python_set_active_version 2 + python_pkg_setup + + # need to check if the active compiler is ok + + broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 " + broken_gcc_x86=" 3.4.0 3.4.2 " + broken_gcc_amd64=" 3.4.6 " + + gcc_vers=$(gcc-fullversion) + + if [[ ${broken_gcc} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm." + elog "Check http://www.llvm.org/docs/GettingStarted.html for" + elog "possible solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm on x86" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]]; + then + elog "Your version of gcc is known to miscompile llvm in amd64" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi +} + +src_prepare() { + # unfortunately ./configure won't listen to --mandir and the-like, so take + # care of this. + einfo "Fixing install dirs" + sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ + -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ + -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \ + -i Makefile.config.in || die "Makefile.config sed failed" + sed -e "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \ + -i tools/llvm-config/llvm-config.cpp || die "llvm-config sed failed" + + einfo "Fixing rpath and CFLAGS" + sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ + -i Makefile.rules || die "rpath sed failed" + if use gold; then + sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -i tools/gold/Makefile || die "gold rpath sed failed" + fi + + # Specify python version + python_convert_shebangs -r 2 test/Scripts + + epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch + epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch + + # User patches + epatch_user +} + +src_configure() { + local CONF_FLAGS="--enable-shared + --with-optimize-option= + $(use_enable !debug optimized) + $(use_enable debug assertions) + $(use_enable debug expensive-checks)" + + if use multitarget; then + CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" + else + CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp" + fi + + if use amd64; then + CONF_FLAGS="${CONF_FLAGS} --enable-pic" + fi + + if use gold; then + CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/" + fi + if use ocaml; then + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml" + else + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none" + fi + + if use udis86; then + CONF_FLAGS="${CONF_FLAGS} --with-udis86" + fi + + if use libffi; then + append-cppflags "$(pkg-config --cflags libffi)" + fi + CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)" + + # llvm prefers clang over gcc, so we may need to force that + tc-export CC CXX + econf ${CONF_FLAGS} +} + +src_compile() { + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 + + pax-mark m Release/bin/lli + if use test; then + pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests + fi +} + +src_install() { + emake KEEP_SYMBOLS=1 DESTDIR="${D}" install + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins utils/vim/*.vim + fi + + # Fix install_names on Darwin. The build system is too complicated + # to just fix this, so we correct it post-install + local lib= f= odylib= libpv=${PV} + if [[ ${CHOST} == *-darwin* ]] ; then + eval $(grep PACKAGE_VERSION= configure) + [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} + for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.dylib ; do + # libEnhancedDisassembly is Darwin10 only, so non-fatal + [[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue + ebegin "fixing install_name of $lib" + install_name_tool \ + -id "${EPREFIX}"/usr/lib/${PN}/${lib} \ + "${ED}"/usr/lib/${PN}/${lib} + eend $? + done + for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do + odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib) + ebegin "fixing install_name reference to ${odylib} of ${f##*/}" + install_name_tool \ + -change "${odylib}" \ + "${EPREFIX}"/usr/lib/${PN}/libLLVM-${libpv}.dylib \ + "${f}" + eend $? + done + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-9999.ebuild new file mode 100644 index 0000000000..fe042a78f0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/llvm/llvm-9999.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# This package is originated from +# http://sources.gentoo.org/sys-devel/llvm/llvm-9999.ebuild + +EAPI="4" +PYTHON_DEPEND="2" +inherit subversion eutils flag-o-matic multilib toolchain-funcs python pax-utils + +DESCRIPTION="Low Level Virtual Machine" +HOMEPAGE="http://llvm.org/" +SRC_URI="" +ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk" + +LICENSE="UoI-NCSA" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug doc gold +libffi multitarget ocaml test udis86 vim-syntax" + +DEPEND="dev-lang/perl + >=sys-devel/make-3.79 + >=sys-devel/flex-2.5.4 + >=sys-devel/bison-1.875d + || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) + || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) + gold? ( >=sys-devel/binutils-2.22[cxx] ) + libffi? ( dev-util/pkgconfig + virtual/libffi ) + ocaml? ( dev-lang/ocaml ) + udis86? ( amd64? ( dev-libs/udis86[pic] ) + !amd64? ( dev-libs/udis86 ) )" +RDEPEND="dev-lang/perl + libffi? ( virtual/libffi ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + +pkg_setup() { + # Required for test and build + python_set_active_version 2 + python_pkg_setup + + # need to check if the active compiler is ok + + broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 " + broken_gcc_x86=" 3.4.0 3.4.2 " + broken_gcc_amd64=" 3.4.6 " + + gcc_vers=$(gcc-fullversion) + + if [[ ${broken_gcc} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm." + elog "Check http://www.llvm.org/docs/GettingStarted.html for" + elog "possible solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm on x86" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]]; + then + elog "Your version of gcc is known to miscompile llvm in amd64" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi +} + +src_prepare() { + # unfortunately ./configure won't listen to --mandir and the-like, so take + # care of this. + einfo "Fixing install dirs" + sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ + -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ + -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \ + -i Makefile.config.in || die "Makefile.config sed failed" + sed -e "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \ + -i tools/llvm-config/llvm-config.cpp || die "llvm-config sed failed" + + einfo "Fixing rpath and CFLAGS" + sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ + -i Makefile.rules || die "rpath sed failed" + if use gold; then + sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -i tools/gold/Makefile || die "gold rpath sed failed" + fi + + # Specify python version + python_convert_shebangs -r 2 test/Scripts + + epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch + epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch + + # User patches + epatch_user +} + +src_configure() { + local CONF_FLAGS="--enable-shared + --with-optimize-option= + $(use_enable !debug optimized) + $(use_enable debug assertions) + $(use_enable debug expensive-checks)" + + if use multitarget; then + CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" + else + CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp" + fi + + if use amd64; then + CONF_FLAGS="${CONF_FLAGS} --enable-pic" + fi + + if use gold; then + CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/" + fi + if use ocaml; then + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml" + else + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none" + fi + + if use udis86; then + CONF_FLAGS="${CONF_FLAGS} --with-udis86" + fi + + if use libffi; then + append-cppflags "$(pkg-config --cflags libffi)" + fi + CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)" + + # llvm prefers clang over gcc, so we may need to force that + tc-export CC CXX + econf ${CONF_FLAGS} +} + +src_compile() { + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 + + pax-mark m Release/bin/lli + if use test; then + pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests + fi +} + +src_install() { + emake KEEP_SYMBOLS=1 DESTDIR="${D}" install + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins utils/vim/*.vim + fi + + # Fix install_names on Darwin. The build system is too complicated + # to just fix this, so we correct it post-install + local lib= f= odylib= libpv=${PV} + if [[ ${CHOST} == *-darwin* ]] ; then + eval $(grep PACKAGE_VERSION= configure) + [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} + for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.dylib ; do + # libEnhancedDisassembly is Darwin10 only, so non-fatal + [[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue + ebegin "fixing install_name of $lib" + install_name_tool \ + -id "${EPREFIX}"/usr/lib/${PN}/${lib} \ + "${ED}"/usr/lib/${PN}/${lib} + eend $? + done + for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do + odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib) + ebegin "fixing install_name reference to ${odylib} of ${f##*/}" + install_name_tool \ + -change "${odylib}" \ + "${EPREFIX}"/usr/lib/${PN}/libLLVM-${libpv}.dylib \ + "${f}" + eend $? + done + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/Manifest new file mode 100644 index 0000000000..a4a5b81b6e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/Manifest @@ -0,0 +1 @@ +DIST fuse-2.8.6.tar.gz 505334 RMD160 df66df0256a677c50f2fc94fef6f34b2d598386c SHA1 c2c0f9fff8bfee217da200888123e5abb5b498f2 SHA256 1ec1913e38f09b2a9ec1579e1800805b5e2c747d1dce515e316dbb665ca139d6 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.5-fix-lazy-binding.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.5-fix-lazy-binding.patch new file mode 100644 index 0000000000..a8e8e7576c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.5-fix-lazy-binding.patch @@ -0,0 +1,11 @@ +diff -pur fuse-1.4.orig/util/Makefile.in fuse-1.4/util/Makefile.in +--- fuse-1.4.orig/util/Makefile.in 2005-01-02 21:09:09.000000000 +0100 ++++ fuse-1.4/util/Makefile.in 2005-01-03 08:49:25.333258992 +0100 +@@ -36,6 +36,7 @@ NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : + ACLOCAL = @ACLOCAL@ ++AM_CFLAGS=-Wl,-z,now + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.5-gold.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.5-gold.patch new file mode 100644 index 0000000000..451ccec621 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.5-gold.patch @@ -0,0 +1,66 @@ +diff -purN fuse-2.8.5.orig/lib/fuse.c fuse-2.8.5/lib/fuse.c +--- fuse-2.8.5.orig/lib/fuse.c 2011-07-27 12:57:39.580516283 -0700 ++++ fuse-2.8.5/lib/fuse.c 2011-07-27 13:00:12.920525842 -0700 +@@ -3947,11 +3947,11 @@ struct fuse *fuse_new_compat1(int fd, in + 11); + } + +-FUSE_SYMVER(".symver fuse_exited,__fuse_exited@"); +-FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@"); +-FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@"); +-FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); +-FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); ++FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED"); + FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2"); + + #endif /* __FreeBSD__ */ +diff -purN fuse-2.8.5.orig/lib/fuse_mt.c fuse-2.8.5/lib/fuse_mt.c +--- fuse-2.8.5.orig/lib/fuse_mt.c 2011-07-27 12:57:39.580516283 -0700 ++++ fuse-2.8.5/lib/fuse_mt.c 2011-07-27 13:01:08.011292778 -0700 +@@ -113,4 +113,4 @@ int fuse_loop_mt(struct fuse *f) + return fuse_session_loop_mt(fuse_get_session(f)); + } + +-FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@"); ++FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED"); +diff -purN fuse-2.8.5.orig/lib/fuse_session.c fuse-2.8.5/lib/fuse_session.c +--- fuse-2.8.5.orig/lib/fuse_session.c 2011-07-27 12:57:39.580516283 -0700 ++++ fuse-2.8.5/lib/fuse_session.c 2011-07-27 13:02:22.181708010 -0700 +@@ -202,4 +202,6 @@ void fuse_chan_destroy(struct fuse_chan + + #ifndef __FreeBSD__ + FUSE_SYMVER(".symver fuse_chan_new_compat24,fuse_chan_new@FUSE_2.4"); ++#else ++FUSE_SYMVER(".symver fuse_chan_new,fuse_chan_new@FUSE_2.4"); + #endif +diff -purN fuse-2.8.5.orig/lib/fuse_versionscript fuse-2.8.5/lib/fuse_versionscript +--- fuse-2.8.5.orig/lib/fuse_versionscript 2011-07-27 12:57:39.580516283 -0700 ++++ fuse-2.8.5/lib/fuse_versionscript 2011-07-27 13:05:21.620513909 -0700 +@@ -1,3 +1,6 @@ ++FUSE_UNVERSIONED { ++}; ++ + FUSE_2.2 { + global: + fuse_destroy; +diff -purN fuse-2.8.5.orig/lib/helper.c fuse-2.8.5/lib/helper.c +--- fuse-2.8.5.orig/lib/helper.c 2011-07-27 12:57:39.580516283 -0700 ++++ fuse-2.8.5/lib/helper.c 2011-07-27 13:06:26.560513148 -0700 +@@ -409,10 +409,10 @@ int fuse_mount_compat1(const char *mount + return fuse_mount_compat22(mountpoint, NULL); + } + +-FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@"); ++FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED"); + FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2"); +-FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@"); +-FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@"); ++FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED"); + FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); + + #endif /* __FreeBSD__ */ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.6-user-option.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.6-user-option.patch new file mode 100644 index 0000000000..c528ec045a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-2.8.6-user-option.patch @@ -0,0 +1,77 @@ +diff -rupN fuse-2.8.6/util/fusermount.c fuse-2.8.6.patched/util/fusermount.c +--- fuse-2.8.6/util/fusermount.c 2011-09-13 00:23:14.000000000 -0700 ++++ fuse-2.8.6.patched/util/fusermount.c 2011-10-19 08:48:44.346535813 -0700 +@@ -613,6 +613,21 @@ static int add_option(char **optsp, cons + return 0; + } + ++static int add_user_option(char **mnt_optsp, const char *user) ++{ ++ if (getuid() != 0) { ++ if (user == NULL) ++ user = get_user_name(); ++ if (user == NULL) ++ return -1; ++ ++ if (add_option(mnt_optsp, "user=", strlen(user)) == -1) ++ return -1; ++ strcat(*mnt_optsp, user); ++ } ++ return 0; ++} ++ + static int get_mnt_opts(int flags, char *opts, char **mnt_optsp) + { + int i; +@@ -633,15 +648,6 @@ static int get_mnt_opts(int flags, char + l = strlen(*mnt_optsp); + if ((*mnt_optsp)[l-1] == ',') + (*mnt_optsp)[l-1] = '\0'; +- if (getuid() != 0) { +- const char *user = get_user_name(); +- if (user == NULL) +- return -1; +- +- if (add_option(mnt_optsp, "user=", strlen(user)) == -1) +- return -1; +- strcat(*mnt_optsp, user); +- } + return 0; + } + +@@ -694,6 +700,7 @@ static int do_mount(const char *mnt, cha + char *subtype = NULL; + char *source = NULL; + char *type = NULL; ++ char *user = NULL; + int check_empty = 1; + int blkdev = 0; + +@@ -707,6 +714,7 @@ static int do_mount(const char *mnt, cha + unsigned len; + const char *fsname_str = "fsname="; + const char *subtype_str = "subtype="; ++ const char *user_str = "user="; + for (len = 0; s[len]; len++) { + if (s[len] == '\\' && s[len + 1]) + len++; +@@ -719,6 +727,9 @@ static int do_mount(const char *mnt, cha + } else if (begins_with(s, subtype_str)) { + if (!get_string_opt(s, len, subtype_str, &subtype)) + goto err; ++ } else if (begins_with(s, user_str)) { ++ if (!get_string_opt(s, len, user_str, &user)) ++ goto err; + } else if (opt_eq(s, len, "blkdev")) { + if (getuid() != 0) { + fprintf(stderr, +@@ -775,6 +786,9 @@ static int do_mount(const char *mnt, cha + res = get_mnt_opts(flags, optbuf, &mnt_opts); + if (res == -1) + goto err; ++ res = add_user_option(&mnt_opts, user); ++ if (res == -1) ++ goto err; + + sprintf(d, "fd=%i,rootmode=%o,user_id=%i,group_id=%i", + fd, rootmode, getuid(), getgid()); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-fbsd.init b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-fbsd.init new file mode 100644 index 0000000000..19b8400eb5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse-fbsd.init @@ -0,0 +1,23 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount +} + +start() { + ebegin "Starting fuse" + if ! kldstat -q -m fuse; then + kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module" + fi + eend ${?} +} + +stop() { + ebegin "Stopping fuse" + if kldstat -q -m fuse; then + kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module" + fi + eend ${?} +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse.init b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse.init new file mode 100644 index 0000000000..30b512e8dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/files/fuse.init @@ -0,0 +1,35 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +MOUNTPOINT=/sys/fs/fuse/connections + +depend() { + need localmount +} + +start() { + + ebegin "Starting fuse" + if ! grep -qw fuse /proc/filesystems; then + modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module" + fi + if grep -qw fusectl /proc/filesystems && \ + ! grep -qw $MOUNTPOINT /proc/mounts; then + mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \ + eerror $? "Error mounting control filesystem" + fi + eend ${?} + +} + +stop() { + + ebegin "Stopping fuse" + if grep -qw $MOUNTPOINT /proc/mounts; then + umount $MOUNTPOINT >/dev/null 2>&1 || \ + eerror $? "Error unmounting control filesystem" + fi + eend ${?} + +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/fuse-2.8.6-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/fuse-2.8.6-r3.ebuild new file mode 100644 index 0000000000..27bc24d0b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/fuse/fuse-2.8.6-r3.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.8.5.ebuild,v 1.11 2011/07/26 00:09:54 zmedico Exp $ + +EAPI=3 +inherit eutils libtool linux-info + +MY_P=${P/_/-} +DESCRIPTION="An interface for filesystems implemented in userspace." +HOMEPAGE="http://fuse.sourceforge.net" +SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="kernel_linux kernel_FreeBSD" +S=${WORKDIR}/${MY_P} +PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" + +pkg_setup() { + if use kernel_linux ; then + if kernel_is lt 2 6 9; then + die "Your kernel is too old." + fi + CONFIG_CHECK="~FUSE_FS" + FUSE_FS_WARNING="You need to have FUSE module built to use user-mode utils" + linux-info_pkg_setup + fi +} + +src_prepare() { + epatch "${FILESDIR}"/fuse-2.8.5-fix-lazy-binding.patch + epatch "${FILESDIR}"/fuse-2.8.5-gold.patch + # This patch changes fusermount to avoid calling getpwuid(3) + # if '-o user=' is provided in the command line. + # This prevents glibc's implementation of getpwuid from invoking + # socket/connect syscalls, which allows Chromium OS daemons to + # put more restrictive seccomp filters on fusermount. + epatch "${FILESDIR}"/fuse-2.8.6-user-option.patch + + elibtoolize +} + +src_configure() { + econf \ + INIT_D_PATH="${EPREFIX}/etc/init.d" \ + MOUNT_FUSE_PATH="${EPREFIX}/sbin" \ + UDEV_RULES_PATH="${EPREFIX}/lib/udev/rules.d" \ + --disable-example \ + --disable-mtab +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog Filesystems README \ + README.NFS NEWS doc/how-fuse-works \ + doc/kernel.txt FAQ + docinto example + dodoc example/* + + if use kernel_linux ; then + newinitd "${FILESDIR}"/fuse.init fuse + elif use kernel_FreeBSD ; then + insinto /usr/include/fuse + doins include/fuse_kernel.h + newinitd "${FILESDIR}"/fuse-fbsd.init fuse + else + die "We don't know what init code install for your kernel, please file a bug." + fi + + rm -rf "${D}/dev" + + # user_allow_other is enabled to allow Chromium OS to run FUSE-based + # file system daemons as a non-root and non-chronos user, while + # allowing chronos to access the mount file systems. + dodir /etc + cat >"${ED}"/etc/fuse.conf <<-EOF + # Set the maximum number of FUSE mounts allowed to non-root users. + # The default is 1000. + # + #mount_max = 1000 + + # Allow non-root users to specify the 'allow_other' or 'allow_root' + # mount options. + # + user_allow_other + EOF +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/Manifest new file mode 100644 index 0000000000..61c7698389 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/Manifest @@ -0,0 +1,2 @@ +AUX 99-ntfs3g.rules 51 RMD160 5c022fc946d0a695f8ef0dde7b8be42080bc8162 SHA1 01c821c46815c8bbe7560455fc22cc355c3844a2 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463 +DIST ntfs-3g_ntfsprogs-2012.1.15.tgz 1149907 RMD160 4db6ea1025eedeee160a1cd4238d069a307b9b35 SHA1 8d55cf49afde172fefa369a0a85289e09c4d7bbb SHA256 6f1611c5000de7ca99141a9b853cba2c8dbd86c8e36d5efbe7ba918af773fb25 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/files/99-ntfs3g.rules b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/files/99-ntfs3g.rules new file mode 100644 index 0000000000..52dca40647 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/files/99-ntfs3g.rules @@ -0,0 +1 @@ +ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs-3g" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/ntfs3g-2012.1.15-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/ntfs3g-2012.1.15-r1.ebuild new file mode 100644 index 0000000000..4ab7b3d9cb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/ntfs3g-2012.1.15-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2012.1.15-r1.ebuild,v 1.11 2012/04/16 17:51:58 ssuominen Exp $ + +EAPI=4 +inherit linux-info + +MY_PN=${PN/3g/-3g} +MY_P=${MY_PN}_ntfsprogs-${PV} + +DESCRIPTION="Open source read-write NTFS driver that runs under FUSE" +HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/" +SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="acl crypt debug +external-fuse extras +ntfsprogs static-libs suid +udev xattr" + +RDEPEND="!=dev-libs/libgcrypt-1.2.2 + >=net-libs/gnutls-1.4.4 + ) + external-fuse? ( >=sys-fs/fuse-2.8.0 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-apps/attr" + +S=${WORKDIR}/${MY_P} + +DOCS="AUTHORS ChangeLog CREDITS README" + +pkg_setup() { + if use external-fuse && use kernel_linux; then + if kernel_is lt 2 6 9; then + die "Your kernel is too old." + fi + CONFIG_CHECK="~FUSE_FS" + FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g" + linux-info_pkg_setup + fi +} + +src_configure() { + econf \ + --exec-prefix="${EPREFIX}/usr" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable debug) \ + --enable-ldscript \ + --disable-ldconfig \ + $(use_enable acl posix-acls) \ + $(use_enable xattr xattr-mappings) \ + $(use_enable crypt crypto) \ + $(use_enable ntfsprogs) \ + $(use_enable extras) \ + $(use_enable static-libs static) \ + --with-fuse=$(use external-fuse && echo external || echo internal) +} + +src_install() { + default + + use suid && fperms u+s /usr/bin/${MY_PN} + + if use udev; then + insinto /lib/udev/rules.d + doins "${FILESDIR}"/99-ntfs3g.rules + fi + + find "${ED}" -name '*.la' -exec rm -f {} + + + # http://bugs.gentoo.org/398069 + dodir /usr/sbin + mv -vf "${D}"/sbin/* "${ED}"/usr/sbin || die + rm -rf "${D}"/sbin + + dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197 +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild new file mode 100644 index 0000000000..4a35f99907 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2012.1.15-r1.ebuild,v 1.11 2012/04/16 17:51:58 ssuominen Exp $ + +EAPI=4 +inherit linux-info + +MY_PN=${PN/3g/-3g} +MY_P=${MY_PN}_ntfsprogs-${PV} + +DESCRIPTION="Open source read-write NTFS driver that runs under FUSE" +HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/" +SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="acl crypt debug +external-fuse extras +ntfsprogs static-libs suid +udev xattr" + +RDEPEND="!=dev-libs/libgcrypt-1.2.2 + >=net-libs/gnutls-1.4.4 + ) + external-fuse? ( >=sys-fs/fuse-2.8.0 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-apps/attr" + +S=${WORKDIR}/${MY_P} + +DOCS="AUTHORS ChangeLog CREDITS README" + +pkg_setup() { + if use external-fuse && use kernel_linux; then + if kernel_is lt 2 6 9; then + die "Your kernel is too old." + fi + CONFIG_CHECK="~FUSE_FS" + FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g" + linux-info_pkg_setup + fi +} + +src_configure() { + econf \ + --exec-prefix="${EPREFIX}/usr" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable debug) \ + --enable-ldscript \ + --disable-ldconfig \ + $(use_enable acl posix-acls) \ + $(use_enable xattr xattr-mappings) \ + $(use_enable crypt crypto) \ + $(use_enable ntfsprogs) \ + $(use_enable extras) \ + $(use_enable static-libs static) \ + --with-fuse=$(use external-fuse && echo external || echo internal) +} + +src_install() { + default + + # If suid is used, change the ntfs-3g binary to "root:ntfs-3g rws--x---" + # See crosbug.com/19887 for details. + if use suid; then + fowners root:ntfs-3g /usr/bin/${MY_PN} + fperms u=rwxs,g=x,o= /usr/bin/${MY_PN} + fi + + if use udev; then + insinto /lib/udev/rules.d + doins "${FILESDIR}"/99-ntfs3g.rules + fi + + find "${ED}" -name '*.la' -exec rm -f {} + + + # http://bugs.gentoo.org/398069 + dodir /usr/sbin + mv -vf "${D}"/sbin/* "${ED}"/usr/sbin || die + rm -rf "${D}"/sbin + + dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197 +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/01-workaround-net-device-db.rules b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/01-workaround-net-device-db.rules new file mode 100644 index 0000000000..7d3a7a5da0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/01-workaround-net-device-db.rules @@ -0,0 +1,3 @@ +# Workaround the fact that udev 146 does not save udevdb entries for +# network devices that are not to be renamed. chromium-os:12387 +SUBSYSTEM=="net", NAME="%k" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/shell-compat-KV.sh b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/shell-compat-KV.sh new file mode 100644 index 0000000000..be74fe49e3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/shell-compat-KV.sh @@ -0,0 +1,45 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these + +cmd_exist() +{ + type "$1" >/dev/null 2>&1 +} + +# does exist in baselayout-1 +# does not exist in openrc, but is added by openrc-ebuild since some time +if ! cmd_exist KV_to_int; then + KV_to_int() { + [ -z $1 ] && return 1 + + local x=${1%%-*} + local KV_MAJOR=${x%%.*} + x=${x#*.} + local KV_MINOR=${x%%.*} + x=${x#*.} + local KV_MICRO=${x%%.*} + local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) + + # We make version 2.2.0 the minimum version we will handle as + # a sanity check ... if its less, we fail ... + [ "${KV_int}" -lt 131584 ] && return 1 + + echo "${KV_int}" + } +fi + +# same as KV_to_int +if ! cmd_exist get_KV; then + _RC_GET_KV_CACHE="" + get_KV() { + [ -z "${_RC_GET_KV_CACHE}" ] \ + && _RC_GET_KV_CACHE="$(uname -r)" + + echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" + + return $? + } +fi + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/shell-compat-addon.sh b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/shell-compat-addon.sh new file mode 100644 index 0000000000..7e684f4d58 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/shell-compat-addon.sh @@ -0,0 +1,43 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# functions that may not be defined, but are used by the udev-start and udev-stop addon +# used by baselayout-1 and openrc before version 0.4.0 + +cmd_exist() +{ + type "$1" >/dev/null 2>&1 +} + +# does not exist in baselayout-1, does exist in openrc +if ! cmd_exist yesno; then + yesno() { + [ -z "$1" ] && return 1 + case "$1" in + yes|Yes|YES) return 0 ;; + esac + return 1 + } +fi + +# does not exist in baselayout-1, does exist in openrc +if ! cmd_exist fstabinfo; then + fstabinfo() { + [ "$1" = "--quiet" ] && shift + local dir="$1" + + # only check RC_USE_FSTAB on baselayout-1 + yesno "${RC_USE_FSTAB}" || return 1 + + # check if entry is in /etc/fstab + local ret=$(gawk 'BEGIN { found="false"; } + $1 ~ "^#" { next } + $2 == "'$dir'" { found="true"; } + END { print found; } + ' /etc/fstab) + + "${ret}" + } +fi + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-dev-tarball.initd b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-dev-tarball.initd new file mode 100644 index 0000000000..2cdce4ff22 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-dev-tarball.initd @@ -0,0 +1,95 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Maintain a tarball of not udev managed device nodes" +[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev + +rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} +device_tarball=/lib/udev/state/devices.tar.bz2 + +depend() { + if [ -f /etc/init.d/sysfs ]; then + need udev-mount + fi +} + +start() +{ + _start +} + +_start() { + if yesno "${rc_device_tarball}" && \ + [ -s "${device_tarball}" ] + then + ebegin "Populating /dev with saved device nodes" + tar -jxpf "${device_tarball}" -C /dev + eend $? + fi +} + +stop() { + if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ + ! yesno "${rc_device_tarball}" || \ + ! touch "${device_tarball}" 2>/dev/null + then + return 0 + fi + + ebegin "Saving device nodes" + # Handle our temp files + save_tmp_base=/tmp/udev.savedevices."$$" + devices_udev="${save_tmp_base}"/devices.udev + devices_real="${save_tmp_base}"/devices.real + devices_totar="${save_tmp_base}"/devices.totar + device_tmp_tarball="${save_tmp_base}"/devices + + rm -rf "${save_tmp_base}" + mkdir "${save_tmp_base}" + touch "${devices_udev}" "${devices_real}" \ + "${devices_totar}" "${device_tmp_tarball}" + + if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ + -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] + then + cd /dev + # Find all devices, but ignore .udev directory + find . -xdev -type b -or -type c -or -type l | \ + cut -d/ -f2- | \ + grep -v ^\\.udev >"${devices_real}" + + # Figure out what udev created + udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" + # These ones we also do not want in there + for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do + echo "${x}" >> "${devices_udev}" + done + if [ -d /lib/udev/devices ]; then + cd /lib/udev/devices + find . -xdev -type b -or -type c -or -type l | \ + cut -d/ -f2- >> "${devices_udev}" + cd /dev + fi + + fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" + + # Now only tarball those not created by udev if we have any + if [ -s "${devices_totar}" ]; then + # we dont want to descend into mounted filesystems (e.g. devpts) + # looking up username may involve NIS/network + # and net may be down + tar --one-file-system --numeric-owner \ + -jcpf "${device_tmp_tarball}" -T "${devices_totar}" + mv -f "${device_tmp_tarball}" "${device_tarball}" + else + rm -f "${device_tarball}" + fi + eend 0 + else + eend 1 "Could not create temporary files!" + fi + + rm -rf "${save_tmp_base}" +} + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-mount.initd b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-mount.initd new file mode 100644 index 0000000000..694b194cab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-mount.initd @@ -0,0 +1,107 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Mount tmpfs on /dev" +[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev + +# get_KV and KV_to_int +. /lib/udev/shell-compat-KV.sh + +# FIXME +# Instead of this script testing kernel version, udev itself should +# Maybe something like udevd --test || exit $? +check_kernel() +{ + if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then + eerror "Your kernel is too old to work with this version of udev." + eerror "Current udev only supports Linux kernel %KV_MIN% and newer." + return 1 + fi + + yesno "${unreliable_kernel_warning:-yes}" || return 0 + + if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then + ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." + fi + return 0 +} + + +mount_dev_directory() +{ + # No options are processed here as they should all be in /etc/fstab + ebegin "Mounting /dev" + if fstabinfo --quiet /dev; then + mount -n /dev + else + # Some devices require exec, Bug #92921 + mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev + fi + eend $? +} + +seed_dev() +{ + # Seed /dev with some things that we know we need + + # creating /dev/console, /dev/tty and /dev/tty1 to be able to write + # to $CONSOLE with/without bootsplash before udevd creates it + [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 + [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 + [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 + + # udevd will dup its stdin/stdout/stderr to /dev/null + # and we do not want a file which gets buffered in ram + [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 + + # so udev can add its start-message to dmesg + [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 + + # copy over any persistant things + if [ -d /lib/udev/devices ]; then + cp -RPp /lib/udev/devices/* /dev 2>/dev/null + fi + + # Not provided by sysfs but needed + ln -snf /proc/self/fd /dev/fd + ln -snf fd/0 /dev/stdin + ln -snf fd/1 /dev/stdout + ln -snf fd/2 /dev/stderr + [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core + + # Create problematic directories + mkdir -p /dev/pts /dev/shm + return 0 +} + + +start() +{ + # do not run this on too old baselayout - udev-addon is already loaded! + if [ ! -f /etc/init.d/sysfs ]; then + eerror "The $SVCNAME init-script is written for baselayout-2!" + eerror "Please do not use it with baselayout-1!". + return 1 + fi + + _start +} + +_start() +{ + check_kernel || return 1 + mount_dev_directory || return 1 + + # Selinux lovin; /selinux should be mounted by selinux-patched init + if [ -x /sbin/restorecon -a -c /selinux/null ]; then + restorecon /dev > /selinux/null + fi + + # make sure it exists + mkdir -p /dev/.udev + + seed_dev + + return 0 +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-postmount.initd b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-postmount.initd new file mode 100644 index 0000000000..96beb845bb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-postmount.initd @@ -0,0 +1,31 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/136/udev-postmount.initd,v 1.3 2009/02/23 16:30:53 zzam Exp $ + +depend() { + need localmount +} + +dir_writeable() +{ + mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ +} + +start() { + # check if this system uses udev + [ -d /dev/.udev/ ] || return 0 + + # only continue if rules-directory is writable + dir_writeable /etc/udev/rules.d || return 0 + + # store persistent-rules that got created while booting + # when / was still read-only + /lib/udev/move_tmp_persistent_rules.sh +} + +stop() { + : +} + +# vim:ts=4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-start.sh b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-start.sh new file mode 100644 index 0000000000..8bf098dee1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-start.sh @@ -0,0 +1,54 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev + +. /lib/udev/shell-compat-addon.sh + +compat_volume_nodes() +{ + # Only do this for baselayout-1* + # This check is likely to get false positives due to some multilib stuff, + # but that should not matter, as this can only happen on old openrc versions + # no longer available as ebuilds. + if [ ! -e /lib/librc.so ]; then + + # Create nodes that udev can't + [ -x /sbin/lvm ] && \ + /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null + # Running evms_activate on a LiveCD causes lots of headaches + [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ + /sbin/evms_activate -q &>/dev/null + fi +} + +start_initd() +{ + ( + . /etc/init.d/"$1" + _start + ) +} + +# mount tmpfs on /dev +start_initd udev-mount || exit 1 + +# Create a file so that our rc system knows it's still in sysinit. +# Existance means init scripts will not directly run. +# rc will remove the file when done with sysinit. +# this is no longer needed as of openrc-0.4.0 +touch /dev/.rcsysinit + +# load device tarball +start_initd udev-dev-tarball + +# run udevd +start_initd udev || exit 1 + +compat_volume_nodes + +# inject into boot runlevel +IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 + +# udev started successfully +exit 0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-stop.sh b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-stop.sh new file mode 100644 index 0000000000..47e095607f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev-stop.sh @@ -0,0 +1,13 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# for function yesno +. /lib/udev/shell-compat-addon.sh + +# store device tarball +( + . /etc/init.d/udev-dev-tarball + stop +) + +exit 0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev.confd b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev.confd new file mode 100644 index 0000000000..bffea3569f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev.confd @@ -0,0 +1,56 @@ +# /etc/conf.d/udev: config file for udev + +# We discourage to disable persistent-net!! +# this may lead to random interface naming + +# Disable adding new rules for persistent-net +persistent_net_disable="no" + +# Disable adding new rules for persistent-cd +# Disabling this will stop new cdrom devices to appear +# as /dev/{cdrom,cdrw,dvd,dvdrw} +persistent_cd_disable="no" + +# Set to "yes" if you want to save /dev to a tarball on shutdown +# and restore it on startup. This is useful if you have a lot of +# custom device nodes that udev does not handle/know about. +# +# As this option is fragile, we recommend you +# to create your devices in /lib/udev/devices. +# These will be copied to /dev on boot. +#rc_device_tarball="NO" + +# udev can trigger coldplug events which cause services to start and +# kernel modules to be loaded. +# Services are deferred to start in the boot runlevel. +# Set rc_coldplug="NO" if you don't want this. +# If you want module coldplugging but not coldplugging of services then you +# can disable service coldplugging in baselayout/openrc config files. +# The setting is named different in different versions. +# in /etc/rc.conf: rc_hotplug="!*" or +# in /etc/conf.d/rc: rc_plug_services="!*" +#rc_coldplug="YES" + + + + +# Expert options: + +# Disable warning about unreliable kernel/udev combination +#unreliable_kernel_warning="no" + +# Timeout in seconds to wait for processing of uevents at boot. +# There should be no need to change this. +#udev_settle_timeout="60" + +# Run udevadmin monitor to get a log of all events +# in /dev/.udev/udevmonitor.log +#udev_monitor="YES" + +# Keep udevmonitor running after populating /dev. +#udev_monitor_keep_running="no" + +# Set cmdline options for udevmonitor. +# could be some of --env --kernel --udev +#udev_monitor_opts="--env" + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev.initd b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev.initd new file mode 100644 index 0000000000..60c9672380 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/151-r4/udev.initd @@ -0,0 +1,244 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Run udevd and create the device-nodes" + +[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf + +rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} + +depend() +{ + if [ -f /etc/init.d/sysfs ]; then + # require new enough openrc with sysinit being extra runlevel + # on linux we just check if sysfs init-script exists + # this is to silence out ugly warnings about not-existing sysfs script + provide dev + if yesno "${rc_device_tarball:-no}"; then + need sysfs udev-mount udev-dev-tarball + else + need sysfs udev-mount + fi + before checkfs fsck + + # udev does not work inside vservers + keyword novserver + fi +} + +cleanup() +{ + # fail more gracely and not leave udevd running + start-stop-daemon --stop --exec /sbin/udevd + exit 1 +} + +disable_hotplug_agent() +{ + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" >/proc/sys/kernel/hotplug + fi +} + +root_link() +{ + /lib/udev/write_root_link_rule +} + +rules_disable_switch() +{ + # this function disables rules files + # by creating new files with the same name + # in a temp rules directory with higher priority + local d=/dev/.udev/rules.d bname="$1" onoff="$2" + + if yesno "${onoff}"; then + mkdir -p "$d" + echo "# This file disables ${bname} due to /etc/conf.d/udev" \ + > "${d}/${bname}" + else + rm -f "${d}/${bname}" + fi +} + +start_udevd() +{ + # load unix domain sockets if built as module, Bug #221253 + if [ -e /proc/modules ] ; then + modprobe -q unix 2>/dev/null + fi + ebegin "Starting udevd" + start-stop-daemon --start --exec /sbin/udevd -- --daemon + eend $? +} + +# populate /dev with devices already found by the kernel +populate_dev() +{ + if get_bootparam "nocoldplug" ; then + rc_coldplug="NO" + ewarn "Skipping udev coldplug as requested in kernel cmdline" + fi + + ebegin "Populating /dev with existing devices through uevents" + if yesno "${rc_coldplug}"; then + udevadm trigger + else + # Do not run any init-scripts, Bug #206518 + udevadm control --env do_not_run_plug_service=1 + + # only create device nodes + udevadm trigger --attr-match=dev + + # run persistent-net stuff, bug 191466 + udevadm trigger --subsystem-match=net + fi + eend $? + + ebegin "Waiting for uevents to be processed" + udevadm settle --timeout=${udev_settle_timeout:-60} + eend $? + + udevadm control --env do_not_run_plug_service= + return 0 +} + +# for debugging +start_udevmonitor() +{ + yesno "${udev_monitor:-no}" || return 0 + + udevmonitor_log=/dev/.udev/udevmonitor.log + udevmonitor_pid=/dev/.udev/udevmonitor.pid + + einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" + start-stop-daemon --start --stdout "${udevmonitor_log}" \ + --make-pidfile --pidfile "${udevmonitor_pid}" \ + --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} +} + +stop_udevmonitor() +{ + yesno "${udev_monitor:-no}" || return 0 + + if yesno "${udev_monitor_keep_running:-no}"; then + ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" + else + einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" + start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm + fi +} + +display_hotplugged_services() { + local svcfile= svc= services= + for svcfile in "${RC_SVCDIR}"/hotplugged/*; do + svc="${svcfile##*/}" + [ -x "${svcfile}" ] || continue + + # do not display this - better: do only inject it later :) + [ "$svc" = "udev-postmount" ] && continue + + services="${services} ${svc}" + done + [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" +} + +inject_postmount_initd() { + if ! mark_service_hotplugged udev-postmount; then + IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 + fi + #einfo "Injected udev-postmount service" +} + +check_persistent_net() +{ + # check if there are problems with persistent-net + local syspath= devs= problem=false + for syspath in /sys/class/net/*_rename*; do + if [ -d "${syspath}" ]; then + devs="${devs} ${syspath##*/}" + problem=true + fi + done + + ${problem} || return 0 + + eerror "UDEV: Your system has a problem assigning persistent names" + eerror "to these network interfaces: ${devs}" + + einfo "Checking persistent-net rules:" + # the sed-expression lists all duplicate lines + # from the input, like "uniq -d" does, but uniq + # is installed into /usr/bin and not available at boot. + dups=$( + RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' + . /lib/udev/rule_generator.functions + find_all_rules 'NAME=' '.*' | \ + tr ' ' '\n' | \ + sort | \ + sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' + ) + if [ -n "${dups}" ]; then + ewarn "The rules create multiple entries assigning these names:" + eindent + ewarn "${dups}" + eoutdent + else + ewarn "Found no duplicate names in persistent-net rules," + ewarn "there must be some other problem!" + fi + return 1 +} + +check_udev_works() +{ + # should exist on every system, else udev failed + if [ ! -e /dev/zero ]; then + eerror "Assuming udev failed somewhere, as /dev/zero does not exist." + return 1 + fi + return 0 +} + +start() +{ + # do not run this on old baselayout where udev-addon gets loaded + if [ ! -f /etc/init.d/sysfs ]; then + eerror "The $SVCNAME init-script is written for baselayout-2!" + eerror "Please do not use it with baselayout-1!". + return 1 + fi + + _start + + display_hotplugged_services + + inject_postmount_initd +} + +_start() +{ + root_link + rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" + rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} + + disable_hotplug_agent + start_udevd || cleanup + start_udevmonitor + populate_dev || cleanup + + check_persistent_net + + check_udev_works || cleanup + stop_udevmonitor + + return 0 +} + +stop() { + ebegin "Stopping udevd" + start-stop-daemon --stop --exec /sbin/udevd + eend $? +} + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/50-compat_firmware.rules b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/50-compat_firmware.rules new file mode 100644 index 0000000000..9a60621aad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/50-compat_firmware.rules @@ -0,0 +1,2 @@ +# compat_firmware-class requests, copies files into the kernel +SUBSYSTEM=="compat_firmware", ACTION=="add", RUN+="compat_firmware.sh" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/blacklist-146 b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/blacklist-146 new file mode 100644 index 0000000000..90bc234b2b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/blacklist-146 @@ -0,0 +1,29 @@ +# This file lists modules which will not be loaded by udev, +# not at coldplugging and not on hotplug events. + +# Add your own entries to this file +# in the format "blacklist " + +# Some examples: +# evbug is a debug tool and should be loaded explicitly +blacklist evbug + +# Autoloading eth1394 most of the time re-orders your network +# interfaces, and with buggy kernel 2.6.21, udev persistent-net +# is not able to rename these devices, so you get eth?_rename devices +# plus an exceeded 30sec boot timeout +blacklist eth1394 + +# You probably want this to not get the console beep loud on every tab :) +#blacklist pcspkr + +# these drivers are very simple, the HID drivers are usually preferred +#blacklist usbmouse +#blacklist usbkbd + +# Sometimes loading a framebuffer driver at boot gets the console black +#install pci:v*d*sv*sd*bc03sc*i* /bin/true + +# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded +#blacklist usblp + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/compat_firmware.sh b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/compat_firmware.sh new file mode 100755 index 0000000000..ef609e71c6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/compat_firmware.sh @@ -0,0 +1,35 @@ +#!/bin/sh -e + +# This is ported from Ubuntu but ubuntu uses these directories which +# other distributions don't care about: +# FIRMWARE_DIRS="/lib/firmware/updates/$(uname -r) /lib/firmware/updates \ +# /lib/firmware/$(uname -r) /lib/firmware" +# If your distribution looks for firmware in other directories +# feel free to extend this and add your own directory here. +# +FIRMWARE_DIRS="/lib/firmware" + +err() { + echo "$@" >&2 + logger -t "${0##*/}[$$]" "$@" 2>/dev/null || true +} + +if [ ! -e /sys$DEVPATH/loading ]; then + err "udev firmware loader misses sysfs directory" + exit 1 +fi + +for DIR in $FIRMWARE_DIRS; do + [ -e "$DIR/$FIRMWARE" ] || continue + echo 1 > /sys$DEVPATH/loading + cat "$DIR/$FIRMWARE" > /sys$DEVPATH/data + echo 0 > /sys$DEVPATH/loading + exit 0 +done + +echo -1 > /sys$DEVPATH/loading +err "Cannot find firmware file '$FIRMWARE'" +mkdir -p /dev/.udev/firmware-missing +file=$(echo "$FIRMWARE" | sed 's:/:\\x2f:g') +ln -s -f "$DEVPATH" /dev/.udev/firmware-missing/$file +exit 1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh new file mode 100755 index 0000000000..1a0259798b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +. /etc/init.d/functions.sh + +# store persistent-rules that got created while booting +# when / was still read-only +store_persistent_rules() { + local file dest + + for file in /dev/.udev/tmp-rules--*; do + dest=${file##*tmp-rules--} + [ "$dest" = '*' ] && break + type=${dest##70-persistent-} + type=${type%%.rules} + ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" + cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" + eend $? "Failed moving persistent rules!" + done +} + +store_persistent_rules + +# vim:ts=4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/net-130-r1.sh b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/net-130-r1.sh new file mode 100755 index 0000000000..af61870d82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/net-130-r1.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# +# net.sh: udev external RUN script +# +# Copyright 2007 Roy Marples +# Distributed under the terms of the GNU General Public License v2 + +IFACE=$1 +ACTION=$2 + +SCRIPT=/etc/init.d/net.$IFACE + +# ignore interfaces that are registered after being "up" (?) +case ${IFACE} in + ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*|br*) + exit 0 ;; +esac + +# stop here if coldplug is disabled, Bug #206518 +if [ "${do_not_run_plug_service}" = 1 ]; then + exit 0 +fi + +if [ ! -x "${SCRIPT}" ] ; then + #do not flood log with messages, bug #205687 + #logger -t udev-net.sh "${SCRIPT}: does not exist or is not executable" + exit 1 +fi + +# If we're stopping then sleep for a bit in-case a daemon is monitoring +# the interface. This to try and ensure we stop after they do. +[ "${ACTION}" == "stop" ] && sleep 2 + +IN_HOTPLUG=1 "${SCRIPT}" --quiet "${ACTION}" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/pnp-aliases b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/pnp-aliases new file mode 100644 index 0000000000..3675fbbc69 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/pnp-aliases @@ -0,0 +1,17 @@ +# /etc/modprobe.d/pnp-aliases +# +# These aliases are used by this udev-rule: +# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'" +# +# They should help to autoload drivers used by various pnp-devices +# (if not blacklisted somewhere else) +# +alias pnp:dPNP0510 irtty-sir +alias pnp:dPNP0511 irtty-sir +alias pnp:dPNP0700 floppy +alias pnp:dPNP0800 pcspkr +alias pnp:dPNP0b00 rtc +alias pnp:dPNP0303 atkbd +alias pnp:dPNP0f13 psmouse +alias pnp:dPNPb02f analog + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-141-remove-devfs-names.diff b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-141-remove-devfs-names.diff new file mode 100644 index 0000000000..56501f828a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-141-remove-devfs-names.diff @@ -0,0 +1,16 @@ +diff --git a/rules/gentoo/40-gentoo.rules b/rules/gentoo/40-gentoo.rules +index 4751b51..91a7545 100644 +--- a/rules/gentoo/40-gentoo.rules ++++ b/rules/gentoo/40-gentoo.rules +@@ -1,11 +1,5 @@ + # do not edit this file, it will be overwritten on update + +-# old devfs path, removing this could break systems +-# Bug 195839 +-KERNEL=="md[0-9]*", SYMLINK+="md/%n" +-KERNEL=="loop[0-9]*", SYMLINK+="loop/%n" +-KERNEL=="ram[0-9]*", SYMLINK+="rd/%n" +- + # keep devices after driver unload + KERNEL=="ppp", OPTIONS+="ignore_remove" + KERNEL=="tun", OPTIONS+="ignore_remove" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-cross-pci-ids.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-cross-pci-ids.patch new file mode 100644 index 0000000000..30a4d72ed1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-cross-pci-ids.patch @@ -0,0 +1,20 @@ +--- a/configure.ac 2010-01-25 21:47:32.000000000 -0800 ++++ b/configure.ac 2010-01-25 21:50:24.000000000 -0800 +@@ -69,13 +69,13 @@ + PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82) + AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)]) + +- AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids]) +- AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids]) +- AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids]) + AC_ARG_WITH(pci-ids-path, + AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]), + [PCI_DATABASE=${withval}], +- [if test -n "$pciids" ; then ++ [AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids]) ++ AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids]) ++ AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids]) ++ if test -n "$pciids" ; then + PCI_DATABASE="$pciids" + else + AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=]) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-pkgconfig.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-pkgconfig.patch new file mode 100644 index 0000000000..c98aa20696 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-pkgconfig.patch @@ -0,0 +1,12 @@ +--- a/libudev/libudev.pc.in 2009-10-24 23:46:04.000000000 +0000 ++++ b/libudev/libudev.pc.in 2009-10-24 23:46:30.000000000 +0000 +@@ -1,7 +1,7 @@ + prefix=@prefix@ +-exec_prefix=@prefix@ ++exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@prefix@/include ++includedir=@includedir@ + + Name: libudev + Description: Library to access udev device information diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-tmp-rules.diff b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-tmp-rules.diff new file mode 100644 index 0000000000..2ce0fb6b31 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-146-tmp-rules.diff @@ -0,0 +1,13 @@ +--- extras/rule_generator/rule_generator.functions.orig 2008-10-23 06:33:41.000000000 -0700 ++++ extras/rule_generator/rule_generator.functions 2010-05-26 10:26:20.000000000 -0700 +@@ -57,7 +57,9 @@ + # Choose the real rules file if it is writeable or a temporary file if not. + # Both files should be checked later when looking for existing rules. + choose_rules_file() { +- local tmp_rules_file="/dev/.udev/tmp-rules--${RULES_FILE##*/}" ++ local orig_rules_base=${RULES_FILE##*/} ++ local tmp_rules_base=${orig_rules_base%%.rules}--tmp.rules ++ local tmp_rules_file="/dev/.udev/rules.d/$tmp_rules_base" + [ -e "$RULES_FILE" -o -e "$tmp_rules_file" ] || PRINT_HEADER=1 + + if writeable ${RULES_FILE%/*}; then diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff new file mode 100644 index 0000000000..7690f6b39a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff @@ -0,0 +1,29 @@ +diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c +index 8f70be4..16455de 100644 +--- a/extras/firmware/firmware.c ++++ b/extras/firmware/firmware.c +@@ -149,6 +149,7 @@ int main(int argc, char **argv) + + util_path_encode(firmware, fwencpath, sizeof(fwencpath)); + util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL); ++ util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); + + if (fwfile == NULL) { + int err; +@@ -166,6 +167,7 @@ int main(int argc, char **argv) + udev_selinux_resetfscreatecon(udev); + } while (err == -ENOENT); + rc = 2; ++ set_loading(udev, loadpath, "-1"); + goto exit; + } + +@@ -176,7 +178,6 @@ int main(int argc, char **argv) + if (unlink(misspath) == 0) + util_delete_path(udev, misspath); + +- util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); + set_loading(udev, loadpath, "1"); + + util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL); + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-151-add-huawei-devices.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-151-add-huawei-devices.patch new file mode 100644 index 0000000000..133ee016ef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-151-add-huawei-devices.patch @@ -0,0 +1,12 @@ +--- extras/modem-modeswitch/61-option-modem-modeswitch.rules~ 2009-12-03 04:45:03.000000000 -0800 ++++ extras/modem-modeswitch/61-option-modem-modeswitch.rules 2010-12-22 17:59:59.307733000 -0800 +@@ -37,6 +37,9 @@ ATTRS{idVendor}=="0af0", ATTRS{idProduct + ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7501", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd" + ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7601", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd" + ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7901", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd" ++ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1446", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd" ++ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1520", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd" ++ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1521", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd" + + # NOTE: only for devices manufactured by Option NV + # DO NOT add devices that are not manufactured by Option NV diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-151-readd-hd-rules.diff b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-151-readd-hd-rules.diff new file mode 100644 index 0000000000..53e99b0569 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-151-readd-hd-rules.diff @@ -0,0 +1,53 @@ +diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules +index 132a680..a3e8e3c 100644 +--- a/extras/cdrom_id/60-cdrom_id.rules ++++ b/extras/cdrom_id/60-cdrom_id.rules +@@ -2,4 +2,4 @@ + + # import optical drive properties + ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \ +- KERNEL=="sr[0-9]*|xvd*", IMPORT{program}="cdrom_id --export $tempnode" ++ KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]|xvd*", IMPORT{program}="cdrom_id --export $tempnode" +diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules +index f8556d1..ba07079 100644 +--- a/rules/rules.d/50-udev-default.rules ++++ b/rules/rules.d/50-udev-default.rules +@@ -77,9 +77,12 @@ SUBSYSTEM=="block", GROUP="disk" + + # floppy + SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" ++SUBSYSTEM=="block", KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k" ++KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions" + + # cdrom + SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" ++SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" + SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" + KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" + KERNEL=="pktcdvd", GROUP="cdrom" +diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules +index 89041a9..6f12a9a 100644 +--- a/rules/rules.d/60-persistent-storage.rules ++++ b/rules/rules.d/60-persistent-storage.rules +@@ -12,12 +12,21 @@ SUBSYSTEM!="block", GOTO="persistent_storage_end" + # skip rules for inappropriate block devices + KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end" + ++# never access non-cdrom removable ide devices, the drivers are causing event loops on open() ++KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end" ++KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end" ++ + # ignore partitions that span the entire disk + TEST=="whole_disk", GOTO="persistent_storage_end" + + # for partitions import parent information + ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" + ++# by-id (hardware serial number) ++KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" ++KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}" ++KERNEL=="hd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}-part%n" ++ + # USB devices use their own serial number + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" + # ATA devices with their own "ata" kernel subsystem diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-fusectl-opts.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-fusectl-opts.patch new file mode 100644 index 0000000000..2a07dcb9e2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-fusectl-opts.patch @@ -0,0 +1,11 @@ +--- a/rules/rules.d/50-udev-default.rules 2013-01-23 16:05:36.000000000 -0500 ++++ b/rules/rules.d/50-udev-default.rules 2013-01-23 16:05:50.000000000 -0500 +@@ -99,7 +99,7 @@ + KERNEL=="cpu[0-9]*", MODE="0444" + + KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse", \ +- RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections" ++ RUN+="/bin/mount -t fusectl -o nodev,noexec,nosuid fusectl /sys/fs/fuse/connections" + + SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc" + KERNEL=="mmtimer", MODE="0644" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-run-not-writable.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-run-not-writable.patch new file mode 100644 index 0000000000..a4b66ba47b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-run-not-writable.patch @@ -0,0 +1,26 @@ +From 2761bebdc7b01ed9af9671189c93bf317c4c43ea Mon Sep 17 00:00:00 2001 +From: Matthias Schwarzott +Date: Sun, 8 May 2011 21:23:33 +0200 +Subject: [PATCH 1/2] Revert "udevd: log warning if /run is not writable" + +This reverts commit 2903820a62de1085f6b5def0fb622070805dd90b. +--- + udev/udevd.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/udev/udevd.c b/udev/udevd.c +index be4b071..23d14fa 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -1227,8 +1227,6 @@ int main(int argc, char *argv[]) + if (udev_set_run_path(udev, filename) == NULL) + goto exit; + mkdir(udev_get_run_path(udev), 0755); +- err(udev, "error: runtime directory '%s' not writable, for now falling back to '%s'", +- udev_get_run_config_path(udev), udev_get_run_path(udev)); + } + } + /* relabel runtime dir only if it resides below /dev */ +-- +1.7.5.rc3 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-usb-ids-location.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-usb-ids-location.patch new file mode 100644 index 0000000000..2d121b3734 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/udev-170-usb-ids-location.patch @@ -0,0 +1,44 @@ +From bda2674f22b58bd32802b2057a05efada6155bae Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Fri, 20 May 2011 14:06:29 -0700 +Subject: [PATCH] configure: allow usb.ids location to be specified + +We already allow the pci.ids location to be specified, so add a +patch doing the same for usb.ids. Please don't make me explain +why this is necessary, it will only make you cry. + +Signed-off-by: Scott James Remnant +Signed-off-by: Kay Sievers +Acked-by: Greg Kroah-Hartman +--- + configure.ac | 14 ++++++++++++-- + 1 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3646f93..cfdb3bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -93,8 +93,18 @@ if test "x$enable_hwdb" = xyes; then + AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids]) + fi + +- PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82) +- AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)]) ++ AC_ARG_WITH(usb-ids-path, ++ [AS_HELP_STRING([--with-usb-ids-path=DIR], [Path to usb.ids file])], ++ [USB_DATABASE=${withval}], ++ [if test -n "$usbids" ; then ++ USB_DATABASE="$usbids" ++ else ++ PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82) ++ AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)]) ++ fi]) ++ AC_MSG_CHECKING([for USB database location]) ++ AC_MSG_RESULT([$USB_DATABASE]) ++ AC_SUBST(USB_DATABASE) + + AC_ARG_WITH(pci-ids-path, + [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])], +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/write_root_link_rule-125 b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/write_root_link_rule-125 new file mode 100755 index 0000000000..8eaea11769 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/files/write_root_link_rule-125 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# This script should run before doing udevtrigger at boot. +# It will create a rule matching the device directory / is on, and +# creating /dev/root symlink pointing on its device node. +# +# This is especially useful for hal looking at /proc/mounts containing +# a line listing /dev/root as device: +# /dev/root / reiserfs rw 0 0 +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation version 2 of the License. +# +# (c) 2007-2008 Matthias Schwarzott + +eval $(udevadm info --export --export-prefix="ROOT_" --device-id-of-file=/) + +[ $? = 0 ] || exit 0 +[ "$ROOT_MAJOR" = 0 ] && exit 0 + +DIR=/dev/.udev/rules.d +[ -d "$DIR" ] || mkdir -p "$DIR" +RULES=$DIR/10-root-link.rules + +echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}" +echo "# This rule should create /dev/root as link to real root device." >> "${RULES}" +echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", SYMLINK+=\"root\"" >> "${RULES}" + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-151-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-151-r6.ebuild new file mode 100644 index 0000000000..a96a51b9fc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-151-r6.ebuild @@ -0,0 +1,597 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r4.ebuild,v 1.14 2010/10/29 06:13:22 jer Exp $ + +EAPI="1" + +inherit autotools eutils flag-o-matic multilib toolchain-funcs linux-info + +#PATCHSET=${P}-gentoo-patchset-v1 + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" + EGIT_BRANCH="master" + inherit git autotools +else + # please update testsys-tarball whenever udev-xxx/test/sys/ is changed + SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 + test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )" + [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" +fi +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="selinux devfs-compat old-hd-rules -extras test" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + extras? ( + sys-apps/acl + >=sys-apps/usbutils-0.82 + virtual/libusb:0 + sys-apps/pciutils + dev-libs/glib:2 + ) + >=sys-apps/util-linux-2.16 + >=sys-libs/glibc-2.9" + +DEPEND="${COMMON_DEPEND} + extras? ( + dev-util/gperf + dev-util/pkgconfig + ) + virtual/os-headers + !=linux-headers-2.6.27 uses the + # new signalfd syscall introduced in kernel 2.6.27 without falling back + # to the old one. So we just depend on 2.6.27 here, see Bug #281312. + KV_PATCH_min=25 + KV_PATCH_reliable=27 + KV_min=2.6.${KV_PATCH_min} + KV_reliable=2.6.${KV_PATCH_reliable} + + # always print kernel version requirements + ewarn + ewarn "${P} does not support Linux kernel before version ${KV_min}!" + if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then + ewarn "For a reliable udev, use at least kernel ${KV_reliable}" + fi + + echo + # We don't care about the secondary revision of the kernel. + # 2.6.30.4 -> 2.6.30 is all we check + udev_check_KV + case "$?" in + 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;; + 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P}," + ewarn "but it may be unreliable in some cases." + ebeep ;; + 0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}" + ebeep ;; + esac + echo + + KV_FULL_SRC=${KV_FULL} + get_running_version + udev_check_KV + if [[ "$?" = "0" ]]; then + eerror + eerror "udev cannot be restarted after emerging," + eerror "as your running kernel version (${KV_FULL}) is too old." + eerror "You really need to use a newer kernel after a reboot!" + NO_RESTART=1 + ebeep + fi +} + +sed_libexec_dir() { + sed -e "s#/lib/udev#${udev_libexec_dir}#" -i "$@" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + + if use test; then + mv "${WORKDIR}"/test/sys "${S}"/test/ + fi + fi + + cd "${S}" + + # patches go here... + + # backport some patches + if [[ -n "${PATCHSET}" ]]; then + EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + fi + + # Bug 301667 + epatch "${FILESDIR}"/udev-150-fix-missing-firmware-timeout.diff + + # pkgconfig fix for when ROOT != / + epatch "${FILESDIR}"/udev-146-pkgconfig.patch + + if ! use devfs-compat; then + # see Bug #269359 + epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff + fi + + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ + -i rules/{rules.d,packages,gentoo}/*.rules \ + || die "failed to change group dialout to uucp" + + if [[ ${PV} != 9999 ]]; then + # Make sure there is no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules") + MD5=${MD5/ -/} + if [[ ${MD5} != 5685cc3878df54845dda5e08d712447a ]] + then + echo + eerror "50-udev-default.rules has been updated, please validate!" + eerror "md5sum: ${MD5}" + die "50-udev-default.rules has been updated, please validate!" + fi + fi + + if use old-hd-rules; then + epatch "${FILESDIR}"/udev-151-readd-hd-rules.diff + fi + + sed_libexec_dir \ + rules/rules.d/50-udev-default.rules \ + rules/rules.d/78-sound-card.rules \ + extras/rule_generator/write_*_rules \ + || die "sed failed" + + if [[ ${PV} == 9999 ]]; then + gtkdocize --copy + fi + epatch "${FILESDIR}"/udev-146-cross-pci-ids.patch + epatch "${FILESDIR}"/udev-151-add-huawei-devices.patch + epatch "${FILESDIR}"/udev-146-tmp-rules.diff + eautoreconf +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + econf \ + --exec-prefix= \ + --libdir='${prefix}'/$(get_libdir) \ + --libexecdir='${exec_prefix}'"${udev_libexec_dir}" \ + --enable-logging \ + --with-pci-ids-path='${exec_prefix}'/usr/share/misc/pci.ids \ + $(use_with selinux) \ + $(use_enable extras) \ + --disable-introspection + # we don't have gobject-introspection in portage tree + + emake || die "compiling udev failed" +} + +src_install() { + local scriptdir="${FILESDIR}/151-r4" + + into / + emake DESTDIR="${D}" install || die "make install failed" + + exeinto "${udev_libexec_dir}" + newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" + newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + || die "move_tmp_persistent_rules.sh not installed properly" + newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \ + || die "write_root_link_rule not installed properly" + + doexe "${FILESDIR}"/compat_firmware.sh \ + || die "compat_firmware.sh not installed properly" + + doexe "${scriptdir}"/shell-compat-KV.sh \ + || die "shell-compat.sh not installed properly" + doexe "${scriptdir}"/shell-compat-addon.sh \ + || die "shell-compat.sh not installed properly" + + keepdir "${udev_libexec_dir}"/state + keepdir "${udev_libexec_dir}"/devices + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym "..${udev_libexec_dir}/scsi_id" /sbin/scsi_id + + # Add gentoo stuff to udev.conf + echo "# If you need to change mount-options, do it in /etc/fstab" \ + >> "${D}"/etc/udev/udev.conf + + # let the dir exist at least + keepdir /etc/udev/rules.d + + # Now installing rules + cd "${S}"/rules + insinto "${udev_libexec_dir}"/rules.d/ + + # Our rules files + doins gentoo/??-*.rules + doins packages/40-isdn.rules + + # workaround for chromium-os:12387, must be removed for >udev-152 + doins "${FILESDIR}"/01-workaround-net-device-db.rules + + # compat-wireless firmware loading (needs compat_firmware.sh above) + doins "${FILESDIR}"/50-compat_firmware.rules \ + || die "compat_firmware.rules not installed properly" + + # Adding arch specific rules + if [[ -f packages/40-${ARCH}.rules ]] + then + doins "packages/40-${ARCH}.rules" + fi + cd "${S}" + + # our udev hooks into the rc system + insinto /$(get_libdir)/rcscripts/addons + doins "${scriptdir}"/udev-start.sh \ + || die "udev-start.sh not installed properly" + doins "${scriptdir}"/udev-stop.sh \ + || die "udev-stop.sh not installed properly" + + local init + # udev-postmount and init-scripts for >=openrc-0.3.1, Bug #240984 + for init in udev udev-mount udev-dev-tarball udev-postmount; do + newinitd "${scriptdir}/${init}.initd" "${init}" \ + || die "initscript ${init} not installed properly" + done + + # insert minimum kernel versions + sed -e "s/%KV_MIN%/${KV_min}/" \ + -e "s/%KV_MIN_RELIABLE%/${KV_reliable}/" \ + -i "${D}"/etc/init.d/udev-mount + + # config file for init-script and start-addon + newconfd "${scriptdir}/udev.confd" udev \ + || die "config file not installed properly" + + insinto /etc/modprobe.d + newins "${FILESDIR}"/blacklist-146 blacklist.conf + newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + + # convert /lib/udev to real used dir + sed_libexec_dir \ + "${D}/$(get_libdir)"/rcscripts/addons/*.sh \ + "${D}/${udev_libexec_dir}"/write_root_link_rule \ + "${D}"/etc/conf.d/udev \ + "${D}"/etc/init.d/udev* \ + "${D}"/etc/modprobe.d/* + + # documentation + dodoc ChangeLog README TODO || die "failed installing docs" + + # keep doc in just one directory, Bug #281137 + rm -rf "${D}/usr/share/doc/${PN}" + if use extras; then + dodoc extras/keymap/README.keymap.txt || die "failed installing docs" + fi +} + +pkg_preinst() { + # moving old files to support newer modprobe, 12 May 2009 + local f dir=${ROOT}/etc/modprobe.d/ + for f in pnp-aliases blacklist; do + if [[ -f $dir/$f && ! -f $dir/$f.conf ]] + then + elog "Moving $dir/$f to $f.conf" + mv -f "$dir/$f" "$dir/$f.conf" + fi + done + + if [[ -d ${ROOT}/lib/udev-state ]] + then + mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ + rm -r "${ROOT}"/lib/udev-state + fi + + if [[ -f ${ROOT}/etc/udev/udev.config && + ! -f ${ROOT}/etc/udev/udev.rules ]] + then + mv -f "${ROOT}"/etc/udev/udev.config "${ROOT}"/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [[ -h ${ROOT}/etc/hotplug.d/default/udev.hotplug ]] + then + rm -f "${ROOT}"/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]] + then + rm -f "${ROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${ROOT}/etc/hotplug.d/default/10-udev.hotplug ]] + then + rm -f "${ROOT}"/etc/hotplug.d/default/10-udev.hotplug + fi + + has_version "=${CATEGORY}/${PN}-103-r3" + previous_equal_to_103_r3=$? + + has_version "<${CATEGORY}/${PN}-104-r5" + previous_less_than_104_r5=$? + + has_version "<${CATEGORY}/${PN}-106-r5" + previous_less_than_106_r5=$? + + has_version "<${CATEGORY}/${PN}-113" + previous_less_than_113=$? +} + +# 19 Nov 2008 +fix_old_persistent_net_rules() { + local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules + [[ -f ${rules} ]] || return + + elog + elog "Updating persistent-net rules file" + + # Change ATTRS to ATTR matches, Bug #246927 + sed -i -e 's/ATTRS{/ATTR{/g' "${rules}" + + # Add KERNEL matches if missing, Bug #246849 + sed -ri \ + -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ + "${rules}" +} + +# See Bug #129204 for a discussion about restarting udevd +restart_udevd() { + if [[ ${NO_RESTART} = "1" ]]; then + ewarn "Not restarting udevd, as your kernel is too old!" + return + fi + + # need to merge to our system + [[ ${ROOT} = / ]] || return + + # check if root of init-process is identical to ours (not in chroot) + [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return + + # abort if there is no udevd running + [[ -n $(pidof udevd) ]] || return + + # abort if no /dev/.udev exists + [[ -e /dev/.udev ]] || return + + elog + elog "restarting udevd now." + + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + + /sbin/udevd --daemon + sleep 3 + if [[ ! -n $(pidof udevd) ]]; then + eerror "FATAL: udev died, please check your kernel is" + eerror "new enough and configured correctly for ${P}." + eerror + eerror "Please have a look at this before rebooting." + eerror "If in doubt, please downgrade udev back to your old version" + ebeep + fi +} + +postinst_init_scripts() { + # FIXME: we may need some code that detects if this is a system bootstrap + # and auto-enables udev then + # + # FIXME: inconsistent handling of init-scripts here + # * udev is added to sysinit in openrc-ebuild + # * we add udev-postmount to default in here + # + + # migration to >=openrc-0.4 + if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] + then + ewarn + ewarn "You need to add the udev init script to the runlevel sysinit," + ewarn "else your system will not be able to boot" + ewarn "after updating to >=openrc-0.4.0" + ewarn "Run this to enable udev for >=openrc-0.4.0:" + ewarn "\trc-update add udev sysinit" + ewarn + fi + + # add udev-postmount to default runlevel instead of that ugly injecting + # like a hotplug event, 2009/10/15 + + # already enabled? + [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return + + local enable_postmount=0 + [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=1 + [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=1 + + if [[ ${enable_postmount} = 1 ]] + then + local initd=udev-postmount + + if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd} + elog "Auto-adding '${initd}' service to your default runlevel" + fi + else + elog "You should add the udev-postmount service to default runlevel." + elog "Run this to add it:" + elog "\trc-update add udev-postmount default" + fi +} + +pkg_postinst() { + fix_old_persistent_net_rules + + restart_udevd + + postinst_init_scripts + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007 + if [[ $previous_equal_to_103_r3 = 0 ]] && + [[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]] + then + ewarn "Deleting stray 40-scsi-hotplug.rules" + ewarn "installed by sys-fs/udev-103-r3" + rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules + fi + + # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 + if [[ -d ${ROOT}/lib/udev/devices ]] + then + rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file, 29 Jan 2007 + if [[ $previous_less_than_104_r5 = 0 ]] + then + rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null + fi + + # 19 Mar 2007 + if [[ $previous_less_than_106_r5 = 0 ]] && + [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]] + then + rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${ROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${ROOT}/etc/dev.d ]] + then + ewarn "You still have the directory /etc/dev.d on your system." + ewarn "This is no longer used by udev and can be removed." + fi + fi + + # 64-device-mapper.rules now gets installed by sys-fs/device-mapper + # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007 + if [[ $previous_less_than_113 = 0 ]] && + [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + # requested in bug #275974, added 2009/09/05 + ewarn + ewarn "If after the udev update removable devices or CD/DVD drives" + ewarn "stop working, try re-emerging HAL before filling a bug report" + + # requested in Bug #225033: + elog + elog "persistent-net does assigning fixed names to network devices." + elog "If you have problems with the persistent-net rules," + elog "just delete the rules file" + elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "and then reboot." + elog + elog "This may however number your devices in a different way than they are now." + + ewarn + ewarn "If you build an initramfs including udev, then please" + ewarn "make sure that the /sbin/udevadm binary gets included," + ewarn "and your scripts changed to use it,as it replaces the" + ewarn "old helper apps udevinfo, udevtrigger, ..." + + ewarn + ewarn "mount options for directory /dev are no longer" + ewarn "set in /etc/udev/udev.conf, but in /etc/fstab" + ewarn "as for other directories." + + if use devfs-compat; then + ewarn + ewarn "devfs-compat use flag is enabled." + ewarn "This enables devfs compatible device names." + else + ewarn + ewarn "This version of udev no longer has devfs-compat enabled" + fi + ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*," + ewarn "then please migrate over to using the device names" + ewarn "/dev/md*, /dev/loop* and /dev/ram*." + ewarn "The devfs-compat rules will be removed on the next udev update." + ewarn "For reference see Bug #269359." + + if use old-hd-rules; then + ewarn + ewarn "old-hd-rules use flag is enabled" + ewarn "This adds the removed rules for /dev/hd* devices" + else + ewarn + ewarn "This version of udev no longer has use flag old-hd-rules enabled" + ewarn "So all special rules for /dev/hd* devices are missing" + fi + ewarn "Please migrate to the new libata if you need these rules." + ewarn "They will be completely removed on the next udev update." + + elog + elog "For more information on udev on Gentoo, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-170-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-170-r2.ebuild new file mode 120000 index 0000000000..1a2ba0c27d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-170-r2.ebuild @@ -0,0 +1 @@ +udev-170.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-170.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-170.ebuild new file mode 100644 index 0000000000..f948f9ab38 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-170.ebuild @@ -0,0 +1,530 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-168-r2.ebuild,v 1.1 2011/05/14 14:00:34 zzam Exp $ + +EAPI="1" + +inherit eutils flag-o-matic multilib toolchain-funcs linux-info autotools + +# I jumped ahead of Gentoo +#PATCHSET=${P}-gentoo-patchset-v1 +scriptversion=v3 +scriptname=udev-gentoo-scripts-${scriptversion} + +if [[ ${PV} == "9999" ]]; then + SRC_URI="mirror://gentoo/${scriptname}.tar.bz2" + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" + EGIT_BRANCH="master" + inherit git autotools +else + # please update testsys-tarball whenever udev-xxx/test/sys/ is changed + SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 + test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 ) + mirror://gentoo/${scriptname}.tar.bz2" + [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" +fi +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +IUSE="selinux test rule_generator hwdb acl gudev introspection + keymap floppy edd action_modeswitch" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + acl? ( sys-apps/acl dev-libs/glib:2 ) + gudev? ( dev-libs/glib:2 ) + introspection? ( dev-libs/gobject-introspection ) + action_modeswitch? ( virtual/libusb:0 ) + >=sys-apps/util-linux-2.16 + >=sys-libs/glibc-2.9" + +DEPEND="${COMMON_DEPEND} + keymap? ( dev-util/gperf ) + virtual/os-headers + !=linux-headers-2.6.27 uses the + # new signalfd syscall introduced in kernel 2.6.27 without falling back + # to the old one. So we just depend on 2.6.27 here, see Bug #281312. + KV_PATCH_min=25 + KV_PATCH_reliable=31 + KV_min=2.6.${KV_PATCH_min} + KV_reliable=2.6.${KV_PATCH_reliable} + + # always print kernel version requirements + ewarn + ewarn "${P} does not support Linux kernel before version ${KV_min}!" + if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then + ewarn "For a reliable udev, use at least kernel ${KV_reliable}" + fi + + echo + # We don't care about the secondary revision of the kernel. + # 2.6.30.4 -> 2.6.30 is all we check + udev_check_KV + case "$?" in + 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;; + 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P}," + ewarn "but it may be unreliable in some cases." + ebeep ;; + 0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}" + ebeep ;; + esac + echo + + KV_FULL_SRC=${KV_FULL} + get_running_version + udev_check_KV + if [[ "$?" = "0" ]]; then + eerror + eerror "udev cannot be restarted after emerging," + eerror "as your running kernel version (${KV_FULL}) is too old." + eerror "You really need to use a newer kernel after a reboot!" + NO_RESTART=1 + ebeep + fi +} + +src_unpack() { + unpack ${A} + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + if use test; then + mv "${WORKDIR}"/test/sys "${S}"/test/ + fi + fi + + #cd "${WORKDIR}/${scriptname}" + + cd "${S}" + + # patches go here... + # run-not-writable taken from the 168 gentoo patchset + epatch "${FILESDIR}"/udev-170-run-not-writable.patch + # usb.ids location can't come from pkgconfig (chromiumos:15595) + epatch "${FILESDIR}"/udev-170-usb-ids-location.patch + + # backport some patches + if [[ -n "${PATCHSET}" ]]; then + EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + fi + + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ + -i rules/{rules.d,arch}/*.rules \ + || die "failed to change group dialout to uucp" + + if [[ ${PV} != 9999 ]]; then + # Make sure there is no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules") + MD5=${MD5/ -/} + if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]] + then + echo + eerror "50-udev-default.rules has been updated, please validate!" + eerror "md5sum: ${MD5}" + die "50-udev-default.rules has been updated, please validate!" + fi + fi + + if [[ ${PV} == 9999 ]]; then + gtkdocize --copy || die "gtkdocize failed" + fi + eautoreconf +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + econf \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/sbin \ + --libdir=/usr/$(get_libdir) \ + --with-rootlibdir=/$(get_libdir) \ + --libexecdir=/lib/udev \ + --enable-logging \ + --enable-static \ + $(use_with selinux) \ + $(use_enable debug) \ + $(use_enable rule_generator) \ + $(use_enable hwdb) \ + --with-pci-ids-path="/usr/share/misc/pci.ids" \ + --with-usb-ids-path="/usr/share/misc/usb.ids" \ + $(use_enable acl udev_acl) \ + $(use_enable gudev) \ + $(use_enable introspection) \ + $(use_enable keymap) \ + $(use_enable floppy) \ + $(use_enable edd) \ + $(use_enable action_modeswitch) \ + --without-systemdsystemunitdir + + emake || die "compiling udev failed" +} + +src_install() { + emake -C "${WORKDIR}/${scriptname}" \ + DESTDIR="${D}" LIBDIR="$(get_libdir)" \ + KV_min="${KV_min}" KV_reliable="${KV_reliable}" \ + install || die "make install failed" + + into / + emake DESTDIR="${D}" install || die "make install failed" + + exeinto /lib/udev + keepdir /lib/udev/state + keepdir /lib/udev/devices + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym "../lib/udev/scsi_id" /sbin/scsi_id + + # Add gentoo stuff to udev.conf + echo "# If you need to change mount-options, do it in /etc/fstab" \ + >> "${D}"/etc/udev/udev.conf + + # let the dir exist at least + keepdir /etc/udev/rules.d + + # Now installing rules + cd "${S}"/rules + insinto /lib/udev/rules.d/ + + # support older kernels + doins misc/30-kernel-compat.rules + + # Adding arch specific rules + if [[ -f arch/40-${ARCH}.rules ]] + then + doins "arch/40-${ARCH}.rules" + fi + cd "${S}" + + insinto /etc/modprobe.d + newins "${FILESDIR}"/blacklist-146 blacklist.conf + newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + + # documentation + dodoc ChangeLog README TODO || die "failed installing docs" + + # keep doc in just one directory, Bug #281137 + rm -rf "${D}/usr/share/doc/${PN}" + if use keymap; then + dodoc extras/keymap/README.keymap.txt || die "failed installing docs" + fi +} + +pkg_preinst() { + # moving old files to support newer modprobe, 12 May 2009 + local f dir=${ROOT}/etc/modprobe.d/ + for f in pnp-aliases blacklist; do + if [[ -f $dir/$f && ! -f $dir/$f.conf ]] + then + elog "Moving $dir/$f to $f.conf" + mv -f "$dir/$f" "$dir/$f.conf" + fi + done + + if [[ -d ${ROOT}/lib/udev-state ]] + then + mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ + rm -r "${ROOT}"/lib/udev-state + fi + + if [[ -f ${ROOT}/etc/udev/udev.config && + ! -f ${ROOT}/etc/udev/udev.rules ]] + then + mv -f "${ROOT}"/etc/udev/udev.config "${ROOT}"/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [[ -h ${ROOT}/etc/hotplug.d/default/udev.hotplug ]] + then + rm -f "${ROOT}"/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]] + then + rm -f "${ROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${ROOT}/etc/hotplug.d/default/10-udev.hotplug ]] + then + rm -f "${ROOT}"/etc/hotplug.d/default/10-udev.hotplug + fi + + has_version "=${CATEGORY}/${PN}-103-r3" + previous_equal_to_103_r3=$? + + has_version "<${CATEGORY}/${PN}-104-r5" + previous_less_than_104_r5=$? + + has_version "<${CATEGORY}/${PN}-106-r5" + previous_less_than_106_r5=$? + + has_version "<${CATEGORY}/${PN}-113" + previous_less_than_113=$? +} + +# 19 Nov 2008 +fix_old_persistent_net_rules() { + local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules + [[ -f ${rules} ]] || return + + elog + elog "Updating persistent-net rules file" + + # Change ATTRS to ATTR matches, Bug #246927 + sed -i -e 's/ATTRS{/ATTR{/g' "${rules}" + + # Add KERNEL matches if missing, Bug #246849 + sed -ri \ + -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ + "${rules}" +} + +# See Bug #129204 for a discussion about restarting udevd +restart_udevd() { + if [[ ${NO_RESTART} = "1" ]]; then + ewarn "Not restarting udevd, as your kernel is too old!" + return + fi + + # need to merge to our system + [[ ${ROOT} = / ]] || return + + # check if root of init-process is identical to ours (not in chroot) + [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return + + # abort if there is no udevd running + [[ -n $(pidof udevd) ]] || return + + # abort if no /dev/.udev exists + [[ -e /dev/.udev ]] || return + + elog + elog "restarting udevd now." + + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + + /sbin/udevd --daemon + sleep 3 + if [[ ! -n $(pidof udevd) ]]; then + eerror "FATAL: udev died, please check your kernel is" + eerror "new enough and configured correctly for ${P}." + eerror + eerror "Please have a look at this before rebooting." + eerror "If in doubt, please downgrade udev back to your old version" + ebeep + fi +} + +postinst_init_scripts() { + # FIXME: we may need some code that detects if this is a system bootstrap + # and auto-enables udev then + # + # FIXME: inconsistent handling of init-scripts here + # * udev is added to sysinit in openrc-ebuild + # * we add udev-postmount to default in here + # + + # migration to >=openrc-0.4 + if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] + then + ewarn + ewarn "You need to add the udev init script to the runlevel sysinit," + ewarn "else your system will not be able to boot" + ewarn "after updating to >=openrc-0.4.0" + ewarn "Run this to enable udev for >=openrc-0.4.0:" + ewarn "\trc-update add udev sysinit" + ewarn + fi + + # add udev-postmount to default runlevel instead of that ugly injecting + # like a hotplug event, 2009/10/15 + + # already enabled? + [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return + + local enable_postmount=0 + [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=1 + [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=1 + + if [[ ${enable_postmount} = 1 ]] + then + local initd=udev-postmount + + if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd} + elog "Auto-adding '${initd}' service to your default runlevel" + fi + else + elog "You should add the udev-postmount service to default runlevel." + elog "Run this to add it:" + elog "\trc-update add udev-postmount default" + fi +} + +pkg_postinst() { + fix_old_persistent_net_rules + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${ROOT}"/dev/loop 2>/dev/null + if [[ -d "${ROOT}"/dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + restart_udevd + + postinst_init_scripts + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007 + if [[ $previous_equal_to_103_r3 = 0 ]] && + [[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]] + then + ewarn "Deleting stray 40-scsi-hotplug.rules" + ewarn "installed by sys-fs/udev-103-r3" + rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules + fi + + # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 + if [[ -d ${ROOT}/lib/udev/devices ]] + then + rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file, 29 Jan 2007 + if [[ $previous_less_than_104_r5 = 0 ]] + then + rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null + fi + + # 19 Mar 2007 + if [[ $previous_less_than_106_r5 = 0 ]] && + [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]] + then + rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${ROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${ROOT}/etc/dev.d ]] + then + ewarn "You still have the directory /etc/dev.d on your system." + ewarn "This is no longer used by udev and can be removed." + fi + fi + + # 64-device-mapper.rules now gets installed by sys-fs/device-mapper + # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007 + if [[ $previous_less_than_113 = 0 ]] && + [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + # requested in bug #275974, added 2009/09/05 + ewarn + ewarn "If after the udev update removable devices or CD/DVD drives" + ewarn "stop working, try re-emerging HAL before filling a bug report" + + # requested in Bug #225033: + elog + elog "persistent-net does assigning fixed names to network devices." + elog "If you have problems with the persistent-net rules," + elog "just delete the rules file" + elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "and then reboot." + elog + elog "This may however number your devices in a different way than they are now." + + ewarn + ewarn "If you build an initramfs including udev, then please" + ewarn "make sure that the /sbin/udevadm binary gets included," + ewarn "and your scripts changed to use it,as it replaces the" + ewarn "old helper apps udevinfo, udevtrigger, ..." + + ewarn + ewarn "mount options for directory /dev are no longer" + ewarn "set in /etc/udev/udev.conf, but in /etc/fstab" + ewarn "as for other directories." + + ewarn + ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*," + ewarn "then please migrate over to using the device names" + ewarn "/dev/md*, /dev/loop* and /dev/ram*." + ewarn "The devfs-compat rules have been removed." + ewarn "For reference see Bug #269359." + + ewarn + ewarn "Rules for /dev/hd* devices have been removed" + ewarn "Please migrate to libata." + + elog + elog "For more information on udev on Gentoo, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-171-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-171-r3.ebuild new file mode 120000 index 0000000000..faea0f5336 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-171-r3.ebuild @@ -0,0 +1 @@ +udev-171.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-171.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-171.ebuild new file mode 100644 index 0000000000..8d4e0a876b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/udev/udev-171.ebuild @@ -0,0 +1,588 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r2.ebuild,v 1.2 2011/09/18 06:42:42 zmedico Exp $ + +EAPI=4 + +KV_min=2.6.32 +KV_reliable=2.6.32 +PATCHSET=${P}-gentoo-patchset-v1 +scriptversion=v4 +scriptname=udev-gentoo-scripts-${scriptversion} + +if [[ ${PV} == "9999" ]] +then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" + EGIT_BRANCH="master" + vcs="git-2 autotools" +fi + +inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool + +if [[ ${PV} != "9999" ]] +then + KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux" + # please update testsys-tarball whenever udev-xxx/test/sys/ is changed + SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 + test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )" + if [[ -n "${PATCHSET}" ]] + then + SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" + fi +fi +SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2" + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" + +LICENSE="GPL-2" +SLOT="0" +IUSE="build selinux test debug +rule_generator hwdb acl gudev introspection + keymap floppy edd action_modeswitch extras" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + extras? ( sys-apps/acl + dev-libs/glib:2 + dev-libs/gobject-introspection + virtual/libusb:0 ) + acl? ( sys-apps/acl dev-libs/glib:2 ) + gudev? ( dev-libs/glib:2 ) + introspection? ( dev-libs/gobject-introspection ) + action_modeswitch? ( virtual/libusb:0 ) + >=sys-apps/util-linux-2.16 + >=sys-libs/glibc-2.10" + +DEPEND="${COMMON_DEPEND} + keymap? ( dev-util/gperf ) + extras? ( dev-util/gperf ) + dev-util/pkgconfig + virtual/os-headers + !> "${ED}"/etc/udev/udev.conf + + # let the dir exist at least + keepdir /etc/udev/rules.d + + # Now installing rules + cd "${S}"/rules + insinto /lib/udev/rules.d/ + + # support older kernels + doins misc/30-kernel-compat.rules + + # Adding arch specific rules + if [[ -f arch/40-${ARCH}.rules ]] + then + doins "arch/40-${ARCH}.rules" + fi + cd "${S}" + + insinto /etc/modprobe.d + newins "${FILESDIR}"/blacklist-146 blacklist.conf + newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + + # documentation + dodoc ChangeLog README TODO + + # keep doc in just one directory, Bug #281137 + rm -rf "${ED}/usr/share/doc/${PN}" + if use keymap + then + dodoc extras/keymap/README.keymap.txt + fi +} + +src_test() { + local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" + cd "${WORKDIR}/${scriptname}" + vecho ">>> Test phase [scripts:test]: ${CATEGORY}/${PF}" + if ! $emake_cmd -j1 test + then + has test $FEATURES && die "scripts: Make test failed. See above for details." + has test $FEATURES || eerror "scripts: Make test failed. See above for details." + fi + + cd "${S}" + vecho ">>> Test phase [udev:check]: ${CATEGORY}/${PF}" + has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests" + if ! $emake_cmd -j1 check + then + has test $FEATURES && die "udev: Make test failed. See above for details." + has test $FEATURES || eerror "udev: Make test failed. See above for details." + fi +} + +pkg_preinst() { + # moving old files to support newer modprobe, 12 May 2009 + local f dir=${EROOT}/etc/modprobe.d/ + for f in pnp-aliases blacklist; do + if [[ -f $dir/$f && ! -f $dir/$f.conf ]] + then + elog "Moving $dir/$f to $f.conf" + mv -f "$dir/$f" "$dir/$f.conf" + fi + done + + if [[ -d ${EROOT}/lib/udev-state ]] + then + mv -f "${EROOT}"/lib/udev-state/* "${ED}"/lib/udev/state/ + rm -r "${EROOT}"/lib/udev-state + fi + + if [[ -f ${EROOT}/etc/udev/udev.config && + ! -f ${EROOT}/etc/udev/udev.rules ]] + then + mv -f "${EROOT}"/etc/udev/udev.config "${EROOT}"/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/udev.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/10-udev.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/10-udev.hotplug + fi + + has_version "=${CATEGORY}/${PN}-103-r3" + previous_equal_to_103_r3=$? + + has_version "<${CATEGORY}/${PN}-104-r5" + previous_less_than_104_r5=$? + + has_version "<${CATEGORY}/${PN}-106-r5" + previous_less_than_106_r5=$? + + has_version "<${CATEGORY}/${PN}-113" + previous_less_than_113=$? +} + +# 19 Nov 2008 +fix_old_persistent_net_rules() { + local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules + [[ -f ${rules} ]] || return + + elog + elog "Updating persistent-net rules file" + + # Change ATTRS to ATTR matches, Bug #246927 + sed -i -e 's/ATTRS{/ATTR{/g' "${rules}" + + # Add KERNEL matches if missing, Bug #246849 + sed -ri \ + -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ + "${rules}" +} + +# See Bug #129204 for a discussion about restarting udevd +restart_udevd() { + if [[ ${NO_RESTART} = "1" ]] + then + ewarn "Not restarting udevd, as your kernel is too old!" + return + fi + + # need to merge to our system + [[ ${EROOT} = / ]] || return + + # check if root of init-process is identical to ours (not in chroot) + [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return + + # abort if there is no udevd running + [[ -n $(pidof udevd) ]] || return + + # abort if no /dev/.udev exists + [[ -e /dev/.udev ]] || return + + elog + elog "restarting udevd now." + + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + + /sbin/udevd --daemon + sleep 3 + if [[ ! -n $(pidof udevd) ]] + then + eerror "FATAL: udev died, please check your kernel is" + eerror "new enough and configured correctly for ${P}." + eerror + eerror "Please have a look at this before rebooting." + eerror "If in doubt, please downgrade udev back to your old version" + fi +} + +postinst_init_scripts() { + local enable_postmount=false + + # FIXME: inconsistent handling of init-scripts here + # * udev is added to sysinit in openrc-ebuild + # * we add udev-postmount to default in here + # + + # If we are building stages, add udev to the sysinit runlevel automatically. + if use build + then + if [[ -x "${EROOT}"/etc/init.d/udev \ + && -d "${EROOT}"/etc/runlevels/sysinit ]] + then + ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev + fi + enable_postmount=true + fi + + # migration to >=openrc-0.4 + if [[ -e "${EROOT}"/etc/runlevels/sysinit && ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]] + then + ewarn + ewarn "You need to add the udev init script to the runlevel sysinit," + ewarn "else your system will not be able to boot" + ewarn "after updating to >=openrc-0.4.0" + ewarn "Run this to enable udev for >=openrc-0.4.0:" + ewarn "\trc-update add udev sysinit" + ewarn + fi + + # add udev-postmount to default runlevel instead of that ugly injecting + # like a hotplug event, 2009/10/15 + + # already enabled? + [[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return + + [[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true + [[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true + + if $enable_postmount + then + local initd=udev-postmount + + if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd} + elog "Auto-adding '${initd}' service to your default runlevel" + fi + else + elog "You should add the udev-postmount service to default runlevel." + elog "Run this to add it:" + elog "\trc-update add udev-postmount default" + fi +} + +pkg_postinst() { + fix_old_persistent_net_rules + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${EROOT}"/dev/loop 2>/dev/null + if [[ -d "${EROOT}"/dev/loop ]] + then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + restart_udevd + + postinst_init_scripts + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007 + if [[ $previous_equal_to_103_r3 = 0 ]] && + [[ -e ${EROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]] + then + ewarn "Deleting stray 40-scsi-hotplug.rules" + ewarn "installed by sys-fs/udev-103-r3" + rm -f "${EROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules + fi + + # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 + if [[ -d ${EROOT}/lib/udev/devices ]] + then + rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file, 29 Jan 2007 + if [[ $previous_less_than_104_r5 = 0 ]] + then + rm -f "${EROOT}"/etc/dev.d/net/hotplug.dev + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/net 2>/dev/null + fi + + # 19 Mar 2007 + if [[ $previous_less_than_106_r5 = 0 ]] && + [[ -e ${EROOT}/etc/udev/rules.d/95-net.rules ]] + then + rm -f "${EROOT}"/etc/udev/rules.d/95-net.rules + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${EROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${EROOT}/etc/dev.d ]] + then + ewarn "You still have the directory /etc/dev.d on your system." + ewarn "This is no longer used by udev and can be removed." + fi + fi + + # 64-device-mapper.rules now gets installed by sys-fs/device-mapper + # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007 + if [[ $previous_less_than_113 = 0 ]] && + [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + # requested in Bug #225033: + elog + elog "persistent-net does assigning fixed names to network devices." + elog "If you have problems with the persistent-net rules," + elog "just delete the rules file" + elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "and then reboot." + elog + elog "This may however number your devices in a different way than they are now." + + ewarn + ewarn "If you build an initramfs including udev, then please" + ewarn "make sure that the /sbin/udevadm binary gets included," + ewarn "and your scripts changed to use it,as it replaces the" + ewarn "old helper apps udevinfo, udevtrigger, ..." + + ewarn + ewarn "mount options for directory /dev are no longer" + ewarn "set in /etc/udev/udev.conf, but in /etc/fstab" + ewarn "as for other directories." + + ewarn + ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*," + ewarn "then please migrate over to using the device names" + ewarn "/dev/md*, /dev/loop* and /dev/ram*." + ewarn "The devfs-compat rules have been removed." + ewarn "For reference see Bug #269359." + + ewarn + ewarn "Rules for /dev/hd* devices have been removed" + ewarn "Please migrate to libata." + + elog + elog "For more information on udev on Gentoo, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/chromeos-kernel-next-3.4_rc7-r348.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/chromeos-kernel-next-3.4_rc7-r348.ebuild new file mode 100644 index 0000000000..725cdda772 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/chromeos-kernel-next-3.4_rc7-r348.ebuild @@ -0,0 +1,17 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="f6a45ba0aa715500f21d6d95a0558dd50e4bbf6b" +CROS_WORKON_TREE="b80c11182613432cf1192946a2c95ea1cd742d9d" +CROS_WORKON_PROJECT="chromiumos/third_party/kernel-next" +CROS_WORKON_LOCALNAME="../third_party/kernel-next/" + +# This must be inherited *after* EGIT/CROS_WORKON variables defined +inherit cros-workon cros-kernel2 + +DESCRIPTION="Chrome OS Kernel-next" +KEYWORDS="amd64 arm x86" + +DEPEND="!sys-kernel/chromeos-kernel" +RDEPEND="!sys-kernel/chromeos-kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/chromeos-kernel-next-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/chromeos-kernel-next-9999.ebuild new file mode 100644 index 0000000000..6f678a46cb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/chromeos-kernel-next-9999.ebuild @@ -0,0 +1,15 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/kernel-next" +CROS_WORKON_LOCALNAME="../third_party/kernel-next/" + +# This must be inherited *after* EGIT/CROS_WORKON variables defined +inherit cros-workon cros-kernel2 + +DESCRIPTION="Chrome OS Kernel-next" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND="!sys-kernel/chromeos-kernel" +RDEPEND="!sys-kernel/chromeos-kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/files/chromeos-version.sh new file mode 100755 index 0000000000..5de8bc36cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel-next/files/chromeos-version.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +# Matching regexp for all known kernel release tags to date. +PATTERN="v[23].*" + +if [ ! -d "$1" ] ; then + exit +fi + +cd "$1" || exit + +git describe --match "${PATTERN}" --abbrev=0 HEAD 2>&1 | egrep "${PATTERN}" | + sed s/v\\.*//g | sed s/-/_/g diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/chromeos-kernel-3.4-r2099.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/chromeos-kernel-3.4-r2099.ebuild new file mode 100644 index 0000000000..2cd1522d9d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/chromeos-kernel-3.4-r2099.ebuild @@ -0,0 +1,25 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="808f8d525c0eeaba7d71f2c9f993c02b1c76e210" +CROS_WORKON_TREE="cf09dbf486aa2e7f53a7236d4d77165325586be8" +CROS_WORKON_PROJECT="chromiumos/third_party/kernel" + +# TODO(jglasgow) Need to fix DEPS file to get rid of "files" +CROS_WORKON_LOCALNAME="../third_party/kernel/files" + +# This must be inherited *after* EGIT/CROS_WORKON variables defined +inherit cros-workon cros-kernel2 + +DESCRIPTION="Chrome OS Kernel" +KEYWORDS="amd64 arm x86" + +RDEPEND="!sys-kernel/chromeos-kernel-next + !sys-kernel/chromeos-kernel-exynos" +DEPEND="${RDEPEND}" + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-kernel2_src_test +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/chromeos-kernel-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/chromeos-kernel-9999.ebuild new file mode 100644 index 0000000000..5e640d4dbc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/chromeos-kernel-9999.ebuild @@ -0,0 +1,23 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/third_party/kernel" + +# TODO(jglasgow) Need to fix DEPS file to get rid of "files" +CROS_WORKON_LOCALNAME="../third_party/kernel/files" + +# This must be inherited *after* EGIT/CROS_WORKON variables defined +inherit cros-workon cros-kernel2 + +DESCRIPTION="Chrome OS Kernel" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND="!sys-kernel/chromeos-kernel-next + !sys-kernel/chromeos-kernel-exynos" +DEPEND="${RDEPEND}" + +src_test() { + # Needed for `cros_run_unit_tests`. + cros-kernel2_src_test +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/files/chromeos-version.sh new file mode 100755 index 0000000000..5de8bc36cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/chromeos-kernel/files/chromeos-version.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This script is given one argument: the base of the source directory of +# the package, and it prints a string on stdout with the numerical version +# number for said repo. + +# Matching regexp for all known kernel release tags to date. +PATTERN="v[23].*" + +if [ ! -d "$1" ] ; then + exit +fi + +cd "$1" || exit + +git describe --match "${PATTERN}" --abbrev=0 HEAD 2>&1 | egrep "${PATTERN}" | + sed s/v\\.*//g | sed s/-/_/g diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-Add-DMABUF-as-a-memory-type.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-Add-DMABUF-as-a-memory-type.patch new file mode 100644 index 0000000000..a7c28134f0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-Add-DMABUF-as-a-memory-type.patch @@ -0,0 +1,50 @@ +From eb12f7626253e47c8a3394bd07c8460d4775eae7 Mon Sep 17 00:00:00 2001 +From: Sean Paul +Date: Wed, 20 Jun 2012 11:39:22 -0400 +Subject: [PATCH] v4l: Add DMABUF as a memory type + +Adds DMABUF memory type to v4l framework. Also adds the related file +descriptor in v4l2_plane and v4l2_buffer. + +Change-Id: If6b8d3e16bf487d87352008f9ac5d3bdad5ab732 +Signed-off-by: Tomasz Stanislawski +[original work in the PoC for buffer sharing] +Signed-off-by: Sumit Semwal +Signed-off-by: Sumit Semwal +Acked-by: Laurent Pinchart +Signed-off-by: Sean Paul +--- + include/linux/videodev2.h | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h +index 7915525..92a495d 100644 +--- a/include/linux/videodev2.h ++++ b/include/linux/videodev2.h +@@ -185,6 +185,7 @@ enum v4l2_memory { + V4L2_MEMORY_MMAP = 1, + V4L2_MEMORY_USERPTR = 2, + V4L2_MEMORY_OVERLAY = 3, ++ V4L2_MEMORY_DMABUF = 4, + }; + + /* see also http://vektor.theorem.ca/graphics/ycbcr/ */ +@@ -617,6 +618,7 @@ struct v4l2_plane { + union { + __u32 mem_offset; + unsigned long userptr; ++ int fd; + } m; + __u32 data_offset; + __u32 reserved[11]; +@@ -667,6 +669,7 @@ struct v4l2_buffer { + __u32 offset; + unsigned long userptr; + struct v4l2_plane *planes; ++ int fd; + } m; + __u32 length; + __u32 input; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-CHROMIUM-v4l2-exynos-move-CID-enums-into-videodev2.h.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-CHROMIUM-v4l2-exynos-move-CID-enums-into-videodev2.h.patch new file mode 100644 index 0000000000..8b2cdfe88f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-CHROMIUM-v4l2-exynos-move-CID-enums-into-videodev2.h.patch @@ -0,0 +1,48 @@ +sheu@chromium.org: trimmed from 3.4 kernel patch + +From e5b2998def807693aa5796112423117022318db2 Mon Sep 17 00:00:00 2001 +From: John Sheu +Date: Fri, 4 Jan 2013 19:08:53 -0800 +Subject: [PATCH] CHROMIUM: v4l2/exynos: move CID enums into videodev2.h + +Move some #defines for V4L_CID_* values out of gsc-core.h and into +videodev2.h, where they belong, as they are part of the userspace API. + +Signed-off-by: John Sheu + +BUG=chromium-os:37294 +BUG=chrome-os-partner:10057 +TEST=local build, run on snow + +Change-Id: Ib06cd97f8c294a0d5f42f0b2adfefe4d761b256f +--- + drivers/media/video/exynos/gsc/gsc-core.h | 12 ------------ + include/linux/videodev2.h | 13 ++++++++++++- + 2 files changed, 12 insertions(+), 13 deletions(-) + +diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h +index 09f7f6d..405313f 100644 +--- a/include/linux/videodev2.h ++++ b/include/linux/videodev2.h +@@ -1342,6 +1342,18 @@ enum v4l2_colorfx { + /* last CID + 1 */ + #define V4L2_CID_LASTP1 (V4L2_CID_BASE+42) + ++#define V4L2_CID_CACHEABLE (V4L2_CID_LASTP1 + 1) ++#define V4L2_CID_TV_LAYER_BLEND_ENABLE (V4L2_CID_LASTP1 + 2) ++#define V4L2_CID_TV_LAYER_BLEND_ALPHA (V4L2_CID_LASTP1 + 3) ++#define V4L2_CID_TV_PIXEL_BLEND_ENABLE (V4L2_CID_LASTP1 + 4) ++#define V4L2_CID_TV_CHROMA_ENABLE (V4L2_CID_LASTP1 + 5) ++#define V4L2_CID_TV_CHROMA_VALUE (V4L2_CID_LASTP1 + 6) ++/* for color space conversion equation selection */ ++#define V4L2_CID_CSC_EQ_MODE (V4L2_CID_LASTP1 + 8) ++#define V4L2_CID_CSC_EQ (V4L2_CID_LASTP1 + 9) ++#define V4L2_CID_CSC_RANGE (V4L2_CID_LASTP1 + 10) ++#define V4L2_CID_GLOBAL_ALPHA (V4L2_CID_LASTP1 + 11) ++#define V4L2_CID_CODEC_DISPLAY_STATUS (V4L2_CID_LASTP1 + 12) + + /* MPEG-class control IDs defined by V4L2 */ + #define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) +-- +1.7.8.6 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-MFC-update-MFC-v4l2-driver-to-support-MFC6.x.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-MFC-update-MFC-v4l2-driver-to-support-MFC6.x.patch new file mode 100644 index 0000000000..9ce247623d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-MFC-update-MFC-v4l2-driver-to-support-MFC6.x.patch @@ -0,0 +1,609 @@ +sheu@chromium.org: trimmed from 3.4 kernel patch + +From 122c0bd18b7df7d40e28be846d57eba291fae955 Mon Sep 17 00:00:00 2001 +From: Naveen Krishna Chatradhi +Date: Wed, 23 May 2012 10:21:26 +0100 +Subject: [PATCH] MFC: update MFC v4l2 driver to support MFC6.x + +Multi Format Codec 6.x is a hardware video coding acceleration +module fount in new Exynos5 SoC series. +It is capable of handling a range of video codecs and this driver +provides a V4L2 interface for video decoding and encoding. + +Change-Id: I69854c51ef20599add4e17b5d4df338785b5432f +Signed-off-by: Jeongtae Park +Singed-off-by: Janghyuck Kim +Singed-off-by: Jaeryul Oh +Cc: Marek Szyprowski +Cc: Kamil Debski +--- + drivers/media/video/Kconfig | 26 +- + drivers/media/video/s5p-mfc/Makefile | 7 +- + drivers/media/video/s5p-mfc/regs-mfc-v6.h | 671 ++++++++++ + drivers/media/video/s5p-mfc/regs-mfc.h | 29 + + drivers/media/video/s5p-mfc/s5p_mfc.c | 192 ++- + drivers/media/video/s5p-mfc/s5p_mfc_cmd.c | 4 +- + drivers/media/video/s5p-mfc/s5p_mfc_cmd.h | 3 + + drivers/media/video/s5p-mfc/s5p_mfc_cmd_v6.c | 130 ++ + drivers/media/video/s5p-mfc/s5p_mfc_common.h | 125 ++- + drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c | 161 ++- + drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 237 +++- + drivers/media/video/s5p-mfc/s5p_mfc_dec.h | 1 + + drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 374 +++++-- + drivers/media/video/s5p-mfc/s5p_mfc_enc.h | 1 + + drivers/media/video/s5p-mfc/s5p_mfc_opr.c | 266 +++-- + drivers/media/video/s5p-mfc/s5p_mfc_opr.h | 20 +- + drivers/media/video/s5p-mfc/s5p_mfc_opr_v6.c | 1677 ++++++++++++++++++++++++++ + drivers/media/video/s5p-mfc/s5p_mfc_opr_v6.h | 137 +++ + drivers/media/video/s5p-mfc/s5p_mfc_pm.c | 6 +- + drivers/media/video/s5p-mfc/s5p_mfc_shm.c | 27 +- + drivers/media/video/s5p-mfc/s5p_mfc_shm.h | 13 +- + include/linux/videodev2.h | 364 +++++- + 22 files changed, 4015 insertions(+), 456 deletions(-) + mode change 100644 => 100755 drivers/media/video/s5p-mfc/Makefile + create mode 100644 drivers/media/video/s5p-mfc/regs-mfc-v6.h + mode change 100644 => 100755 drivers/media/video/s5p-mfc/regs-mfc.h + mode change 100644 => 100755 drivers/media/video/s5p-mfc/s5p_mfc.c + create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_cmd_v6.c + mode change 100644 => 100755 drivers/media/video/s5p-mfc/s5p_mfc_common.h + mode change 100644 => 100755 drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c + mode change 100644 => 100755 drivers/media/video/s5p-mfc/s5p_mfc_dec.c + mode change 100644 => 100755 drivers/media/video/s5p-mfc/s5p_mfc_enc.c + create mode 100755 drivers/media/video/s5p-mfc/s5p_mfc_opr_v6.c + create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_opr_v6.h + mode change 100644 => 100755 drivers/media/video/s5p-mfc/s5p_mfc_pm.c + mode change 100644 => 100755 drivers/media/video/s5p-mfc/s5p_mfc_shm.h + +diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h +index 320ce9c..a58bdd1 100644 +--- a/include/linux/videodev2.h ++++ b/include/linux/videodev2.h +@@ -289,12 +289,12 @@ struct v4l2_capability { + * V I D E O I M A G E F O R M A T + */ + struct v4l2_pix_format { +- __u32 width; ++ __u32 width; + __u32 height; + __u32 pixelformat; +- enum v4l2_field field; +- __u32 bytesperline; /* for padding, zero if unused */ +- __u32 sizeimage; ++ enum v4l2_field field; ++ __u32 bytesperline; /* for padding, zero if unused */ ++ __u32 sizeimage; + enum v4l2_colorspace colorspace; + __u32 priv; /* private data, depends on pixelformat */ + }; +@@ -359,6 +359,7 @@ struct v4l2_pix_format { + + /* two non contiguous planes - one Y, one Cr + Cb interleaved */ + #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ ++#define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/CrCb 4:2:0 */ + #define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ + + /* three non contiguous planes - Y, Cb, Cr */ +@@ -392,13 +393,23 @@ struct v4l2_pix_format { + #define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */ + #define V4L2_PIX_FMT_H264 v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */ + #define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ ++#define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */ + #define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263 */ + #define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ + #define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES */ ++#define V4L2_PIX_FMT_MPEG12 v4l2_fourcc('M', 'P', '1', '2') /* MPEG-1/2 */ + #define V4L2_PIX_FMT_MPEG4 v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 ES */ ++#define V4L2_PIX_FMT_FIMV v4l2_fourcc('F', 'I', 'M', 'V') /* FIMV */ ++#define V4L2_PIX_FMT_FIMV1 v4l2_fourcc('F', 'I', 'M', '1') /* FIMV1 */ ++#define V4L2_PIX_FMT_FIMV2 v4l2_fourcc('F', 'I', 'M', '2') /* FIMV2 */ ++#define V4L2_PIX_FMT_FIMV3 v4l2_fourcc('F', 'I', 'M', '3') /* FIMV3 */ ++#define V4L2_PIX_FMT_FIMV4 v4l2_fourcc('F', 'I', 'M', '4') /* FIMV4 */ + #define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */ + #define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */ + #define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */ ++#define V4L2_PIX_FMT_VC1 v4l2_fourcc('V', 'C', '1', 'A') /* VC-1 */ ++#define V4L2_PIX_FMT_VC1_RCV v4l2_fourcc('V', 'C', '1', 'R') /* VC-1 RCV */ ++#define V4L2_PIX_FMT_VP8 v4l2_fourcc('V', 'P', '8', '0') /* VP8 */ + + /* Vendor-specific formats */ + #define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */ +@@ -859,7 +870,7 @@ typedef __u64 v4l2_std_id; + V4L2_STD_NTSC_M_JP |\ + V4L2_STD_NTSC_M_KR) + /* Secam macros */ +-#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ ++#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ + V4L2_STD_SECAM_K |\ + V4L2_STD_SECAM_K1) + /* All Secam Standards */ +@@ -1162,8 +1173,9 @@ struct v4l2_ext_controls { + #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ + #define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */ + #define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator control class */ +-#define V4L2_CTRL_CLASS_FLASH 0x009c0000 /* Camera flash controls */ +-#define V4L2_CTRL_CLASS_JPEG 0x009d0000 /* JPEG-compression controls */ ++#define V4L2_CTRL_CLASS_CODEC 0x009c0000 /* Codec control class */ ++#define V4L2_CTRL_CLASS_FLASH 0x009d0000 /* Camera flash controls */ ++#define V4L2_CTRL_CLASS_JPEG 0x009e0000 /* JPEG-compression controls */ + + #define V4L2_CTRL_ID_MASK (0x0fffffff) + +@@ -1206,11 +1218,11 @@ struct v4l2_querymenu { + /* Control flags */ + #define V4L2_CTRL_FLAG_DISABLED 0x0001 + #define V4L2_CTRL_FLAG_GRABBED 0x0002 +-#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 +-#define V4L2_CTRL_FLAG_UPDATE 0x0008 +-#define V4L2_CTRL_FLAG_INACTIVE 0x0010 +-#define V4L2_CTRL_FLAG_SLIDER 0x0020 +-#define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040 ++#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 ++#define V4L2_CTRL_FLAG_UPDATE 0x0008 ++#define V4L2_CTRL_FLAG_INACTIVE 0x0010 ++#define V4L2_CTRL_FLAG_SLIDER 0x0020 ++#define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040 + #define V4L2_CTRL_FLAG_VOLATILE 0x0080 + + /* Query flag, to be ORed with the control ID */ +@@ -1223,7 +1235,7 @@ struct v4l2_querymenu { + /* IDs reserved for driver specific controls */ + #define V4L2_CID_PRIVATE_BASE 0x08000000 + +-#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) ++#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) + #define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0) + #define V4L2_CID_CONTRAST (V4L2_CID_BASE+1) + #define V4L2_CID_SATURATION (V4L2_CID_BASE+2) +@@ -1261,21 +1273,21 @@ enum v4l2_power_line_frequency { + #define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25) + #define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26) + #define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27) +-#define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) +-#define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) +-#define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) ++#define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) ++#define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) ++#define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) + #define V4L2_CID_COLORFX (V4L2_CID_BASE+31) + enum v4l2_colorfx { + V4L2_COLORFX_NONE = 0, + V4L2_COLORFX_BW = 1, + V4L2_COLORFX_SEPIA = 2, +- V4L2_COLORFX_NEGATIVE = 3, +- V4L2_COLORFX_EMBOSS = 4, +- V4L2_COLORFX_SKETCH = 5, +- V4L2_COLORFX_SKY_BLUE = 6, ++ V4L2_COLORFX_NEGATIVE = 3, ++ V4L2_COLORFX_EMBOSS = 4, ++ V4L2_COLORFX_SKETCH = 5, ++ V4L2_COLORFX_SKY_BLUE = 6, + V4L2_COLORFX_GRASS_GREEN = 7, + V4L2_COLORFX_SKIN_WHITEN = 8, +- V4L2_COLORFX_VIVID = 9, ++ V4L2_COLORFX_VIVID = 9, + }; + #define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32) + #define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33) +@@ -1310,13 +1322,13 @@ enum v4l2_mpeg_stream_type { + V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */ + V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */ + }; +-#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) +-#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) +-#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) +-#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) +-#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) +-#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) +-#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) ++#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) ++#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) ++#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) ++#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) ++#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) ++#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) ++#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) + enum v4l2_mpeg_stream_vbi_fmt { + V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */ + V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */ +@@ -1329,7 +1341,7 @@ enum v4l2_mpeg_audio_sampling_freq { + V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1, + V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2, + }; +-#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) ++#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) + enum v4l2_mpeg_audio_encoding { + V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0, + V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1, +@@ -1337,7 +1349,7 @@ enum v4l2_mpeg_audio_encoding { + V4L2_MPEG_AUDIO_ENCODING_AAC = 3, + V4L2_MPEG_AUDIO_ENCODING_AC3 = 4, + }; +-#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) ++#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) + enum v4l2_mpeg_audio_l1_bitrate { + V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0, + V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1, +@@ -1371,7 +1383,7 @@ enum v4l2_mpeg_audio_l2_bitrate { + V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12, + V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13, + }; +-#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) ++#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) + enum v4l2_mpeg_audio_l3_bitrate { + V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0, + V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1, +@@ -1388,32 +1400,32 @@ enum v4l2_mpeg_audio_l3_bitrate { + V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12, + V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13, + }; +-#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) ++#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) + enum v4l2_mpeg_audio_mode { + V4L2_MPEG_AUDIO_MODE_STEREO = 0, + V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1, + V4L2_MPEG_AUDIO_MODE_DUAL = 2, + V4L2_MPEG_AUDIO_MODE_MONO = 3, + }; +-#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) ++#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) + enum v4l2_mpeg_audio_mode_extension { + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0, + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1, + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2, + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3, + }; +-#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) ++#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) + enum v4l2_mpeg_audio_emphasis { + V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0, + V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1, + V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2, + }; +-#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) ++#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) + enum v4l2_mpeg_audio_crc { + V4L2_MPEG_AUDIO_CRC_NONE = 0, + V4L2_MPEG_AUDIO_CRC_CRC16 = 1, + }; +-#define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) ++#define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) + #define V4L2_CID_MPEG_AUDIO_AAC_BITRATE (V4L2_CID_MPEG_BASE+110) + #define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+111) + enum v4l2_mpeg_audio_ac3_bitrate { +@@ -1449,33 +1461,33 @@ enum v4l2_mpeg_audio_dec_playback { + #define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113) + + /* MPEG video controls specific to multiplexed streams */ +-#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) ++#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) + enum v4l2_mpeg_video_encoding { + V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, + V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, + V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2, + }; +-#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) ++#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) + enum v4l2_mpeg_video_aspect { + V4L2_MPEG_VIDEO_ASPECT_1x1 = 0, + V4L2_MPEG_VIDEO_ASPECT_4x3 = 1, + V4L2_MPEG_VIDEO_ASPECT_16x9 = 2, + V4L2_MPEG_VIDEO_ASPECT_221x100 = 3, + }; +-#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) +-#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) +-#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) +-#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) +-#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) ++#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) ++#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) ++#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) ++#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) ++#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) + enum v4l2_mpeg_video_bitrate_mode { + V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, + V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, + }; +-#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) +-#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) ++#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) ++#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) + #define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209) +-#define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) +-#define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) ++#define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) ++#define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) + #define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE (V4L2_CID_MPEG_BASE+212) + #define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER (V4L2_CID_MPEG_BASE+213) + #define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB (V4L2_CID_MPEG_BASE+214) +@@ -1489,16 +1501,20 @@ enum v4l2_mpeg_video_header_mode { + #define V4L2_CID_MPEG_VIDEO_MAX_REF_PIC (V4L2_CID_MPEG_BASE+217) + #define V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE (V4L2_CID_MPEG_BASE+218) + #define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES (V4L2_CID_MPEG_BASE+219) ++#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BITS (V4L2_CID_MPEG_BASE+219) + #define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB (V4L2_CID_MPEG_BASE+220) + #define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE (V4L2_CID_MPEG_BASE+221) + enum v4l2_mpeg_video_multi_slice_mode { + V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE = 0, + V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB = 1, + V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES = 2, ++ V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB = 1, ++ V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BITS = 2, + }; + #define V4L2_CID_MPEG_VIDEO_VBV_SIZE (V4L2_CID_MPEG_BASE+222) + #define V4L2_CID_MPEG_VIDEO_DEC_PTS (V4L2_CID_MPEG_BASE+223) + #define V4L2_CID_MPEG_VIDEO_DEC_FRAME (V4L2_CID_MPEG_BASE+224) ++#define V4L2_CID_MPEG_VIDEO_VBV_DELAY (V4L2_CID_MPEG_BASE+225) + + #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP (V4L2_CID_MPEG_BASE+300) + #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP (V4L2_CID_MPEG_BASE+301) +@@ -1589,6 +1605,46 @@ enum v4l2_mpeg_video_h264_vui_sar_idc { + V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_2x1 = 16, + V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED = 17, + }; ++#define V4L2_CID_MPEG_VIDEO_H264_SEI_FRAME_PACKING (V4L2_CID_MPEG_BASE+368) ++#define V4L2_CID_MPEG_VIDEO_H264_SEI_FP_CURRENT_FRAME_0 (V4L2_CID_MPEG_BASE+369) ++#define V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE (V4L2_CID_MPEG_BASE+370) ++enum v4l2_mpeg_video_h264_sei_fp_arrangement_type { ++ V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_CHEKERBOARD = 0, ++ V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_COLUMN = 1, ++ V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_ROW = 2, ++ V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_SIDE_BY_SIDE = 3, ++ V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TOP_BOTTOM = 4, ++ V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TEMPORAL = 5, ++}; ++#define V4L2_CID_MPEG_VIDEO_H264_FMO (V4L2_CID_MPEG_BASE+371) ++#define V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE (V4L2_CID_MPEG_BASE+372) ++enum v4l2_mpeg_video_h264_fmo_map_type { ++ V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES = 0, ++ V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES = 1, ++ V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_FOREGROUND_WITH_LEFT_OVER = 2, ++ V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_BOX_OUT = 3, ++ V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_RASTER_SCAN = 4, ++ V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_WIPE_SCAN = 5, ++ V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_EXPLICIT = 6, ++}; ++#define V4L2_CID_MPEG_VIDEO_H264_FMO_SLICE_GROUP (V4L2_CID_MPEG_BASE+373) ++#define V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_DIRECTION (V4L2_CID_MPEG_BASE+374) ++enum v4l2_mpeg_video_h264_fmo_change_dir { ++ V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_RIGHT = 0, ++ V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_LEFT = 1, ++}; ++#define V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_RATE (V4L2_CID_MPEG_BASE+375) ++#define V4L2_CID_MPEG_VIDEO_H264_FMO_RUN_LENGTH (V4L2_CID_MPEG_BASE+376) ++#define V4L2_CID_MPEG_VIDEO_H264_ASO (V4L2_CID_MPEG_BASE+377) ++#define V4L2_CID_MPEG_VIDEO_H264_ASO_SLICE_ORDER (V4L2_CID_MPEG_BASE+378) ++#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING (V4L2_CID_MPEG_BASE+379) ++#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE (V4L2_CID_MPEG_BASE+380) ++enum v4l2_mpeg_video_h264_hierarchical_coding_type { ++ V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_B = 0, ++ V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P = 1, ++}; ++#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER (V4L2_CID_MPEG_BASE+381) ++#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP (V4L2_CID_MPEG_BASE+382) + #define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400) + #define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401) + #define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402) +@@ -1683,6 +1739,220 @@ enum v4l2_mpeg_mfc51_video_force_frame_type { + #define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC (V4L2_CID_MPEG_MFC51_BASE+53) + #define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P (V4L2_CID_MPEG_MFC51_BASE+54) + ++#define V4L2_CID_CODEC_BASE (V4L2_CTRL_CLASS_CODEC | 0x900) ++#define V4L2_CID_CODEC_CLASS (V4L2_CTRL_CLASS_CODEC | 1) ++ ++/* Codec class control IDs specific to the MFC5X driver */ ++#define V4L2_CID_CODEC_MFC5X_BASE (V4L2_CTRL_CLASS_CODEC | 0x1000) ++ ++/* For both decoding and encoding */ ++ ++/* For decoding */ ++ ++#define V4L2_CID_CODEC_LOOP_FILTER_MPEG4_ENABLE (V4L2_CID_CODEC_BASE + 110) ++#define V4L2_CID_CODEC_DISPLAY_DELAY (V4L2_CID_CODEC_BASE + 137) ++#define V4L2_CID_CODEC_REQ_NUM_BUFS (V4L2_CID_CODEC_BASE + 140) ++#define V4L2_CID_CODEC_SLICE_INTERFACE (V4L2_CID_CODEC_BASE + 141) ++#define V4L2_CID_CODEC_PACKED_PB (V4L2_CID_CODEC_BASE + 142) ++#define V4L2_CID_CODEC_FRAME_TAG (V4L2_CID_CODEC_BASE + 143) ++#define V4L2_CID_CODEC_CRC_ENABLE (V4L2_CID_CODEC_BASE + 144) ++#define V4L2_CID_CODEC_CRC_DATA_LUMA (V4L2_CID_CODEC_BASE + 145) ++#define V4L2_CID_CODEC_CRC_DATA_CHROMA (V4L2_CID_CODEC_BASE + 146) ++#define V4L2_CID_CODEC_CRC_DATA_LUMA_BOT (V4L2_CID_CODEC_BASE + 147) ++#define V4L2_CID_CODEC_CRC_DATA_CHROMA_BOT (V4L2_CID_CODEC_BASE + 148) ++#define V4L2_CID_CODEC_CRC_GENERATED (V4L2_CID_CODEC_BASE + 149) ++#define V4L2_CID_CODEC_FRAME_TYPE (V4L2_CID_CODEC_BASE + 154) ++#define V4L2_CID_CODEC_CHECK_STATE (V4L2_CID_CODEC_BASE + 155) ++#define V4L2_CID_CODEC_DISPLAY_STATUS (V4L2_CID_CODEC_BASE + 156) ++#define V4L2_CID_CODEC_FRAME_PACK_SEI_PARSE (V4L2_CID_CODEC_BASE + 157) ++#define V4L2_CID_CODEC_FRAME_PACK_SEI_AVAIL (V4L2_CID_CODEC_BASE + 158) ++#define V4L2_CID_CODEC_FRAME_PACK_ARRGMENT_ID (V4L2_CID_CODEC_BASE + 159) ++#define V4L2_CID_CODEC_FRAME_PACK_SEI_INFO (V4L2_CID_CODEC_BASE + 160) ++#define V4L2_CID_CODEC_FRAME_PACK_GRID_POS (V4L2_CID_CODEC_BASE + 161) ++ ++/* For encoding */ ++#define V4L2_CID_CODEC_LOOP_FILTER_H264 (V4L2_CID_CODEC_BASE + 9) ++enum v4l2_cid_codec_loop_filter_h264 { ++ V4L2_CID_CODEC_LOOP_FILTER_H264_ENABLE = 0, ++ V4L2_CID_CODEC_LOOP_FILTER_H264_DISABLE = 1, ++ V4L2_CID_CODEC_LOOP_FILTER_H264_DISABLE_AT_BOUNDARY = 2, ++}; ++ ++#define V4L2_CID_CODEC_FRAME_INSERTION (V4L2_CID_CODEC_BASE + 10) ++enum v4l2_cid_codec_frame_insertion { ++ V4L2_CID_CODEC_FRAME_INSERT_NONE = 0x0, ++ V4L2_CID_CODEC_FRAME_INSERT_I_FRAME = 0x1, ++ V4L2_CID_CODEC_FRAME_INSERT_NOT_CODED = 0x2, ++}; ++ ++#define V4L2_CID_CODEC_ENCODED_LUMA_ADDR (V4L2_CID_CODEC_BASE + 11) ++#define V4L2_CID_CODEC_ENCODED_CHROMA_ADDR (V4L2_CID_CODEC_BASE + 12) ++ ++#define V4L2_CID_CODEC_ENCODED_I_PERIOD_CH V4L2_CID_CODEC_MFC5X_ENC_GOP_SIZE ++#define V4L2_CID_CODEC_ENCODED_FRAME_RATE_CH V4L2_CID_CODEC_MFC5X_ENC_H264_RC_FRAME_RATE ++#define V4L2_CID_CODEC_ENCODED_BIT_RATE_CH V4L2_CID_CODEC_MFC5X_ENC_RC_BIT_RATE ++ ++#define V4L2_CID_CODEC_FRAME_PACK_SEI_GEN (V4L2_CID_CODEC_BASE + 13) ++#define V4L2_CID_CODEC_FRAME_PACK_FRM0_FLAG (V4L2_CID_CODEC_BASE + 14) ++enum v4l2_codec_mfc5x_enc_flag { ++ V4L2_CODEC_MFC5X_ENC_FLAG_DISABLE = 0, ++ V4L2_CODEC_MFC5X_ENC_FLAG_ENABLE = 1, ++}; ++#define V4L2_CID_CODEC_FRAME_PACK_ARRGMENT_TYPE (V4L2_CID_CODEC_BASE + 15) ++enum v4l2_codec_mfc5x_enc_frame_pack_arrgment_type { ++ V4L2_CODEC_MFC5X_ENC_FRAME_PACK_SIDE_BY_SIDE = 0, ++ V4L2_CODEC_MFC5X_ENC_FRAME_PACK_TOP_AND_BOT = 1, ++ V4L2_CODEC_MFC5X_ENC_FRAME_PACK_TMP_INTER = 2, ++}; ++ ++/* common */ ++enum v4l2_codec_mfc5x_enc_switch { ++ V4L2_CODEC_MFC5X_ENC_SW_DISABLE = 0, ++ V4L2_CODEC_MFC5X_ENC_SW_ENABLE = 1, ++}; ++enum v4l2_codec_mfc5x_enc_switch_inv { ++ V4L2_CODEC_MFC5X_ENC_SW_INV_ENABLE = 0, ++ V4L2_CODEC_MFC5X_ENC_SW_INV_DISABLE = 1, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_GOP_SIZE (V4L2_CID_CODEC_MFC5X_BASE+300) ++#define V4L2_CID_CODEC_MFC5X_ENC_MULTI_SLICE_MODE (V4L2_CID_CODEC_MFC5X_BASE+301) ++enum v4l2_codec_mfc5x_enc_multi_slice_mode { ++ V4L2_CODEC_MFC5X_ENC_MULTI_SLICE_MODE_DISABLE = 0, ++ V4L2_CODEC_MFC5X_ENC_MULTI_SLICE_MODE_MACROBLOCK_COUNT = 1, ++ V4L2_CODEC_MFC5X_ENC_MULTI_SLICE_MODE_BIT_COUNT = 3, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_MULTI_SLICE_MB (V4L2_CID_CODEC_MFC5X_BASE+302) ++#define V4L2_CID_CODEC_MFC5X_ENC_MULTI_SLICE_BIT (V4L2_CID_CODEC_MFC5X_BASE+303) ++#define V4L2_CID_CODEC_MFC5X_ENC_INTRA_REFRESH_MB (V4L2_CID_CODEC_MFC5X_BASE+304) ++#define V4L2_CID_CODEC_MFC5X_ENC_PAD_CTRL_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+305) ++#define V4L2_CID_CODEC_MFC5X_ENC_PAD_LUMA_VALUE (V4L2_CID_CODEC_MFC5X_BASE+306) ++#define V4L2_CID_CODEC_MFC5X_ENC_PAD_CB_VALUE (V4L2_CID_CODEC_MFC5X_BASE+307) ++#define V4L2_CID_CODEC_MFC5X_ENC_PAD_CR_VALUE (V4L2_CID_CODEC_MFC5X_BASE+308) ++#define V4L2_CID_CODEC_MFC5X_ENC_RC_FRAME_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+309) ++#define V4L2_CID_CODEC_MFC5X_ENC_RC_BIT_RATE (V4L2_CID_CODEC_MFC5X_BASE+310) ++#define V4L2_CID_CODEC_MFC5X_ENC_RC_REACTION_COEFF (V4L2_CID_CODEC_MFC5X_BASE+311) ++#define V4L2_CID_CODEC_MFC5X_ENC_STREAM_SIZE (V4L2_CID_CODEC_MFC5X_BASE+312) ++#define V4L2_CID_CODEC_MFC5X_ENC_FRAME_COUNT (V4L2_CID_CODEC_MFC5X_BASE+313) ++#define V4L2_CID_CODEC_MFC5X_ENC_FRAME_TYPE (V4L2_CID_CODEC_MFC5X_BASE+314) ++enum v4l2_codec_mfc5x_enc_frame_type { ++ V4L2_CODEC_MFC5X_ENC_FRAME_TYPE_NOT_CODED = 0, ++ V4L2_CODEC_MFC5X_ENC_FRAME_TYPE_I_FRAME = 1, ++ V4L2_CODEC_MFC5X_ENC_FRAME_TYPE_P_FRAME = 2, ++ V4L2_CODEC_MFC5X_ENC_FRAME_TYPE_B_FRAME = 3, ++ V4L2_CODEC_MFC5X_ENC_FRAME_TYPE_SKIPPED = 4, ++ V4L2_CODEC_MFC5X_ENC_FRAME_TYPE_OTHERS = 5, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_FORCE_FRAME_TYPE (V4L2_CID_CODEC_MFC5X_BASE+315) ++enum v4l2_codec_mfc5x_enc_force_frame_type { ++ V4L2_CODEC_MFC5X_ENC_FORCE_FRAME_TYPE_I_FRAME = 1, ++ V4L2_CODEC_MFC5X_ENC_FORCE_FRAME_TYPE_NOT_CODED = 2, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_VBV_BUF_SIZE (V4L2_CID_CODEC_MFC5X_BASE+316) ++#define V4L2_CID_CODEC_MFC5X_ENC_SEQ_HDR_MODE (V4L2_CID_CODEC_MFC5X_BASE+317) ++enum v4l2_codec_mfc5x_enc_seq_hdr_mode { ++ V4L2_CODEC_MFC5X_ENC_SEQ_HDR_MODE_SEQ = 0, ++ V4L2_CODEC_MFC5X_ENC_SEQ_HDR_MODE_SEQ_FRAME = 1, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_FRAME_SKIP_MODE (V4L2_CID_CODEC_MFC5X_BASE+318) ++enum v4l2_codec_mfc5x_enc_frame_skip_mode { ++ V4L2_CODEC_MFC5X_ENC_FRAME_SKIP_MODE_DISABLE = 0, ++ V4L2_CODEC_MFC5X_ENC_FRAME_SKIP_MODE_LEVEL = 1, ++ V4L2_CODEC_MFC5X_ENC_FRAME_SKIP_MODE_VBV_BUF_SIZE = 2, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_RC_FIXED_TARGET_BIT (V4L2_CID_CODEC_MFC5X_BASE+319) ++#define V4L2_CID_CODEC_MFC5X_ENC_FRAME_DELTA (V4L2_CID_CODEC_MFC5X_BASE+320) ++ ++/* codec specific */ ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_B_FRAMES (V4L2_CID_CODEC_MFC5X_BASE+400) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_PROFILE (V4L2_CID_CODEC_MFC5X_BASE+401) ++enum v4l2_codec_mfc5x_enc_h264_profile { ++ V4L2_CODEC_MFC5X_ENC_H264_PROFILE_MAIN = 0, ++ V4L2_CODEC_MFC5X_ENC_H264_PROFILE_HIGH = 1, ++ V4L2_CODEC_MFC5X_ENC_H264_PROFILE_BASELINE = 2, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_LEVEL (V4L2_CID_CODEC_MFC5X_BASE+402) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_INTERLACE (V4L2_CID_CODEC_MFC5X_BASE+403) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_LOOP_FILTER_MODE (V4L2_CID_CODEC_MFC5X_BASE+404) ++enum v4l2_codec_mfc5x_enc_h264_loop_filter { ++ V4L2_CODEC_MFC5X_ENC_H264_LOOP_FILTER_ENABLE = 0, ++ V4L2_CODEC_MFC5X_ENC_H264_LOOP_FILTER_DISABLE = 1, ++ V4L2_CODEC_MFC5X_ENC_H264_LOOP_FILTER_DISABLE_AT_BOUNDARY = 2, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_LOOP_FILTER_ALPHA (V4L2_CID_CODEC_MFC5X_BASE+405) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_LOOP_FILTER_BETA (V4L2_CID_CODEC_MFC5X_BASE+406) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ENTROPY_MODE (V4L2_CID_CODEC_MFC5X_BASE+407) ++enum v4l2_codec_mfc5x_enc_h264_entropy_mode { ++ V4L2_CODEC_MFC5X_ENC_H264_ENTROPY_MODE_CAVLC = 0, ++ V4L2_CODEC_MFC5X_ENC_H264_ENTROPY_MODE_CABAC = 1, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_MAX_REF_PIC (V4L2_CID_CODEC_MFC5X_BASE+408) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_NUM_REF_PIC_4P (V4L2_CID_CODEC_MFC5X_BASE+409) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_8X8_TRANSFORM (V4L2_CID_CODEC_MFC5X_BASE+410) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_MB_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+411) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_FRAME_RATE (V4L2_CID_CODEC_MFC5X_BASE+412) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+413) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_MIN_QP (V4L2_CID_CODEC_MFC5X_BASE+414) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_MAX_QP (V4L2_CID_CODEC_MFC5X_BASE+415) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_MB_DARK (V4L2_CID_CODEC_MFC5X_BASE+416) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_MB_SMOOTH (V4L2_CID_CODEC_MFC5X_BASE+417) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_MB_STATIC (V4L2_CID_CODEC_MFC5X_BASE+418) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_MB_ACTIVITY (V4L2_CID_CODEC_MFC5X_BASE+419) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_P_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+420) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_RC_B_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+421) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_AR_VUI_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+422) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_AR_VUI_IDC (V4L2_CID_CODEC_MFC5X_BASE+423) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_EXT_SAR_WIDTH (V4L2_CID_CODEC_MFC5X_BASE+424) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_EXT_SAR_HEIGHT (V4L2_CID_CODEC_MFC5X_BASE+425) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_OPEN_GOP (V4L2_CID_CODEC_MFC5X_BASE+426) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_I_PERIOD (V4L2_CID_CODEC_MFC5X_BASE+427) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_HIER_P_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+428) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_LAYER0_QP (V4L2_CID_CODEC_MFC5X_BASE+429) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_LAYER1_QP (V4L2_CID_CODEC_MFC5X_BASE+430) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_LAYER2_QP (V4L2_CID_CODEC_MFC5X_BASE+431) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+432) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+433) ++ ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_B_FRAMES (V4L2_CID_CODEC_MFC5X_BASE+440) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_PROFILE (V4L2_CID_CODEC_MFC5X_BASE+441) ++enum v4l2_codec_mfc5x_enc_mpeg4_profile { ++ V4L2_CODEC_MFC5X_ENC_MPEG4_PROFILE_SIMPLE = 0, ++ V4L2_CODEC_MFC5X_ENC_MPEG4_PROFILE_ADVANCED_SIMPLE = 1, ++}; ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_LEVEL (V4L2_CID_CODEC_MFC5X_BASE+442) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_RC_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+443) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_RC_MIN_QP (V4L2_CID_CODEC_MFC5X_BASE+444) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_RC_MAX_QP (V4L2_CID_CODEC_MFC5X_BASE+445) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_QUARTER_PIXEL (V4L2_CID_CODEC_MFC5X_BASE+446) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_RC_P_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+447) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_RC_B_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+448) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_VOP_TIME_RES (V4L2_CID_CODEC_MFC5X_BASE+449) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_VOP_FRM_DELTA (V4L2_CID_CODEC_MFC5X_BASE+450) ++#define V4L2_CID_CODEC_MFC5X_ENC_MPEG4_RC_MB_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+451) ++ ++#define V4L2_CID_CODEC_MFC5X_ENC_H263_RC_FRAME_RATE (V4L2_CID_CODEC_MFC5X_BASE+460) ++#define V4L2_CID_CODEC_MFC5X_ENC_H263_RC_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+461) ++#define V4L2_CID_CODEC_MFC5X_ENC_H263_RC_MIN_QP (V4L2_CID_CODEC_MFC5X_BASE+462) ++#define V4L2_CID_CODEC_MFC5X_ENC_H263_RC_MAX_QP (V4L2_CID_CODEC_MFC5X_BASE+463) ++#define V4L2_CID_CODEC_MFC5X_ENC_H263_RC_P_FRAME_QP (V4L2_CID_CODEC_MFC5X_BASE+464) ++#define V4L2_CID_CODEC_MFC5X_ENC_H263_RC_MB_ENABLE (V4L2_CID_CODEC_MFC5X_BASE+465) ++ ++/* FMO/ASO parameters */ ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_MAP_TYPE (V4L2_CID_CODEC_MFC5X_BASE+480) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_SLICE_NUM (V4L2_CID_CODEC_MFC5X_BASE+481) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_RUN_LEN1 (V4L2_CID_CODEC_MFC5X_BASE+482) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_RUN_LEN2 (V4L2_CID_CODEC_MFC5X_BASE+483) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_RUN_LEN3 (V4L2_CID_CODEC_MFC5X_BASE+484) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_RUN_LEN4 (V4L2_CID_CODEC_MFC5X_BASE+485) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_SG_DIR (V4L2_CID_CODEC_MFC5X_BASE+486) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_FMO_SG_RATE (V4L2_CID_CODEC_MFC5X_BASE+487) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_0 (V4L2_CID_CODEC_MFC5X_BASE+488) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_1 (V4L2_CID_CODEC_MFC5X_BASE+489) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_2 (V4L2_CID_CODEC_MFC5X_BASE+490) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_3 (V4L2_CID_CODEC_MFC5X_BASE+491) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_4 (V4L2_CID_CODEC_MFC5X_BASE+492) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_5 (V4L2_CID_CODEC_MFC5X_BASE+493) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_6 (V4L2_CID_CODEC_MFC5X_BASE+494) ++#define V4L2_CID_CODEC_MFC5X_ENC_H264_ASO_SL_ORDER_7 (V4L2_CID_CODEC_MFC5X_BASE+495) + /* Camera class control IDs */ + #define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) + #define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1) +-- +1.7.8.6 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-Media-Exynos-Header-file-support-for-G-Scaler-driver.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-Media-Exynos-Header-file-support-for-G-Scaler-driver.patch new file mode 100644 index 0000000000..ce2249670e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-Media-Exynos-Header-file-support-for-G-Scaler-driver.patch @@ -0,0 +1,38 @@ +sheu@chromium.org: trimmed from 3.4 kernel patch + +From a282f22565b9e0d1aefdbe1b2956d11c21b81810 Mon Sep 17 00:00:00 2001 +From: Subash Patel +Date: Tue, 22 May 2012 20:18:30 +0100 +Subject: [PATCH] Media: Exynos: Header file support for G-Scaler driver + +This commit adds the header files required to define the controls +of the new G-Scaler driver. + +Change-Id: Iea9d01e18870501758326750c3b0051df9ec139f +Signed-off-by: Subash Patel +Signed-off-by: Kiran AVND +--- + arch/arm/mach-exynos/include/mach/videonode.h | 32 +++++++++++++++++++++++++ + include/linux/videodev2.h | 2 + + 2 files changed, 34 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-exynos/include/mach/videonode.h + +diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h +index 9bbd3b3..17715dd 100644 +--- a/include/linux/videodev2.h ++++ b/include/linux/videodev2.h +@@ -361,9 +361,11 @@ struct v4l2_pix_format { + #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ + #define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/CrCb 4:2:0 */ + #define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ ++#define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 macroblocks */ + + /* three non contiguous planes - Y, Cb, Cr */ + #define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12 YUV420 planar */ ++#define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'V', 'U', 'M') /* 12 YVU420 planar */ + + /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ + #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ +-- +1.7.8.6 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-add-buffer-exporting-via-dmabuf.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-add-buffer-exporting-via-dmabuf.patch new file mode 100644 index 0000000000..bb9ef14d0a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/files/3.4-v4l-add-buffer-exporting-via-dmabuf.patch @@ -0,0 +1,68 @@ +sheu@chromium.org: trimmed from 3.4 kernel patch + +From ddbbf176f4e8cafcb4bd5cf215b82d30c721ed83 Mon Sep 17 00:00:00 2001 +From: Tomasz Stanislawski +Date: Thu, 14 Jun 2012 16:32:23 +0200 +Subject: [PATCH] v4l: add buffer exporting via dmabuf + +This patch adds extension to V4L2 api. It allow to export a mmap buffer as file +descriptor. New ioctl VIDIOC_EXPBUF is added. It takes a buffer offset used by +mmap and return a file descriptor on success. + +Signed-off-by: Tomasz Stanislawski +Signed-off-by: Kyungmin Park +--- + drivers/media/video/v4l2-compat-ioctl32.c | 1 + + drivers/media/video/v4l2-dev.c | 1 + + drivers/media/video/v4l2-ioctl.c | 6 ++++++ + include/linux/videodev2.h | 26 ++++++++++++++++++++++++++ + include/media/v4l2-ioctl.h | 2 ++ + 5 files changed, 36 insertions(+), 0 deletions(-) + +diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h +index d884d4a..52f2aa0 100644 +--- a/include/linux/videodev2.h ++++ b/include/linux/videodev2.h +@@ -679,6 +679,31 @@ struct v4l2_buffer { + #define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE 0x0800 + #define V4L2_BUF_FLAG_NO_CACHE_CLEAN 0x1000 + ++/** ++ * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor ++ * ++ * @fd: file descriptor associated with DMABUF (set by driver) ++ * @mem_offset: buffer memory offset as returned by VIDIOC_QUERYBUF in struct ++ * v4l2_buffer::m.offset (for single-plane formats) or ++ * v4l2_plane::m.offset (for multi-planar formats) ++ * @flags: flags for newly created file, currently only O_CLOEXEC is ++ * supported, refer to manual of open syscall for more details ++ * ++ * Contains data used for exporting a video buffer as DMABUF file descriptor. ++ * The buffer is identified by a 'cookie' returned by VIDIOC_QUERYBUF ++ * (identical to the cookie used to mmap() the buffer to userspace). All ++ * reserved fields must be set to zero. The field reserved0 is expected to ++ * become a structure 'type' allowing an alternative layout of the structure ++ * content. Therefore this field should not be used for any other extensions. ++ */ ++struct v4l2_exportbuffer { ++ __u32 fd; ++ __u32 reserved0; ++ __u32 mem_offset; ++ __u32 flags; ++ __u32 reserved[12]; ++}; ++ + /* + * O V E R L A Y P R E V I E W + */ +@@ -2326,6 +2351,7 @@ struct v4l2_create_buffers { + #define VIDIOC_S_FBUF _IOW('V', 11, struct v4l2_framebuffer) + #define VIDIOC_OVERLAY _IOW('V', 14, int) + #define VIDIOC_QBUF _IOWR('V', 15, struct v4l2_buffer) ++#define VIDIOC_EXPBUF _IOWR('V', 16, struct v4l2_exportbuffer) + #define VIDIOC_DQBUF _IOWR('V', 17, struct v4l2_buffer) + #define VIDIOC_STREAMON _IOW('V', 18, int) + #define VIDIOC_STREAMOFF _IOW('V', 19, int) +-- +1.7.8.6 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/linux-headers-3.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/linux-headers-3.4-r3.ebuild new file mode 120000 index 0000000000..ab19e5e047 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/linux-headers-3.4-r3.ebuild @@ -0,0 +1 @@ +linux-headers-3.4.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/linux-headers-3.4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/linux-headers-3.4.ebuild new file mode 100644 index 0000000000..9164559f7e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/linux-headers/linux-headers-3.4.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.4.ebuild,v 1.1 2012/05/22 03:21:59 vapier Exp $ + +EAPI="3" + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86" +inherit kernel-2 +detect_version + +PATCH_VER="1" +SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz + ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" + +DEPEND="app-arch/xz-utils + dev-lang/perl" +RDEPEND="" + +S=${WORKDIR}/gentoo-headers-base-${PV} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} + epatch ${FILESDIR}/3.4-v4l-Add-DMABUF-as-a-memory-type.patch + epatch ${FILESDIR}/3.4-v4l-Media-Exynos-Header-file-support-for-G-Scaler-driver.patch + epatch ${FILESDIR}/3.4-v4l-MFC-update-MFC-v4l2-driver-to-support-MFC6.x.patch + epatch ${FILESDIR}/3.4-v4l-CHROMIUM-v4l2-exynos-move-CID-enums-into-videodev2.h.patch + epatch ${FILESDIR}/3.4-v4l-add-buffer-exporting-via-dmabuf.patch +} + +src_install() { + kernel-2_src_install + cd "${D}" + egrep -r \ + -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ + -e '\<([us](8|16|32|64))\>' \ + . + headers___fix $(find -type f) + + egrep -l -r -e '__[us](8|16|32|64)' "${D}" | xargs grep -L linux/types.h + + # hrm, build system sucks + find "${D}" '(' -name '.install' -o -name '*.cmd' ')' -print0 | xargs -0 rm -f + + # provided by libdrm (for now?) + rm -rf "${D}"/$(kernel_header_destdir)/drm +} + +src_test() { + emake ARCH=$(tc-arch-kernel) headers_check || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/ChangeLog new file mode 100644 index 0000000000..9ad40f4599 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/ChangeLog @@ -0,0 +1,1237 @@ +# ChangeLog for sys-libs/db +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.297 2009/10/01 20:27:01 klausman Exp $ + + 01 Oct 2009; Tobias Klausmann db-4.7.25_p4.ebuild: + Stable on alpha, bug #285324 + + 30 Sep 2009; Markus Meier db-4.7.25_p4.ebuild: + amd64/x86 stable, bug #285324 + + 27 Sep 2009; nixnut db-4.7.25_p4.ebuild: + ppc stable #285324 + + 26 Sep 2009; Brent Baude db-4.7.25_p4.ebuild: + Marking db-4.7.25_p4 ppc64 for bug 285324 + + 23 Sep 2009; Jeroen Roovers db-4.7.25_p4.ebuild: + Stable for HPPA (bug #285324). + + 20 Sep 2009; Robin H. Johnson db-4.2.52_p4-r2.ebuild, + db-4.2.52_p5.ebuild, db-4.2.52_p5-r1.ebuild, db-4.3.29-r2.ebuild, + db-4.3.29_p1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.4.20_p4.ebuild, + db-4.4.20_p4-r1.ebuild, db-4.5.20_p2.ebuild, db-4.5.20_p2-r1.ebuild, + db-4.6.21_p4.ebuild, db-4.7.25_p3.ebuild, db-4.7.25_p4.ebuild, + db-4.8.24.ebuild: + berkeley_db_svc is not always built, and might be going away permanently + in db-4.8 series, but I suspect it might come back too, so just don't try + to rename it if it doesn't exist. Thanks to Sebastian Luettich + . + + 19 Sep 2009; Robin H. Johnson db-4.8.24.ebuild, + +files/db-4.8.24-java-manifest-location.patch: + Bug #285516: Build fix for java compile. + +*db-4.8.24 (18 Sep 2009) + + 18 Sep 2009; Arfrever Frehtes Taifersar Arahesis + +db-4.8.24.ebuild, +files/db-4.8-libtool.patch: + Version bump (bug #285320). + + 15 Sep 2009; Arfrever Frehtes Taifersar Arahesis + db-4.2.52_p5-r1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.4.20_p4-r1.ebuild, + db-4.5.20_p2-r1.ebuild, db-4.6.21_p4.ebuild, db-4.7.25_p4.ebuild: + Use more standard date format in DB_VERSION_STRING. + + 13 Sep 2009; Robin H. Johnson db-4.7.25_p4.ebuild: + Bug #270851: with FEATURES=test USE=-tcl, we need to include Tcl anyway so + that the testsuite works. + + 29 Jul 2009; Paul de Vrieze db-3.2.9-r11.ebuild, + db-3.2.9_p2.ebuild, db-4.2.52_p4-r2.ebuild, db-4.2.52_p5.ebuild, + db-4.2.52_p5-r1.ebuild, db-4.3.29-r2.ebuild, db-4.3.29_p1.ebuild, + db-4.3.29_p1-r1.ebuild, db-4.4.20_p4.ebuild, db-4.4.20_p4-r1.ebuild, + db-4.5.20_p2.ebuild, db-4.5.20_p2-r1.ebuild, db-4.6.21_p4.ebuild: + Fix bug #278962 and don't use the FEATURES variable in the ebuild when + checking for the test feature. + + 05 Jul 2009; Mike Frysinger db-4.7.25_p4.ebuild: + Add --with-mutex option for arm systems as suggested by thomasq #273906. + +*db-4.7.25_p4 (21 Jun 2009) + + 21 Jun 2009; Caleb Tennis +db-4.7.25_p4.ebuild: + Version bump, from #272983 + + 01 Jun 2009; Raúl Porcel db-4.6.21_p4.ebuild: + arm/ia64/m68k/s390/sh/sparc stable wrt #248905 + + 24 May 2009; Markus Meier db-4.6.21_p4.ebuild: + amd64/x86 stable, bug #248905 + + 07 May 2009; Jeroen Roovers db-4.6.21_p4.ebuild: + Stable for HPPA (bug #248905). + + 03 May 2009; Tobias Klausmann db-4.6.21_p4.ebuild: + Stable on alpha, bug #248905 + + 26 Apr 2009; Brent Baude db-4.6.21_p4.ebuild: + stable ppc, bug 248905 + + 21 Apr 2009; Brent Baude db-4.6.21_p4.ebuild: + Marking db-4.6.21_p4 ppc64 for bug 248905 + + 19 Apr 2009; Caleb Tennis +db-4.6.21_p4.ebuild, + +db-4.7.25_p3.ebuild: + Bumping db 4.6 and 4.7 per 259039 + + 14 Mar 2009; Mike Frysinger db-4.2.52_p4-r2.ebuild, + db-4.2.52_p5.ebuild, db-4.2.52_p5-r1.ebuild, db-4.3.29-r2.ebuild, + db-4.3.29_p1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.4.20_p4.ebuild, + db-4.4.20_p4-r1.ebuild, db-4.5.20_p2.ebuild, db-4.5.20_p2-r1.ebuild: + Drop remaining USE=bootstrap usage #256439. + + 24 Feb 2009; Joshua Kinard db-4.6.21_p3-r1.ebuild: + Add ~mips to KEYWORDS + + 07 Feb 2009; Mike Frysinger db-4.5.20_p2.ebuild, + db-4.5.20_p2-r1.ebuild, db-4.6.21_p1.ebuild, db-4.6.21_p3.ebuild, + db-4.6.21_p3-r1.ebuild, db-4.7.25.ebuild, db-4.7.25_p1.ebuild, + db-4.7.25_p1-r1.ebuild: + Use is-flagq rather than is-flag. + + 07 Feb 2009; Mike Frysinger db-4.7.25_p1-r1.ebuild: + Cleanup src_compile and src_install. + + 07 Feb 2009; Mike Frysinger db-4.6.21_p1.ebuild, + db-4.6.21_p3.ebuild, db-4.6.21_p3-r1.ebuild, db-4.7.25.ebuild, + db-4.7.25_p1.ebuild, db-4.7.25_p1-r1.ebuild: + Drop USE=bootstrap #256439. + + 20 Sep 2008; Brent Baude db-3.2.9_p2.ebuild, + db-4.2.52_p5-r1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.5.20_p2-r1.ebuild: + Mass stablization for ppc and ppc64 for bug 237127 + + 17 Sep 2008; Jeremy Olexa db-3.2.9_p2.ebuild, + db-4.2.52_p5-r1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.5.20_p2-r1.ebuild: + amd64 stable. Thanks to Chad A. Simmons (amd64 AT) for testing, bug #237127 + + 17 Sep 2008; Raúl Porcel db-3.2.9_p2.ebuild, + db-4.2.52_p5-r1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.5.20_p2-r1.ebuild: + ia64/sparc/x86 stable wrt #237127 + + 16 Sep 2008; Tobias Klausmann + db-4.5.20_p2-r1.ebuild: + Stable on alpha, bug #237127 + + 16 Sep 2008; Tobias Klausmann + db-4.3.29_p1-r1.ebuild: + Stable on alpha, bug #237127 + + 16 Sep 2008; Tobias Klausmann + db-4.2.52_p5-r1.ebuild: + Stable on alpha, bug #237127 + + 16 Sep 2008; Tobias Klausmann db-3.2.9_p2.ebuild: + Stable on alpha, bug #237127 + + 16 Sep 2008; Jeroen Roovers db-3.2.9_p2.ebuild, + db-4.2.52_p5-r1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.5.20_p2-r1.ebuild: + Stable for HPPA (bug #237127). + + 09 Sep 2008; Robin H. Johnson db-4.2.52_p5-r1.ebuild, + db-4.3.29_p1-r1.ebuild, db-4.5.20_p2-r1.ebuild, db-4.6.21_p3-r1.ebuild, + db-4.7.25_p1-r1.ebuild: + Fix bug #235025 for libtool-2.2 and non-bash boxes. + + 16 Aug 2008; Robin H. Johnson + +files/db-3.2.9-gcc43.patch, db-3.2.9_p2.ebuild: + Bug #218469, fix compilation with GCC4.3. + + 16 Aug 2008; Robin H. Johnson db-4.3.29_p1-r1.ebuild, + db-4.4.20_p4-r1.ebuild, db-4.5.20_p2-r1.ebuild, db-4.6.21_p3-r1.ebuild, + db-4.7.25_p1-r1.ebuild: + Add o_direct support per bug #208967, not used by default. + + 16 Aug 2008; Robin H. Johnson metadata.xml: + Bug #234081, cleanup entity in metadata. + +*db-4.2.52_p5-r1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson + +db-4.2.52_p5-r1.ebuild: + Fix 4.2 slot for SONAME bug #182972, java support bug #217661 and also + properly do what the jarlocation patches were supported to do. + +*db-4.3.29_p1-r1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson + +db-4.3.29_p1-r1.ebuild: + Fix 4.3 slot for SONAME bug #182972, java support bug #217661 and also + properly do what the jarlocation patches were supported to do. + +*db-4.4.20_p4-r1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson + +db-4.4.20_p4-r1.ebuild: + Fix 4.4 slot for SONAME bug #182972, java support bug #217661 and also + properly do what the jarlocation patches were supported to do. + +*db-4.5.20_p2-r1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson + +db-4.5.20_p2-r1.ebuild: + Fix 4.5 slot for SONAME bug #182972, java support bug #217661 and also + properly do what the jarlocation patches were supported to do. + +*db-4.6.21_p3-r1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson + +db-4.6.21_p3-r1.ebuild: + Fix 4.6 slot for SONAME bug #182972, java support bug #217661 and also + properly do what the jarlocation patches were supported to do. + +*db-4.7.25_p1-r1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson + +db-4.7.25_p1-r1.ebuild: + Fix 4.7 slot for SONAME bug #182972, java support bug #217661 and also + properly do what the jarlocation patches were supported to do. + +*db-4.7.25_p1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson +db-4.7.25_p1.ebuild: + Version bump. + +*db-4.6.21_p3 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson +db-4.6.21_p3.ebuild: + Version bump and cleanup. + + 16 Aug 2008; Robin H. Johnson db-3.2.9_p2.ebuild, + db-4.2.52_p5.ebuild, db-4.3.29_p1.ebuild, db-4.4.20_p4.ebuild, + db-4.5.20_p2.ebuild, db-4.6.21_p1.ebuild, db-4.7.25.ebuild: + Use the Oracle load-balancer rather than a single mirror. + +*db-4.3.29_p1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson +db-4.3.29_p1.ebuild: + Fix gnuconfig usage in 4.3 per bug #160192, update for Oracle download + location, and include one further patch from upstream to fix minor race + bug (same as 4.2 changes). + +*db-4.2.52_p5 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson +db-4.2.52_p5.ebuild: + Fix gnuconfig usage in 4.2 per bug #160192, update for Oracle download + location, and include one further patch from upstream to fix minor race + bug. + + 16 Aug 2008; Robin H. Johnson db-3.2.9_p2.ebuild: + Chop out other old stuff that is not needed since gnuconfig is gone. + +*db-3.2.9_p2 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson +db-3.2.9_p2.ebuild: + Add db-3.2.9_p2, should be identical in result to 3.2.9-r11, but has a + cleaned up build process and does not use gnuconfig per bug #160192. + + 16 Aug 2008; Robin H. Johnson -db-1.85-r1.ebuild, + db-1.85-r3.ebuild: + Remove old 1.85 ebuild, plus clean up 1.85 for downloading from Oracle. + + 16 Aug 2008; Robin H. Johnson db-4.4.20_p4.ebuild, + db-4.5.20_p2.ebuild: + Start ebuild cleanup so we can get rid of gnuconfig in old slots. + +*db-4.7.25 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson +db-4.7.25.ebuild: + Adding package.masked db-4.7.25 per bug #228063. You can run the testsuite + if you like, but db has never had a good history of testsuite passes, the + testsuite also takes 12 hours on a quad-core 2.4Ghz machine. + +*db-4.6.21_p1 (21 May 2008) + + 21 May 2008; Caleb Tennis -db-4.6.19.ebuild, + -db-4.6.21.ebuild, +db-4.6.21_p1.ebuild: + patch rev bump, remove older versions of 4.6 + + 20 Mar 2008; Ryan Hill db-4.5.20_p2.ebuild: + Keyword ~mips for bug #178750. + + 10 Mar 2008; db-4.2.52_p4-r2.ebuild: + Drop to ~mips due to unstable deps + + 29 Feb 2008; Santiago M. Mola db-4.3.29-r2.ebuild: + amd64 stable wrt bug #204213 + + 18 Feb 2008; Jeroen Roovers db-4.3.29-r2.ebuild: + Stable for HPPA (bug #204213). + + 17 Feb 2008; Raúl Porcel db-4.3.29-r2.ebuild: + alpha stable wrt #201213 + + 13 Feb 2008; Petteri Räty -db-3.2.9-r10.ebuild: + Remove generation 1 ebuild. + + 13 Feb 2008; Raúl Porcel db-3.2.9-r11.ebuild: + alpha stable wrt #209942 + + 13 Feb 2008; Jeroen Roovers db-3.2.9-r11.ebuild: + Stable for HPPA (bug #209942). + + 12 Feb 2008; db-3.2.9-r11.ebuild: + The java useflag actually fails because of db's way to find the headers (bug + #207164). As the lack of reports indicates that people don't use it. The + useflag is disabled for now on this old version of db. + + 05 Jan 2008; Raúl Porcel db-4.3.29-r2.ebuild: + Add ~alpha wrt #204213 + + 19 Nov 2007; Joshua Kinard db-1.85-r3.ebuild: + Stable on mips, per #159445. + +*db-4.6.21 (04 Nov 2007) + + 04 Nov 2007; Caleb Tennis +db-4.6.21.ebuild: + version bump + + 25 Oct 2007; Michael Sterrett +db-3.2.9-r10.ebuild: + Restored removed version since it broke deps on mips and hppa. + + 25 Oct 2007; Torsten Veller db-3.2.9-r11.ebuild: + Added a missing quote (#196944) + + 24 Oct 2007; William L. Thomson Jr. db-1.85-r1.ebuild, + -db-3.2.9-r10.ebuild, db-3.2.9-r11.ebuild, db-4.4.20_p4.ebuild, + db-4.5.20_p2.ebuild, db-4.6.19.ebuild: + Removed java gen 1 ebuild, quoted vars + + 03 Sep 2007; Caleb Tennis db-3.2.9-r11.ebuild: + Changing java dep per bug #181832 + + 27 Aug 2007; Jurek Bartuszek db-4.5.20_p2.ebuild: + x86 stable (bug #178750) + + 20 Aug 2007; Caleb Tennis db-1.85-r1.ebuild, + -db-1.85-r2.ebuild, -db-4.2.52_p2-r1.ebuild, -db-4.6.18.ebuild: + remove some unnecessary versions + +*db-4.6.19 (19 Aug 2007) + + 19 Aug 2007; Caleb Tennis +db-4.6.19.ebuild: + version bump + +*db-4.6.18 (15 Aug 2007) + + 15 Aug 2007; Caleb Tennis + +files/db-4.6-jarlocation.patch, + +files/db-4.6-jni-check-prefix-first.patch, +files/db-4.6-libtool.patch, + +db-4.6.18.ebuild: + Next major revision of db. package.mask'd for now for further testing + + 09 Aug 2007; Jeroen Roovers db-4.5.20_p2.ebuild: + Stable for HPPA (bug #178750). + + 27 Jul 2007; Raúl Porcel db-4.5.20_p2.ebuild: + alpha stable + + 12 Jul 2007; Roy Marples db-4.5.20_p2.ebuild: + Keyworded ~sparc-fbsd + + 04 Jul 2007; Jeroen Roovers db-4.5.20_p2.ebuild: + Reverting to ~hppa. :\ + + 04 Jul 2007; Jeroen Roovers db-4.5.20_p2.ebuild: + Stable for HPPA (bug #178750). + + 01 Jul 2007; Christoph Mende db-4.5.20_p2.ebuild: + Appending -O2 for people who don't have any optimization turned on, bug + #171231 + + 26 Jun 2007; Raúl Porcel db-4.5.20_p2.ebuild: + ia64 stable wrt #178750 + + 26 Jun 2007; Lars Weiler db-4.5.20_p2.ebuild: + Stable on ppc; bug #178750. + + 15 Jun 2007; Christoph Mende db-4.5.20_p2.ebuild: + Stable on amd64 wrt bug 178750 + + 13 Jun 2007; Raúl Porcel db-4.5.20_p2.ebuild: + Add ~alpha + + 13 Jun 2007; Gustavo Zacarias db-4.5.20_p2.ebuild: + Stable on sparc wrt #178750 + + 09 Jun 2007; Markus Rothe db-4.5.20_p2.ebuild: + Stable on ppc64; bug #178750 + + 03 Jun 2007; Christoph Mende db-4.5.20_p2.ebuild: + Replacing -O0 with -O2 on amd64, bug 171231 + + 29 May 2007; Jeroen Roovers db-4.3.29-r2.ebuild: + Trivial whitespace fix. + + 24 Apr 2007; Bryan Østergaard db-4.2.52_p4-r2.ebuild: + Stable on Mips, bug 168726. + + 23 Apr 2007; Raúl Porcel db-4.3.29-r2.ebuild: + ia64 stable + + 16 Apr 2007; Markus Rothe db-4.3.29-r2.ebuild: + Stable on ppc64 + + 04 Apr 2007; Gustavo Zacarias db-4.3.29-r2.ebuild: + Stable on sparc + + 31 Mar 2007; Christian Faulhammer db-4.3.29-r2.ebuild: + stable x86, security bug #170828 + + 29 Mar 2007; Tobias Scherbaum db-4.3.29-r2.ebuild: + Stable on ppc wrt bug #170828. + + 25 Mar 2007; Paul de Vrieze db-4.5.20_p2.ebuild: + Have a different fix for not stripping as the old fix no longer works for this + db version. + + 02 Mar 2007; Caleb Tennis -files/db-4.1.25-java.patch, + -files/db-4.1.25-uclibc.patch, -files/db-4.1.25_p1-jarlocation.patch, + -db-4.0.14-r2.ebuild, -db-4.0.14-r3.ebuild, -db-4.1.25_p1-r3.ebuild, + -db-4.1.25_p1-r4.ebuild, -db-4.1.25_p2.ebuild: + Okay, I did it. I removed db 4.0 and db 4.1. I announced it on -dev and + there are no explicit deps on it, so it shouldn't create any issues. + However, if it does, please open a bug and let me know. + + 28 Feb 2007; Caleb Tennis db-4.4.20_p4.ebuild, + db-4.5.20_p2.ebuild: + Update 4.4 and 4.5 to use econf instead of gnuconfig_update per bug #160192 + + 27 Feb 2007; Caleb Tennis db-4.5.20_p2.ebuild: + Paul asked to turn uniquename off, since it causes too many issues + + 27 Feb 2007; Caleb Tennis -db-4.2.52_p2.ebuild, + -db-4.2.52_p4.ebuild: + more stale versions + + 27 Feb 2007; Caleb Tennis -db-4.3.27.ebuild, + -db-4.3.29.ebuild, -db-4.4.20_p2.ebuild: + removing a few stale ebuilds, including 4.3.27 which isn't available anymore + +*db-4.4.20_p4 (27 Feb 2007) + + 27 Feb 2007; Caleb Tennis +db-4.4.20_p4.ebuild: + Bump to 4.4.20_p4, change SRC_URI to reflect new location of stuff + +*db-4.5.20_p2 (27 Feb 2007) + + 27 Feb 2007; Caleb Tennis + files/db-4.4-jarlocation.patch, +files/db-4.5-jarlocation.patch, + +files/db-4.5-libtool.patch, +db-4.5.20_p2.ebuild: + Bump to 4.5. SRC_URI and LICENSE have changed because Oracle bought + Sleepycat. I also revered back to --with-uniquename as it's supported again + with C++,Java, and RPC (was not in 4.2-4.4 series). >=4.4 is currently + masked, so this is currently in for testing + + 17 Feb 2007; Fabian Groffen db-4.2.52_p2.ebuild, + db-4.2.52_p2-r1.ebuild, db-4.2.52_p4.ebuild, db-4.2.52_p4-r2.ebuild: + Dropped ppc-macos keyword, see you in prefix + + 02 Feb 2007; Gustavo Zacarias db-3.2.9-r11.ebuild: + Stable on sparc + + 26 Jan 2007; Jeroen Roovers db-4.3.29-r2.ebuild: + Marked ~hppa (bug #152713). + + 10 Jan 2007; Bryan Østergaard db-4.2.52_p4-r2.ebuild: + Stable on Alpha. + + 09 Jan 2007; Christian Faulhammer db-1.85-r3.ebuild: + stable x86, bug #159445 + + 09 Jan 2007; Markus Rothe db-1.85-r3.ebuild: + Stable on ppc64; bug #159445 + + 08 Jan 2007; Jeroen Roovers db-1.85-r3.ebuild: + Stable for HPPA (bug #159445). + + 07 Jan 2007; Tobias Scherbaum db-1.85-r3.ebuild: + ppc stable, bug #159445 + + 04 Jan 2007; Peter Weller (welp) db-1.85-r3.ebuild: + Stable on amd64 wrt bug #159445 + + 04 Jan 2007; Bryan Østergaard db-1.85-r3.ebuild: + Stable on IA64. + + 04 Jan 2007; Gustavo Zacarias db-1.85-r3.ebuild: + Stable on sparc wrt #159445 + + 17 Oct 2006; Gustavo Zacarias + db-4.2.52_p4-r2.ebuild: + Stable on sparc + + 17 Oct 2006; Roy Marples db-4.3.29-r2.ebuild: + Added ~sparc-fbsd keyword. + + 15 Oct 2006; Tobias Scherbaum db-3.2.9-r11.ebuild, + db-4.2.52_p4-r2.ebuild: + ppc stable. bug #147254 + + 15 Oct 2006; Joshua Nichols db-3.2.9-r11.ebuild, + db-4.2.52_p4-r2.ebuild: + Stabilizing on ia64 as part of new Java system, bug #147254. + + 14 Oct 2006; Thomas Cort db-1.85-r3.ebuild: + Stable on alpha wrt Bug #116177. + + 14 Oct 2006; Joshua Nichols db-3.2.9-r11.ebuild, + db-4.2.52_p4-r2.ebuild: + Stabilizing on amd64 as part of new Java system, bug #147254. + + 14 Oct 2006; Joshua Nichols db-3.2.9-r11.ebuild, + db-4.2.52_p4-r2.ebuild: + Stabilizing on ppc64 as part of new Java system, bug #147254. + + 14 Oct 2006; Joshua Jackson db-3.2.9-r11.ebuild, + db-4.2.52_p4-r2.ebuild: + New java stable on x86; bug #147254 + + 28 Sep 2006; Robin H. Johnson db-3.2.9-r11.ebuild: + QA fix, fix upstream stripping, bug #149448. + + 28 Sep 2006; Robin H. Johnson db-3.2.9-r11.ebuild: + Bug #149446 - testsuite is broken by upstream in the 3.2.9 release, so do + not use our db_src_test from the eclass. + + 22 Sep 2006; Markus Rothe db-4.3.27.ebuild, + db-4.3.29.ebuild, db-4.3.29-r2.ebuild, db-4.4.20_p2.ebuild: + Added ~ppc64 + + 19 Sep 2006; Vlastimil Babka db-3.2.9-r10.ebuild: + Move JAVACABS export to src_compile() to make it actually work. + +*db-3.2.9-r11 (31 Aug 2006) + + 31 Aug 2006; Peter Volkov db-3.2.9-r10.ebuild, + +db-3.2.9-r11.ebuild: + Added fix for new java system. Thank Caster and Tichoj for fix and Jan + Callewaert for report of the bug #132690. + + 17 Aug 2006; Jeroen Roovers db-4.2.52_p4-r2.ebuild: + Stable for HPPA (bug #142965). There seems no need for HPPA to wait for Java. + + 10 Aug 2006; Paul de Vrieze db-4.4.20_p2.ebuild: + The 4.3 java patches still work so just use those and not make a copy. + Solves bug #143459 reported by weeve@gentoo.org. + + 06 Aug 2006; Paul de Vrieze db-4.4.20_p2.ebuild: + Use new java class for db-4.4 too. + + 03 Aug 2006; Doug Goldstein db-3.2.9-r10.ebuild, + db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild, + db-4.1.25_p1-r4.ebuild, db-4.1.25_p2.ebuild, db-4.2.52_p2.ebuild, + db-4.2.52_p2-r1.ebuild, db-4.2.52_p4.ebuild, db-4.2.52_p4-r2.ebuild, + db-4.3.27.ebuild, db-4.3.29.ebuild, db-4.3.29-r2.ebuild, + db-4.4.20_p2.ebuild: + Changed tcltk USE flag to tcl as per bug #17808 + + 26 Jul 2006; Martin Schlemmer db-4.2.52_p4-r2.ebuild, + db-4.3.29-r2.ebuild: + Fixup static 'lib' paths in new java stuff. Fixup some quoting. + +*db-4.3.29-r2 (25 Jul 2006) +*db-4.2.52_p4-r2 (25 Jul 2006) + + 25 Jul 2006; Joshua Nichols + +files/db-4.2-jni-check-prefix-first.patch, + +files/db-4.2-listen-to-java-options.patch, + +files/db-4.3-jni-check-prefix-first.patch, + +files/db-4.3-listen-to-java-options.patch, +db-4.2.52_p4-r2.ebuild, + +db-4.3.29-r2.ebuild: + Revision bumps to support new Java system. + + 12 Jun 2006; Paul de Vrieze db-4.3.29.ebuild: + This upstream tarball has also changed. + + 30 May 2006; Paul de Vrieze db-4.2.52_p2.ebuild, + db-4.2.52_p2-r1.ebuild, db-4.2.52_p4.ebuild: + The upstream tarball has changed :-( + + 20 May 2006; Diego Pettenò db-4.4.20_p2.ebuild: + Add ~x86-fbsd to 4.4 version. + + 20 May 2006; Paul de Vrieze db-4.1.25_p2.ebuild, + db-4.3.27.ebuild, db-4.3.29.ebuild: + Port the striping fix to the other versions + + 19 May 2006; Diego Pettenò db-4.3.29.ebuild: + Add ~x86-fbsd keyword. + +*db-4.4.20_p2 (08 May 2006) + + 08 May 2006; -db-4.4.20.ebuild, +db-4.4.20_p2.ebuild: + Use the upstream patches. + + 29 Apr 2006; Joshua Kinard db-4.2.52_p2-r1.ebuild: + Marked stable on mips. + + 30 Mar 2006; Diego Pettenò db-4.2.52_p4.ebuild, + db-4.4.20.ebuild: + Mark ~x86-fbsd the non-masked db. + + 30 Mar 2006; Diego Pettenò db-4.4.20.ebuild: + Add ~x86-fbsd keyword. + + 24 Mar 2006; Caleb Tennis db-4.3.29.ebuild, + db-4.4.20.ebuild: + Add a dep on >=binutils-2.16.1, which is where --default-symver is first + implemented + + 12 Mar 2006; Paul de Vrieze + +files/db-4.4-jarlocation.patch, db-4.4.20.ebuild: + Fix the jar filenames. I missed that when creating the package. Thanks to + Hanno Meyer-Thurow (h.mth@web.de) in bug #125758. + + 09 Mar 2006; Paul de Vrieze db-4.2.52_p4.ebuild: + Disable stripping (bug #125581) + + 28 Feb 2006; -files/db.1.85.patch, db-1.85-r1.ebuild: + Move the patch to the mirrors. It's too big for the tree. + + 22 Feb 2006; Paul de Vrieze db-4.3.29.ebuild, + db-4.4.20.ebuild: + Add the "--default-symver" linker option. This should be a superior solution + to the uniquename hack. It works with the linker, so no header file + problems, no configure script problems, etc. This might actually finally + solve our db problems ;-). + + 01 Feb 2006; Caleb Tennis db-4.4.20.ebuild: + 43 -> 44 + + 20 Jan 2006; Caleb Tennis db-4.3.27.ebuild, + db-4.3.29.ebuild: + Fix installation name (was 42, should be 43) + +*db-4.3.29 (26 Dec 2005) +*db-4.2.52_p4 (26 Dec 2005) +*db-4.1.25_p2 (26 Dec 2005) + + 26 Dec 2005; Robin H. Johnson +db-4.1.25_p2.ebuild, + +db-4.2.52_p4.ebuild, +db-4.3.29.ebuild: + Version bumps in preperation for db-4.4. src_test support added, warning it + can take 6 hours! + + 13 Dec 2005; Fernando J. Pereda db-4.2.52_p2-r1.ebuild: + stable on alpha + + 10 Dec 2005; Jason Wever db-4.2.52_p2-r1.ebuild: + Stable on SPARC wrt bug #105380. + + 08 Dec 2005; Mark Loeser db-4.2.52_p2-r1.ebuild: + Stable on x86; bug #105380 + + 07 Dec 2005; db-4.2.52_p2-r1.ebuild: + Marked stable on amd64 + + 06 Dec 2005; Michael Hanselmann + db-4.2.52_p2-r1.ebuild: + Stable on hppa, ppc. + + 06 Dec 2005; Markus Rothe db-4.2.52_p2-r1.ebuild: + Stable on ppc64; bug #105380 + +*db-4.2.52_p2-r1 (02 Dec 2005) + + 02 Dec 2005; Robin H. Johnson + +files/db-4.2.52_p2-TXN.patch, +db-4.2.52_p2-r1.ebuild: + Bug #113905, TXN support for DB-4.2, used for OpenLDAP data integrity. + + 02 Dec 2005; Robin H. Johnson db-1.85-r3.ebuild: + Fix bug #114223, bad perms on /usr/include/db1. + +*db-1.85-r3 (08 Nov 2005) + + 08 Nov 2005; Mike Frysinger + +files/db-1.85-gentoo-paths.patch, +db-1.85-r3.ebuild: + Further cleanup the patch from Redhat, add a SONAME fix for alpha #48616, + and tweak how we build/install. + + 25 Aug 2005; -db-3.2.9-r7.ebuild: + Remove old ebuild versions + + 23 Aug 2005; Aron Griffis db-4.2.52_p2.ebuild: + stable on ia64 + + 07 Aug 2005; Kito db-4.2.52_p2.ebuild: + ~ppc-macos + + 03 Aug 2005; Gustavo Zacarias db-1.85-r2.ebuild, + db-4.0.14-r3.ebuild: + Stable on sparc + + 03 Aug 2005; Gustavo Zacarias db-3.2.9-r10.ebuild: + Stable on sparc #86985 + + 19 Jul 2005; Bryan Østergaard db-4.2.52_p2.ebuild: + Stable on alpha. + + 17 Jul 2005; Hardave Riar db-4.2.52_p2.ebuild: + Keyworded ~mips + + 10 Jul 2005; Sven Wegener db-4.0.14-r2.ebuild, + db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild, db-4.1.25_p1-r4.ebuild, + db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild, db-4.3.27.ebuild: + QA: Removed 'emake || make || die' and variants. Either a package is + parallel build safe or it is not. There's nothing like trying and falling + back. + + 02 Jul 2005; Bryan Østergaard db-4.2.52_p2.ebuild: + Add ~alpha keyword. + + 17 Jun 2005; Michael Hanselmann db-4.2.52_p2.ebuild: + Stable on ppc. + + 15 Jun 2005; Gustavo Zacarias db-4.2.52_p2.ebuild: + Stable on sparc + + 06 Jun 2005; Marcus D. Hanwell db-4.2.52_p2.ebuild: + Stable on amd64. + + 06 Jun 2005; Markus Rothe db-4.2.52_p2.ebuild: + Stable on ppc64 + + 04 Jun 2005; Guy Martin db-4.2.52_p2.ebuild: + Stable on hppa. + + 02 Jun 2005; db-4.2.52_p2.ebuild, db-4.3.27.ebuild: + Fix bug #94692, that is caused by use of gcc --version together with a + crappy version detection script. Use a sed script to change the use of + gcc --version to gcc -dumpversion + + 29 May 2005; Paul de Vrieze db-4.2.52_p2.ebuild: + Mark 4.2 stable. + + 09 Apr 2005; Markus Rothe db-4.1.25_p1-r4.ebuild: + Stable on ppc64 + + 29 Mar 2005; Markus Rothe db-4.2.52_p2.ebuild: + Added ~ppc64 to KEYWORDS + +*db-4.3.27 (29 Mar 2005) + + 29 Mar 2005; +files/db-4.3-jarlocation.patch, + +files/db-4.3-libtool.patch, +files/db-4.3.27-fix-dep-link.patch, + db-3.2.9-r10.ebuild, +db-4.3.27.ebuild: + Fix silly cd error + + 28 Mar 2005; Jason Wever db-3.2.9-r10.ebuild: + Marked as ~sparc because this ebuild is brand new, improperly marked stable, + and the patch is broken. :( + + 27 Mar 2005; Paul de Vrieze + +files/db-3.2.9-java15.patch, db-3.2.9-r10.ebuild: + Add a java 1.5 patch from bug #84770. Also bump all architectures that were + not stable on this ebuild. It has not changed much since months and the + instable keywords were added a very long time ago. + + 19 Mar 2005; Bryan Østergaard db-1.85-r2.ebuild: + Stable on alpha. + + 19 Mar 2005; Bryan Østergaard db-4.1.25_p1-r4.ebuild: + Stable on alpha. + +*db-4.3.27 (02 Feb 2005) + + 02 Feb 2005; +files/db-4.3-jarlocation.patch, + +files/db-4.3-libtool.patch, +files/db-4.3.27-fix-dep-link.patch, + +db-4.3.27.ebuild: + A new upstream version. The patches are updated to apply again. + + 30 Jan 2005; Paul de Vrieze db-1.85-r1.ebuild, + db-1.85-r2.ebuild, db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild, + db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild, + db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild: + The upstream download location changed. Fixed it. + + 19 Jan 2005; Joshua Kinard db-4.1.25_p1-r4.ebuild: + Marked stable on mips. + + 13 Jan 2005; Mike Frysinger db-4.1.25_p1-r4.ebuild, + db-4.2.52_p2.ebuild: + Clean up USE=uclibc and USE=nocxx usage. + + 16 Dec 2004; Jeremy Huddleston db-1.85-r1.ebuild, + db-1.85-r2.ebuild, db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild, + db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild, + db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild: + get_libdir support for multilib archs. + + 14 Dec 2004; Dylan Carlson db-4.1.25_p1-r4.ebuild: + Stable on amd64. + + 13 Dec 2004; Mike Frysinger db-1.85-r2.ebuild: + Update patch to be cross-compile friendly. + + 08 Dec 2004; Simon Stelling + +files/db-4.2-libtool.patch, db-4.2.52_p2.ebuild: + added Andy Lutomirski's patch and marked ~amd64, see bug #57654 + + 01 Dec 2004; Gustavo Zacarias db-4.1.25_p1-r4.ebuild: + Stable on sparc + + 30 Nov 2004; Paul de Vrieze + +files/db-4.1.25-java.patch, db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, + db-4.1.25_p1-r3.ebuild, db-4.1.25_p1-r4.ebuild: + Fix compilation with 1.5 jdk's by renaming some enum local variable + + 30 Nov 2004; Paul de Vrieze db-4.1.25_p1-r4.ebuild: + Stabilize on x86 + + 01 Oct 2004; Simon Stelling db-4.1.25_p1-r3.ebuild, + db-4.1.25_p1-r4.ebuild, db-4.2.52_p2.ebuild: + get_libdir-ized + + 27 Sep 2004; db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild: + Fix bug #65291 and mark the -r10 release testing on amd64. + + 03 Sep 2004; Pieter Van den Abeele + db-3.2.9-r10.ebuild, db-4.0.14-r2.ebuild: + Masked db-4.0.14-r2.ebuild stable for ppc + + 03 Sep 2004; Pieter Van den Abeele + db-3.2.9-r10.ebuild: + Masked db-3.2.9-r10.ebuild stable for ppc + + 03 Sep 2004; Caleb Tennis -db-3.3.11.ebuild: + Removing package.masked version + + 02 Sep 2004; Robin H. Johnson : + fix missing digest bug #62562. + +*db-1.85-r2 (01 Sep 2004) + + 01 Sep 2004; Robin H. Johnson +db-1.85-r2.ebuild: + Clean up old db-1.8.5 build to not for omit-frame-pointer, and grab it's patch + from DISTDIR. + + 01 Sep 2004; Robin H. Johnson db-4.1.25_p1-r3.ebuild, + db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild: + Ebuild cleanup to use epatch and not abuse sed. + + 23 Aug 2004; db-3.3.11.ebuild: + Add IUSE + + 23 Aug 2004; db-3.2.9-r10.ebuild, -db-3.2.9-r9.ebuild: + Clean out the -r9 release + + 11 Aug 2004; Michael Sterrett db-3.2.9-r10.ebuild: + gnuconfig_update in src_unpack + + 02 Jul 2004; Jeremy Huddleston db-1.85-r1.ebuild, + db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild, db-3.2.9-r9.ebuild, + db-3.3.11.ebuild: + virtual/glibc -> virtual/libc + + 25 Jun 2004; db-4.1.25_p1-r4.ebuild: + uclibc update + +*db-4.1.25_p1-r4 (19 Jun 2004) + + 19 Jun 2004; db-4.1.25_p1-r4.ebuild, + files/db-4.1.25-uclibc.patch: + added IUSE=uclibc support for building portage with uclibc support + + 06 May 2004; Ferris McCormick db-4.2.52_p2.ebuild: + Add ~sparc keyword at user request (bug 50272) + + 26 Apr 2004; Jason Wever db-4.1.25_p1-r3.ebuild: + Fixed sparc keyword problem, sorry folks :( + + 24 Apr 2004; Tom Gall db-3.2.9-r10.ebuild, + db-4.2.52_p2.ebuild: + fix to update config for ppc64 in db-3.2.9-r10.ebuild and + db-4.2.52_p2.ebuild marked stable for ppc64 + + 22 Apr 2004; Travis Tilley db-4.1.25_p1-r3.ebuild: + added fix for bug #48558 + +*db-4.2.52_p2 (15 Apr 2004) + + 15 Apr 2004; Paul de Vrieze db-4.2.52_p2.ebuild: + New patch version + + 21 Mar 2004; Joshua Kinard db-4.1.25_p1-r3.ebuild: + Tweak to make gnuconfig work again for mips (the 'dist' dir got moved from + 'build_unix' to one level up) + + 07 Mar 2004; Joshua Kinard db-4.1.25_p1-r3.ebuild: + Marked stable on mips. + + 18 Feb 2004; David Holm db-4.2.52_p1.ebuild: + Added to ~ppc. + + 09 Feb 2004; db-4.1.25_p1-r3.ebuild: + stable on sparc + + 06 Feb 2004; Martin Schlemmer db-4.1.25_p1-r3.ebuild: + Bump to stable for x86 (needed by pam-0.77). + + 10 Feb 2004; Paul de Vrieze db-4.0.14-r3.ebuild, + db-4.1.25_p1-r3.ebuild, db-4.2.52_p1.ebuild: + Change the runtime dependency to a java runtime environment only + + 22 Jan 2004; Luca Barbato db-4.0.14-r3.ebuild: + Marked ppc + + 19 Jan 2004; Guy Martin db-4.0.14-r2.ebuild, + db-4.1.25_p1-r3.ebuild: + Marked stable on hppa. + + 16 Jan 2004; Bartosch Pixa db-4.1.25_p1-r3.ebuild: + set ppc in keywords + + 28 Dec 2003; Joshua Kinard db-4.0.14-r2.ebuild: + Move to mips stable (~mips -> mips) + +*db-4.2.52_p1 (22 Dec 2003) + + 22 Dec 2003; db-4.2.52_p1.ebuild, + files/db-4.2-jarlocation.patch: + New upstream version. It is for now still masked for testing. There should be + no problems though. + + 21 Dec 2003; Brad House db-4.1.25_p1-r3.ebuild: + mark stable on amd64 + + 20 Dec 2003; db-3.2.9-r2.ebuild, db-3.2.9-r6.ebuild, + db-3.2.9-r8.ebuild, db-4.0.14-r1.ebuild, db-4.0.14.ebuild, db-4.1.25.ebuild, + db-4.1.25_p1-r1.ebuild, db-4.1.25_p1-r2.ebuild, db-4.1.25_p1.ebuild: + Remove old versions. Clean things up + + 20 Dec 2003; db-4.1.25_p1-r3.ebuild: + A gnuconfig update for mips. The patch comes from kumba@gentoo.org + + 15 Dec 2003; Joshua Kinard db-4.1.25_p1-r3.ebuild: + Added ~mips to keywords + +*db-4.1.25_p1-r3 (14 Dec 2003) + + 20 Dec 2003; Guy Martin db-4.1.25_p1-r3.ebuild : + Added ~hppa to KEYWORDS. + + 14 Dec 2003; Jason Wever db-4.1.25_p1-r3.ebuild: + Added sparc64 fix and and ~sparc keyword. + + 06 Nov 2003; Paul de Vrieze db-4.0.14-r3.ebuild: + Add the fix for the ibm jdk + + 02 Nov 2003; : + Include the fix from db-4.0.14-r1 for the pthread library. + + 31 Oct 2003; Luca Barbato db-4.1.25_p1-r2.ebuild: + Marked ~ppc + + 26 Oct 2003; Brad House db-4.1.25_p1-r2.ebuild: + add amd64 flag + + 23 Oct 2003; Paul de Vrieze db-4.0.14.ebuild, + db-4.1.25_p1-r2.ebuild: + Fix sandbox problems related to ibm jdk wanting to write to /proc/self/maps + +*db-4.1.25_p1-r2 (18 Oct 2003) +*db-4.0.14-r3 (18 Oct 2003) +*db-3.2.9-r10 (18 Oct 2003) + + 18 Oct 2003; Robin H. Johnson db-3.2.9-r10.ebuild, + db-4.0.14-r3.ebuild, db-4.1.25_p1-r2.ebuild, + files/db-3.2.9-jarlocation.patch, files/db-4.0.14-jarlocation.patch, + files/db-4.1.25_p1-jarlocation.patch: + new revision of db-3 and db-4.[01] packages adding patch to avoid db.jar + overwriting, adds java support to db-3.2.9-r10, and rpc support in db-4.[01] + + 15 Oct 2003; Brad House db-1.85-r1.ebuild, + db-3.2.9-r7.ebuild: + add amd64 flags to db-1.85-r1, and move db-3.2.9-r7 to stable + + 14 Oct 2003; Aron Griffis db-4.1.25_p1-r1.ebuild: + Add ~alpha + + 12 Oct 2003; Robin H. Johnson db-4.1.25_p1-r1.ebuild: + bump to ~x86 + + 10 Oct 2003; Alexander Gabert db-3.2.9-r7.ebuild, + db-3.2.9-r9.ebuild, db-4.0.14-r2.ebuild: + removed hardened-gcc comment fields + + 09 Oct 2003; Alexander Gabert db-4.0.14-r2.ebuild: + commented out hardened-gcc flags + + 04 Oct 2003; Brad House db-4.0.14-r2.ebuild, + db-4.1.25.ebuild, db-4.1.25_p1-r1.ebuild, db-4.1.25_p1.ebuild: + db-4.1.25 is not very palatable for many apps, and at this point causes many + problems. Not sure why amd64 was set to stable with this. The only other + platform that was also is ia64. Remove the stable flag, don't even turn on the + ~amd64 flag as it causes too many problems. Make 4.0.14-r2 the stable + 4.0 series. + + 02 Oct 2003; Brad House db-3.2.9-r7.ebuild: + add ~amd64 flag + + 01 Oct 2003; Jason Wever db-4.0.14-r2.ebuild: + Added sparc keyword, fixed bug #28328. + + 01 Oct 2003; Aron Griffis db-4.0.14-r2.ebuild: + Stable on alpha + + 01 Oct 2003; Robin H. Johnson db-3.2.9-r9.ebuild: + bump db-3.2.9-r9 to stable on x86 + +*db-3.2.9-r6 (23 Sep 2003) + + 23 Sep 2003; Bartosch Pixa db-3.2.9-r6.ebuild: + set ppc in keywords + + 20 Sep 2003; Alexander Gabert db-4.0.14-r2.ebuild: + added configure logic for hardened-gcc + + 13 Sep 2003; Robin H. Johnson db-4.0.14-r2.ebuild: + added Kumba's changes for mips + + 08 Sep 2003; Alexander Gabert db-3.2.9-r7.ebuild, + db-3.2.9-r9.ebuild, db-4.0.14-r2.ebuild: + changed hardened-gcc, db works now with etdyn + + 08 Sep 2003; Robin H. Johnson db-4.0.14-r2.ebuild: + mark db-4.0 as stable on x86, and put it into testing on all other arches + + 07 Sep 2003; Alexander Gabert db-3.2.9-r7.ebuild, + db-3.2.9-r9.ebuild, db-4.0.14-r2.ebuild: + added hardened-gcc changes to CC + +*db-3.2.9-r9 (02 Sep 2003) + + 02 Sep 2003; Robin H. Johnson db-3.2.9-r9.ebuild: + add some more symlink stuff to db_fix_so in the eclass, and remove the old + broken leftover parts from ebuild + +*db-4.1.25_p1-r1 (21 Aug 2003) +*db-4.0.14-r2 (21 Aug 2003) + + 21 Aug 2003; Robin H. Johnson db-3.2.9-r8.ebuild, + db-4.0.14-r2.ebuild, db-4.1.25_p1-r1.ebuild: + crucial fix to all ebuilds db-3 or newer for bad symlinks in /usr/lib and + /usr/include, code is now in db.eclass + +*db-3.2.9-r7 (17 Aug 2003) + + 17 Aug 2003; Paul de Vrieze db-3.2.3h-r4.ebuild, + db-3.2.9-r1.ebuild, db-3.2.9-r5.ebuild, db-3.2.9-r7.ebuild, db-3.2.9.ebuild: + New stable version with support for db-4 and that actually installs the static + libraries + +*db-4.0.14-r1 (16 Aug 2003) + + 16 Aug 2003; Martin Schlemmer db-4.0.14-r1.ebuild, + files/db-4.0.14-fix-dep-link.patch: + Get db to link libdb* to correct dependencies ... for example if we use + NPTL or NGPT, db detects usable mutexes, and should link against + libpthread, but does not do so ... + +*db-4.1.25_p1 (05 Aug 2003) + + 05 Aug 2003; Paul de Vrieze db-4.1.25_p1.ebuild: + Make a version that applies the upstream patches + + 01 Aug 2003; Paul de Vrieze db-4.0.14.ebuild, + db-4.1.24.ebuild, db-4.1.25.ebuild: + Make sure that db-4.1 is in a different slot as db-4, and that there are no + duplicates. db-4 is still masked though + + 01 Aug 2003; Paul de Vrieze db-4.0.14.ebuild: + Mark db-4.0.14 as testing. There probably still will be some minor problems, + but these can be better handled when the package is testing. Some of the + dependent packages do not really like versioned symbols. We do need to use + them though to be able to run multiple versions in parallel and so providing + an update path + + 03 Jul 2003; Paul de Vrieze db-4.1.25.ebuild: + Allow db-4.0 and db-4.1 to be both installed, by putting db-4.1 in a different + slot and by renaming the binaries to db41_??? instead of db4_??? + + 01 Jul 2003; Todd Sunderlin db-3.2.9-r5.ebuild: + set stable on sparc + + 26 Jun 2003; Paul de Vrieze db-4.0.14.ebuild, + db-4.1.24.ebuild, db-4.1.25.ebuild: + Make sure that latest db.h gets linked to /usr/include/db.h. Also add + db_185.h link to /usr/include + + 22 Jun 2003; Paul de Vrieze db-3.2.9-r5.ebuild, + db-4.0.14.ebuild, db-4.1.24.ebuild, db-4.1.25.ebuild: + Fix java compilation problem + + 19 Jun 2003; Paul de Vrieze db-3.2.9-r5.ebuild: + Make db-3.2.9-r5 respect CFLAGS, by hacking the configure script (#22415) + + 07 Jun 2003; Paul de Vrieze db-3.2.9-r5.ebuild, + db-4.0.14.ebuild, db-4.1.24.ebuild, db-4.1.25.ebuild: + Fix the autosymlinking script to work in a cross environment. Courtessy of + Alastair Tse , bug #22393. + +*db-4.1.25 (30 May 2003) + + 30 May 2003; Paul de Vrieze db-4.1.25.ebuild: + Add new upstream version db-4.1.25. + + 28 May 2003; Grant Goodyear db-4.0.14.ebuild: + Changed goofy "-x86" mask to "~x86" masks, since the package + is still hard-masked in package.mask. (This way those of us + trying to test this package can use package.unmask!) + + 28 May 2003; Paul de Vrieze db-3.2.9-r5.ebuild: + Masking db-3.2.9-r5 as testing. This should be stable. The only changes are + the renaming of all tools from db_ to db3_ + + 25 May 2003; Paul de Vrieze db-3.2.9-r5.ebuild, + db-4.0.14.ebuild, db-4.1.24.ebuild: + Fix a problem with the auto header linking script. It is not necessary toe + locally, but in that case you need to do ln -s db4/db.h /usr/include/db.h + + 25 May 2003; Paul de Vrieze db-4.0.14.ebuild, + db-4.1.24.ebuild: + Make java work with db-4{0,1} + +*db-3.2.9-r5 (24 May 2003) + + 24 May 2003; Paul de Vrieze db-3.2.9-r5.ebuild, + db-4.0.14.ebuild, db-4.1.24.ebuild: + The db4 ebuilds have now been changed to live alongside the db3 ebuilds. Also + the db-3.2.9-r5 ebuild is created to go along with the db-4 ebuilds. This + ebuild is more gentle to the db4 ebuild, but upgrading this is not that + necessary. + + 19 May 2003; Zach Welch db-3.2.9-r2.ebuild: + Mark all platforms stable in 3.2.9-r2 KEYWORDS + + 06 May 2003; Paul de Vrieze db-4.0.14.ebuild, + db-4.1.24.ebuild: + Change db-4.* ebuilds to build with versioned (unique) symbols, to allow for + parallel db versions to be installed and used + +*db-3.2.9-r2 (23 Feb 2003) + + 11 Mar 2003; Zach Welch db-3.2.9-r2.ebuild: + mark stable on arm + + 01 Mar 2003; Brandon Low db-3.2.9-r1.ebuild, + db-3.2.9-r2.ebuild, db-4.1.24.ebuild: + Fix for userpriv and make -> emake changes + + 24 Feb 2003; Brandon Low db-3.2.9-r2.ebuild : + Fix for userpriv mode + + 23 Feb 2003; Martin Schlemmer : + Fix build to link libdb*.so to dependency libs .. for instance when building + with NPTL we need to link to libpthread. + Fix the db185 stuff to not have to hack the build to pieces to build. + We should compile shared and static libs in two diff build dirs ... + + 20 Feb 2003; Zach Welch db-1.85-r1.ebuild , db-3.2.9-r1.ebuild : + Added arm to keywords. + + 07 Feb 2003; Guy Martin db-1.85-r1.ebuild , db-3.2.9-r1.ebuild : + Added hppa to keywords. + +*db-1.85-r1.ebuild , db-3.2.9-r1.ebuild (13 Dec 2002) + + 13 Dec 2002; Jan Seidel db-1.85-r1.ebuild , db-3.2.9-r1.ebuild : + Added mips to keywords. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*db-3.3.11 (16 Nov 2002) + + 16 Nov 2002; Seemant Kulleen db-3.3.11.ebuild : + + Made this install similar to db-3.2.9 which should make this version more + usable. Still masked. Closes bug #9900 by l_calamandrei@neri-group.com + (Lapo Calamandrei) + +*db-4.1.24 (08 Oct 2002) + + 14 Nov 2002; Seemant Kulleen db-4.1.24.ebuild : + + Removed posixmutexes option as it is rarely needed on linux systems and it + kills the config. Closes bug #10678 by jani@iv.ro + + 23 Oct 2002; Mark Guertin db-4.1.24.ebuild : + set -ppc in keywords, not working on ppc, investigating further. + (some pthreads problems it seems) + + 21 Oct 2002; Seemant Kulleen db-4.1.24.ebuild : + + changed configure statement to add a few features (like db-1.8.5 + compatibility). + + 08 Oct 2002; Ryan Phillips : + + version bump.. has new crypto support + +*db-3.2.9-r1 (28 Jul 2002) + + 22 Oct 2002; Seemant Kulleen : db-3.2.9-r1.ebuild : + + Update SRC_URI. Thanks to: zinzarin@ameritech.net (Rob Riemersma) in bug + #9493. + + 28 Jul 2002; Martin Schlemmer : + Update to get it working with gcc-3.2 (remove config.guess), as well + as cleanups. + +*db-3.2.9 (25 Jul 2002) + 25 Jul 2002; Spider : + Add a fix to remove -fno-exceptions in CXXFLAGS as it doesnt build then + +*db-4.0.14 (30 Jan 2002) + +*db-1.85-r2 (8 May 2002) + + 15 Jul 2002; Mark Guertin + Added ppc to keywords + + 1 Feb 2002; José Alberto Suárez López Changelog db-1.85-r1.ebuild : + + Fixed an error with the source url. + +*db-3.2.3h-r4 (21 Mar 2002) + + 15 Jul 2002; Mark Guertin + Added ppc to keywords + + 21 Mar 2002; Seemant Kulleen db-3.2.3h-r4.ebuild : + + HTML documentation will no longer get gzipped -- but too small a change + to warrant having the users remerge this. Thanks so stefan@mdy.univie.ac.at + for the bug. + +*db-3.2.3h-r4 (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. + +*db-1.85-r1 (07 Feb 2001) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/Manifest new file mode 100644 index 0000000000..99274b2b66 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/Manifest @@ -0,0 +1,6 @@ +DIST db-4.6.21.tar.gz 11881885 RMD160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e SHA1 5be3beb82e42a78ff671a3f5a4c30e5652972119 SHA256 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21 +DIST db-4.7.25.tar.gz 13124129 RMD160 9a5d8149d61452906c3f1c36f2859a2033c8bc3b SHA1 957c10358df1211e1dc37ea997aadef42117d6a5 SHA256 f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e +DIST patch.4.6.21.1 2475 RMD160 8c11e9b991ac6559f22ece2d93617b16126049e8 SHA1 c7c155705687e4de03d06c2ea86940f573fdac0b SHA256 d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53 +DIST patch.4.6.21.2 892 RMD160 f8abf554552db668037e046dea54700ce3340bf8 SHA1 a694b71088ba99b74042e7568f395fe467bb6590 SHA256 9496a6cad44377ad1fab8c617f17c6f541e3423814663bfa81c3abb4001622d9 +DIST patch.4.6.21.3 1517 RMD160 63743d910f8c3832409bdc6e7d74db0fcdd686a5 SHA1 a893f6bcdb6ae1f9395c027431c038168d500c9b SHA256 3f531b18d88ce68ff080761cd62ef621444e675593aa23045d69121cd2c7c638 +DIST patch.4.6.21.4 41501 RMD160 f1d18e59c311fb4e1f00a3b6220269fca17df312 SHA1 e2190185c667edb97e800495ce6eb4f95f43eb87 SHA256 98bb4499dc7408c27a8a855330972a69abd3b29d0ff3820d6e1da790593a5bb7 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.6.21_p4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.6.21_p4.ebuild new file mode 100644 index 0000000000..4162e00264 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.6.21_p4.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.10 2009/09/20 19:52:44 robbat2 Exp $ + +inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool + +#Number of official patches +#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` +PATCHNO=${PV/*.*.*_p} +if [[ ${PATCHNO} == "${PV}" ]] ; then + MY_PV=${PV} + MY_P=${P} + PATCHNO=0 +else + MY_PV=${PV/_p${PATCHNO}} + MY_P=${PN}-${MY_PV} +fi + +S="${WORKDIR}/${MY_P}/build_unix" +DESCRIPTION="Oracle Berkeley DB" +HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" +for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do + export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" +done + +LICENSE="OracleDB" +SLOT="4.6" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="tcl java doc nocxx" + +DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) + java? ( >=virtual/jdk-1.4 ) + >=sys-devel/binutils-2.16.1" +RDEPEND="tcl? ( dev-lang/tcl ) + java? ( >=virtual/jre-1.4 )" + +src_unpack() { + unpack "${MY_P}".tar.gz + cd "${WORKDIR}"/"${MY_P}" + for (( i=1 ; i<=${PATCHNO} ; i++ )) + do + epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" + done + epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch + + # use the includes from the prefix + epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch + epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch + + sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE + + # Include the SLOT for Java JAR files + # This supersedes the unused jarlocation patches. + sed -r -i \ + -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ + "${S}"/../dist/Makefile.in + + cd "${S}"/../dist + rm -f aclocal/libtool.m4 + sed -i \ + -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ + configure.ac + sed -i \ + -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ + aclocal/programs.m4 + AT_M4DIR="aclocal aclocal_java" eautoreconf + # Upstream sucks - they do autoconf and THEN replace the version variables. + . ./RELEASE + sed -i \ + -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure +} + +src_compile() { + # compilation with -O0 fails on amd64, see bug #171231 + if use amd64; then + replace-flags -O0 -O2 + is-flagq -O[s123] || append-flags -O2 + fi + + local myconf="" + + use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly" + + myconf="${myconf} $(use_enable !nocxx cxx)" + + use tcl \ + && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \ + || myconf="${myconf} --disable-tcl" + + myconf="${myconf} $(use_enable java)" + if use java; then + myconf="${myconf} --with-java-prefix=${JAVA_HOME}" + # Can't get this working any other way, since it returns spaces, and + # bash doesn't seem to want to pass correctly in any way i try + local javaconf="-with-javac-flags=$(java-pkg_javac-args)" + fi + + [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}" + + # the entire testsuite needs the TCL functionality + if use tcl && use test ; then + myconf="${myconf} --enable-test" + else + myconf="${myconf} --disable-test" + fi + + # Add linker versions to the symbols. Easier to do, and safer than header file + # mumbo jumbo. + if use userland_GNU; then + append-ldflags -Wl,--default-symver + fi + + cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --datadir=/usr/share \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --libdir=/usr/"$(get_libdir)" \ + --enable-compat185 \ + --enable-o_direct \ + --without-uniquename \ + $(use arm && echo --with-mutex=ARM/gcc-assembly) \ + --enable-rpc \ + --host="${CHOST}" \ + ${myconf} "${javaconf}" || die "configure failed" + + sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \ + && mv Makefile.cpy Makefile + + emake || die "make failed" +} + +src_install() { + einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die + + db_src_install_usrbinslot + + db_src_install_headerslot + + db_src_install_doc + + db_src_install_usrlibcleanup + + dodir /usr/sbin + # This file is not always built, and no longer exists as of db-4.8 + [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ + mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + + if use java; then + java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so + java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar + rm -f "${D}"/usr/"$(get_libdir)"/*.jar + fi +} + +pkg_postinst() { + db_fix_so +} + +pkg_postrm() { + db_fix_so +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.7.25_p4-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.7.25_p4-r4.ebuild new file mode 100644 index 0000000000..0eeb68c69a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.7.25_p4-r4.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p4.ebuild,v 1.13 2010/01/24 18:29:31 armin76 Exp $ + +inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool binutils-funcs + +#Number of official patches +#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` +PATCHNO=${PV/*.*.*_p} +if [[ ${PATCHNO} == "${PV}" ]] ; then + MY_PV=${PV} + MY_P=${P} + PATCHNO=0 +else + MY_PV=${PV/_p${PATCHNO}} + MY_P=${PN}-${MY_PV} +fi + +S="${WORKDIR}/${MY_P}/build_unix" +DESCRIPTION="Oracle Berkeley DB" +HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" + +LICENSE="OracleDB" +SLOT="4.7" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="doc java nocxx tcl test" + +# the entire testsuite needs the TCL functionality +DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) + test? ( >=dev-lang/tcl-8.4 ) + java? ( >=virtual/jdk-1.5 ) + >=sys-devel/binutils-2.16.1" +RDEPEND="tcl? ( dev-lang/tcl ) + java? ( >=virtual/jre-1.5 )" + +src_unpack() { + unpack "${MY_P}".tar.gz + cd "${WORKDIR}"/"${MY_P}" + for (( i=1 ; i<=${PATCHNO} ; i++ )) + do + epatch "${FILESDIR}"/patch."${MY_PV}"."${i}" + done + epatch "${FILESDIR}"/"${PN}"-4.6-libtool.patch + + # use the includes from the prefix + epatch "${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch + epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch + + sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE + + # Include the SLOT for Java JAR files + # This supersedes the unused jarlocation patches. + sed -r -i \ + -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ + "${S}"/../dist/Makefile.in + + cd "${S}"/../dist + rm -f aclocal/libtool.m4 + sed -i \ + -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ + configure.ac + sed -i \ + -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ + aclocal/programs.m4 + AT_M4DIR="aclocal aclocal_java" eautoreconf + # Upstream sucks - they do autoconf and THEN replace the version variables. + . ./RELEASE + sed -i \ + -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure +} + +src_compile() { + if use arm ; then + append-cflags "-marm" + appennd-cxxflags "-marm" + fi + + local myconf='' + + # compilation with -O0 fails on amd64, see bug #171231 + if use amd64; then + replace-flags -O0 -O2 + is-flagq -O[s123] || append-flags -O2 + fi + + # use `set` here since the java opts will contain whitespace + set -- + if use java ; then + set -- "$@" \ + --with-java-prefix="${JAVA_HOME}" \ + --with-javac-flags="$(java-pkg_javac-args)" + fi + + # Add linker versions to the symbols. Easier to do, and safer than header file + # mumbo jumbo. + if use userland_GNU ; then + append-ldflags -Wl,--default-symver + # gold doesn't support --default-symver so force GNU ld + tc-export CC CXX LD + LD="$(get_binutils_path_ld)/ld" + CC="${CC} -B$(get_binutils_path_ld)" + CXX="${CXX} -B$(get_binutils_path_ld)" + fi + + # Bug #270851: test needs TCL support + if use tcl || use test ; then + myconf="${myconf} --enable-tcl" + myconf="${myconf} --with-tcl=/usr/$(get_libdir)" + else + myconf="${myconf} --disable-tcl" + fi + + cd "${S}" + ECONF_SOURCE="${S}"/../dist \ + STRIP="true" \ + econf \ + --enable-compat185 \ + --enable-o_direct \ + --without-uniquename \ + --enable-rpc \ + $(use arm && echo --with-mutex=ARM/gcc-assembly) \ + $(use amd64 && echo --with-mutex=x86/gcc-assembly) \ + $(use_enable !nocxx cxx) \ + $(use_enable java) \ + ${myconf} \ + $(use_enable test) \ + "$@" + + emake || die "make failed" +} + +src_install() { + emake install DESTDIR="${D}" || die + + db_src_install_usrbinslot + + db_src_install_headerslot + + db_src_install_doc + + db_src_install_usrlibcleanup + + dodir /usr/sbin + # This file is not always built, and no longer exists as of db-4.8 + [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ + mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + + if use java; then + java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so + java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar + rm -f "${D}"/usr/"$(get_libdir)"/*.jar + fi +} + +pkg_postinst() { + db_fix_so +} + +pkg_postrm() { + db_fix_so +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-1.85-gentoo-paths.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-1.85-gentoo-paths.patch new file mode 100644 index 0000000000..4a65106bdc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-1.85-gentoo-paths.patch @@ -0,0 +1,29 @@ +--- PORT/linux/Makefile ++++ PORT/linux/Makefile +@@ -1,12 +1,12 @@ + # @(#)Makefile 8.9 (Berkeley) 7/14/94 + +-LIBDB= libdb.a +-LIBDBSO=libdb.so ++LIBDB= libdb1.a ++LIBDBSO=libdb1.so + SOVER=2 + SONAME=$(LIBDBSO).$(SOVER) + LIBNDBM=libndbm.a + LIBNDBMSO=libndbm.so +-PROG= db_dump185 ++PROG= db1_dump185 + OBJ1= hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o \ + ndbm.o + OBJ2= bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o \ +@@ -27,8 +27,8 @@ + DESTDIR = + prefix = /usr + bindir = $(prefix)/bin +-libdir = $(prefix)/lib +-includedir = $(prefix)/include ++libdir = $(prefix)/@GENTOO_LIBDIR@ ++includedir = $(prefix)/include/db1 + + all: $(LIBDB) $(LIBDBSO) $(PROG) + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-fix-dep-link.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-fix-dep-link.patch new file mode 100644 index 0000000000..cdf6599b0d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-fix-dep-link.patch @@ -0,0 +1,26 @@ +--- db-3.2.9/dist/Makefile.in.orig 2003-02-23 23:41:13.000000000 +0200 ++++ db-3.2.9/dist/Makefile.in 2003-02-23 23:42:07.000000000 +0200 +@@ -240,19 +240,19 @@ + + $(libso_target): $(OBJS) + $(SOLINK) $(SOFLAGS) -o $(libso_target) \ +- $(OBJS) $(LDFLAGS) $(LIBSO_LIBS) ++ $(OBJS) $(LDFLAGS) $(LIBS) $(LIBSO_LIBS) + + $(libxso_target): $(COBJS) $(OBJS) + $(SOLINK) $(SOFLAGS) -o $(libxso_target) \ +- $(COBJS) $(OBJS) $(LDFLAGS) $(LIBXSO_LIBS) ++ $(COBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBXSO_LIBS) + + $(libjso_target): $(JOBJS) $(OBJS) + $(SOLINK) $(SOFLAGS) -o $(libjso_target) \ +- $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBJSO_LIBS) ++ $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBJSO_LIBS) + + $(libtso_target): $(TOBJS) $(OBJS) + $(SOLINK) $(SOFLAGS) -o $(libtso_target) \ +- $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBTSO_LIBS) ++ $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBTSO_LIBS) + + ################################################## + # Creating individual dependencies and actions for building class diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-gcc43.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-gcc43.patch new file mode 100644 index 0000000000..f032da8529 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-gcc43.patch @@ -0,0 +1,16 @@ +diff -Nuar db-3.2.9.orig/include/db_cxx.h db-3.2.9/include/db_cxx.h +--- db-3.2.9.orig/include/db_cxx.h 2001-01-11 10:28:55.000000000 -0800 ++++ db-3.2.9/include/db_cxx.h 2008-08-16 16:10:48.474699646 -0700 +@@ -49,7 +49,12 @@ + // Forward declarations + // + ++#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) ++using namespace std; ++#include ++#else + #include ++#endif + #include + #include "db.h" + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-jarlocation.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-jarlocation.patch new file mode 100644 index 0000000000..0654e2ef48 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-jarlocation.patch @@ -0,0 +1,12 @@ +diff -ur db-3.2.9.old/dist/Makefile.in db-3.2.9/dist/Makefile.in +--- db-3.2.9.old/dist/Makefile.in 2003-10-18 02:21:18.000000000 -0700 ++++ db-3.2.9/dist/Makefile.in 2003-10-18 02:22:14.000000000 -0700 +@@ -72,7 +72,7 @@ + JAVA_DBDIR= $(JAVA_SRCDIR)/$(JAVA_DBREL) + JAVA_EXDIR= $(JAVA_SRCDIR)/com/sleepycat/examples + +-libj_jarfile= db.jar ++libj_jarfile= db-$(SOVERSION).jar + libjso_base= libdb_java + libjso= $(libjso_base)-$(SOVERSION).@SOSUFFIX@ + libjso_target= $(libjso_base)-$(SOVERSION).la diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-java15.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-java15.patch new file mode 100644 index 0000000000..5482831e31 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-java15.patch @@ -0,0 +1,15 @@ +--- db-3.2.9/java/src/com/sleepycat/db/DbEnv.java.orig 2005-03-10 18:30:19.705147736 +0000 ++++ db-3.2.9/java/src/com/sleepycat/db/DbEnv.java 2005-03-10 18:03:07.930215232 +0000 +@@ -78,9 +78,9 @@ + // + /*package*/ void _notify_dbs() + { +- Enumeration enum = dblist_.elements(); +- while (enum.hasMoreElements()) { +- Db db = (Db)enum.nextElement(); ++ Enumeration en = dblist_.elements(); ++ while (en.hasMoreElements()) { ++ Db db = (Db)en.nextElement(); + db._notify_dbenv_close(); + } + dblist_.removeAllElements(); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-fix-dep-link.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-fix-dep-link.patch new file mode 100644 index 0000000000..f54f064640 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-fix-dep-link.patch @@ -0,0 +1,38 @@ +--- db-4.0.14/dist/Makefile.in.orig 2003-08-16 06:21:53.763400112 +0200 ++++ db-4.0.14/dist/Makefile.in 2003-08-16 06:23:16.036892640 +0200 +@@ -58,7 +58,7 @@ + + LDFLAGS= @LDFLAGS@ + LIBS= @LIBS@ +-LIBSO_LIBS= @LIBSO_LIBS@ ++LIBSO_LIBS= @LIBSO_LIBS@ $(LIBS) + + libdb= libdb.a + libso_base= libdb +@@ -77,7 +77,7 @@ + CXX= @MAKEFILE_CXX@ + CXXLINK= @MAKEFILE_CXXLINK@ + XSOLINK= @MAKEFILE_XSOLINK@ +-LIBXSO_LIBS= @LIBXSO_LIBS@ ++LIBXSO_LIBS= @LIBXSO_LIBS@ $(LIBS) + + libcxx= libdb_cxx.a + libxso_base= libdb_cxx +@@ -93,7 +93,7 @@ + # Java support is optional and requires shared librarires. + ################################################## + CLASSPATH= $(JAVA_CLASSTOP) +-LIBJSO_LIBS= @LIBJSO_LIBS@ ++LIBJSO_LIBS= @LIBJSO_LIBS@ $(LIBS) + + JAR= @JAR@ + JAVAC= env CLASSPATH="$(CLASSPATH)" @JAVAC@ +@@ -121,7 +121,7 @@ + # Tcl support is optional and requires shared libraries. + ################################################## + TCFLAGS= @TCFLAGS@ +-LIBTSO_LIBS= @LIBTSO_LIBS@ ++LIBTSO_LIBS= @LIBTSO_LIBS@ $(LIBS) + libtso_base= libdb_tcl + libtso= $(libtso_base)-$(SOVERSION).@SOSUFFIX@ + libtso_static= $(libtso_base)-$(SOVERSION).a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-jarlocation.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-jarlocation.patch new file mode 100644 index 0000000000..667a32b20d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-jarlocation.patch @@ -0,0 +1,14 @@ +diff -ur db-4.0.14.old/dist/Makefile.in db-4.0.14/dist/Makefile.in +--- db-4.0.14.old/dist/Makefile.in 2003-10-18 02:24:50.000000000 -0700 ++++ db-4.0.14/dist/Makefile.in 2003-10-18 02:25:18.000000000 -0700 +@@ -105,8 +105,8 @@ + JAVA_DBDIR= $(JAVA_SRCDIR)/$(JAVA_DBREL) + JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL) + +-libj_jarfile= db.jar +-libj_exjarfile= dbexamples.jar ++libj_jarfile= db-$(SOVERSION).jar ++libj_exjarfile= dbexamples-$(SOVERSION).jar + libjso_base= libdb_java + libjso= $(libjso_base)-$(SOVERSION).@SOSUFFIX@ + libjso_static= $(libjso_base)-$(SOVERSION).a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jarlocation.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jarlocation.patch new file mode 100644 index 0000000000..600f48a3a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jarlocation.patch @@ -0,0 +1,16 @@ +diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in +--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700 ++++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700 +@@ -107,9 +107,9 @@ + JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL) + JAVA_RPCDIR= $(srcdir)/rpc_server/java + +-libj_jarfile= db.jar +-libj_exjarfile= dbexamples.jar +-rpc_jarfile= dbsvc.jar ++libj_jarfile= db-4.2.jar ++libj_exjarfile= dbexamples-4.2.jar ++rpc_jarfile= dbsvc-4.2.jar + libjso_base= libdb_java + libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@ + libjso_static= $(libjso_base)-$(SOVERSION).a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch new file mode 100644 index 0000000000..17f80e1bcf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch @@ -0,0 +1,30 @@ +--- dist/aclocal_java/ac_jni_include_dirs.ac 2003-10-06 20:41:38.000000000 +0200 ++++ dist/aclocal_java/ac_jni_include_dirs.ac 2005-09-23 21:31:26.000000000 +0200 +@@ -43,14 +43,19 @@ + *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; + esac + +-_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") +-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` +-case "$host_os" in +- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` +- _JINC="$_JTOPDIR/Headers";; +- *) _JINC="$_JTOPDIR/include";; +-esac +- ++# If JAVAPREFIX is defined, look there first ++if test -r "$JAVAPREFIX/include/jni.h"; then ++ _JTOPDIR="$JAVAPREFIX" ++ _JINC="$JAVAPREFIX/include" ++else ++ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") ++ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` ++ case "$host_os" in ++ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` ++ _JINC="$_JTOPDIR/Headers";; ++ *) _JINC="$_JTOPDIR/include";; ++ esac ++fi + # If we find jni.h in /usr/include, then it's not a java-only tree, so + # don't add /usr/include or subdirectories to the list of includes. + # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-libtool.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-libtool.patch new file mode 100644 index 0000000000..a4a9db7f45 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-libtool.patch @@ -0,0 +1,20 @@ +--- ./dist/configure.orig 2004-09-22 22:58:48.421632944 -0700 ++++ ./dist/configure 2004-09-22 23:02:55.068136976 -0700 +@@ -5657,7 +5657,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +-case `"$LD" -v 2>&1 &1 &6 + else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +-case `"$LD" -v 2>&1 &1 &6 + else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -11383,7 +11383,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -17695,7 +17695,7 @@ + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ="$tmp_archive_cmds" + supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3-listen-to-java-options.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3-listen-to-java-options.patch new file mode 100644 index 0000000000..8ddb46b702 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3-listen-to-java-options.patch @@ -0,0 +1,10 @@ +--- dist/configure.ac 2005-09-23 21:01:26.000000000 +0200 ++++ dist/configure.ac 2005-09-23 20:59:20.000000000 +0200 +@@ -385,6 +385,7 @@ + # A classpath that includes . is needed to check for Java + CLASSPATH=".:$CLASSPATH" + export CLASSPATH ++ AC_JAVA_OPTIONS + AC_PROG_JAVAC + AC_PROG_JAR + AC_PROG_JAVA diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3.27-fix-dep-link.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3.27-fix-dep-link.patch new file mode 100644 index 0000000000..1d14e83d07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3.27-fix-dep-link.patch @@ -0,0 +1,38 @@ +--- db-4.3.27/dist/Makefile.in.chris 2005-02-01 23:40:34.447945464 +0100 ++++ db-4.3.27/dist/Makefile.in 2005-02-01 23:42:21.635650456 +0100 +@@ -58,7 +58,7 @@ + LDFLAGS= @LDFLAGS@ + LIBS= @LIBS@ + TEST_LIBS= @TEST_LIBS@ +-LIBSO_LIBS= @LIBSO_LIBS@ ++LIBSO_LIBS= @LIBSO_LIBS@ $(LIBS) + + libdb_base= libdb + libdb= $(libdb_base).a +@@ -77,7 +77,7 @@ + CXX= @MAKEFILE_CXX@ + CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ + XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@ +-LIBXSO_LIBS= @LIBXSO_LIBS@ ++LIBXSO_LIBS= @LIBXSO_LIBS@ $(LIBS) + + libcxx_base= libdb_cxx + libcxx= $(libcxx_base).a +@@ -93,7 +93,7 @@ + # Java support is optional and requires shared librarires. + ################################################## + CLASSPATH= $(JAVA_CLASSTOP) +-LIBJSO_LIBS= @LIBJSO_LIBS@ ++LIBJSO_LIBS= @LIBJSO_LIBS@ $(LIBS) + + JAR= @JAR@ + JAVAC= env CLASSPATH="$(CLASSPATH)" @JAVAC@ +@@ -126,7 +126,7 @@ + # Tcl support is optional and requires shared libraries. + ################################################## + TCFLAGS= @TCFLAGS@ +-LIBTSO_LIBS= @LIBTSO_LIBS@ ++LIBTSO_LIBS= @LIBTSO_LIBS@ $(LIBS) + libtso_base= libdb_tcl + libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ + libtso_static= $(libtso_base)-$(LIBVERSION).a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-jarlocation.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-jarlocation.patch new file mode 100644 index 0000000000..2d4bd4e460 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-jarlocation.patch @@ -0,0 +1,16 @@ +diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in +--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700 ++++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700 +@@ -107,9 +107,9 @@ + JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL) + JAVA_RPCDIR= $(srcdir)/rpc_server/java + +-libj_jarfile= db.jar +-libj_exjarfile= dbexamples.jar +-rpc_jarfile= dbsvc.jar ++libj_jarfile= db-4.5.jar ++libj_exjarfile= dbexamples-4.5.jar ++rpc_jarfile= dbsvc-4.5.jar + libjso_base= libdb_java + libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@ + libjso_static= $(libjso_base)-$(SOVERSION).a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-libtool.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-libtool.patch new file mode 100644 index 0000000000..3d86b88f86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-libtool.patch @@ -0,0 +1,47 @@ +--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100 ++++ dist/configure 2006-01-31 10:26:43.000000000 +0100 +@@ -5765,7 +5765,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -11855,7 +11855,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -18300,7 +18300,7 @@ + whole_archive_flag_spec_GCJ= + fi + supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-jarlocation.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-jarlocation.patch new file mode 100644 index 0000000000..c0d689f436 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-jarlocation.patch @@ -0,0 +1,16 @@ +diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in +--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700 ++++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700 +@@ -107,9 +107,9 @@ + JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL) + JAVA_RPCDIR= $(srcdir)/rpc_server/java + +-libj_jarfile= db.jar +-libj_exjarfile= dbexamples.jar +-rpc_jarfile= dbsvc.jar ++libj_jarfile= db-4.4.jar ++libj_exjarfile= dbexamples-4.4.jar ++rpc_jarfile= dbsvc-4.4.jar + libjso_base= libdb_java + libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@ + libjso_static= $(libjso_base)-$(SOVERSION).a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-libtool.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-libtool.patch new file mode 100644 index 0000000000..3d86b88f86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-libtool.patch @@ -0,0 +1,47 @@ +--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100 ++++ dist/configure 2006-01-31 10:26:43.000000000 +0100 +@@ -5765,7 +5765,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -11855,7 +11855,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -18300,7 +18300,7 @@ + whole_archive_flag_spec_GCJ= + fi + supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jarlocation.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jarlocation.patch new file mode 100644 index 0000000000..c0d689f436 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jarlocation.patch @@ -0,0 +1,16 @@ +diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in +--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700 ++++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700 +@@ -107,9 +107,9 @@ + JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL) + JAVA_RPCDIR= $(srcdir)/rpc_server/java + +-libj_jarfile= db.jar +-libj_exjarfile= dbexamples.jar +-rpc_jarfile= dbsvc.jar ++libj_jarfile= db-4.4.jar ++libj_exjarfile= dbexamples-4.4.jar ++rpc_jarfile= dbsvc-4.4.jar + libjso_base= libdb_java + libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@ + libjso_static= $(libjso_base)-$(SOVERSION).a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch new file mode 100644 index 0000000000..63735e6246 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch @@ -0,0 +1,30 @@ +--- dist/aclocal_java/ac_jni_include_dirs.m4 2003-10-06 20:41:38.000000000 +0200 ++++ dist/aclocal_java/ac_jni_include_dirs.m4 2005-09-23 21:31:26.000000000 +0200 +@@ -43,14 +43,19 @@ + *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; + esac + +-_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") +-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` +-case "$host_os" in +- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` +- _JINC="$_JTOPDIR/Headers";; +- *) _JINC="$_JTOPDIR/include";; +-esac +- ++# If JAVAPREFIX is defined, look there first ++if test -r "$JAVAPREFIX/include/jni.h"; then ++ _JTOPDIR="$JAVAPREFIX" ++ _JINC="$JAVAPREFIX/include" ++else ++ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") ++ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` ++ case "$host_os" in ++ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` ++ _JINC="$_JTOPDIR/Headers";; ++ *) _JINC="$_JTOPDIR/include";; ++ esac ++fi + # If we find jni.h in /usr/include, then it's not a java-only tree, so + # don't add /usr/include or subdirectories to the list of includes. + # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-libtool.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-libtool.patch new file mode 100644 index 0000000000..3d86b88f86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-libtool.patch @@ -0,0 +1,47 @@ +--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100 ++++ dist/configure 2006-01-31 10:26:43.000000000 +0100 +@@ -5765,7 +5765,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -11855,7 +11855,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 /dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -18300,7 +18300,7 @@ + whole_archive_flag_spec_GCJ= + fi + supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in ++ case `"$LD" -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.8-libtool.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.8-libtool.patch new file mode 100644 index 0000000000..f5d985b2f2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.8-libtool.patch @@ -0,0 +1,65 @@ +--- dist/configure ++++ dist/configure +@@ -6691,7 +6691,7 @@ + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 &1` in ++ case `"$LD" -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -10858,7 +10858,7 @@ + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in ++ case `"$LD" -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 +@@ -12206,7 +12206,7 @@ + libsuff= shlibsuff= + ;; + *) +- case $LD in # libtool.m4 will add one of these switches to LD ++ case "$LD" in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +@@ -13423,7 +13423,7 @@ + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &1 dbentry[i].dblist); + else + TAILQ_REINSERT_HEAD( +! &logp->dbentry[i].dblist, dbp, links); + } + + /* Initialize the new entries. */ +--- 404,410 ---- + TAILQ_INIT(&logp->dbentry[i].dblist); + else + TAILQ_REINSERT_HEAD( +! &logp->dbentry[i].dblist, dbtmp, links); + } + + /* Initialize the new entries. */ + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.1 b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.1 new file mode 100644 index 0000000000..3c7e23ce07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.1 @@ -0,0 +1,75 @@ +*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 +--- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 +*************** +*** 187,193 **** + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! if (DB_IS_READONLY(dbp)) { + ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); + goto err; + } +--- 187,197 ---- + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! /* +! * We can let replication clients open sequences, but must +! * check later that they do not update them. +! */ +! if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); + goto err; + } +*************** +*** 244,249 **** +--- 248,258 ---- + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +*************** +*** 296,302 **** + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: rp->seq_version = DB_SEQUENCE_VERSION; + if (!F_ISSET(env, ENV_LITTLEENDIAN)) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +--- 305,316 ---- + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: if (IS_REP_CLIENT(env) && +! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { +! ret = __db_rdonly(env, "DB_SEQUENCE->open"); +! goto err; +! } +! rp->seq_version = DB_SEQUENCE_VERSION; + if (!F_ISSET(env, ENV_LITTLEENDIAN)) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +*************** +*** 707,712 **** +--- 721,733 ---- + + MUTEX_LOCK(env, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(env, "Sequence overflow"); + ret = EINVAL; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.2 b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.2 new file mode 100644 index 0000000000..1f42dcec71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.2 @@ -0,0 +1,71 @@ +Index: lock/lock.c +=================================================================== +RCS file: /a/CVSROOT/db/lock/lock.c,v +retrieving revision 12.61 +diff -c -r12.61 lock.c +*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 +--- lock/lock.c 19 Aug 2008 17:28:24 -0000 +*************** +*** 1278,1287 **** + SH_TAILQ_REMOVE( + <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); + if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { +! LOCK_REGION_LOCK(env); + __env_alloc_free(<->reginfo, + SH_DBT_PTR(&sh_obj->lockobj)); +! LOCK_REGION_UNLOCK(env); + } + SH_TAILQ_INSERT_HEAD( + &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); +--- 1278,1289 ---- + SH_TAILQ_REMOVE( + <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); + if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { +! if (region->part_t_size != 1) +! LOCK_REGION_LOCK(env); + __env_alloc_free(<->reginfo, + SH_DBT_PTR(&sh_obj->lockobj)); +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + } + SH_TAILQ_INSERT_HEAD( + &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); +*************** +*** 1470,1484 **** + if (obj->size <= sizeof(sh_obj->objdata)) + p = sh_obj->objdata; + else { +! LOCK_REGION_LOCK(env); + if ((ret = + __env_alloc(<->reginfo, obj->size, &p)) != 0) { + __db_errx(env, + "No space for lock object storage"); +! LOCK_REGION_UNLOCK(env); + goto err; + } +! LOCK_REGION_UNLOCK(env); + } + + memcpy(p, obj->data, obj->size); +--- 1472,1492 ---- + if (obj->size <= sizeof(sh_obj->objdata)) + p = sh_obj->objdata; + else { +! /* +! * If we have only one partition, the region is locked. +! */ +! if (region->part_t_size != 1) +! LOCK_REGION_LOCK(env); + if ((ret = + __env_alloc(<->reginfo, obj->size, &p)) != 0) { + __db_errx(env, + "No space for lock object storage"); +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + goto err; + } +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + } + + memcpy(p, obj->data, obj->size); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.3 b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.3 new file mode 100644 index 0000000000..b58a43074f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.3 @@ -0,0 +1,314 @@ +*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 +--- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 +*************** +*** 121,127 **** + DB_LOCKTAB *lt; + db_timespec now; + locker_info *idmap; +! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; + u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; + u_int32_t lock_max, txn_max; + int ret, status; +--- 121,127 ---- + DB_LOCKTAB *lt; + db_timespec now; + locker_info *idmap; +! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; + u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; + u_int32_t lock_max, txn_max; + int ret, status; +*************** +*** 133,139 **** + if (IS_REP_CLIENT(env)) + atype = DB_LOCK_MINWRITE; + +! free_me = NULL; + + lt = env->lk_handle; + if (rejectp != NULL) +--- 133,140 ---- + if (IS_REP_CLIENT(env)) + atype = DB_LOCK_MINWRITE; + +! copymap = tmpmap = NULL; +! deadlist = NULL; + + lt = env->lk_handle; + if (rejectp != NULL) +*************** +*** 179,189 **** + memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); + + if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) +! goto err1; + + /* Find a deadlock. */ + if ((ret = +! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) + return (ret); + + /* +--- 180,190 ---- + memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); + + if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) +! goto err; + + /* Find a deadlock. */ + if ((ret = +! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) + return (ret); + + /* +*************** +*** 204,211 **** + txn_max = TXN_MAXIMUM; + + killid = BAD_KILLID; +! free_me = deadp; +! for (; *deadp != NULL; deadp++) { + if (rejectp != NULL) + ++*rejectp; + killid = (u_int32_t)(*deadp - bitmap) / nalloc; +--- 205,211 ---- + txn_max = TXN_MAXIMUM; + + killid = BAD_KILLID; +! for (deadp = deadlist; *deadp != NULL; deadp++) { + if (rejectp != NULL) + ++*rejectp; + killid = (u_int32_t)(*deadp - bitmap) / nalloc; +*************** +*** 342,352 **** + __db_msg(env, + "Aborting locker %lx", (u_long)idmap[killid].id); + } +! __os_free(env, tmpmap); +! err1: __os_free(env, copymap); +! +! err: if (free_me != NULL) +! __os_free(env, free_me); + __os_free(env, bitmap); + __os_free(env, idmap); + +--- 342,353 ---- + __db_msg(env, + "Aborting locker %lx", (u_long)idmap[killid].id); + } +! err: if(copymap != NULL) +! __os_free(env, copymap); +! if (deadlist != NULL) +! __os_free(env, deadlist); +! if(tmpmap != NULL) +! __os_free(env, tmpmap); + __os_free(env, bitmap); + __os_free(env, idmap); + +*************** +*** 360,365 **** +--- 361,377 ---- + + #define DD_INVALID_ID ((u_int32_t) -1) + ++ /* ++ * __dd_build -- ++ * Build the lock dependency bit maps. ++ * Notes on syncronization: ++ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have ++ * a single partition. ++ * LOCK_LOCKERS is held while we are walking the lockers list and ++ * to single thread the use of lockerp->dd_id. ++ * LOCK_DD protects the DD list of objects. ++ */ ++ + static int + __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) + ENV *env; +*************** +*** 393,398 **** +--- 405,411 ---- + * In particular we do not build the conflict array and our caller + * needs to expect this. + */ ++ LOCK_SYSTEM_LOCK(lt, region); + if (atype == DB_LOCK_EXPIRE) { + skip: LOCK_DD(env, region); + op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); +*************** +*** 430,446 **** + OBJECT_UNLOCK(lt, region, indx); + } + UNLOCK_DD(env, region); + goto done; + } + + /* +! * We'll check how many lockers there are, add a few more in for +! * good measure and then allocate all the structures. Then we'll +! * verify that we have enough room when we go back in and get the +! * mutex the second time. + */ +! retry: count = region->stat.st_nlockers; + if (count == 0) { + *nlockers = 0; + return (0); + } +--- 443,460 ---- + OBJECT_UNLOCK(lt, region, indx); + } + UNLOCK_DD(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + goto done; + } + + /* +! * Allocate after locking the region +! * to make sure the structures are large enough. + */ +! LOCK_LOCKERS(env, region); +! count = region->stat.st_nlockers; + if (count == 0) { ++ UNLOCK_LOCKERS(env, region); + *nlockers = 0; + return (0); + } +*************** +*** 448,497 **** + if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) + __db_msg(env, "%lu lockers", (u_long)count); + +- count += 20; + nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; + +! /* +! * Allocate enough space for a count by count bitmap matrix. +! * +! * XXX +! * We can probably save the malloc's between iterations just +! * reallocing if necessary because count grew by too much. +! */ + if ((ret = __os_calloc(env, (size_t)count, +! sizeof(u_int32_t) * nentries, &bitmap)) != 0) + return (ret); + + if ((ret = __os_calloc(env, + sizeof(u_int32_t), nentries, &tmpmap)) != 0) { + __os_free(env, bitmap); + return (ret); + } + + if ((ret = __os_calloc(env, + (size_t)count, sizeof(locker_info), &id_array)) != 0) { + __os_free(env, bitmap); + __os_free(env, tmpmap); + return (ret); + } + + /* +- * Now go back in and actually fill in the matrix. +- */ +- if (region->stat.st_nlockers > count) { +- __os_free(env, bitmap); +- __os_free(env, tmpmap); +- __os_free(env, id_array); +- goto retry; +- } +- +- /* + * First we go through and assign each locker a deadlock detector id. + */ + id = 0; +- LOCK_LOCKERS(env, region); + SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { + if (lip->master_locker == INVALID_ROFF) { + lip->dd_id = id++; + id_array[lip->dd_id].id = lip->id; + switch (atype) { +--- 462,498 ---- + if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) + __db_msg(env, "%lu lockers", (u_long)count); + + nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; + +! /* Allocate enough space for a count by count bitmap matrix. */ + if ((ret = __os_calloc(env, (size_t)count, +! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { +! UNLOCK_LOCKERS(env, region); + return (ret); ++ } + + if ((ret = __os_calloc(env, + sizeof(u_int32_t), nentries, &tmpmap)) != 0) { ++ UNLOCK_LOCKERS(env, region); + __os_free(env, bitmap); + return (ret); + } + + if ((ret = __os_calloc(env, + (size_t)count, sizeof(locker_info), &id_array)) != 0) { ++ UNLOCK_LOCKERS(env, region); + __os_free(env, bitmap); + __os_free(env, tmpmap); + return (ret); + } + + /* + * First we go through and assign each locker a deadlock detector id. + */ + id = 0; + SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { + if (lip->master_locker == INVALID_ROFF) { ++ DB_ASSERT(env, id < count); + lip->dd_id = id++; + id_array[lip->dd_id].id = lip->id; + switch (atype) { +*************** +*** 510,516 **** + lip->dd_id = DD_INVALID_ID; + + } +- UNLOCK_LOCKERS(env, region); + + /* + * We only need consider objects that have waiters, so we use +--- 511,516 ---- +*************** +*** 669,675 **** + * status after building the bit maps so that we will not detect + * a blocked transaction without noting that it is already aborting. + */ +- LOCK_LOCKERS(env, region); + for (id = 0; id < count; id++) { + if (!id_array[id].valid) + continue; +--- 669,674 ---- +*************** +*** 738,743 **** +--- 737,743 ---- + id_array[id].in_abort = 1; + } + UNLOCK_LOCKERS(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + + /* + * Now we can release everything except the bitmap matrix that we +*************** +*** 839,844 **** +--- 839,845 ---- + ret = 0; + + /* We must lock so this locker cannot go away while we abort it. */ ++ LOCK_SYSTEM_LOCK(lt, region); + LOCK_LOCKERS(env, region); + + /* +*************** +*** 895,900 **** +--- 896,902 ---- + done: OBJECT_UNLOCK(lt, region, info->last_ndx); + err: + out: UNLOCK_LOCKERS(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + return (ret); + } + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.4 b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.4 new file mode 100644 index 0000000000..2f6bded4f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.4 @@ -0,0 +1,183 @@ +*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 +--- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 374,379 **** +--- 374,380 ---- + #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) + #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) + #define IS_VALID_EID(e) ((e) >= 0) ++ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) + #define SELF_EID INT_MAX + + #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ +*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 +--- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 +*************** +*** 33,39 **** + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); + + /* + * __rep_elect -- +--- 33,39 ---- + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); + + /* + * __rep_elect -- +*************** +*** 55,61 **** + ENV *env; + LOG *lp; + REP *rep; +! int done, eid, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +--- 55,61 ---- + ENV *env; + LOG *lp; + REP *rep; +! int done, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +*************** +*** 181,188 **** + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, &eid, +! 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +--- 181,187 ---- + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +*************** +*** 286,296 **** + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +--- 285,295 ---- + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (!IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +*************** +*** 398,412 **** + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! if (eid != DB_EID_INVALID) +! goto edone; +! ret = DB_REP_UNAVAIL; +! break; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +--- 397,408 ---- + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! goto edone; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +*************** +*** 1050,1062 **** + ENV *env; + REP *rep; + { +- /* +- * We often come through here twice, sometimes even more. We mustn't +- * let the redundant calls affect stats counting. But rep_elect relies +- * on this first part for setting eidp. +- */ +- rep->master_id = rep->eid; +- + if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { + /* We've been through here already; avoid double counting. */ + return; +--- 1046,1051 ---- +*************** +*** 1093,1102 **** + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, eidp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int *eidp, full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +--- 1082,1091 ---- + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +*************** +*** 1174,1180 **** + F_CLR(rep, REP_F_EGENUPDATE); + ret = DB_REP_EGENCHG; + } else if (phase_over) { +- *eidp = rep->master_id; + done = 1; + ret = 0; + } +--- 1163,1168 ---- +*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 +--- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 100,105 **** +--- 100,107 ---- + control, rec, &nsites_sent, &npeers_sent)) != 0) + goto out; + } else { ++ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); ++ + /* + * If this is a request that can be sent anywhere, then see if + * we can send it to our peer (to save load on the master), but diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/db/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/metadata.xml new file mode 100644 index 0000000000..b37740fa96 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/db/metadata.xml @@ -0,0 +1,34 @@ + + + +base-system + + + pauldv@gentoo.org + Paul de Vrieze + Making db4 work with gentoo + + + + caleb@gentoo.org + Caleb Tennis + + + +The Berkeley Database (Berkeley DB) is a programmatic toolkit +that provides embedded database support for both traditional and client/server +applications. Berkeley DB includes b+tree, queue, extended linear hashing, +fixed, and variable-length record access methods, transactions, locking, +logging, shared memory caching and database recovery. DB supports C, C++, Java, +and Perl APIs. DB is available for a wide variety of UNIX platforms as well as +Windows NT and Windows '95 (MSVC 4, 5 and 6). +De Berkeley Database is een programmatische toolkit +die embedded database support verzorg voor en traditionele en client/server +applicaties. Berkeley DB bevat b+tree, rij, uitgebreide lineaire hashing, vaste +en variabele lengte record toegangsmethoden, transacties, locking, logging, +gedeeld geheugen caching en database herstel. DB ondersteund C, C++, Java en +Perl API's. DB is beschikbaar voor veel UNIX platformen en +Windows. + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/Manifest new file mode 100644 index 0000000000..0557aaa21d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/Manifest @@ -0,0 +1,8 @@ +DIST glibc-2.10.1-patches-6.tar.bz2 113352 RMD160 6874a93e993bb082fc4fd23582b5f6bd1044ec28 SHA1 2448fa11229deeaf7a2135510d35bbdbfe9f31e0 SHA256 36a838d5be4fb96f0471d288f172443df28867c301e7790667e1cb57615e6c04 +DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86e9 SHA1 cb478cf9d6e2c905a1a4f4a2cae44a320b8dc50b SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667 +DIST glibc-2.11-patches-5.tar.bz2 106033 RMD160 57fc0ebbe7e7abf82af90dd8085a0a61a7c3ac8f SHA1 a03b9071d80a094acafbafa621c0033a100a6b87 SHA256 b628984de9123a33d03180ec53472e2f0209dabeadef9561eceee32f4cd9ecbe +DIST glibc-2.11.tar.bz2 15684114 RMD160 817ed8febe8876602d6fe37983505908046d0925 SHA1 f89c0651ca25423523c872a27b0ccf70f5670b6e SHA256 9ef10e498fac4acc458029898fd8fa76c3cedee1f63d23fedf0c579c505ed62c +DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c +DIST glibc-libidn-2.10.1.tar.bz2 102248 RMD160 0fbb3ecc09f59f0b9e90e0669bd9cd6075164173 SHA1 50c1ac0d9ddff6eb83f75aa1c4cb84ba6fffa0cd SHA256 0fa72d1dd06a30642d3bb20a659f4ed0f4af54a205d7102896b68169b38676dc +DIST glibc-ports-2.10.1.tar.bz2 584860 RMD160 1f094d4df18306ccb01037d07f0a0e3014fdfc60 SHA1 3cc9eff22d624c5fb6d951bbcb31b40112238fe7 SHA256 b1f1ec9720036a3a33598b8478eef102535444a083d5b5813a6981ed74ab4071 +DIST glibc-ports-2.11.tar.bz2 599606 RMD160 e7262cb903b42d27bd0666fb170d2abb4c8b478f SHA1 76a0513c74b80e34f81abcaabbc538fa0f33b6a4 SHA256 38d212b1a22ed121c97f2827e7357e3e077084635ebc197246993d328b1b6589 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c new file mode 100644 index 0000000000..37711e8aac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c @@ -0,0 +1,315 @@ +/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Copyright (C) 2006-2008 Gentoo Foundation Inc. + * License terms as above. + * + * Hardened Gentoo SSP and FORTIFY handler + * + * An SSP failure handler that does not use functions from the rest of + * glibc; it uses the INTERNAL_SYSCALL methods directly. This ensures + * no possibility of recursion into the handler. + * + * Direct all bug reports to http://bugs.gentoo.org/ + * + * Re-written from the glibc-2.3 Hardened Gentoo SSP handler + * by Kevin F. Quinn - + * + * The following people contributed to the glibc-2.3 Hardened + * Gentoo SSP and FORTIFY handler, from which this implementation draws much: + * + * Ned Ludd - + * Alexander Gabert - + * The PaX Team - + * Peter S. Mazinger - + * Yoann Vandoorselaere - + * Robert Connolly - + * Cory Visi + * Mike Frysinger + * Magnus Granberg + */ + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include + +#include +/* from sysdeps */ +#include +/* for the stuff in bits/socket.h */ +#include +#include + +/* Sanity check on SYSCALL macro names - force compilation + * failure if the names used here do not exist + */ +#if !defined __NR_socketcall && !defined __NR_socket +# error Cannot do syscall socket or socketcall +#endif +#if !defined __NR_socketcall && !defined __NR_connect +# error Cannot do syscall connect or socketcall +#endif +#ifndef __NR_write +# error Cannot do syscall write +#endif +#ifndef __NR_close +# error Cannot do syscall close +#endif +#ifndef __NR_getpid +# error Cannot do syscall getpid +#endif +#ifndef __NR_kill +# error Cannot do syscall kill +#endif +#ifndef __NR_exit +# error Cannot do syscall exit +#endif +#ifdef SSP_SMASH_DUMPS_CORE +# define ENABLE_SSP_SMASH_DUMPS_CORE 1 +# if !defined _KERNEL_NSIG && !defined _NSIG +# error No _NSIG or _KERNEL_NSIG for rt_sigaction +# endif +# if !defined __NR_sigaction && !defined __NR_rt_sigaction +# error Cannot do syscall sigaction or rt_sigaction +# endif +/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size + * of the _kernel_ sigset_t which is not the same as the user sigset_t. + * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for + * some reason. + */ +# ifdef _KERNEL_NSIG +# define _SSP_NSIG _KERNEL_NSIG +# else +# define _SSP_NSIG _NSIG +# endif +#else +# define _SSP_NSIG 0 +# define ENABLE_SSP_SMASH_DUMPS_CORE 0 +#endif + +/* Define DO_SIGACTION - default to newer rt signal interface but + * fallback to old as needed. + */ +#ifdef __NR_rt_sigaction +# define DO_SIGACTION(signum, act, oldact) \ + INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8) +#else +# define DO_SIGACTION(signum, act, oldact) \ + INLINE_SYSCALL(sigaction, 3, signum, act, oldact) +#endif + +/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */ +#if defined(__NR_socket) && defined(__NR_connect) +# define USE_OLD_SOCKETCALL 0 +#else +# define USE_OLD_SOCKETCALL 1 +#endif + +/* stub out the __NR_'s so we can let gcc optimize away dead code */ +#ifndef __NR_socketcall +# define __NR_socketcall 0 +#endif +#ifndef __NR_socket +# define __NR_socket 0 +#endif +#ifndef __NR_connect +# define __NR_connect 0 +#endif +#define DO_SOCKET(result, domain, type, protocol) \ + do { \ + if (USE_OLD_SOCKETCALL) { \ + socketargs[0] = domain; \ + socketargs[1] = type; \ + socketargs[2] = protocol; \ + socketargs[3] = 0; \ + result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \ + } else \ + result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \ + } while (0) +#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \ + do { \ + if (USE_OLD_SOCKETCALL) { \ + socketargs[0] = sockfd; \ + socketargs[1] = (unsigned long int)serv_addr; \ + socketargs[2] = addrlen; \ + socketargs[3] = 0; \ + result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \ + } else \ + result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \ + } while (0) + +#ifndef _PATH_LOG +# define _PATH_LOG "/dev/log" +#endif + +static const char path_log[] = _PATH_LOG; + +/* For building glibc with SSP switched on, define __progname to a + * constant if building for the run-time loader, to avoid pulling + * in more of libc.so into ld.so + */ +#ifdef IS_IN_rtld +static char *__progname = ""; +#else +extern char *__progname; +#endif + +/* Common handler code, used by chk_fail + * Inlined to ensure no self-references to the handler within itself. + * Data static to avoid putting more than necessary on the stack, + * to aid core debugging. + */ +__attribute__ ((__noreturn__ , __always_inline__)) +static inline void +__hardened_gentoo_chk_fail(char func[], int damaged) +{ +#define MESSAGE_BUFSIZ 256 + static pid_t pid; + static int plen, i; + static char message[MESSAGE_BUFSIZ]; + static const char msg_ssa[] = ": buffer overflow attack"; + static const char msg_inf[] = " in function "; + static const char msg_ssd[] = "*** buffer overflow detected ***: "; + static const char msg_terminated[] = " - terminated\n"; + static const char msg_report[] = "Report to http://bugs.gentoo.org/\n"; + static const char msg_unknown[] = ""; + static int log_socket, connect_result; + static struct sockaddr_un sock; + static unsigned long int socketargs[4]; + + /* Build socket address + */ + sock.sun_family = AF_UNIX; + i = 0; + while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) { + sock.sun_path[i] = path_log[i]; + i++; + } + sock.sun_path[i] = '\0'; + + /* Try SOCK_DGRAM connection to syslog */ + connect_result = -1; + DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0); + if (log_socket != -1) + DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); + if (connect_result == -1) { + if (log_socket != -1) + INLINE_SYSCALL(close, 1, log_socket); + /* Try SOCK_STREAM connection to syslog */ + DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0); + if (log_socket != -1) + DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); + } + + /* Build message. Messages are generated both in the old style and new style, + * so that log watchers that are configured for the old-style message continue + * to work. + */ +#define strconcat(str) \ + {i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \ + {\ + message[plen+i]=str[i];\ + i++;\ + }\ + plen+=i;} + + /* R.Henderson post-gcc-4 style message */ + plen = 0; + strconcat(msg_ssd); + if (__progname != (char *)0) + strconcat(__progname) + else + strconcat(msg_unknown); + strconcat(msg_terminated); + + /* Write out error message to STDERR, to syslog if open */ + INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); + if (connect_result != -1) + INLINE_SYSCALL(write, 3, log_socket, message, plen); + + /* Dr. Etoh pre-gcc-4 style message */ + plen = 0; + if (__progname != (char *)0) + strconcat(__progname) + else + strconcat(msg_unknown); + strconcat(msg_ssa); + strconcat(msg_inf); + if (func != NULL) + strconcat(func) + else + strconcat(msg_unknown); + strconcat(msg_terminated); + /* Write out error message to STDERR, to syslog if open */ + INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); + if (connect_result != -1) + INLINE_SYSCALL(write, 3, log_socket, message, plen); + + /* Direct reports to bugs.gentoo.org */ + plen=0; + strconcat(msg_report); + message[plen++]='\0'; + + /* Write out error message to STDERR, to syslog if open */ + INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); + if (connect_result != -1) + INLINE_SYSCALL(write, 3, log_socket, message, plen); + + if (log_socket != -1) + INLINE_SYSCALL(close, 1, log_socket); + + /* Suicide */ + pid = INLINE_SYSCALL(getpid, 0); + + if (ENABLE_SSP_SMASH_DUMPS_CORE) { + static struct sigaction default_abort_act; + /* Remove any user-supplied handler for SIGABRT, before using it */ + default_abort_act.sa_handler = SIG_DFL; + default_abort_act.sa_sigaction = NULL; + __sigfillset(&default_abort_act.sa_mask); + default_abort_act.sa_flags = 0; + if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0) + INLINE_SYSCALL(kill, 2, pid, SIGABRT); + } + + /* Note; actions cannot be added to SIGKILL */ + INLINE_SYSCALL(kill, 2, pid, SIGKILL); + + /* In case the kill didn't work, exit anyway + * The loop prevents gcc thinking this routine returns + */ + while (1) + INLINE_SYSCALL(exit, 0); +} + +__attribute__ ((__noreturn__)) +void __chk_fail(void) +{ + __hardened_gentoo_chk_fail(NULL, 0); +} + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch new file mode 100644 index 0000000000..e75ccc788c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch @@ -0,0 +1,30 @@ +Prevent default-fPIE from confusing configure into thinking +PIC code is default. This causes glibc to build both PIC and +non-PIC code as normal, which on the hardened compiler generates +PIC and PIE. + +Patch by Kevin F. Quinn +Fixed for glibc 2.10 by Magnus Granberg + +--- configure.in ++++ configure.in +@@ -2145,7 +2145,7 @@ + # error PIC is default. + #endif + EOF +-if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then ++if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then + libc_cv_pic_default=no + fi + rm -f conftest.*]) +--- configure ++++ configure +@@ -7698,7 +7698,7 @@ + # error PIC is default. + #endif + EOF +-if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then ++if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then + libc_cv_pic_default=no + fi + rm -f conftest.* diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch new file mode 100644 index 0000000000..cb6d8e3c78 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch @@ -0,0 +1,274 @@ +When building glibc PIE (which is not something upstream support), +several modifications are necessary to the glibc build process. + +First, any syscalls in PIEs must be of the PIC variant, otherwise +textrels ensue. Then, any syscalls made before the initialisation +of the TLS will fail on i386, as the sysenter variant on i386 uses +the TLS, giving rise to a chicken-and-egg situation. This patch +defines a PIC syscall variant that doesn't use sysenter, even when the sysenter +version is normally used, and uses the non-sysenter version for the brk +syscall that is performed by the TLS initialisation. Further, the TLS +initialisation is moved in this case prior to the initialisation of +dl_osversion, as that requires further syscalls. + +csu/libc-start.c: Move initial TLS initialization to before the +initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined + +csu/libc-tls.c: Use the no-sysenter version of sbrk when +INTERNAL_SYSCALL_NOSYSENTER is defined. + +misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter +version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined. + +misc/brk.c: Define a no-sysenter version of brk if +INTERNAL_SYSCALL_NOSYSENTER is defined. + +sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER +Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED. + +Patch by Kevin F. Quinn +Fixed for 2.10 by Magnus Granberg + +--- csu/libc-start.c ++++ csu/libc-start.c +@@ -28,6 +28,7 @@ + extern int __libc_multiple_libcs; + + #include ++#include + #ifndef SHARED + # include + extern void __pthread_initialize_minimal (void); +@@ -129,6 +130,11 @@ + # endif + _dl_aux_init (auxvec); + # endif ++# ifdef INTERNAL_SYSCALL_NOSYSENTER ++ /* Do the initial TLS initialization before _dl_osversion, ++ since the latter uses the uname syscall. */ ++ __pthread_initialize_minimal (); ++# endif + # ifdef DL_SYSDEP_OSCHECK + if (!__libc_multiple_libcs) + { +@@ -138,10 +144,12 @@ + } + # endif + ++# ifndef INTERNAL_SYSCALL_NOSYSENTER + /* Initialize the thread library at least a bit since the libgcc + functions are using thread functions if these are available and + we need to setup errno. */ + __pthread_initialize_minimal (); ++# endif + + /* Set up the stack checker's canary. */ + uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); +--- csu/libc-tls.c ++++ csu/libc-tls.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + + #ifdef SHARED +@@ -29,6 +30,9 @@ + #error makefile bug, this file is for static only + #endif + ++#ifdef INTERNAL_SYSCALL_NOSYSENTER ++extern void *__sbrk_nosysenter (intptr_t __delta); ++#endif + extern ElfW(Phdr) *_dl_phdr; + extern size_t _dl_phnum; + +@@ -141,14 +145,26 @@ + + The initialized value of _dl_tls_static_size is provided by dl-open.c + to request some surplus that permits dynamic loading of modules with +- IE-model TLS. */ ++ IE-model TLS. ++ ++ Where the normal sbrk would use a syscall that needs the TLS (i386) ++ use the special non-sysenter version instead. */ + #if TLS_TCB_AT_TP + tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign); ++# ifdef INTERNAL_SYSCALL_NOSYSENTER ++ tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align); ++# else + tlsblock = __sbrk (tcb_offset + tcbsize + max_align); ++# endif + #elif TLS_DTV_AT_TP + tcb_offset = roundup (tcbsize, align ?: 1); ++# ifdef INTERNAL_SYSCALL_NOSYSENTER ++ tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align ++ + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); ++# else + tlsblock = __sbrk (tcb_offset + memsz + max_align + + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); ++# endif + tlsblock += TLS_PRE_TCB_SIZE; + #else + /* In case a model with a different layout for the TCB and DTV +--- misc/sbrk.c ++++ misc/sbrk.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + /* Defined in brk.c. */ + extern void *__curbrk; +@@ -29,6 +30,35 @@ + /* Extend the process's data space by INCREMENT. + If INCREMENT is negative, shrink data space by - INCREMENT. + Return start of new space allocated, or -1 for errors. */ ++#ifdef INTERNAL_SYSCALL_NOSYSENTER ++/* This version is used by csu/libc-tls.c whem initialising the TLS ++ if the SYSENTER version requires the TLS (which it does on i386). ++ Obviously using the TLS before it is initialised is broken. */ ++extern int __brk_nosysenter (void *addr); ++void * ++__sbrk_nosysenter (intptr_t increment) ++{ ++ void *oldbrk; ++ ++ /* If this is not part of the dynamic library or the library is used ++ via dynamic loading in a statically linked program update ++ __curbrk from the kernel's brk value. That way two separate ++ instances of __brk and __sbrk can share the heap, returning ++ interleaved pieces of it. */ ++ if (__curbrk == NULL || __libc_multiple_libcs) ++ if (__brk_nosysenter (0) < 0) /* Initialize the break. */ ++ return (void *) -1; ++ ++ if (increment == 0) ++ return __curbrk; ++ ++ oldbrk = __curbrk; ++ if (__brk_nosysenter (oldbrk + increment) < 0) ++ return (void *) -1; ++ ++ return oldbrk; ++} ++#endif + void * + __sbrk (intptr_t increment) + { +--- sysdeps/unix/sysv/linux/i386/brk.c ++++ sysdeps/unix/sysv/linux/i386/brk.c +@@ -31,6 +31,30 @@ + linker. */ + weak_alias (__curbrk, ___brk_addr) + ++#ifdef INTERNAL_SYSCALL_NOSYSENTER ++/* This version is used by csu/libc-tls.c whem initialising the TLS ++ * if the SYSENTER version requires the TLS (which it does on i386). ++ * Obviously using the TLS before it is initialised is broken. */ ++int ++__brk_nosysenter (void *addr) ++{ ++ void *__unbounded newbrk; ++ ++ INTERNAL_SYSCALL_DECL (err); ++ newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1, ++ __ptrvalue (addr)); ++ ++ __curbrk = newbrk; ++ ++ if (newbrk < addr) ++ { ++ __set_errno (ENOMEM); ++ return -1; ++ } ++ ++ return 0; ++} ++#endif + int + __brk (void *addr) + { +--- sysdeps/unix/sysv/linux/i386/sysdep.h ++++ sysdeps/unix/sysv/linux/i386/sysdep.h +@@ -187,7 +187,7 @@ + /* The original calling convention for system calls on Linux/i386 is + to use int $0x80. */ + #ifdef I386_USE_SYSENTER +-# ifdef SHARED ++# if defined SHARED || defined __PIC__ + # define ENTER_KERNEL call *%gs:SYSINFO_OFFSET + # else + # define ENTER_KERNEL call *_dl_sysinfo +@@ -358,7 +358,7 @@ + possible to use more than four parameters. */ + #undef INTERNAL_SYSCALL + #ifdef I386_USE_SYSENTER +-# ifdef SHARED ++# if defined SHARED || defined __PIC__ + # define INTERNAL_SYSCALL(name, err, nr, args...) \ + ({ \ + register unsigned int resultvar; \ +@@ -384,6 +384,18 @@ + : "0" (name), "i" (offsetof (tcbhead_t, sysinfo)) \ + ASMFMT_##nr(args) : "memory", "cc"); \ + (int) resultvar; }) ++# define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \ ++ ({ \ ++ register unsigned int resultvar; \ ++ EXTRAVAR_##nr \ ++ asm volatile ( \ ++ LOADARGS_NOSYSENTER_##nr \ ++ "movl %1, %%eax\n\t" \ ++ "int $0x80\n\t" \ ++ RESTOREARGS_NOSYSENTER_##nr \ ++ : "=a" (resultvar) \ ++ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ ++ (int) resultvar; }) + # else + # define INTERNAL_SYSCALL(name, err, nr, args...) \ + ({ \ +@@ -447,12 +459,20 @@ + + #define LOADARGS_0 + #ifdef __PIC__ +-# if defined I386_USE_SYSENTER && defined SHARED ++# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) + # define LOADARGS_1 \ + "bpushl .L__X'%k3, %k3\n\t" + # define LOADARGS_5 \ + "movl %%ebx, %4\n\t" \ + "movl %3, %%ebx\n\t" ++# define LOADARGS_NOSYSENTER_1 \ ++ "bpushl .L__X'%k2, %k2\n\t" ++# define LOADARGS_NOSYSENTER_2 LOADARGS_NOSYSENTER_1 ++# define LOADARGS_NOSYSENTER_3 LOADARGS_3 ++# define LOADARGS_NOSYSENTER_4 LOADARGS_3 ++# define LOADARGS_NOSYSENTER_5 \ ++ "movl %%ebx, %3\n\t" \ ++ "movl %2, %%ebx\n\t" + # else + # define LOADARGS_1 \ + "bpushl .L__X'%k2, %k2\n\t" +@@ -474,11 +495,18 @@ + + #define RESTOREARGS_0 + #ifdef __PIC__ +-# if defined I386_USE_SYSENTER && defined SHARED ++# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) + # define RESTOREARGS_1 \ + "bpopl .L__X'%k3, %k3\n\t" + # define RESTOREARGS_5 \ + "movl %4, %%ebx" ++# define RESTOREARGS_NOSYSENTER_1 \ ++ "bpopl .L__X'%k2, %k2\n\t" ++# define RESTOREARGS_NOSYSENTER_2 RESTOREARGS_NOSYSENTER_1 ++# define RESTOREARGS_NOSYSENTER_3 RESTOREARGS_3 ++# define RESTOREARGS_NOSYSENTER_4 RESTOREARGS_3 ++# define RESTOREARGS_NOSYSENTER_5 \ ++ "movl %3, %%ebx" + # else + # define RESTOREARGS_1 \ + "bpopl .L__X'%k2, %k2\n\t" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-disable-memset-warning.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-disable-memset-warning.patch new file mode 100644 index 0000000000..6c00ef00f8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-disable-memset-warning.patch @@ -0,0 +1,31 @@ +Disable memset warning that happens when the fill-value of memset is a non-zero +constant and the size parameter is zero. + +This warning is triggered when certain functions containing memset calls are +inlined, example: + +https://bugs.webkit.org/show_bug.cgi?id=78513 + +Warnings are treated as errors in the Chromium build. + + +--- string/bits/string3.h 2012-02-17 14:32:47.830600426 -0800 ++++ string/bits/string3.h 2012-02-17 14:32:47.830600426 -0800 +@@ -20,9 +20,6 @@ + # error "Never use directly; include instead." + #endif + +-__warndecl (__warn_memset_zero_len, +- "memset used with constant zero length parameter; this could be due to transposed parameters"); +- + #ifndef __cplusplus + /* XXX This is temporarily. We should not redefine any of the symbols + and instead integrate the error checking into the original +@@ -79,7 +76,6 @@ + if (__builtin_constant_p (__len) && __len == 0 + && (!__builtin_constant_p (__ch) || __ch != 0)) + { +- __warn_memset_zero_len (); + return __dest; + } + return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest)); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-frecord-gcc-switches.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-frecord-gcc-switches.patch new file mode 100644 index 0000000000..53106323ca --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-frecord-gcc-switches.patch @@ -0,0 +1,10 @@ +--- ./glibc-2.11.1/csu/Makefile 2012-02-15 19:52:31.597382895 -0800 ++++ ./glibc-2.11.1/csu/Makefile 2012-02-15 19:53:24.557242505 -0800 +@@ -93,7 +93,7 @@ + $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h + $(compile.S) -g0 $(ASFLAGS-.os) -o $@ + +-CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) ++CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) -fno-record-gcc-switches + + vpath initfini.c $(sysdirs) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-resolv-milliseconds.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-resolv-milliseconds.patch new file mode 100644 index 0000000000..ff5a1a7bf5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-resolv-milliseconds.patch @@ -0,0 +1,124 @@ +This is a pending upstream change. +http://sourceware.org/ml/libc-alpha/2012-06/msg00571.html +Allow an option to specify DNS timeout in milliseconds instead +of seconds. +--- +v3 changes: + * Handle situations where the ns shift would have overflowed INT_MAX + * Removed RES_MINWAIT_MS; using 1 second universally, since this is now an + unlikely exceptional condition. + + resolv/res_debug.c | 1 + + resolv/res_init.c | 9 +++++++++ + resolv/res_send.c | 26 ++++++++++++++++++++++---- + resolv/resolv.h | 2 ++ + 4 files changed, 34 insertions(+), 4 deletions(-) + +diff --git a/resolv/res_debug.c b/resolv/res_debug.c +index 3daa44e..e4915f8 100644 +--- a/resolv/res_debug.c ++++ b/resolv/res_debug.c +@@ -589,6 +589,7 @@ p_option(u_long option) { + case RES_USE_EDNS0: return "edns0"; + case RES_USE_DNSSEC: return "dnssec"; + case RES_NOTLDQUERY: return "no-tld-query"; ++ case RES_TIMEOUT_MS: return "timeout-in-milliseconds"; + /* XXX nonreentrant */ + default: sprintf(nbuf, "?0x%lx?", (u_long)option); + return (nbuf); +diff --git a/resolv/res_init.c b/resolv/res_init.c +index c58c763..d00a7b0 100644 +--- a/resolv/res_init.c ++++ b/resolv/res_init.c +@@ -501,11 +501,20 @@ res_setoptions(res_state statp, const char *options, const char *source) { + printf(";;\tndots=%d\n", statp->ndots); + #endif + } else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) { ++ statp->options &= ~RES_TIMEOUT_MS; + i = atoi(cp + sizeof("timeout:") - 1); + if (i <= RES_MAXRETRANS) + statp->retrans = i; + else + statp->retrans = RES_MAXRETRANS; ++ } else if (!strncmp(cp, "timeout-ms:", ++ sizeof("timeout-ms:") - 1)) { ++ statp->options |= RES_TIMEOUT_MS; ++ i = atoi(cp + sizeof("timeout-ms:") - 1); ++ if (i <= RES_MAXRETRANS * 1000) ++ statp->retrans = i; ++ else ++ statp->retrans = RES_MAXRETRANS * 1000; + } else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){ + i = atoi(cp + sizeof("attempts:") - 1); + if (i <= RES_MAXRETRY) +diff --git a/resolv/res_send.c b/resolv/res_send.c +index 0a28cd7..4d45335 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -1008,11 +1008,29 @@ send_dg(res_state statp, + /* + * Compute time for the total operation. + */ +- int seconds = (statp->retrans << ns); ++ int operation_time; ++ if (statp->retrans > (INT_MAX >> ns)) { ++ /* ++ * Saturate operation_time if it would have exceeded INT_MAX ++ */ ++ operation_time = INT_MAX; ++ } else { ++ operation_time = (statp->retrans << ns); ++ } + if (ns > 0) +- seconds /= statp->nscount; +- if (seconds <= 0) ++ operation_time /= statp->nscount; ++ time_t seconds; ++ long milliseconds; ++ if (operation_time <= 0) { + seconds = 1; ++ milliseconds = 0; ++ } else if ((statp->options & RES_TIMEOUT_MS) != 0) { ++ seconds = operation_time / 1000; ++ milliseconds = operation_time % 1000; ++ } else { ++ seconds = operation_time; ++ milliseconds = 0; ++ } + bool single_request = (statp->options & RES_SNGLKUP) != 0; + bool single_request_reopen = (statp->options & RES_SNGLKUPREOP) != 0; + int save_gotsomewhere = *gotsomewhere; +@@ -1025,7 +1043,7 @@ send_dg(res_state statp, + return retval; + retry: + evNowTime(&now); +- evConsTime(&timeout, seconds, 0); ++ evConsTime(&timeout, seconds, milliseconds * 1000000L); + evAddTime(&finish, &now, &timeout); + int need_recompute = 0; + int nwritten = 0; +diff --git a/resolv/resolv.h b/resolv/resolv.h +index ed15a70..f09754a 100644 +--- a/resolv/resolv.h ++++ b/resolv/resolv.h +@@ -97,7 +97,7 @@ typedef res_sendhookact (*res_send_rhook + # define MAXRESOLVSORT 10 /* number of net to sort on */ + # define RES_MAXNDOTS 15 /* should reflect bit field size */ + # define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ +-# define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ ++# define RES_MAXRETRY 15 /* only for resolv.conf/RES_OPTIONS */ + # define RES_DFLRETRY 2 /* Default #/tries. */ + # define RES_MAXTIME 65535 /* Infinity, in milliseconds. */ + +@@ -221,6 +221,8 @@ struct res_sym { + #define RES_USE_DNSSEC 0x00800000 /* use DNSSEC using OK bit in OPT */ + #define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name + as a TLD. */ ++#define RES_TIMEOUT_MS 0x02000000 /* Timeout is specified in ++ milliseconds instead of seconds. */ + + #define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-tls-stack-addition.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-tls-stack-addition.patch new file mode 100644 index 0000000000..e94e08b40f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.11/glibc-2.11-tls-stack-addition.patch @@ -0,0 +1,30 @@ +From 86b7236edcb4e1719a0da7273128286b3fda20eb Mon Sep 17 00:00:00 2001 +From: Ahmad Sharif +Date: Tue, 24 Apr 2012 11:19:19 -0700 +Subject: [PATCH] Added TLS size to stack size if it's lower than 16 * + TLS_SIZE. + +Under normal circumstances, the TLS size is substracted from the stack size +before allocaton. This can cause the application to crash if the TLS size is +close to the stack size. +--- + nptl/allocatestack.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c +index 79c4531..7864c8c 100644 +--- a/nptl/allocatestack.c ++++ b/nptl/allocatestack.c +@@ -463,6 +463,9 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, + size += pagesize_m1 + 1; + #endif + ++ if (size < 16 * __static_tls_size) ++ size = roundup (size + __static_tls_size, pagesize_m1 + 1); ++ + /* Adjust the stack size for alignment. */ + size &= ~__static_tls_align_m1; + assert (size != 0); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch new file mode 100644 index 0000000000..3315171d95 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch @@ -0,0 +1,39 @@ +2010-08-11 Magnus Granberg + + #332331 + * Makeconfig (+link): Set to +link-pie. + (+link-static): Change $(static-start-installed-name) to + S$(static-start-installed-name). + (+prector): Set to +prectorS. + (+postctor): Set to +postctorS. + +--- libc/Makeconfig ++++ libc/Makeconfig +@@ -447,11 +447,12 @@ + $(common-objpfx)libc% $(+postinit),$^) \ + $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit) + endif +++link = $(+link-pie) + # Command for statically linking programs with the C library. + ifndef +link-static + +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \ + $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ +- $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ ++ $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ + $(+preinit) $(+prector) \ + $(filter-out $(addprefix $(csu-objpfx),start.o \ + $(start-installed-name))\ +@@ -549,11 +550,10 @@ + ifeq ($(elf),yes) + +preinit = $(addprefix $(csu-objpfx),crti.o) + +postinit = $(addprefix $(csu-objpfx),crtn.o) +-+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o` +-+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` +-# Variants of the two previous definitions for linking PIE programs. + +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o` + +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o` +++prector = $(+prectorS) +++postctor = $(+postctorS) + +interp = $(addprefix $(elf-objpfx),interp.os) + endif + csu-objpfx = $(common-objpfx)csu/ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c new file mode 100644 index 0000000000..217bf1a907 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c @@ -0,0 +1,321 @@ +/* Copyright (C) 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Copyright (C) 2006-2007 Gentoo Foundation Inc. + * License terms as above. + * + * Hardened Gentoo SSP handler + * + * An SSP failure handler that does not use functions from the rest of + * glibc; it uses the INTERNAL_SYSCALL methods directly. This ensures + * no possibility of recursion into the handler. + * + * Direct all bug reports to http://bugs.gentoo.org/ + * + * Re-written from the glibc-2.3 Hardened Gentoo SSP handler + * by Kevin F. Quinn - + * + * The following people contributed to the glibc-2.3 Hardened + * Gentoo SSP handler, from which this implementation draws much: + * + * Ned Ludd - + * Alexander Gabert - + * The PaX Team - + * Peter S. Mazinger - + * Yoann Vandoorselaere - + * Robert Connolly - + * Cory Visi + * Mike Frysinger + */ + +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include + +#include +/* from sysdeps */ +#include +/* for the stuff in bits/socket.h */ +#include +#include + + +/* Sanity check on SYSCALL macro names - force compilation + * failure if the names used here do not exist + */ +#if !defined __NR_socketcall && !defined __NR_socket +# error Cannot do syscall socket or socketcall +#endif +#if !defined __NR_socketcall && !defined __NR_connect +# error Cannot do syscall connect or socketcall +#endif +#ifndef __NR_write +# error Cannot do syscall write +#endif +#ifndef __NR_close +# error Cannot do syscall close +#endif +#ifndef __NR_getpid +# error Cannot do syscall getpid +#endif +#ifndef __NR_kill +# error Cannot do syscall kill +#endif +#ifndef __NR_exit +# error Cannot do syscall exit +#endif +#ifdef SSP_SMASH_DUMPS_CORE +# define ENABLE_SSP_SMASH_DUMPS_CORE 1 +# if !defined _KERNEL_NSIG && !defined _NSIG +# error No _NSIG or _KERNEL_NSIG for rt_sigaction +# endif +# if !defined __NR_sigaction && !defined __NR_rt_sigaction +# error Cannot do syscall sigaction or rt_sigaction +# endif +/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size + * of the _kernel_ sigset_t which is not the same as the user sigset_t. + * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for + * some reason. + */ +# ifdef _KERNEL_NSIG +# define _SSP_NSIG _KERNEL_NSIG +# else +# define _SSP_NSIG _NSIG +# endif +#else +# define _SSP_NSIG 0 +# define ENABLE_SSP_SMASH_DUMPS_CORE 0 +#endif + +/* Define DO_SIGACTION - default to newer rt signal interface but + * fallback to old as needed. + */ +#ifdef __NR_rt_sigaction +# define DO_SIGACTION(signum, act, oldact) \ + INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8) +#else +# define DO_SIGACTION(signum, act, oldact) \ + INLINE_SYSCALL(sigaction, 3, signum, act, oldact) +#endif + +/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */ +#if defined(__NR_socket) && defined(__NR_connect) +# define USE_OLD_SOCKETCALL 0 +#else +# define USE_OLD_SOCKETCALL 1 +#endif +/* stub out the __NR_'s so we can let gcc optimize away dead code */ +#ifndef __NR_socketcall +# define __NR_socketcall 0 +#endif +#ifndef __NR_socket +# define __NR_socket 0 +#endif +#ifndef __NR_connect +# define __NR_connect 0 +#endif +#define DO_SOCKET(result, domain, type, protocol) \ + do { \ + if (USE_OLD_SOCKETCALL) { \ + socketargs[0] = domain; \ + socketargs[1] = type; \ + socketargs[2] = protocol; \ + socketargs[3] = 0; \ + result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \ + } else \ + result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \ + } while (0) +#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \ + do { \ + if (USE_OLD_SOCKETCALL) { \ + socketargs[0] = sockfd; \ + socketargs[1] = (unsigned long int)serv_addr; \ + socketargs[2] = addrlen; \ + socketargs[3] = 0; \ + result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \ + } else \ + result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \ + } while (0) + +#ifndef _PATH_LOG +# define _PATH_LOG "/dev/log" +#endif + +static const char path_log[] = _PATH_LOG; + +/* For building glibc with SSP switched on, define __progname to a + * constant if building for the run-time loader, to avoid pulling + * in more of libc.so into ld.so + */ +#ifdef IS_IN_rtld +static char *__progname = ""; +#else +extern char *__progname; +#endif + + +/* Common handler code, used by stack_chk_fail and __stack_smash_handler + * Inlined to ensure no self-references to the handler within itself. + * Data static to avoid putting more than necessary on the stack, + * to aid core debugging. + */ +__attribute__ ((__noreturn__ , __always_inline__)) +static inline void +__hardened_gentoo_stack_chk_fail(char func[], int damaged) +{ +#define MESSAGE_BUFSIZ 256 + static pid_t pid; + static int plen, i; + static char message[MESSAGE_BUFSIZ]; + static const char msg_ssa[] = ": stack smashing attack"; + static const char msg_inf[] = " in function "; + static const char msg_ssd[] = "*** stack smashing detected ***: "; + static const char msg_terminated[] = " - terminated\n"; + static const char msg_report[] = "Report to http://bugs.gentoo.org/\n"; + static const char msg_unknown[] = ""; + static int log_socket, connect_result; + static struct sockaddr_un sock; + static unsigned long int socketargs[4]; + + /* Build socket address + */ + sock.sun_family = AF_UNIX; + i = 0; + while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) { + sock.sun_path[i] = path_log[i]; + i++; + } + sock.sun_path[i] = '\0'; + + /* Try SOCK_DGRAM connection to syslog */ + connect_result = -1; + DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0); + if (log_socket != -1) + DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); + if (connect_result == -1) { + if (log_socket != -1) + INLINE_SYSCALL(close, 1, log_socket); + /* Try SOCK_STREAM connection to syslog */ + DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0); + if (log_socket != -1) + DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); + } + + /* Build message. Messages are generated both in the old style and new style, + * so that log watchers that are configured for the old-style message continue + * to work. + */ +#define strconcat(str) \ + {i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \ + {\ + message[plen+i]=str[i];\ + i++;\ + }\ + plen+=i;} + + /* R.Henderson post-gcc-4 style message */ + plen = 0; + strconcat(msg_ssd); + if (__progname != (char *)0) + strconcat(__progname) + else + strconcat(msg_unknown); + strconcat(msg_terminated); + + /* Write out error message to STDERR, to syslog if open */ + INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); + if (connect_result != -1) + INLINE_SYSCALL(write, 3, log_socket, message, plen); + + /* Dr. Etoh pre-gcc-4 style message */ + plen = 0; + if (__progname != (char *)0) + strconcat(__progname) + else + strconcat(msg_unknown); + strconcat(msg_ssa); + strconcat(msg_inf); + if (func != NULL) + strconcat(func) + else + strconcat(msg_unknown); + strconcat(msg_terminated); + /* Write out error message to STDERR, to syslog if open */ + INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); + if (connect_result != -1) + INLINE_SYSCALL(write, 3, log_socket, message, plen); + + /* Direct reports to bugs.gentoo.org */ + plen=0; + strconcat(msg_report); + message[plen++]='\0'; + + /* Write out error message to STDERR, to syslog if open */ + INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); + if (connect_result != -1) + INLINE_SYSCALL(write, 3, log_socket, message, plen); + + if (log_socket != -1) + INLINE_SYSCALL(close, 1, log_socket); + + /* Suicide */ + pid = INLINE_SYSCALL(getpid, 0); + + if (ENABLE_SSP_SMASH_DUMPS_CORE) { + static struct sigaction default_abort_act; + /* Remove any user-supplied handler for SIGABRT, before using it */ + default_abort_act.sa_handler = SIG_DFL; + default_abort_act.sa_sigaction = NULL; + __sigfillset(&default_abort_act.sa_mask); + default_abort_act.sa_flags = 0; + if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0) + INLINE_SYSCALL(kill, 2, pid, SIGABRT); + } + + /* Note; actions cannot be added to SIGKILL */ + INLINE_SYSCALL(kill, 2, pid, SIGKILL); + + /* In case the kill didn't work, exit anyway + * The loop prevents gcc thinking this routine returns + */ + while (1) + INLINE_SYSCALL(exit, 0); +} + +__attribute__ ((__noreturn__)) +void __stack_chk_fail(void) +{ + __hardened_gentoo_stack_chk_fail(NULL, 0); +} + +#ifdef ENABLE_OLD_SSP_COMPAT +__attribute__ ((__noreturn__)) +void __stack_smash_handler(char func[], int damaged) +{ + __hardened_gentoo_stack_chk_fail(func, damaged); +} +#endif diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/common.eblit b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/common.eblit new file mode 100644 index 0000000000..f47a25b402 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/common.eblit @@ -0,0 +1,313 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.28 2012/08/10 19:44:47 vapier Exp $ + +alt_prefix() { + is_crosscompile && echo /usr/${CTARGET} +} + +# We need to be able to set alternative headers for +# compiling for non-native platform +# Will also become useful for testing kernel-headers without screwing up +# the whole system. +# note: intentionally undocumented. +alt_headers() { + echo ${ALT_HEADERS:=$(alt_prefix)/usr/include} +} +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + if tc-is-cross-compiler ; then + ALT_BUILD_HEADERS=${ROOT}$(alt_headers) + if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then + local header_path=$(echo '#include ' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h') + ALT_BUILD_HEADERS=${header_path%/linux/version.h} + fi + fi + fi + echo "${ALT_BUILD_HEADERS}" +} + +alt_libdir() { + echo $(alt_prefix)/$(get_libdir) +} +alt_usrlibdir() { + echo $(alt_prefix)/usr/$(get_libdir) +} + +setup_target_flags() { + # This largely mucks with compiler flags. None of which should matter + # when building up just the headers. + just_headers && return 0 + + # Needed as workaround to fix: + # http://code.google.com/p/chromium-os/issues/detail?id=22373 + # Can be removed when we emerge glibc to the target: + # http://code.google.com/p/chromium-os/issues/detail?id=20792 + append-cflags "-ggdb" + + if ! use cros_host ; then + # ChromiumOS: Need to unset the SYSROOT value so that the + # compiler uses the default sysroot when building glibc. This + # is because the glibc startup objects are needed to configure + # glibc. We don't want to bootstrap libc again. + export SYSROOT="" + fi + + # Never use gold to build glibc. Manually force GNU ld, whatever the actual settings are. + # Glibc does not link with gold because of missing features. It also doesn't pass the + # configure check. + export CC="$(tc-getCC ${CTARGET}) -B$(get_binutils_path_ld ${CTARGET})" + + case $(tc-arch) in + x86) + # -march needed for #185404 #199334 + if ! glibc_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + filter-flags '-march=*' + export CFLAGS="-march=${t} ${CFLAGS}" + einfo "Auto adding -march=${t} to CFLAGS #185404" + fi + ;; + amd64) + # -march needed for #185404 #199334 + if ! glibc_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + filter-flags '-march=*' + # ugly, ugly, ugly. ugly. + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + export CFLAGS_x86="${CFLAGS_x86} -march=${t}" + einfo "Auto adding -march=${t} to CFLAGS_x86 #185404" + fi + ;; + ppc) + append-flags "-freorder-blocks" + ;; + sparc) + # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. + filter-flags "-fcall-used-g7" + append-flags "-fcall-used-g6" + filter-flags "-mvis" + + GLIBCMAJOR=$(get_version_component_range 1 ${PV}) + GLIBCMINOR=$(get_version_component_range 2 ${PV}) + + # set CTARGET_OPT so glibc can use cpu-specific .S files for better performance + # - UltraSPARC T1 (niagara) support requires >= glibc 2.8 + # - UltraSPARC T2 (niagara2) support requires >= glibc 2.7 + + if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then + case ${ABI}:${CTARGET} in + sparc64:*|\ + default:sparc64*) + filter-flags -Wa,-xarch -Wa,-A + + if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then + CTARGET_OPT="sparc64v2-unknown-linux-gnu" + append-flags "-Wa,-xarch=v9b" + export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" + elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then + CTARGET_OPT="sparc64v-unknown-linux-gnu" + append-flags "-Wa,-xarch=v9b" + export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" + elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then + CTARGET_OPT="sparc64b-unknown-linux-gnu" + append-flags "-Wa,-xarch=v9b" + export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" + else + CTARGET_OPT="sparc64-unknown-linux-gnu" + append-flags "-Wa,-xarch=v9a" + export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a" + fi + ;; + *) + if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then + CTARGET_OPT="sparcv9v2-unknown-linux-gnu" + elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then + CTARGET_OPT="sparcv9v-unknown-linux-gnu" + elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then + CTARGET_OPT="sparcv9b-unknown-linux-gnu" + else + CTARGET_OPT="sparcv9-unknown-linux-gnu" + fi + ;; + esac + else + if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then + CTARGET_OPT="sparcv9v2-unknown-linux-gnu" + elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then + CTARGET_OPT="sparcv9v-unknown-linux-gnu" + elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then + CTARGET_OPT="sparcv9b-unknown-linux-gnu" + elif { is_crosscompile && want_nptl; } || is-flagq "-mcpu=ultrasparc2" || is-flagq "-mcpu=ultrasparc"; then + CTARGET_OPT="sparcv9-unknown-linux-gnu" + fi + fi + ;; + esac +} + +setup_flags() { + # Make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi + + # Store our CFLAGS because it's changed depending on which CTARGET + # we are building when pulling glibc on a multilib profile + CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} + CFLAGS=${CFLAGS_BASE} + CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}} + CXXFLAGS=${CXXFLAGS_BASE} + ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} + ASFLAGS=${ASFLAGS_BASE} + + # Over-zealous CFLAGS can often cause problems. What may work for one + # person may not work for another. To avoid a large influx of bugs + # relating to failed builds, we strip most CFLAGS out to ensure as few + # problems as possible. + strip-flags + strip-unsupported-flags + filter-flags -m32 -m64 -mabi=* + + unset CBUILD_OPT CTARGET_OPT + if has_multilib_profile ; then + CTARGET_OPT=$(get_abi_CTARGET) + [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) + fi + + setup_target_flags + + if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then + CBUILD_OPT=${CTARGET_OPT} + fi + + # Lock glibc at -O2 -- linuxthreads needs it and we want to be + # conservative here. -fno-strict-aliasing is to work around #155906 + filter-flags -O? + append-flags -O2 -fno-strict-aliasing + + # Can't build glibc itself with fortify code. Newer versions add + # this flag for us, so no need to do it manually. + version_is_at_least 2.16 ${PV} || append-cppflags -U_FORTIFY_SOURCE + + # Undefine USE_NSCD to disable of the use of nscd implementation + # in glibc functions (crosbug.com/21924). + append-cppflags -UUSE_NSCD + + # building glibc with SSP is fraught with difficulty, especially + # due to __stack_chk_fail_local which would mean significant changes + # to the glibc build process. See bug #94325 #293721 + use hardened && gcc-ssp && append-cflags $(test-flags-CC -fno-stack-protector) + + if use hardened && gcc-pie; then + # Force PIC macro definition for all compilations since they're all + # either -fPIC or -fPIE with the default-PIE compiler. + append-cppflags -DPIC + else + # Don't build -fPIE without the default-PIE compiler and the + # hardened-pie patch + filter-flags -fPIE + fi +} + +want_nptl() { + [[ -z ${LT_VER} ]] && return 0 + want_tls || return 1 + use nptl || return 1 + + # Only list the arches that cannot do NPTL + case $(tc-arch) in + m68k) return 1;; + sparc) + # >= v9 is needed for nptl. + [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 + ;; + esac + + return 0 +} + +want_linuxthreads() { + [[ -z ${LT_VER} ]] && return 1 + use linuxthreads +} + +want_tls() { + # Archs that can use TLS (Thread Local Storage) + case $(tc-arch) in + x86) + # requires i486 or better #106556 + [[ ${CTARGET} == i[4567]86* ]] && return 0 + return 1 + ;; + esac + + return 0 +} + +want__thread() { + want_tls || return 1 + + # For some reason --with-tls --with__thread is causing segfaults on sparc32. + [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 + + [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} + + # only test gcc -- cant test linking yet + tc-has-tls -c ${CTARGET} + WANT__THREAD=$? + + return ${WANT__THREAD} +} + +use_multiarch() { + # Make sure binutils is new enough to support indirect functions #336792 + local bver nver + bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}') + case $(tc-arch ${CTARGET}) in + amd64|x86) nver="2.20" ;; + sparc) nver="2.21" ;; + *) return 1 ;; + esac + version_is_at_least ${nver} ${bver} +} + +# Setup toolchain variables that had historically +# been defined in the profiles for these archs. +setup_env() { + # silly users + unset LD_RUN_PATH + + multilib_env ${CTARGET_OPT:-${CTARGET}} + if is_crosscompile || tc-is-cross-compiler ; then + if ! use multilib ; then + MULTILIB_ABIS=${DEFAULT_ABI} + else + MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} + fi + + # If the user has CFLAGS_ in their make.conf, use that, + # and fall back on CFLAGS. + local VAR=CFLAGS_${CTARGET//[-.]/_} + CFLAGS=${!VAR-${CFLAGS}} + fi + + setup_flags + + export ABI=${ABI:-${DEFAULT_ABI:-default}} + + local VAR=CFLAGS_${ABI} + # We need to export CFLAGS with abi information in them because glibc's + # configure script checks CFLAGS for some targets (like mips). Keep + # around the original clean value to avoid appending multiple ABIs on + # top of each other. + : ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})} + export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}" +} + +just_headers() { + is_crosscompile && use crosscompile_opts_headers-only +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_postinst.eblit b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_postinst.eblit new file mode 100644 index 0000000000..9e5447d267 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_postinst.eblit @@ -0,0 +1,27 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_postinst.eblit,v 1.2 2012/04/15 20:04:44 vapier Exp $ + +eblit-glibc-pkg_postinst() { + # nothing to do if just installing headers + just_headers && return + + if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then + # Generate fastloading iconv module configuration file. + "${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}" + fi + + if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then + # Reload init ... if in a chroot or a diff init package, ignore + # errors from this step #253697 + /sbin/telinit U 2>/dev/null + + # if the host locales.gen contains no entries, we'll install everything + local locale_list="${ROOT}etc/locale.gen" + if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then + ewarn "Generating all locales; edit /etc/locale.gen to save time/space" + locale_list="${ROOT}usr/share/i18n/SUPPORTED" + fi + locale-gen -j $(makeopts_jobs) --config "${locale_list}" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_preinst.eblit new file mode 100644 index 0000000000..bb1032ddcb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_preinst.eblit @@ -0,0 +1,43 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.6 2012/10/02 07:12:17 vapier Exp $ + +eblit-glibc-pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${ROOT}"/etc/ld.so.conf.d + + # Default /etc/hosts.conf:multi to on for systems with small dbs. + if [[ $(wc -l < "${ROOT}"/etc/hosts) -lt 1000 ]] ; then + sed -i '/^multi off/s:off:on:' "${D}"/etc/host.conf + elog "Defaulting /etc/host.conf:multi to on" + fi + + # simple test to make sure our new glibc isnt completely broken. + # make sure we don't test with statically built binaries since + # they will fail. also, skip if this glibc is a cross compiler. + [[ ${ROOT} != "/" ]] && return 0 + [[ -d ${D}/$(get_libdir) ]] || return 0 + cd / #228809 + local x striptest + for x in date env ls true uname ; do + x=$(type -p ${x}) + [[ -z ${x} ]] && continue + striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) + [[ -z ${striptest} ]] && continue + [[ ${striptest} == *"statically linked"* ]] && continue + # we enter ${D} so to avoid trouble if the path contains + # special characters; for instance if the path contains the + # colon character (:), then the linker will try to split it + # and look for the libraries in an unexpected place. This can + # lead to unsafe code execution if the generated prefix is + # within a world-writable directory + # (e.g. /var/tmp/portage:${HOSTNAME}) + pushd "${D}"/$(get_libdir) 2>/dev/null + ./ld-*.so --library-path . ${x} > /dev/null \ + || die "simple run test (${x}) failed" + popd 2>/dev/null + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_setup.eblit new file mode 100644 index 0000000000..640fce341c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/pkg_setup.eblit @@ -0,0 +1,122 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.10 2011/12/14 16:42:46 vapier Exp $ + +glibc_compile_test() { + local ret save_cflags=${CFLAGS} + CFLAGS+=" $1" + shift + + pushd "${T}" >/dev/null + + rm -f glibc-test* + printf '%b' "$*" > glibc-test.c + + emake -s glibc-test + ret=$? + + popd >/dev/null + + CFLAGS=${save_cflags} + return ${ret} +} + +glibc_run_test() { + local ret + + if [[ ${EMERGE_FROM} == "binary" ]] ; then + # ignore build failures when installing a binary package #324685 + glibc_compile_test "" "$@" 2>/dev/null || return 0 + else + if ! glibc_compile_test "" "$@" ; then + ewarn "Simple build failed ... assuming this is desired #324685" + return 0 + fi + fi + + pushd "${T}" >/dev/null + + ./glibc-test + ret=$? + rm -f glibc-test* + + popd >/dev/null + + return ${ret} +} + +eblit-glibc-pkg_setup() { + # prevent native builds from downgrading ... maybe update to allow people + # to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2) + if [[ ${ROOT} == "/" ]] && [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then + if has_version '>'${CATEGORY}/${PF} ; then + eerror "Sanity check to keep you from breaking your system:" + eerror " Downgrading glibc is not supported and a sure way to destruction" + die "aborting to save your system" + fi + + if ! glibc_run_test '#include \nint main(){return getpwuid(0)==0;}\n' + then + eerror "Your patched vendor kernel is broken. You need to get an" + eerror "update from whoever is providing the kernel to you." + eerror "http://sourceware.org/bugzilla/show_bug.cgi?id=5227" + eerror "http://bugs.gentoo.org/262698" + die "keeping your system alive, say thank you" + fi + + if ! glibc_run_test '#include \n#include \nint main(){return syscall(1000)!=-1;}\n' + then + eerror "Your old kernel is broken. You need to update it to" + eerror "a newer version as syscall() will break." + eerror "http://bugs.gentoo.org/279260" + die "keeping your system alive, say thank you" + fi + fi + + # users have had a chance to phase themselves, time to give em the boot + if [[ -e ${ROOT}/etc/locale.gen ]] && [[ -e ${ROOT}/etc/locales.build ]] ; then + eerror "You still haven't deleted ${ROOT}/etc/locales.build." + eerror "Do so now after making sure ${ROOT}/etc/locale.gen is kosher." + die "lazy upgrader detected" + fi + + if [[ ${CTARGET} == i386-* ]] ; then + eerror "i386 CHOSTs are no longer supported." + eerror "Chances are you don't actually want/need i386." + eerror "Please read http://www.gentoo.org/doc/en/change-chost.xml" + die "please fix your CHOST" + fi + + if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then + ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." + ewarn "This will result in a 50% performance penalty when running with a 32bit" + ewarn "hypervisor, which is probably not what you want." + fi + + use hardened && ! gcc-specs-pie && \ + ewarn "PIE hardening not applied, as your compiler doesn't default to PIE" + + # Make sure host system is up to date #394453 + if has_version ' /dev/null + local ADDONS=$(echo */configure | sed \ + -e 's:/configure::g' \ + -e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \ + -e 's: \+$::' \ + -e 's! !,!g' \ + -e 's!^!,!' \ + -e '/^,\*$/d') + [[ -d ports ]] && ADDONS="${ADDONS},ports" + popd > /dev/null + + myconf="${myconf} $(use_enable hardened stackguard-randomization)" + if has_version ' "${D}"$(alt_usrlibdir)/nptl/${l} + fi + + # then grab the static lib ... + src_lib=${src_lib/%.so/.a} + [[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a} + cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" + src_lib=${src_lib/%.a/_nonshared.a} + if [[ -e ${src_lib} ]] ; then + cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" + fi + done + + # use the nptl linker instead of the linuxthreads one as the linuxthreads + # one may lack TLS support and that can be really bad for business + cp -a elf/ld.so "${D}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp" + fi + + # We'll take care of the cache ourselves + rm -f "${D}"/etc/ld.so.cache + + # Everything past this point just needs to be done once ... + is_final_abi || return 0 + + # Make sure the non-native interp can be found on multilib systems even + # if the main library set isn't installed into the right place. Maybe + # we should query the active gcc for info instead of hardcoding it ? + local i ldso_abi ldso_name + local ldso_abi_list=( + # x86 + amd64 /lib64/ld-linux-x86-64.so.2 + x32 /libx32/ld-linux-x32.so.2 + x86 /lib/ld-linux.so.2 + # mips + o32 /lib/ld.so.1 + n32 /lib32/ld.so.1 + n64 /lib64/ld.so.1 + # powerpc + ppc /lib/ld.so.1 + ppc64 /lib64/ld64.so.1 + # s390 + s390 /lib/ld.so.1 + s390x /lib/ld64.so.1 + # sparc + sparc32 /lib/ld-linux.so.2 + sparc64 /lib64/ld-linux.so.2 + ) + if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${D}/$(alt_prefix)/lib ]] ; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib + fi + for (( i = 0; i < ${#ldso_abi_list[@]}; ++i )) ; do + ldso_abi=${ldso_abi_list[i]} + has ${ldso_abi} $(get_install_abis) || continue + + ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}" + if [[ ! -L ${D}/${ldso_name} && ! -e ${D}/${ldso_name} ]] ; then + dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name} + fi + done + + ################################################################# + # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # + # Make sure we install some symlink hacks so that when we build + # a 2nd stage cross-compiler, gcc finds the target system + # headers correctly. See gcc/doc/gccinstall.info + if is_crosscompile ; then + # We need to make sure that /lib and /usr/lib always exists. + # gcc likes to use relative paths to get to its multilibs like + # /usr/lib/../lib64/. So while we don't install any files into + # /usr/lib/, we do need it to exist. + cd "${D}"$(alt_libdir)/.. + [[ -e lib ]] || mkdir lib + cd "${D}"$(alt_usrlibdir)/.. + [[ -e lib ]] || mkdir lib + + dosym usr/include $(alt_prefix)/sys-include + return 0 + fi + + # Files for Debian-style locale updating + dodir /usr/share/i18n + sed \ + -e "/^#/d" \ + -e "/SUPPORTED-LOCALES=/d" \ + -e "s: \\\\::g" -e "s:/: :g" \ + "${S}"/localedata/SUPPORTED > "${D}"/usr/share/i18n/SUPPORTED \ + || die "generating /usr/share/i18n/SUPPORTED failed" + cd "${WORKDIR}"/extra/locale + dosbin locale-gen || die + doman *.[0-8] + insinto /etc + doins locale.gen || die + + # Make sure all the ABI's can find the locales and so we only + # have to generate one set + local a + keepdir /usr/$(get_libdir)/locale + for a in $(get_install_abis) ; do + if [[ ! -e ${D}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then + dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale + fi + done + + if ! has noinfo ${FEATURES} && [[ -n ${INFOPAGE_VER} ]] ; then + einfo "Installing info pages..." + + emake \ + -C "${GBUILDDIR}" \ + install_root="${install_root}" \ + info -i || die + fi + + if [[ -n ${MANPAGE_VER} ]] ; then + einfo "Installing man pages..." + + # Install linuxthreads man pages even if nptl is enabled + cd "${WORKDIR}"/man + doman *.3thr + fi + + cd "${S}" + + # Install misc network config files + insinto /etc + doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf || die + doins "${WORKDIR}"/extra/etc/*.conf || die + doinitd "${WORKDIR}"/extra/etc/nscd || die + + local nscd_args=( + -e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):" + ) + version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' ) + sed -i "${nscd_args[@]}" "${D}"/etc/init.d/nscd + + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc + doenvd "${T}"/00glibc || die + + for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do + [[ -s ${d} ]] && dodoc ${d} + done + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f "${D}"/etc/localtime +} + +toolchain-glibc_headers_install() { + local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers + cd "${GBUILDDIR}" + emake install_root="${D}$(alt_prefix)" install-headers || die + if ! version_is_at_least 2.16 ; then + insinto $(alt_headers)/bits + doins bits/stdio_lim.h || die + fi + insinto $(alt_headers)/gnu + doins "${S}"/include/gnu/stubs.h || die "doins include gnu" + # Make sure we install the sys-include symlink so that when + # we build a 2nd stage cross-compiler, gcc finds the target + # system headers correctly. See gcc/doc/gccinstall.info + dosym usr/include /usr/${CTARGET}/sys-include +} + +src_strip() { + # gdb is lame and requires some debugging information to remain in + # libpthread, so we need to strip it by hand. libthread_db makes no + # sense stripped as it is only used when debugging. + local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}") + env \ + -uRESTRICT \ + CHOST=${CTARGET} \ + STRIP_MASK="/*/{,tls/}${pthread}*" \ + prepallstrip + # if user has stripping enabled and does not have split debug turned on, + # then leave the debugging sections in libpthread. + if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then + ${STRIP:-${CTARGET}-strip} --strip-debug "${D}"/*/libpthread-*.so + fi +} + +eblit-glibc-src_install() { + if just_headers ; then + export ABI=default + toolchain-glibc_headers_install + return + fi + + setup_env + + if [[ -z ${OABI} ]] ; then + local abilist="" + if has_multilib_profile ; then + abilist=$(get_install_abis) + einfo "Installing multilib glibc for ABIs: ${abilist}" + elif is_crosscompile || tc-is-cross-compiler ; then + abilist=${DEFAULT_ABI} + fi + if [[ -n ${abilist} ]] ; then + OABI=${ABI} + for ABI in ${abilist} ; do + export ABI + eblit-glibc-src_install + done + ABI=${OABI} + unset OABI + src_strip + return 0 + fi + fi + + toolchain-glibc_src_install + [[ -z ${OABI} ]] && src_strip +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/src_test.eblit b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/src_test.eblit new file mode 100644 index 0000000000..edcdac71de --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/src_test.eblit @@ -0,0 +1,42 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.4 2010/08/10 08:08:05 vapier Exp $ + +toolchain-glibc_src_test() { + cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1" + unset LD_ASSUME_KERNEL + emake -j1 check && return 0 + einfo "make check failed - re-running with --keep-going to get the rest of the results" + emake -j1 -k check + ewarn "make check failed for ${ABI}-${CTARGET}-$1" + return 1 +} + +eblit-glibc-src_test() { + local ret=0 + + setup_env + + # give tests more time to complete + export TIMEOUTFACTOR=5 + + if [[ -z ${OABI} ]] && has_multilib_profile ; then + OABI=${ABI} + einfo "Testing multilib glibc for ABIs: $(get_install_abis)" + for ABI in $(get_install_abis) ; do + export ABI + einfo " Testing ${ABI} glibc" + src_test + ((ret+=$?)) + done + ABI=${OABI} + unset OABI + [[ ${ret} -ne 0 ]] \ + && die "tests failed" \ + || return 0 + fi + + want_linuxthreads && toolchain-glibc_src_test linuxthreads ; ((ret+=$?)) + want_nptl && toolchain-glibc_src_test nptl ; ((ret+=$?)) + return ${ret} +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/src_unpack.eblit b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/src_unpack.eblit new file mode 100644 index 0000000000..5f04ef605e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/eblits/src_unpack.eblit @@ -0,0 +1,189 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.19 2012/11/11 07:24:55 vapier Exp $ + +int_to_KV() { + local version=$1 major minor micro + major=$((version / 65536)) + minor=$(((version % 65536) / 256)) + micro=$((version % 256)) + echo ${major}.${minor}.${micro} +} + +eend_KV() { + [[ $(KV_to_int $1) -ge $(KV_to_int $2) ]] + eend $? +} + +get_kheader_version() { + printf '#include \nLINUX_VERSION_CODE\n' | \ + $(tc-getCPP ${CTARGET}) -I "$(alt_build_headers)" | \ + tail -n 1 +} + +check_nptl_support() { + # don't care about the compiler here as we arent using it + just_headers && return + + local run_kv build_kv want_kv + run_kv=$(int_to_KV $(get_KV)) + build_kv=$(int_to_KV $(get_kheader_version)) + want_kv=${NPTL_KERN_VER} + + ebegin "Checking gcc for __thread support" + if ! eend $(want__thread ; echo $?) ; then + echo + eerror "Could not find a gcc that supports the __thread directive!" + eerror "Please update your binutils/gcc and try again." + die "No __thread support in gcc!" + fi + + if ! is_crosscompile && ! tc-is-cross-compiler ; then + # Building fails on an non-supporting kernel + ebegin "Checking kernel version (${run_kv} >= ${want_kv})" + if ! eend_KV ${run_kv} ${want_kv} ; then + echo + eerror "You need a kernel of at least ${want_kv} for NPTL support!" + die "Kernel version too low!" + fi + fi + + ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})" + if ! eend_KV ${build_kv} ${want_kv} ; then + echo + eerror "You need linux-headers of at least ${want_kv} for NPTL support!" + die "linux-headers version too low!" + fi +} + +unpack_pkg() { + local a=${PN} + [[ -n ${SNAP_VER} ]] && a="${a}-${RELEASE_VER}" + [[ -n $1 ]] && a="${a}-$1" + if [[ -n ${SNAP_VER} ]] ; then + a="${a}-${SNAP_VER}" + else + if [[ -n $2 ]] ; then + a="${a}-$2" + else + a="${a}-${RELEASE_VER}" + fi + fi + if has ${a}.tar.xz ${A} ; then + unpacker ${a}.tar.xz + else + unpack ${a}.tar.bz2 + fi + [[ -n $1 ]] && { mv ${a} $1 || die ; } +} + +toolchain-glibc_src_unpack() { + # Check NPTL support _before_ we unpack things to save some time + want_nptl && check_nptl_support + + if [[ -n ${EGIT_REPO_URIS} ]] ; then + local i d + for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do + EGIT_REPO_URI=${EGIT_REPO_URIS[$i]} + EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]} + git-2_src_unpack + done + else + unpack_pkg + fi + + cd "${S}" + touch locale/C-translit.h #185476 #218003 + [[ -n ${LT_VER} ]] && unpack_pkg linuxthreads ${LT_VER} + [[ -n ${PORTS_VER} ]] && unpack_pkg ports ${PORTS_VER} + [[ -n ${LIBIDN_VER} ]] && unpack_pkg libidn + + if [[ -n ${PATCH_VER} ]] ; then + cd "${WORKDIR}" + unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 + # pull out all the addons + local d + for d in extra/*/configure ; do + d=${d%/configure} + [[ -d ${S}/${d} ]] && die "${d} already exists in \${S}" + mv "${d}" "${S}" || die "moving ${d} failed" + done + fi + + # XXX: We should do the branchupdate, before extracting the manpages and + # infopages else it does not help much (mtimes change if there is a change + # to them with branchupdate) + if [[ -n ${BRANCH_UPDATE} ]] ; then + cd "${S}" + epatch "${DISTDIR}"/glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 + + # Snapshot date patch + einfo "Patching version to display snapshot date ..." + sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h + fi + + if [[ -n ${MANPAGE_VER} ]] ; then + cd "${WORKDIR}" + unpack glibc-manpages-${MANPAGE_VER}.tar.bz2 + fi + + if [[ -n ${INFOPAGE_VER} ]] ; then + cd "${S}" + unpack glibc-infopages-${INFOPAGE_VER}.tar.bz2 + fi + + # tag, glibc is it + cd "${S}" + [[ -e csu/Banner ]] && die "need new banner location" + [[ -n ${SNAP_VER} ]] && echo "Gentoo snapshot ${SNAP_VER}" >> csu/Banner + [[ -n ${BRANCH_UPDATE} ]] && echo "Gentoo branch ${BRANCH_UPDATE}" >> csu/Banner + if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then + cd "${S}" + EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER} ..." \ + EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ + EPATCH_SUFFIX="patch" \ + ARCH=$(tc-arch) \ + epatch "${WORKDIR}"/patches + echo "Gentoo patchset ${PATCH_VER}" >> csu/Banner + fi + + if just_headers ; then + if [[ -e ports/sysdeps/mips/preconfigure ]] ; then + # mips peeps like to screw with us. if building headers, + # we don't have a real compiler, so we can't let them + # insert -mabi on us. + sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die + find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} + + fi + fi + + epatch_user + + gnuconfig_update +} + +eblit-glibc-src_unpack() { + setup_env + + toolchain-glibc_src_unpack + + # Glibc is stupid sometimes, and doesn't realize that with a + # static C-Only gcc, -lgcc_eh doesn't exist. + # http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html + # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html + # But! Finally fixed in recent versions: + # http://sourceware.org/ml/libc-alpha/2012-05/msg01865.html + if ! version_is_at_least 2.16 ; then + echo 'int main(){}' > "${T}"/gcc_eh_test.c + if ! $(tc-getCC ${CTARGET}) "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then + sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" + fi + fi + + cd "${WORKDIR}" + find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; + find . -name configure -exec touch {} \; + + # Fix permissions on some of the scripts + chmod u+x "${S}"/scripts/*.sh +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/local/glibc-2.14-file-mangle.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/local/glibc-2.14-file-mangle.patch new file mode 100644 index 0000000000..a78c154b2e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/local/glibc-2.14-file-mangle.patch @@ -0,0 +1,514 @@ +Description: use PTR_MANGLE/PTR_DEMANGLE for FILE vtables. This adds inline + functions to run the PTR_MANGLE at vtable assignment time and PTR_DEMANGLE + at vtable dereference time so that the FILE structure's stored vtable + pointer is not in the clear on the heap. To make sure nothing accidentally + uses _IO_JUMPS or _IO_WIDE_JUMPS directly, the macros have been renamed to + include the _RAW suffix. +Author: Kees Cook + +diff -uNrp glibc-2.11.1~/debug/obprintf_chk.c glibc-2.11.1/debug/obprintf_chk.c +--- glibc-2.11.1~/debug/obprintf_chk.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/debug/obprintf_chk.c 2012-01-05 12:08:38.135675971 -0800 +@@ -56,7 +56,7 @@ __obstack_vprintf_chk (struct obstack *o + #endif + + _IO_no_init (&new_f.ofile.file.file, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&new_f.ofile.file) = &_IO_obstack_jumps; ++ _IO_JUMPS_SET (&new_f.ofile.file, &_IO_obstack_jumps); + room = obstack_room (obstack); + size = obstack_object_size (obstack) + room; + if (size == 0) +diff -uNrp glibc-2.11.1~/debug/vasprintf_chk.c glibc-2.11.1/debug/vasprintf_chk.c +--- glibc-2.11.1~/debug/vasprintf_chk.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/debug/vasprintf_chk.c 2012-01-05 12:08:38.135675971 -0800 +@@ -54,7 +54,7 @@ __vasprintf_chk (char **result_ptr, int + sf._sbf._f._lock = NULL; + #endif + _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; ++ _IO_JUMPS_SET (&sf._sbf, &_IO_str_jumps); + _IO_str_init_static_internal (&sf, string, init_string_size, string); + sf._sbf._f._flags &= ~_IO_USER_BUF; + sf._s._allocate_buffer = (_IO_alloc_type) malloc; +diff -uNrp glibc-2.11.1~/debug/vdprintf_chk.c glibc-2.11.1/debug/vdprintf_chk.c +--- glibc-2.11.1~/debug/vdprintf_chk.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/debug/vdprintf_chk.c 2012-01-05 12:08:38.135675971 -0800 +@@ -40,7 +40,7 @@ __vdprintf_chk (int d, int flags, const + tmpfil.file._lock = NULL; + #endif + _IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps); +- _IO_JUMPS (&tmpfil) = &_IO_file_jumps; ++ _IO_JUMPS_SET (&tmpfil, &_IO_file_jumps); + INTUSE(_IO_file_init) (&tmpfil); + #if !_IO_UNIFIED_JUMPTABLES + tmpfil.vtable = NULL; +diff -uNrp glibc-2.11.1~/debug/vsnprintf_chk.c glibc-2.11.1/debug/vsnprintf_chk.c +--- glibc-2.11.1~/debug/vsnprintf_chk.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/debug/vsnprintf_chk.c 2012-01-05 12:08:38.135675971 -0800 +@@ -53,7 +53,7 @@ ___vsnprintf_chk (char *s, size_t maxlen + } + + _IO_no_init (&sf.f._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&sf.f._sbf) = &_IO_strn_jumps; ++ _IO_JUMPS_SET (&sf.f._sbf, &_IO_strn_jumps); + s[0] = '\0'; + + /* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n +diff -uNrp glibc-2.11.1~/debug/vsprintf_chk.c glibc-2.11.1/debug/vsprintf_chk.c +--- glibc-2.11.1~/debug/vsprintf_chk.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/debug/vsprintf_chk.c 2012-01-05 12:08:38.135675971 -0800 +@@ -75,7 +75,7 @@ ___vsprintf_chk (char *s, int flags, siz + __chk_fail (); + + _IO_no_init (&f._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&f._sbf) = &_IO_str_chk_jumps; ++ _IO_JUMPS_SET (&f._sbf, &_IO_str_chk_jumps); + s[0] = '\0'; + _IO_str_init_static_internal (&f, s, slen - 1, s); + +diff -uNrp glibc-2.11.1~/libio/fileops.c glibc-2.11.1/libio/fileops.c +--- glibc-2.11.1~/libio/fileops.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/fileops.c 2012-01-05 12:08:38.139676023 -0800 +@@ -464,8 +464,8 @@ _IO_file_setbuf_mmap (fp, p, len) + _IO_FILE *result; + + /* Change the function table. */ +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_file_jumps); ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps); + + /* And perform the normal operation. */ + result = _IO_new_file_setbuf (fp, p, len); +@@ -473,8 +473,8 @@ _IO_file_setbuf_mmap (fp, p, len) + /* If the call failed, restore to using mmap. */ + if (result == NULL) + { +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps_mmap; +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps_mmap; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_file_jumps_mmap); ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps_mmap); + } + + return result; +@@ -713,10 +713,10 @@ mmap_remap_check (_IO_FILE *fp) + fp->_IO_buf_base = fp->_IO_buf_end = NULL; + _IO_setg (fp, NULL, NULL, NULL); + if (fp->_mode <= 0) +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_file_jumps); + else +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_wfile_jumps; +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_wfile_jumps); ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps); + + return 1; + } +@@ -793,10 +793,10 @@ decide_maybe_mmap (_IO_FILE *fp) + fp->_offset = st.st_size; + + if (fp->_mode <= 0) +- _IO_JUMPS ((struct _IO_FILE_plus *)fp) = &_IO_file_jumps_mmap; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *)fp, &_IO_file_jumps_mmap); + else +- _IO_JUMPS ((struct _IO_FILE_plus *)fp) = &_IO_wfile_jumps_mmap; +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps_mmap; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *)fp, &_IO_wfile_jumps_mmap); ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps_mmap); + + return; + } +@@ -806,10 +806,10 @@ decide_maybe_mmap (_IO_FILE *fp) + /* We couldn't use mmap, so revert to the vanilla file operations. */ + + if (fp->_mode <= 0) +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_file_jumps); + else +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_wfile_jumps; +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_wfile_jumps); ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps); + } + + int +diff -uNrp glibc-2.11.1~/libio/freopen64.c glibc-2.11.1/libio/freopen64.c +--- glibc-2.11.1~/libio/freopen64.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/freopen64.c 2012-01-05 12:09:59.188744539 -0800 +@@ -51,9 +51,9 @@ freopen64 (filename, mode, fp) + ? fd_to_filename (fd) : filename); + fp->_flags2 |= _IO_FLAGS2_NOCLOSE; + INTUSE(_IO_file_close_it) (fp); +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_file_jumps); + if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL) +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps); + result = INTUSE(_IO_file_fopen) (fp, gfilename, mode, 0); + fp->_flags2 &= ~_IO_FLAGS2_NOCLOSE; + if (result != NULL) +diff -uNrp glibc-2.11.1~/libio/freopen.c glibc-2.11.1/libio/freopen.c +--- glibc-2.11.1~/libio/freopen.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/freopen.c 2012-01-05 12:11:29.601936735 -0800 +@@ -59,16 +59,16 @@ freopen (filename, mode, fp) + to the old libio may be passed into shared C library and wind + up here. */ + _IO_old_file_close_it (fp); +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_old_file_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_old_file_jumps); + result = _IO_old_file_fopen (fp, gfilename, mode); + } + else + #endif + { + INTUSE(_IO_file_close_it) (fp); +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_file_jumps); + if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL) +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps); + result = INTUSE(_IO_file_fopen) (fp, gfilename, mode, 1); + if (result != NULL) + result = __fopen_maybe_mmap (result); +diff -uNrp glibc-2.11.1~/libio/genops.c glibc-2.11.1/libio/genops.c +--- glibc-2.11.1~/libio/genops.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/genops.c 2012-01-05 12:08:38.139676023 -0800 +@@ -664,7 +664,7 @@ _IO_no_init (fp, flags, orientation, wd, + fp->_wide_data->_IO_backup_base = NULL; + fp->_wide_data->_IO_save_end = NULL; + +- fp->_wide_data->_wide_vtable = jmp; ++ _IO_WIDE_JUMPS_SET (fp, jmp); + } + #endif + fp->_freeres_list = NULL; +diff -uNrp glibc-2.11.1~/libio/iofdopen.c glibc-2.11.1/libio/iofdopen.c +--- glibc-2.11.1~/libio/iofdopen.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/iofdopen.c 2012-01-05 12:08:38.139676023 -0800 +@@ -154,11 +154,11 @@ _IO_new_fdopen (fd, mode) + ? &_IO_wfile_jumps_maybe_mmap : + #endif + &_IO_wfile_jumps); +- _IO_JUMPS (&new_f->fp) = ++ _IO_JUMPS_SET (&new_f->fp, + #ifdef _G_HAVE_MMAP + (use_mmap && (read_write & _IO_NO_WRITES)) ? &_IO_file_jumps_maybe_mmap : + #endif +- &_IO_file_jumps; ++ &_IO_file_jumps); + INTUSE(_IO_file_init) (&new_f->fp); + #if !_IO_UNIFIED_JUMPTABLES + new_f->fp.vtable = NULL; +diff -uNrp glibc-2.11.1~/libio/iofopen.c glibc-2.11.1/libio/iofopen.c +--- glibc-2.11.1~/libio/iofopen.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/iofopen.c 2012-01-05 12:08:38.139676023 -0800 +@@ -50,10 +50,10 @@ __fopen_maybe_mmap (fp) + vanilla file operations and reset the jump table accordingly. */ + + if (fp->_mode <= 0) +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps_maybe_mmap; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_file_jumps_maybe_mmap); + else +- _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_wfile_jumps_maybe_mmap; +- fp->_wide_data->_wide_vtable = &_IO_wfile_jumps_maybe_mmap; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) fp, &_IO_wfile_jumps_maybe_mmap); ++ _IO_WIDE_JUMPS_SET (fp, &_IO_wfile_jumps_maybe_mmap); + } + #endif + return fp; +@@ -85,7 +85,7 @@ __fopen_internal (filename, mode, is32) + #else + _IO_no_init (&new_f->fp.file, 1, 0, NULL, NULL); + #endif +- _IO_JUMPS (&new_f->fp) = &_IO_file_jumps; ++ _IO_JUMPS_SET (&new_f->fp, &_IO_file_jumps); + INTUSE(_IO_file_init) (&new_f->fp); + #if !_IO_UNIFIED_JUMPTABLES + new_f->fp.vtable = NULL; +diff -uNrp glibc-2.11.1~/libio/iofopncook.c glibc-2.11.1/libio/iofopncook.c +--- glibc-2.11.1~/libio/iofopncook.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/iofopncook.c 2012-01-05 12:08:38.139676023 -0800 +@@ -147,7 +147,7 @@ _IO_cookie_init (struct _IO_cookie_file + void *cookie, _IO_cookie_io_functions_t io_functions) + { + INTUSE(_IO_init) (&cfile->__fp.file, 0); +- _IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps; ++ _IO_JUMPS_SET (&cfile->__fp, &_IO_cookie_jumps); + + cfile->__cookie = cookie; + cfile->__io_functions = io_functions; +@@ -272,7 +272,7 @@ _IO_old_fopencookie (cookie, mode, io_fu + + ret = _IO_fopencookie (cookie, mode, io_functions); + if (ret != NULL) +- _IO_JUMPS ((struct _IO_FILE_plus *) ret) = &_IO_old_cookie_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) ret, &_IO_old_cookie_jumps); + + return ret; + } +diff -uNrp glibc-2.11.1~/libio/iopopen.c glibc-2.11.1/libio/iopopen.c +--- glibc-2.11.1~/libio/iopopen.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/iopopen.c 2012-01-05 12:08:38.139676023 -0800 +@@ -304,7 +304,7 @@ _IO_new_popen (command, mode) + #endif + fp = &new_f->fpx.file.file; + INTUSE(_IO_init) (fp, 0); +- _IO_JUMPS (&new_f->fpx.file) = &_IO_proc_jumps; ++ _IO_JUMPS_SET (&new_f->fpx.file, &_IO_proc_jumps); + _IO_new_file_init (&new_f->fpx.file); + #if !_IO_UNIFIED_JUMPTABLES + new_f->fpx.file.vtable = NULL; +diff -uNrp glibc-2.11.1~/libio/iovdprintf.c glibc-2.11.1/libio/iovdprintf.c +--- glibc-2.11.1~/libio/iovdprintf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/iovdprintf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -43,7 +43,7 @@ _IO_vdprintf (d, format, arg) + tmpfil.file._lock = NULL; + #endif + _IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps); +- _IO_JUMPS (&tmpfil) = &_IO_file_jumps; ++ _IO_JUMPS_SET (&tmpfil, &_IO_file_jumps); + INTUSE(_IO_file_init) (&tmpfil); + #if !_IO_UNIFIED_JUMPTABLES + tmpfil.vtable = NULL; +diff -uNrp glibc-2.11.1~/libio/iovsprintf.c glibc-2.11.1/libio/iovsprintf.c +--- glibc-2.11.1~/libio/iovsprintf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/iovsprintf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -38,7 +38,7 @@ __IO_vsprintf (char *string, const char + sf._sbf._f._lock = NULL; + #endif + _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; ++ _IO_JUMPS_SET (&sf._sbf, &_IO_str_jumps); + _IO_str_init_static_internal (&sf, string, -1, string); + ret = INTUSE(_IO_vfprintf) (&sf._sbf._f, format, args); + _IO_putc_unlocked ('\0', &sf._sbf._f); +diff -uNrp glibc-2.11.1~/libio/iovsscanf.c glibc-2.11.1/libio/iovsscanf.c +--- glibc-2.11.1~/libio/iovsscanf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/iovsscanf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -40,7 +40,7 @@ _IO_vsscanf (string, format, args) + sf._sbf._f._lock = NULL; + #endif + _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; ++ _IO_JUMPS_SET (&sf._sbf, &_IO_str_jumps); + _IO_str_init_static_internal (&sf, (char*)string, 0, NULL); + ret = INTUSE(_IO_vfscanf) (&sf._sbf._f, format, args, NULL); + return ret; +diff -uNrp glibc-2.11.1~/libio/libioP.h glibc-2.11.1/libio/libioP.h +--- glibc-2.11.1~/libio/libioP.h 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/libioP.h 2012-01-05 12:13:24.243448752 -0800 +@@ -74,11 +74,11 @@ extern "C" { + * The _IO_FILE type is used to implement the FILE type in GNU libc, + * as well as the streambuf class in GNU iostreams for C++. + * These are all the same, just used differently. +- * An _IO_FILE (or FILE) object is allows followed by a pointer to +- * a jump table (of pointers to functions). The pointer is accessed +- * with the _IO_JUMPS macro. The jump table has a eccentric format, +- * so as to be compatible with the layout of a C++ virtual function table. +- * (as implemented by g++). When a pointer to a streambuf object is ++ * An _IO_FILE (or FILE) object is allows followed by a pointer to a jump ++ * table (of pointers to functions). The pointer is accessed with the ++ * _IO_JUMPS_SET and _IO_JUMPS_FUNC macros. The jump table has a eccentric ++ * format, so as to be compatible with the layout of a C++ virtual function ++ * table (as implemented by g++). When a pointer to a streambuf object is + * coerced to an (_IO_FILE*), then _IO_JUMPS on the result just + * happens to point to the virtual function table of the streambuf. + * Thus the _IO_JUMPS function table used for C stdio/libio does +@@ -105,20 +105,40 @@ extern "C" { + # define _IO_JUMPS_OFFSET 1 + #endif + +-#define _IO_JUMPS(THIS) (THIS)->vtable +-#define _IO_WIDE_JUMPS(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable ++static inline void ++__mangle_vtable(const struct _IO_jump_t **vtable, const struct _IO_jump_t *table) ++{ ++ struct _IO_jump_t *ptr; ++ ptr = (struct _IO_jump_t *)table; ++ PTR_MANGLE(ptr); ++ *vtable = ptr; ++} ++ ++#define _IO_JUMPS_RAW(THIS) (THIS)->vtable ++#define _IO_JUMPS_SET(THIS, TABLE) __mangle_vtable(&_IO_JUMPS_RAW(THIS), (TABLE)) ++#define _IO_WIDE_JUMPS_RAW(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable ++#define _IO_WIDE_JUMPS_SET(THIS, TABLE) __mangle_vtable(&_IO_WIDE_JUMPS_RAW(THIS), (TABLE)) + #define _IO_CHECK_WIDE(THIS) (((struct _IO_FILE *) (THIS))->_wide_data != NULL) + ++static inline const struct _IO_jump_t * ++__demangle_vtable(const struct _IO_jump_t *vtable) ++{ ++ struct _IO_jump_t *ptr; ++ ptr = (struct _IO_jump_t *)vtable; ++ PTR_DEMANGLE(ptr); ++ return (const struct _IO_jump_t *)ptr; ++} ++ + #if _IO_JUMPS_OFFSET +-# define _IO_JUMPS_FUNC(THIS) \ +- (*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \ +- + (THIS)->_vtable_offset)) ++# define _IO_JUMPS_FUNC(THIS) __demangle_vtable (\ ++ (*(struct _IO_jump_t **) ((void *) &_IO_JUMPS_RAW ((struct _IO_FILE_plus *) (THIS)) \ ++ + (THIS)->_vtable_offset))) + # define _IO_vtable_offset(THIS) (THIS)->_vtable_offset + #else +-# define _IO_JUMPS_FUNC(THIS) _IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) ++# define _IO_JUMPS_FUNC(THIS) __demangle_vtable (_IO_JUMPS_RAW ((struct _IO_FILE_plus *) (THIS))) + # define _IO_vtable_offset(THIS) 0 + #endif +-#define _IO_WIDE_JUMPS_FUNC(THIS) _IO_WIDE_JUMPS(THIS) ++#define _IO_WIDE_JUMPS_FUNC(THIS) __demangle_vtable (_IO_WIDE_JUMPS_RAW(THIS)) + #ifdef _G_USING_THUNKS + # define JUMP_FIELD(TYPE, NAME) TYPE NAME + # define JUMP0(FUNC, THIS) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS) +diff -uNrp glibc-2.11.1~/libio/memstream.c glibc-2.11.1/libio/memstream.c +--- glibc-2.11.1~/libio/memstream.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/memstream.c 2012-01-05 12:08:38.139676023 -0800 +@@ -87,7 +87,7 @@ open_memstream (bufloc, sizeloc) + if (buf == NULL) + return NULL; + INTUSE(_IO_init) (&new_f->fp._sf._sbf._f, 0); +- _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf) = &_IO_mem_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf, &_IO_mem_jumps); + _IO_str_init_static_internal (&new_f->fp._sf, buf, _IO_BUFSIZ, buf); + new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF; + new_f->fp._sf._s._allocate_buffer = (_IO_alloc_type) malloc; +diff -uNrp glibc-2.11.1~/libio/obprintf.c glibc-2.11.1/libio/obprintf.c +--- glibc-2.11.1~/libio/obprintf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/obprintf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -136,7 +136,7 @@ _IO_obstack_vprintf (struct obstack *obs + #endif + + _IO_no_init (&new_f.ofile.file.file, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&new_f.ofile.file) = &_IO_obstack_jumps; ++ _IO_JUMPS_SET (&new_f.ofile.file, &_IO_obstack_jumps); + room = obstack_room (obstack); + size = obstack_object_size (obstack) + room; + if (size == 0) +diff -uNrp glibc-2.11.1~/libio/oldiofdopen.c glibc-2.11.1/libio/oldiofdopen.c +--- glibc-2.11.1~/libio/oldiofdopen.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/oldiofdopen.c 2012-01-05 12:08:38.139676023 -0800 +@@ -117,7 +117,7 @@ _IO_old_fdopen (fd, mode) + new_f->fp.file._file._lock = &new_f->lock; + #endif + _IO_old_init (&new_f->fp.file._file, 0); +- _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp) = &_IO_old_file_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) &new_f->fp, &_IO_old_file_jumps); + _IO_old_file_init ((struct _IO_FILE_plus *) &new_f->fp); + #if !_IO_UNIFIED_JUMPTABLES + new_f->fp.vtable = NULL; +diff -uNrp glibc-2.11.1~/libio/oldiofopen.c glibc-2.11.1/libio/oldiofopen.c +--- glibc-2.11.1~/libio/oldiofopen.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/oldiofopen.c 2012-01-05 12:08:38.139676023 -0800 +@@ -56,7 +56,7 @@ _IO_old_fopen (filename, mode) + new_f->fp.file._file._lock = &new_f->lock; + #endif + _IO_old_init (&new_f->fp.file._file, 0); +- _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp) = &_IO_old_file_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) &new_f->fp, &_IO_old_file_jumps); + _IO_old_file_init ((struct _IO_FILE_plus *) &new_f->fp); + #if !_IO_UNIFIED_JUMPTABLES + new_f->fp.vtable = NULL; +diff -uNrp glibc-2.11.1~/libio/oldiopopen.c glibc-2.11.1/libio/oldiopopen.c +--- glibc-2.11.1~/libio/oldiopopen.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/oldiopopen.c 2012-01-05 12:08:38.139676023 -0800 +@@ -225,7 +225,7 @@ _IO_old_popen (command, mode) + #endif + fp = &new_f->fpx.file.file._file; + _IO_old_init (fp, 0); +- _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fpx.file) = &_IO_old_proc_jumps; ++ _IO_JUMPS_SET ((struct _IO_FILE_plus *) &new_f->fpx.file, &_IO_old_proc_jumps); + _IO_old_file_init ((struct _IO_FILE_plus *) &new_f->fpx.file); + #if !_IO_UNIFIED_JUMPTABLES + new_f->fpx.file.vtable = NULL; +diff -uNrp glibc-2.11.1~/libio/vasprintf.c glibc-2.11.1/libio/vasprintf.c +--- glibc-2.11.1~/libio/vasprintf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/vasprintf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -56,7 +56,7 @@ _IO_vasprintf (result_ptr, format, args) + sf._sbf._f._lock = NULL; + #endif + _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; ++ _IO_JUMPS_SET (&sf._sbf, &_IO_str_jumps); + _IO_str_init_static_internal (&sf, string, init_string_size, string); + sf._sbf._f._flags &= ~_IO_USER_BUF; + sf._s._allocate_buffer = (_IO_alloc_type) malloc; +diff -uNrp glibc-2.11.1~/libio/vsnprintf.c glibc-2.11.1/libio/vsnprintf.c +--- glibc-2.11.1~/libio/vsnprintf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/libio/vsnprintf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -114,7 +114,7 @@ _IO_vsnprintf (string, maxlen, format, a + } + + _IO_no_init (&sf.f._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&sf.f._sbf) = &_IO_strn_jumps; ++ _IO_JUMPS_SET (&sf.f._sbf, &_IO_strn_jumps); + string[0] = '\0'; + _IO_str_init_static_internal (&sf.f, string, maxlen - 1, string); + ret = INTUSE(_IO_vfprintf) (&sf.f._sbf._f, format, args); +diff -uNrp glibc-2.11.1~/misc/init-misc.c glibc-2.11.1/misc/init-misc.c +--- glibc-2.11.1~/misc/init-misc.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/misc/init-misc.c 2012-01-05 12:13:44.995722496 -0800 +@@ -17,7 +17,11 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#include "libioP.h" ++ + #include ++#include ++#include + #include + + char *__progname_full = (char *) ""; +@@ -38,4 +42,13 @@ __init_misc (int argc, char **argv, char + __progname = p + 1; + __progname_full = argv[0]; + } ++ ++ PTR_MANGLE (_IO_JUMPS_RAW ((struct _IO_FILE_plus *)stdin)); ++ PTR_MANGLE (_IO_WIDE_JUMPS_RAW (stdin)); ++ ++ PTR_MANGLE (_IO_JUMPS_RAW ((struct _IO_FILE_plus *)stdout)); ++ PTR_MANGLE (_IO_WIDE_JUMPS_RAW (stdout)); ++ ++ PTR_MANGLE (_IO_JUMPS_RAW ((struct _IO_FILE_plus *)stderr)); ++ PTR_MANGLE (_IO_WIDE_JUMPS_RAW (stderr)); + } +diff -uNrp glibc-2.11.1~/stdio-common/isoc99_vsscanf.c glibc-2.11.1/stdio-common/isoc99_vsscanf.c +--- glibc-2.11.1~/stdio-common/isoc99_vsscanf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/stdio-common/isoc99_vsscanf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -38,7 +38,7 @@ __isoc99_vsscanf (const char *string, co + sf._sbf._f._lock = NULL; + #endif + _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); +- _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; ++ _IO_JUMPS_SET (&sf._sbf, &_IO_str_jumps); + _IO_str_init_static_internal (&sf, (char*)string, 0, NULL); + sf._sbf._f._flags2 |= _IO_FLAGS2_SCANF_STD; + ret = INTUSE(_IO_vfscanf) (&sf._sbf._f, format, args, NULL); +diff -uNrp glibc-2.11.1~/stdio-common/vfprintf.c glibc-2.11.1/stdio-common/vfprintf.c +--- glibc-2.11.1~/stdio-common/vfprintf.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/stdio-common/vfprintf.c 2012-01-05 12:08:38.139676023 -0800 +@@ -2224,7 +2224,7 @@ buffered_vfprintf (register _IO_FILE *s, + hp->_lock = NULL; + #endif + hp->_flags2 = s->_flags2; +- _IO_JUMPS (&helper._f) = (struct _IO_jump_t *) &_IO_helper_jumps; ++ _IO_JUMPS_SET (&helper._f, (struct _IO_jump_t *) &_IO_helper_jumps); + + /* Now print to helper instead. */ + #ifndef COMPILE_WPRINTF +diff -uNrp glibc-2.11.1~/stdlib/strfmon_l.c glibc-2.11.1/stdlib/strfmon_l.c +--- glibc-2.11.1~/stdlib/strfmon_l.c 2009-12-08 12:10:20.000000000 -0800 ++++ glibc-2.11.1/stdlib/strfmon_l.c 2012-01-05 12:08:38.143676076 -0800 +@@ -517,7 +517,7 @@ __vstrfmon_l (char *s, size_t maxsize, _ + f._sbf._f._lock = NULL; + #endif + INTUSE(_IO_init) (&f._sbf._f, 0); +- _IO_JUMPS (&f._sbf) = &_IO_str_jumps; ++ _IO_JUMPS_SET (&f._sbf, &_IO_str_jumps); + INTUSE(_IO_str_init_static) (&f, dest, + (s + maxsize) - dest, dest); + /* We clear the last available byte so we can find out whether diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/local/glibc-2.15-arm-memcpy.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/local/glibc-2.15-arm-memcpy.patch new file mode 100644 index 0000000000..420d8c0fb4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/local/glibc-2.15-arm-memcpy.patch @@ -0,0 +1,370 @@ +--- ports/sysdeps/arm/eabi/armv7/memcpy.S ++++ ports/sysdeps/arm/eabi/armv7/memcpy.S 2012-08-02 15:59:19.932220525 -0700 +@@ -0,0 +1,367 @@ ++/* ++This version of memcpy for arm is from the newlib. ++http://sourceware.org/newlib/ ++*/ ++#include ++ ++ .text ++ ++/* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ ++ ++ENTRY(memcpy) ++ ++ /* Assumes that n >= 0, and dst, src are valid pointers. ++ If there is at least 8 bytes to copy, use LDRD/STRD. ++ If src and dst are misaligned with different offsets, ++ first copy byte by byte until dst is aligned, ++ and then copy using LDRD/STRD and shift if needed. ++ When less than 8 left, copy a word and then byte by byte. */ ++ ++ /* Save registers (r0 holds the return value): ++ optimized push {r0, r4, r5, lr}. ++ To try and improve performance, stack layout changed, ++ i.e., not keeping the stack looking like users expect ++ (highest numbered register at highest address). */ ++ push {r0, lr} ++ strd r4, r5, [sp, #-8]! ++ ++ /* TODO: Add debug frame directives. ++ We don't need exception unwind directives, because the code below ++ does not throw any exceptions and does not call any other functions. ++ Generally, newlib functions like this lack debug information for ++ assembler source. */ ++ ++ /* Get copying of tiny blocks out of the way first. */ ++ /* Is there at least 4 bytes to copy? */ ++ subs r2, r2, #4 ++ blt copy_less_than_4 /* If n < 4. */ ++ ++ /* Check word alignment. */ ++ ands ip, r0, #3 /* ip = last 2 bits of dst. */ ++ bne dst_not_word_aligned /* If dst is not word-aligned. */ ++ ++ /* Get here if dst is word-aligned. */ ++ ands ip, r1, #3 /* ip = last 2 bits of src. */ ++ bne src_not_word_aligned /* If src is not word-aligned. */ ++word_aligned: ++ /* Get here if source and dst both are word-aligned. ++ The number of bytes remaining to copy is r2+4. */ ++ ++ /* Is there is at least 64 bytes to copy? */ ++ subs r2, r2, #60 ++ blt copy_less_than_64 /* If r2 + 4 < 64. */ ++ ++ /* First, align the destination buffer to 8-bytes, ++ to make sure double loads and stores don't cross cache line boundary, ++ as they are then more expensive even if the data is in the cache ++ (require two load/store issue cycles instead of one). ++ If only one of the buffers is not 8-bytes aligned, ++ then it's more important to align dst than src, ++ because there is more penalty for stores ++ than loads that cross cacheline boundary. ++ This check and realignment are only worth doing ++ if there is a lot to copy. */ ++ ++ /* Get here if dst is word aligned, ++ i.e., the 2 least significant bits are 0. ++ If dst is not 2w aligned (i.e., the 3rd bit is not set in dst), ++ then copy 1 word (4 bytes). */ ++ ands r3, r0, #4 ++ beq 11f /* If dst already two-word aligned. */ ++ ldr r3, [r1], #4 ++ str r3, [r0], #4 ++ subs r2, r2, #4 ++ blt copy_less_than_64 ++ ++11: ++ /* TODO: Align to cacheline (useful for PLD optimization). */ ++ ++ /* Every loop iteration copies 64 bytes. */ ++1: ++ .irp offset, #0, #8, #16, #24, #32, #40, #48, #56 ++ ldrd r4, r5, [r1, \offset] ++ strd r4, r5, [r0, \offset] ++ .endr ++ ++ add r0, r0, #64 ++ add r1, r1, #64 ++ subs r2, r2, #64 ++ bge 1b /* If there is more to copy. */ ++ ++copy_less_than_64: ++ ++ /* Get here if less than 64 bytes to copy, -64 <= r2 < 0. ++ Restore the count if there is more than 7 bytes to copy. */ ++ adds r2, r2, #56 ++ blt copy_less_than_8 ++ ++ /* Copy 8 bytes at a time. */ ++2: ++ ldrd r4, r5, [r1], #8 ++ strd r4, r5, [r0], #8 ++ subs r2, r2, #8 ++ bge 2b /* If there is more to copy. */ ++ ++copy_less_than_8: ++ ++ /* Get here if less than 8 bytes to copy, -8 <= r2 < 0. ++ Check if there is more to copy. */ ++ cmn r2, #8 ++ beq return /* If r2 + 8 == 0. */ ++ ++ /* Restore the count if there is more than 3 bytes to copy. */ ++ adds r2, r2, #4 ++ blt copy_less_than_4 ++ ++ /* Copy 4 bytes. */ ++ ldr r3, [r1], #4 ++ str r3, [r0], #4 ++ ++copy_less_than_4: ++ /* Get here if less than 4 bytes to copy, -4 <= r2 < 0. */ ++ ++ /* Restore the count, check if there is more to copy. */ ++ adds r2, r2, #4 ++ beq return /* If r2 == 0. */ ++ ++ /* Get here with r2 is in {1,2,3}={01,10,11}. */ ++ /* Logical shift left r2, insert 0s, update flags. */ ++ lsls r2, r2, #31 ++ ++ /* Copy byte by byte. ++ Condition ne means the last bit of r2 is 0. ++ Condition cs means the second to last bit of r2 is set, ++ i.e., r2 is 1 or 3. */ ++ ldrneb r3, [r1], #1 ++ ldrcsb r4, [r1], #1 ++ ldrcsb ip, [r1] ++ strneb r3, [r0], #1 ++ strcsb r4, [r0], #1 ++ strcsb ip, [r0] ++ ++ ++return: ++ /* Restore registers: optimized pop {r0, r4, r5, pc} */ ++ ldrd r4, r5, [sp], #8 ++ pop {r0, pc} /* This is the only return point of memcpy. */ ++ ++#ifndef __ARM_FEATURE_UNALIGNED ++ ++ /* The following assembly macro implements misaligned copy in software. ++ Assumes that dst is word aligned, src is at offset "pull" bits from ++ word, push = 32 - pull, and the number of bytes that remain to copy ++ is r2 + 4, r2 >= 0. */ ++ ++ /* In the code below, r2 is the number of bytes that remain to be ++ written. The number of bytes read is always larger, because we have ++ partial words in the shift queue. */ ++ ++ .macro miscopy pull push shiftleft shiftright ++ ++ /* Align src to the previous word boundary. */ ++ bic r1, r1, #3 ++ ++ /* Initialize the shift queue. */ ++ ldr r5, [r1], #4 /* Load a word from source. */ ++ ++ subs r2, r2, #4 ++ blt 6f /* Go to misaligned copy of less than 8 bytes. */ ++ ++ /* Get here if there is more than 8 bytes to copy. ++ The number of bytes to copy is r2+8, r2 >= 0. */ ++ ++ /* Save registers: push { r6, r7 }. ++ We need additional registers for LDRD and STRD, because in ARM state ++ the first destination register must be even and the second ++ consecutive. */ ++ strd r6, r7, [sp, #-8]! ++ ++ subs r2, r2, #56 ++ blt 4f /* Go to misaligned copy of less than 64 bytes. */ ++ ++3: ++ /* Get here if there is more than 64 bytes to copy. ++ The number of bytes to copy is r2+64, r2 >= 0. */ ++ ++ /* Copy 64 bytes in every iteration. ++ Use a partial word from the shift queue. */ ++ .irp offset, #0, #8, #16, #24, #32, #40, #48, #56 ++ mov r6, r5, \shiftleft #\pull ++ ldrd r4, r5, [r1, \offset] ++ orr r6, r6, r4, \shiftright #\push ++ mov r7, r4, \shiftleft #\pull ++ orr r7, r7, r5, \shiftright #\push ++ strd r6, r7, [r0, \offset] ++ .endr ++ ++ add r1, r1, #64 ++ add r0, r0, #64 ++ subs r2, r2, #64 ++ bge 3b ++ ++4: ++ /* Get here if there is less than 64 bytes to copy (-64 <= r2 < 0) ++ and they are misaligned. */ ++ ++ /* Restore the count if there is more than 7 bytes to copy. */ ++ adds r2, r2, #56 ++ ++ /* If less than 8 bytes to copy, ++ restore registers saved for this loop: optimized poplt { r6, r7 }. */ ++ itt lt ++ ldrltd r6, r7, [sp], #8 ++ blt 6f /* Go to misaligned copy of less than 8 bytes. */ ++ ++5: ++ /* Copy 8 bytes at a time. ++ Use a partial word from the shift queue. */ ++ mov r6, r5, \shiftleft #\pull ++ ldrd r4, r5, [r1], #8 ++ orr r6, r6, r4, \shiftright #\push ++ mov r7, r4, \shiftleft #\pull ++ orr r7, r7, r5, \shiftright #\push ++ strd r6, r7, [r0], #8 ++ ++ subs r2, r2, #8 ++ bge 5b /* If there is more to copy. */ ++ ++ /* Restore registers saved for this loop: optimized pop { r6, r7 }. */ ++ ldrd r6, r7, [sp], #8 ++ ++6: ++ /* Get here if there less than 8 bytes to copy (-8 <= r2 < 0) ++ and they are misaligned. */ ++ ++ /* Check if there is more to copy. */ ++ cmn r2, #8 ++ beq return ++ ++ /* Check if there is less than 4 bytes to copy. */ ++ cmn r2, #4 ++ ++ itt lt ++ /* Restore src offset from word-align. */ ++ sublt r1, r1, #(\push / 8) ++ blt copy_less_than_4 ++ ++ /* Use a partial word from the shift queue. */ ++ mov r3, r5, \shiftleft #\pull ++ /* Load a word from src, but without writeback ++ (this word is not fully written to dst). */ ++ ldr r5, [r1] ++ ++ /* Restore src offset from word-align. */ ++ add r1, r1, #(\pull / 8) ++ ++ /* Shift bytes to create one dst word and store it. */ ++ orr r3, r3, r5, \shiftright #\push ++ str r3, [r0], #4 ++ ++ /* Use single byte copying of the remaining bytes. */ ++ b copy_less_than_4 ++ ++ .endm ++ ++#endif /* not __ARM_FEATURE_UNALIGNED */ ++ ++dst_not_word_aligned: ++ ++ /* Get here when dst is not aligned and ip has the last 2 bits of dst, ++ i.e., ip is the offset of dst from word. ++ The number of bytes that remains to copy is r2 + 4, ++ i.e., there are at least 4 bytes to copy. ++ Write a partial word (0 to 3 bytes), such that dst becomes ++ word-aligned. */ ++ ++ /* If dst is at ip bytes offset from a word (with 0 < ip < 4), ++ then there are (4 - ip) bytes to fill up to align dst to the next ++ word. */ ++ rsb ip, ip, #4 /* ip = #4 - ip. */ ++ cmp ip, #2 ++ ++ /* Copy byte by byte with conditionals. */ ++ ldrgtb r3, [r1], #1 ++ ldrgeb r4, [r1], #1 ++ ldrb lr, [r1], #1 ++ strgtb r3, [r0], #1 ++ strgeb r4, [r0], #1 ++ subs r2, r2, ip ++ strb lr, [r0], #1 ++ /* Update the count. ++ ip holds the number of bytes we have just copied. */ ++ /*subs r2, r2, ip /* r2 = r2 - ip. */ ++ blt copy_less_than_4 /* If r2 < ip. */ ++ ++ /* Get here if there are more than 4 bytes to copy. ++ Check if src is aligned. If beforehand src and dst were not word ++ aligned but congruent (same offset), then now they are both ++ word-aligned, and we can copy the rest efficiently (without ++ shifting). */ ++ ands ip, r1, #3 /* ip = last 2 bits of src. */ ++ beq word_aligned /* If r1 is word-aligned. */ ++ ++src_not_word_aligned: ++ /* Get here when src is not word-aligned, but dst is word-aligned. ++ The number of bytes that remains to copy is r2+4. */ ++ ++#ifdef __ARM_FEATURE_UNALIGNED ++ /* Copy word by word using LDR when alignment can be done in hardware, ++ i.e., SCTLR.A is set, supporting unaligned access in LDR and STR. */ ++ subs r2, r2, #60 ++ blt 8f ++ ++7: ++ /* Copy 64 bytes in every loop iteration. */ ++ .irp offset, #0, #4, #8, #12, #16, #20, #24, #28, #32, #36, #40, #44, #48, #52, #56, #60 ++ ldr r3, [r1, \offset] ++ str r3, [r0, \offset] ++ .endr ++ ++ add r0, r0, #64 ++ add r1, r1, #64 ++ subs r2, r2, #64 ++ bge 7b ++ ++8: ++ /* Get here if less than 64 bytes to copy, -64 <= r2 < 0. ++ Check if there is more than 3 bytes to copy. */ ++ adds r2, r2, #60 ++ blt copy_less_than_4 ++ ++9: ++ /* Get here if there is less than 64 but at least 4 bytes to copy, ++ where the number of bytes to copy is r2+4. */ ++ ldr r3, [r1], #4 ++ str r3, [r0], #4 ++ subs r2, r2, #4 ++ bge 9b ++ ++ b copy_less_than_4 ++ ++#else /* not __ARM_FEATURE_UNALIGNED */ ++ ++ /* ip has last 2 bits of src, ++ i.e., ip is the offset of src from word, and ip > 0. ++ Compute shifts needed to copy from src to dst. */ ++ cmp ip, #2 ++ beq miscopy_16_16 /* If ip == 2. */ ++ bge miscopy_24_8 /* If ip == 3. */ ++ ++ /* Get here if ip == 1. */ ++ ++ /* Endian independent macros for shifting bytes within registers. */ ++ ++#ifndef __ARMEB__ ++miscopy_8_24: miscopy pull=8 push=24 shiftleft=lsr shiftright=lsl ++miscopy_16_16: miscopy pull=16 push=16 shiftleft=lsr shiftright=lsl ++miscopy_24_8: miscopy pull=24 push=8 shiftleft=lsr shiftright=lsl ++#else /* not __ARMEB__ */ ++miscopy_8_24: miscopy pull=8 push=24 shiftleft=lsl shiftright=lsr ++miscopy_16_16: miscopy pull=16 push=16 shiftleft=lsl shiftright=lsr ++miscopy_24_8: miscopy pull=24 push=8 shiftleft=lsl shiftright=lsr ++#endif /* not __ARMEB__ */ ++ ++#endif /* not __ARM_FEATURE_UNALIGNED */ ++ ++END(memcpy) ++libc_hidden_builtin_def (memcpy) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.15-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.15-r5.ebuild new file mode 100644 index 0000000000..fb6d29cd54 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.15-r5.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.1 2012/05/18 05:04:44 vapier Exp $ + +inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker binutils-funcs + +DESCRIPTION="GNU libc6 (also called glibc2) C library" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" + +LICENSE="LGPL-2" +KEYWORDS="amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +RESTRICT="strip" # strip ourself #46186 +EMULTILIB_PKG="true" + +# Configuration variables +RELEASE_VER="" +BRANCH_UPDATE="" +SNAP_VER="" +case ${PV} in +9999*) + EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" ) + EGIT_SOURCEDIRS=( "${S}" "${S}/ports" ) + inherit git-2 + ;; +*_p*) + RELEASE_VER=${PV%_p*} + SNAP_VER=${PV#*_p} + ;; +*) + RELEASE_VER=${PV} + ;; +esac +MANPAGE_VER="" # pregenerated manpages +INFOPAGE_VER="" # pregenerated infopages +LIBIDN_VER="" # it's integrated into the main tarball now +PATCH_VER="22" # Gentoo patchset +PORTS_VER=${RELEASE_VER} # version of glibc ports addon +NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires + +IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only" +[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} + +# Here's how the cross-compile logic breaks down ... +# CTARGET - machine that will target the binaries +# CHOST - machine that will host the binaries +# CBUILD - machine that will build the binaries +# If CTARGET != CHOST, it means you want a libc for cross-compiling. +# If CHOST != CBUILD, it means you want to cross-compile the libc. +# CBUILD = CHOST = CTARGET - native build/install +# CBUILD != (CHOST = CTARGET) - cross-compile a native build +# (CBUILD = CHOST) != CTARGET - libc for cross-compiler +# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler +# For install paths: +# CHOST = CTARGET - install into / +# CHOST != CTARGET - install into /usr/CTARGET/ + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20} + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} +alt_libdir() { + if is_crosscompile ; then + echo /usr/${CTARGET}/$(get_libdir) + else + echo /$(get_libdir) + fi +} + +if is_crosscompile ; then + SLOT="${CTARGET}-2.2" +else + # Why SLOT 2.2 you ask yourself while sippin your tea ? + # Everyone knows 2.2 > 0, duh. + SLOT="2.2" +fi + +# General: We need a new-enough binutils for as-needed +# arch: we need to make sure our binutils/gcc supports TLS +DEPEND=">=sys-devel/gcc-3.4.4 + arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) + x86? ( >=sys-devel/gcc-4.3 ) + amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) + ppc? ( >=sys-devel/gcc-4.1.0 ) + ppc64? ( >=sys-devel/gcc-4.1.0 ) + >=sys-devel/binutils-2.15.94 + >=app-misc/pax-utils-0.1.10 + virtual/os-headers + !=sys-devel/patch-2.6.1 + selinux? ( sys-libs/libselinux )" +RDEPEND="!sys-kernel/ps3-sources + selinux? ( sys-libs/libselinux ) + !sys-libs/nss-db" + +if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" + [[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers" +else + DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )" + RDEPEND="${RDEPEND} + vanilla? ( !sys-libs/timezone-data ) + !vanilla? ( sys-libs/timezone-data )" +fi + +SRC_URI=$( + upstream_uris() { + echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 + } + gentoo_uris() { + local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" + devspace=${devspace//HTTP/http://dev.gentoo.org/} + echo mirror://gentoo/$1 ${devspace//URI/$1} + } + + TARNAME=${PN} + if [[ -n ${SNAP_VER} ]] ; then + TARNAME="${PN}-${RELEASE_VER}" + [[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER} + upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2 + elif [[ -z ${EGIT_REPO_URIS} ]] ; then + upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz + fi + [[ -n ${LIBIDN_VER} ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2 + [[ -n ${PORTS_VER} ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz + [[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 + [[ -n ${PATCH_VER} ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 + [[ -n ${MANPAGE_VER} ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2 + [[ -n ${INFOPAGE_VER} ]] && gentoo_uris glibc-infopages-${INFOPAGE_VER}.tar.bz2 +) + +# eblit-include [--skip] [version] +eblit-include() { + local skipable=false + [[ $1 == "--skip" ]] && skipable=true && shift + [[ $1 == pkg_* ]] && skipable=true + + local e v func=$1 ver=$2 + [[ -z ${func} ]] && die "Usage: eblit-include [version]" + for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do + e="${FILESDIR}/eblits/${func}${v}.eblit" + if [[ -e ${e} ]] ; then + source "${e}" + return 0 + fi + done + ${skipable} && return 0 + die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" +} + +# eblit-run-maybe +# run the specified function if it is defined +eblit-run-maybe() { + [[ $(type -t "$@") == "function" ]] && "$@" +} + +# eblit-run [version] +# aka: src_unpack() { eblit-run src_unpack ; } +eblit-run() { + eblit-include --skip common "${*:2}" + eblit-include "$@" + eblit-run-maybe eblit-$1-pre + eblit-${PN}-$1 + eblit-run-maybe eblit-$1-post +} + +src_unpack() { eblit-run src_unpack ; } +src_compile() { eblit-run src_compile ; } +src_test() { eblit-run src_test ; } +src_install() { eblit-run src_install ; } + +# FILESDIR might not be available during binpkg install +for x in setup {pre,post}inst ; do + e="${FILESDIR}/eblits/pkg_${x}.eblit" + if [[ -e ${e} ]] ; then + . "${e}" + eval "pkg_${x}() { eblit-run pkg_${x} ; }" + fi +done + +eblit-src_unpack-pre() { + if [[ ${CTARGET} == x86_64* ]] && has x32 $(get_all_abis) ; then + GLIBC_PATCH_EXCLUDE+=" 0080_all_glibc-2.15-revert-x86_64-eagain-pthread_cond_wait.patch" + else + GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" + fi +} + +eblit-src_unpack-post() { + cd "${S}" + epatch "${FILESDIR}"/local/glibc-2.14-file-mangle.patch + epatch "${FILESDIR}"/2.11/glibc-2.11-frecord-gcc-switches.patch + epatch "${FILESDIR}"/2.11/glibc-2.11-disable-memset-warning.patch + epatch "${FILESDIR}"/2.11/glibc-2.11-resolv-milliseconds.patch + epatch "${FILESDIR}"/local/glibc-2.15-arm-memcpy.patch + if use hardened ; then + cd "${S}" + einfo "Patching to get working PIE binaries on PIE (hardened) platforms" + gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch + epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch + epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch + epatch "${FILESDIR}"/2.11/glibc-2.11-tls-stack-addition.patch + + einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" + cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ + debug/stack_chk_fail.c || die + cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ + debug/chk_fail.c || die + + if use debug ; then + # When using Hardened Gentoo stack handler, have smashes dump core for + # analysis - debug only, as core could be an information leak + # (paranoia). + sed -i \ + -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ + debug/Makefile \ + || die "Failed to modify debug/Makefile for debug stack handler" + sed -i \ + -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ + debug/Makefile \ + || die "Failed to modify debug/Makefile for debug fortify handler" + fi + + # Build nscd with ssp-all + sed -i \ + -e 's:-fstack-protector$:-fstack-protector-all:' \ + nscd/Makefile \ + || die "Failed to ensure nscd builds with ssp-all" + fi +} + +eblit-pkg_preinst-post() { + if [[ ${CTARGET} == arm* ]] ; then + # Backwards compat support for renaming hardfp ldsos #417287 + local oldso='/lib/ld-linux.so.3' + local nldso='/lib/ld-linux-armhf.so.3' + if [[ -e ${D}${nldso} ]] ; then + if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then + ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." + ewarn "Please rebuild all packages using this old ldso as compat" + ewarn "support will be dropped in the future." + ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" + fi + fi + fi +} + +maint_pkg_create() { + local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}" + cd ${base} + local stamp=$(date +%Y%m%d) + local d + for d in libc ports ; do + #(cd ${d} && cvs up) + case ${d} in + libc) tarball="${P}";; + ports) tarball="${PN}-ports-${PV}";; + esac + rm -f ${tarball}* + ln -sf ${d} ${tarball} + tar hcf - ${tarball} --exclude-vcs | lzma > "${T}"/${tarball}.tar.lzma + du -b "${T}"/${tarball}.tar.lzma + done +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.16.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.16.0.ebuild new file mode 100644 index 0000000000..d842ab1f8f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.16.0.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.16 2012/11/18 09:32:24 vapier Exp $ + +inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing + +DESCRIPTION="GNU libc6 (also called glibc2) C library" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" + +LICENSE="LGPL-2" +KEYWORDS="" +RESTRICT="strip" # strip ourself #46186 +EMULTILIB_PKG="true" + +# Configuration variables +RELEASE_VER="" +BRANCH_UPDATE="" +SNAP_VER="" +case ${PV} in +9999*) + EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" ) + EGIT_SOURCEDIRS=( "${S}" "${S}/ports" ) + inherit git-2 + ;; +*_p*) + RELEASE_VER=${PV%_p*} + SNAP_VER=${PV#*_p} + ;; +*) + RELEASE_VER=${PV} + ;; +esac +MANPAGE_VER="" # pregenerated manpages +INFOPAGE_VER="" # pregenerated infopages +LIBIDN_VER="" # it's integrated into the main tarball now +PATCH_VER="8" # Gentoo patchset +PORTS_VER=${RELEASE_VER} # version of glibc ports addon +NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires + +IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only" +[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} + +# Here's how the cross-compile logic breaks down ... +# CTARGET - machine that will target the binaries +# CHOST - machine that will host the binaries +# CBUILD - machine that will build the binaries +# If CTARGET != CHOST, it means you want a libc for cross-compiling. +# If CHOST != CBUILD, it means you want to cross-compile the libc. +# CBUILD = CHOST = CTARGET - native build/install +# CBUILD != (CHOST = CTARGET) - cross-compile a native build +# (CBUILD = CHOST) != CTARGET - libc for cross-compiler +# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler +# For install paths: +# CHOST = CTARGET - install into / +# CHOST != CTARGET - install into /usr/CTARGET/ + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20} + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +# Why SLOT 2.2 you ask yourself while sippin your tea ? +# Everyone knows 2.2 > 0, duh. +SLOT="2.2" + +# General: We need a new-enough binutils/gcc to match upstream baseline. +# arch: we need to make sure our binutils/gcc supports TLS. +DEPEND=">=app-misc/pax-utils-0.1.10 + ! [version] +eblit-include() { + local skipable=false + [[ $1 == "--skip" ]] && skipable=true && shift + [[ $1 == pkg_* ]] && skipable=true + + local e v func=$1 ver=$2 + [[ -z ${func} ]] && die "Usage: eblit-include [version]" + for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do + e="${FILESDIR}/eblits/${func}${v}.eblit" + if [[ -e ${e} ]] ; then + source "${e}" + return 0 + fi + done + ${skipable} && return 0 + die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" +} + +# eblit-run-maybe +# run the specified function if it is defined +eblit-run-maybe() { + [[ $(type -t "$@") == "function" ]] && "$@" +} + +# eblit-run [version] +# aka: src_unpack() { eblit-run src_unpack ; } +eblit-run() { + eblit-include --skip common "${*:2}" + eblit-include "$@" + eblit-run-maybe eblit-$1-pre + eblit-${PN}-$1 + eblit-run-maybe eblit-$1-post +} + +src_unpack() { eblit-run src_unpack ; } +src_compile() { eblit-run src_compile ; } +src_test() { eblit-run src_test ; } +src_install() { eblit-run src_install ; } + +# FILESDIR might not be available during binpkg install +for x in setup {pre,post}inst ; do + e="${FILESDIR}/eblits/pkg_${x}.eblit" + if [[ -e ${e} ]] ; then + . "${e}" + eval "pkg_${x}() { eblit-run pkg_${x} ; }" + fi +done + +eblit-src_unpack-post() { + if use hardened ; then + cd "${S}" + einfo "Patching to get working PIE binaries on PIE (hardened) platforms" + gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch + epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch + epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch + + einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" + cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ + debug/stack_chk_fail.c || die + cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ + debug/chk_fail.c || die + + if use debug ; then + # When using Hardened Gentoo stack handler, have smashes dump core for + # analysis - debug only, as core could be an information leak + # (paranoia). + sed -i \ + -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ + debug/Makefile \ + || die "Failed to modify debug/Makefile for debug stack handler" + sed -i \ + -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ + debug/Makefile \ + || die "Failed to modify debug/Makefile for debug fortify handler" + fi + + # Build nscd with ssp-all + sed -i \ + -e 's:-fstack-protector$:-fstack-protector-all:' \ + nscd/Makefile \ + || die "Failed to ensure nscd builds with ssp-all" + fi +} + +eblit-pkg_preinst-post() { + if [[ ${CTARGET} == arm* ]] ; then + # Backwards compat support for renaming hardfp ldsos #417287 + local oldso='/lib/ld-linux.so.3' + local nldso='/lib/ld-linux-armhf.so.3' + if [[ -e ${D}${nldso} ]] ; then + if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then + ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." + ewarn "Please rebuild all packages using this old ldso as compat" + ewarn "support will be dropped in the future." + ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" + fi + fi + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-9999.ebuild new file mode 100644 index 0000000000..6a6c26c541 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-9999.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.16 2012/11/02 18:25:11 vapier Exp $ + +inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing binutils-funcs + +DESCRIPTION="GNU libc6 (also called glibc2) C library" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" + +LICENSE="LGPL-2" +#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +RESTRICT="strip" # strip ourself #46186 +EMULTILIB_PKG="true" + +# Configuration variables +RELEASE_VER="" +case ${PV} in +9999*) + EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" ) + EGIT_SOURCEDIRS=( "${S}" "${S}/ports" ) + inherit git-2 + ;; +*) + RELEASE_VER=${PV} + ;; +esac +PATCH_VER="" # Gentoo patchset +PORTS_VER=${RELEASE_VER} # version of glibc ports addon +NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires + +IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only" + +# Here's how the cross-compile logic breaks down ... +# CTARGET - machine that will target the binaries +# CHOST - machine that will host the binaries +# CBUILD - machine that will build the binaries +# If CTARGET != CHOST, it means you want a libc for cross-compiling. +# If CHOST != CBUILD, it means you want to cross-compile the libc. +# CBUILD = CHOST = CTARGET - native build/install +# CBUILD != (CHOST = CTARGET) - cross-compile a native build +# (CBUILD = CHOST) != CTARGET - libc for cross-compiler +# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler +# For install paths: +# CHOST = CTARGET - install into / +# CHOST != CTARGET - install into /usr/CTARGET/ + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20} + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +# Why SLOT 2.2 you ask yourself while sippin your tea ? +# Everyone knows 2.2 > 0, duh. +SLOT="2.2" + +# General: We need a new-enough binutils/gcc to match upstream baseline. +# arch: we need to make sure our binutils/gcc supports TLS. +DEPEND=">=app-misc/pax-utils-0.1.10 + ! [version] +eblit-include() { + local skipable=false + [[ $1 == "--skip" ]] && skipable=true && shift + [[ $1 == pkg_* ]] && skipable=true + + local e v func=$1 ver=$2 + [[ -z ${func} ]] && die "Usage: eblit-include [version]" + for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do + e="${FILESDIR}/eblits/${func}${v}.eblit" + if [[ -e ${e} ]] ; then + source "${e}" + return 0 + fi + done + ${skipable} && return 0 + die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" +} + +# eblit-run-maybe +# run the specified function if it is defined +eblit-run-maybe() { + [[ $(type -t "$@") == "function" ]] && "$@" +} + +# eblit-run [version] +# aka: src_unpack() { eblit-run src_unpack ; } +eblit-run() { + eblit-include --skip common "${*:2}" + eblit-include "$@" + eblit-run-maybe eblit-$1-pre + eblit-${PN}-$1 + eblit-run-maybe eblit-$1-post +} + +src_unpack() { eblit-run src_unpack ; } +src_compile() { eblit-run src_compile ; } +src_test() { eblit-run src_test ; } +src_install() { eblit-run src_install ; } + +# FILESDIR might not be available during binpkg install +for x in setup {pre,post}inst ; do + e="${FILESDIR}/eblits/pkg_${x}.eblit" + if [[ -e ${e} ]] ; then + . "${e}" + eval "pkg_${x}() { eblit-run pkg_${x} ; }" + fi +done + +eblit-src_unpack-post() { + if use hardened ; then + cd "${S}" + einfo "Patching to get working PIE binaries on PIE (hardened) platforms" + gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch + epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch + epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch + + einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" + cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ + debug/stack_chk_fail.c || die + cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ + debug/chk_fail.c || die + + if use debug ; then + # When using Hardened Gentoo stack handler, have smashes dump core for + # analysis - debug only, as core could be an information leak + # (paranoia). + sed -i \ + -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ + debug/Makefile \ + || die "Failed to modify debug/Makefile for debug stack handler" + sed -i \ + -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ + debug/Makefile \ + || die "Failed to modify debug/Makefile for debug fortify handler" + fi + + # Build nscd with ssp-all + sed -i \ + -e 's:-fstack-protector$:-fstack-protector-all:' \ + nscd/Makefile \ + || die "Failed to ensure nscd builds with ssp-all" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/Manifest new file mode 100644 index 0000000000..505564766a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/Manifest @@ -0,0 +1 @@ +DIST busybox-1.19.0.tar.bz2 2168657 RMD160 07c8c313d8ed7edcf8f12fe805389c96bda3dae2 SHA1 70569f23751640d9ac7fc2aa49b29e6cd274be6d SHA256 19cf44a096d7796800780d6344c4cc5054dac9f50d1c9b7a5c506c4777f7620c diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/libbb-1.19.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/libbb-1.19.0.ebuild new file mode 100644 index 0000000000..ca58e78caa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/libbb-1.19.0.ebuild @@ -0,0 +1,53 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +inherit toolchain-funcs flag-o-matic cros-au + +MY_P=busybox-${PV/_/-} +DESCRIPTION="library for busybox - libbb.a" +HOMEPAGE="http://www.busybox.net/" +SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="32bit_au" + +S=${WORKDIR}/${MY_P} + +busybox_config_option() { + case $1 in + y) sed -i -e "s:.*\.*set:CONFIG_$2=y:g" .config;; + n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; + *) use $1 \ + && busybox_config_option y $2 \ + || busybox_config_option n $2 + return 0 + ;; + esac + einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...) +} + +src_configure() { + emake allnoconfig > /dev/null + busybox_config_option y DD + busybox_config_option y RM + busybox_config_option y DD_IBS_OBS +} + +src_compile() { + use 32bit_au && board_setup_32bit_au_env + + tc-export CC AR RANLIB + emake CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" libbb/lib.a + # Add the list of utils we need. Unused symbols will be stripped + cp libbb/lib.a libbb/libbb.a || die + $AR rc libbb/libbb.a coreutils/{dd,rm}.o || die +} + +src_install() { + dolib.a libbb/libbb.a + insinto /usr/include + doins include/libbb.h +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest new file mode 100644 index 0000000000..5c493835bd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest @@ -0,0 +1 @@ +DIST talloc-2.0.1.tar.gz 242426 RMD160 b6d28a9f913c5d3abe2098d8b571bd293156ae1c SHA1 40453d01e3676832150cefe0a057835d3a847ac1 SHA256 5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/files/talloc-2.0.0-without-doc.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/files/talloc-2.0.0-without-doc.patch new file mode 100644 index 0000000000..1e9a319dc7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/files/talloc-2.0.0-without-doc.patch @@ -0,0 +1,21 @@ +--- talloc-2.0.0-orig/configure.ac 2009-08-31 02:58:36 +0900 ++++ talloc-2.0.0/configure.ac 2009-10-23 11:00:13 +0900 +@@ -36,10 +36,15 @@ + m4_include(libtalloc.m4) + m4_include(compat/talloc_compat1.m4) + +-AC_PATH_PROG(XSLTPROC,xsltproc) + DOC_TARGET="" +-if test -n "$XSLTPROC"; then +- DOC_TARGET=doc ++AC_ARG_WITH([doc], ++ AS_HELP_STRING([--without-doc], [disable manpage generation]), ++ [], [with_doc=yes]) ++if test "yes" = "$with_doc"; then ++ AC_PATH_PROG(XSLTPROC,xsltproc) ++ if test -n "$XSLTPROC"; then ++ DOC_TARGET=doc ++ fi + fi + AC_SUBST(DOC_TARGET) + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.0.1-r1.ebuild new file mode 120000 index 0000000000..473214428c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.0.1-r1.ebuild @@ -0,0 +1 @@ +talloc-2.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.0.1.ebuild new file mode 100644 index 0000000000..7670471da4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.0.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.1.ebuild,v 1.1 2010/01/26 22:04:08 patrick Exp $ + +EAPI="2" + +inherit confutils eutils autotools + +DESCRIPTION="Samba talloc library" +HOMEPAGE="http://talloc.samba.org/" +SRC_URI="http://samba.org/ftp/talloc/${P}.tar.gz" +LICENSE="GPL-3" +IUSE="compat doc" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86" + +DEPEND="! +Date: Mon, 31 Jan 2011 15:30:01 +0100 +Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused + +The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't +synchronous, i. e. it doesn't wait until the module usage count actually drops +to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some +models/older kernels you need to do that to fix suspend problems), as at that +point the module is still in use. + +On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to +unload, so use 100 ms wait steps with a timeout of 2 seconds. + +Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759 +Bug-Ubuntu: https://launchpad.net/bugs/698331 +--- + pm/sleep.d/49bluetooth | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth +index d46ba49..0dc1909 100755 +--- a/pm/sleep.d/49bluetooth ++++ b/pm/sleep.d/49bluetooth +@@ -12,6 +12,15 @@ suspend_bluetooth() + if grep -q enabled /proc/acpi/ibm/bluetooth; then + savestate ibm_bluetooth enable + echo disable > /proc/acpi/ibm/bluetooth ++ ++ # wait for up to 2 seconds for the module to actually get ++ # unused ++ TIMEOUT=20 ++ while [ $TIMEOUT -ge 0 ]; do ++ [ `cat /sys/module/btusb/refcnt` = 0 ] && break ++ TIMEOUT=$((TIMEOUT-1)) ++ sleep 0.1 ++ done + else + savestate ibm_bluetooth disable + fi +-- +1.7.2.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch b/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch new file mode 100644 index 0000000000..7b5494932c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch @@ -0,0 +1,26 @@ +Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware. +Author: Martin Pitt +Bug-Ubuntu: https://launchpad.net/bugs/539467 + +Index: pm-utils/pm/power.d/sata_alpm +=================================================================== +--- pm-utils.orig/pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100 ++++ pm-utils/pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100 +@@ -2,7 +2,7 @@ + + . "${PM_FUNCTIONS}" + +-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true} ++SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false} + + help() { + cat < +To: submit@bugs.debian.org +Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug) +Date: Sat, 25 Sep 2010 11:27:30 +0200 + +In the script intel-audio-powersave is this loop + +for dev in /sys/module/snd_*/parameters/power_save; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for $s to %d..." "$dev##*/" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + +I think it should be + +for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + + +This fixes the two bugs. + +diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave +index 36675a8..da63e40 100644 +--- a/pm/power.d/intel-audio-powersave ++++ b/pm/power.d/intel-audio-powersave +@@ -20,9 +20,9 @@ EOF + + audio_powersave() { + [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA +- for dev in /sys/module/snd_*/parameters/power_save; do ++ for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue +- printf "Setting power savings for $s to %d..." "$dev##*/" "$1" ++ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. + done + } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/files/1.4.1-logging-append.patch b/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/files/1.4.1-logging-append.patch new file mode 100644 index 0000000000..987e0570a9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/files/1.4.1-logging-append.patch @@ -0,0 +1,19 @@ +Author: James Westby +Description: Do not clear the log file on each operation, but instead append to it. + This makes debugging of several suspends much easier. +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255 +Bug-Ubuntu: https://launchpad.net/bugs/410352 + +Index: pm-utils/pm/pm-functions.in +=================================================================== +--- pm-utils.orig/pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200 ++++ pm-utils/pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200 +@@ -271,7 +271,7 @@ + return 1 + fi + export LOGGING=true +- exec > "$1" 2>&1 ++ exec >> "$1" 2>&1 + } + + check_suspend() { [ -n "$SUSPEND_MODULE" ]; } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/pm-utils-1.4.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/pm-utils-1.4.1-r2.ebuild new file mode 100644 index 0000000000..105030cfaf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-power/pm-utils/pm-utils-1.4.1-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1.ebuild,v 1.10 2010/12/12 16:50:12 armin76 Exp $ + +EAPI=2 +inherit multilib + +DESCRIPTION="Suspend and hibernation utilities" +HOMEPAGE="http://pm-utils.freedesktop.org/" +SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" +IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon" + +vbetool="!video_cards_intel? ( sys-apps/vbetool )" +DEPEND="!=sys-power/powermgmt-base-1.31[-pm-utils]" +RDEPEND="${DEPEND} + sys-apps/dbus + >=sys-apps/util-linux-2.13 + sys-power/pm-quirks + alsa? ( media-sound/alsa-utils ) + networkmanager? ( net-misc/networkmanager ) + ntp? ( || ( net-misc/ntp net-misc/openntpd ) ) + amd64? ( ${vbetool} ) + x86? ( ${vbetool} ) + video_cards_radeon? ( app-laptop/radeontool )" + +src_prepare() { + local ignore="01grub" + use networkmanager || ignore+=" 55NetworkManager" + use ntp || ignore+=" 90clock" + + # this kills our usb ethernet devices + ignore+=" disable_wol" + + # don't touch vm settings + ignore+=" laptop-mode" + + use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo + echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo +} + +src_configure() { + econf \ + --docdir=/usr/share/doc/${PF} \ + --disable-dependency-tracking \ + --disable-doc +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO ||die + doman man/*.{1,8} || die + + insinto /etc/pm/config.d + doins "${T}"/gentoo || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-bsp/chromeos-bsp-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-bsp/chromeos-bsp-1.ebuild new file mode 100644 index 0000000000..be2868ffbc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-bsp/chromeos-bsp-1.ebuild @@ -0,0 +1,37 @@ +# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +DESCRIPTION="Generic ebuild which satisifies virtual/chromeos-bsp. +This is a direct dependency of chromeos-base/chromeos, but is expected to +be overridden in an overlay for each specialized board. A typical +non-generic implementation will install any board-specific configuration +files and drivers which are not suitable for inclusion in a generic board +overlay." +HOMEPAGE="http://src.chromium.org" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +X86_DEPEND=" + net-wireless/iwl1000-ucode + net-wireless/iwl2000-ucode + net-wireless/iwl2030-ucode + net-wireless/iwl3945-ucode + net-wireless/iwl4965-ucode + >=net-wireless/iwl5000-ucode-8.24.2.12 + net-wireless/iwl6000-ucode + net-wireless/iwl6005-ucode + net-wireless/iwl6030-ucode + net-wireless/iwl6050-ucode +" + +RDEPEND=" + !chromeos-base/chromeos-bsp-null + amd64? ( ${X86_DEPEND} ) + x86? ( ${X86_DEPEND} ) +" +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-coreboot/chromeos-coreboot-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-coreboot/chromeos-coreboot-1.ebuild new file mode 100644 index 0000000000..ddd19aa3dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-coreboot/chromeos-coreboot-1.ebuild @@ -0,0 +1,13 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Chrome OS Firmware virtual package" +HOMEPAGE="http://src.chromium.org" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="sys-boot/chromeos-coreboot" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-firmware/chromeos-firmware-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-firmware/chromeos-firmware-1.ebuild new file mode 100644 index 0000000000..43974d38b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/chromeos-firmware/chromeos-firmware-1.ebuild @@ -0,0 +1,13 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Chrome OS Firmware virtual package" +HOMEPAGE="http://src.chromium.org" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" + +RDEPEND="chromeos-base/chromeos-firmware-null" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/glu/glu-9.0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/glu/glu-9.0.ebuild new file mode 100644 index 0000000000..eb8d448c99 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/glu/glu-9.0.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0.ebuild,v 1.1 2012/09/18 23:45:34 chithanh Exp $ + +DESCRIPTION="Virtual for OpenGL utility library" +HOMEPAGE="" +SRC_URI="" +LICENSE="" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" +RDEPEND="|| ( media-libs/glu media-libs/opengl-apple )" +DEPEND="" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-1.ebuild new file mode 100644 index 0000000000..b1d0181fe2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-1.ebuild @@ -0,0 +1,17 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +DESCRIPTION="Chrome OS Kernel virtual package" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="-kernel_next -kernel_sources" + +RDEPEND=" + kernel_next? ( sys-kernel/chromeos-kernel-next[kernel_sources=] ) + !kernel_next? ( sys-kernel/chromeos-kernel[kernel_sources=] ) +" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1-r2.ebuild new file mode 120000 index 0000000000..4a36547ba1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1-r2.ebuild @@ -0,0 +1 @@ +modemmanager-1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1.ebuild new file mode 100644 index 0000000000..3f2b29cbfd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Chrome OS virtual ModemManager package" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="+modemmanager_next" + +# TODO(benchan): Remove this virtual package once there is no need to switch +# back to modemmanager. +DEPEND=" + modemmanager_next? ( + net-misc/modemmanager-next + net-misc/modemmanager-classic-interfaces + !net-misc/modemmanager + !net-misc/modemmanager-next-interfaces + ) + !modemmanager_next? ( + !net-misc/modemmanager-next + !net-misc/modemmanager-classic-interfaces + net-misc/modemmanager + net-misc/modemmanager-next-interfaces + ) +" +RDEPEND="${DEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/opengles/opengles-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/opengles/opengles-1.ebuild new file mode 100644 index 0000000000..aa1f6893b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/opengles/opengles-1.ebuild @@ -0,0 +1,12 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Virtual for OpenGLES implementations" +SRC_URI="" + +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd" +IUSE="" + +RDEPEND="x11-drivers/opengles" +DEPEND="" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/u-boot-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/u-boot-1.ebuild new file mode 100644 index 0000000000..288fa41b78 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/u-boot-1.ebuild @@ -0,0 +1,16 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Chrome OS u-boot virtual package" +HOMEPAGE="http://src.chromium.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND=" + sys-boot/chromeos-u-boot +" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild new file mode 100644 index 0000000000..876e3461f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.2.ebuild,v 1.3 2009/12/10 18:16:44 fauli Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="intel gpu userland tools" +KEYWORDS="amd64 x86" +IUSE="" +RESTRICT="test" + +DEPEND=" + >=x11-libs/libdrm-2.4.6 + >=x11-libs/libpciaccess-0.10 + x11-libs/cairo" +RDEPEND="${DEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest new file mode 100644 index 0000000000..d933de577a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest @@ -0,0 +1,2 @@ +DIST MesaDemos-7.5.1.tar.bz2 1552059 RMD160 9147d9fba75998fcd344a736995069ec642c8893 SHA1 5bafef98a896f4e5c22d17b435db0d14e981ba6c SHA256 64d6b9b42a93e93b770cd07d944a5fe872752db18b1cd84224198f7a431a1721 +DIST MesaLib-7.5.1.tar.bz2 4382803 RMD160 bccf6f52fce3b3c7ac6525444f907e3c2fe790c2 SHA1 26171fb4de23a21431861d6663203e400df45bf7 SHA256 48f21e5a91a82fa9fb6d0bc5ae72d9d9cc1824429dcfc759cfcc1a44e3e1440a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch new file mode 100644 index 0000000000..2dde569898 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch @@ -0,0 +1,12 @@ +diff -ru Mesa-7.5.1/progs/xdemos/Makefile Mesa-7.5.1.patched/progs/xdemos/Makefile +--- Mesa-7.5.1/progs/xdemos/Makefile 2010-10-06 10:21:04.000000000 -0700 ++++ Mesa-7.5.1.patched/progs/xdemos/Makefile 2010-10-06 10:20:31.000000000 -0700 +@@ -8,7 +8,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) -lX11 -lpthread + + PROGS = \ + corender \ diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild new file mode 100644 index 0000000000..3a2a8c4083 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild,v 1.8 2009/12/16 18:02:52 scarabeus Exp $ + +inherit eutils toolchain-funcs + +MY_PN="${PN/m/M}" +MY_PN="${MY_PN/-progs}" +MY_P="${MY_PN}-${PV/_/-}" +LIB_P="${MY_PN}Lib-${PV/_/-}" +PROG_P="${MY_PN}Demos-${PV/_/-}" +DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" +HOMEPAGE="http://mesa3d.sourceforge.net/" +if [[ $PV = *_rc* ]]; then + SRC_URI="http://www.mesa3d.org/beta/${LIB_P}.tar.gz + http://www.mesa3d.org/beta/${PROG_P}.tar.gz" +elif [[ $PV = 9999 ]]; then + SRC_URI="" +else + SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${LIB_P}.tar.bz2 + ftp://ftp.freedesktop.org/pub/mesa/${PV}/${PROG_P}.tar.bz2" +fi +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" +IUSE="" + +RDEPEND="virtual/glut + virtual/opengl + virtual/glu" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if [[ ${KERNEL} == "FreeBSD" ]]; then + CONFIG="freebsd" + elif use x86; then + CONFIG="linux-dri-x86" + elif use amd64; then + CONFIG="linux-dri-x86-64" + elif use ppc; then + CONFIG="linux-dri-ppc" + else + CONFIG="linux-dri" + fi +} + +src_unpack() { + HOSTCONF="${S}/configs/${CONFIG}" + + unpack ${A} + cd "${S}" + + # Kill this; we don't want /usr/X11R6/lib ever to be searched in this + # build. + echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} + + echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} + echo "CC = $(tc-getCC)" >> ${HOSTCONF} + echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} + echo "LDFLAGS = ${LDFLAGS}" >> ${HOSTCONF} + + # Just executables here, no need to compile with -fPIC + echo "PIC_FLAGS =" >> ${HOSTCONF} + + epatch "${FILESDIR}"/${P}-gold.patch +} + +src_compile() { + cd "${S}"/configs + ln -s ${CONFIG} current + + cd "${S}"/progs/xdemos + + emake glxinfo || die "glxinfo failed" + emake glxgears || die "glxgears failed" +} + +src_install() { + dobin "${S}"/progs/xdemos/{glxgears,glxinfo} || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild new file mode 100644 index 0000000000..74cd16c10a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild @@ -0,0 +1,23 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +CROS_WORKON_COMMIT="f0fda739ab48538a97ed784c9cd1f94dc2569555" +CROS_WORKON_TREE="ccfcb72fba4959143cc6e3273301e2be6965ff53" +CROS_WORKON_PROJECT="chromiumos/platform/mtplot" +inherit autotools cros-workon + +DESCRIPTION="Multitouch Contact Plotter" +CROS_WORKON_LOCALNAME="../platform/mtplot" +HOMEPAGE="http://src.chromium.org" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" + +src_prepare() { + eautoreconf +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild new file mode 100644 index 0000000000..c4d7a06afd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild @@ -0,0 +1,21 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +CROS_WORKON_PROJECT="chromiumos/platform/mtplot" +inherit autotools cros-workon + +DESCRIPTION="Multitouch Contact Plotter" +CROS_WORKON_LOCALNAME="../platform/mtplot" +HOMEPAGE="http://src.chromium.org" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" + +src_prepare() { + eautoreconf +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest new file mode 100644 index 0000000000..4c90f30f7e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest @@ -0,0 +1 @@ +DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch new file mode 100644 index 0000000000..a25ef4ba2a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch @@ -0,0 +1,61 @@ +From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001 +From: Tomas Chvatal +Date: Mon, 1 Nov 2010 16:46:36 +0100 +Subject: [PATCH] Gentoo customizations. + + +Signed-off-by: Tomas Chvatal +--- + xinitrc.cpp | 26 ++++++++++++++++++-------- + 1 files changed, 18 insertions(+), 8 deletions(-) + +diff --git a/xinitrc.cpp b/xinitrc.cpp +index 049a8e4..80c3ad9 100644 +--- a/xinitrc.cpp ++++ b/xinitrc.cpp +@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD + + userresources=$HOME/.Xresources + usermodmap=$HOME/.Xmodmap +-sysresources=XINITDIR/.Xresources +-sysmodmap=XINITDIR/.Xmodmap ++sysresources=XINITDIR/Xresources ++sysmodmap=XINITDIR/Xmodmap + + XCOMM merge in defaults and keymaps + +@@ -84,15 +84,25 @@ fi + XCOMM This is the fallback case if nothing else is executed above + #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ + ++if [ -n "`/etc/X11/chooser.sh`" ]; then ++ command="`/etc/X11/chooser.sh`" ++else ++ failsafe="yes" ++fi ++ + if [ -d XINITDIR/xinitrc.d ] ; then +- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do ++ for f in XINITDIR/xinitrc.dXSLASHGLOB ; do + [ -x "$f" ] && . "$f" + done + unset f + fi + +-TWM & +-XCLOCK -geometry 50x50-1+1 & +-XTERM -geometry 80x50+494+51 & +-XTERM -geometry 80x20+494-0 & +-exec XTERM -geometry 80x66+0+0 -name login ++if [ -n "$failsafe" ]; then ++ TWM & ++ XCLOCK -geometry 50x50-1+1 & ++ XTERM -geometry 80x50+494+51 & ++ XTERM -geometry 80x20+494-0 & ++ exec XTERM -geometry 80x66+0+0 -name login ++else ++ exec $command ++fi +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession new file mode 100644 index 0000000000..c86ccee19f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession @@ -0,0 +1,107 @@ +#!/bin/sh +# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ + +case $# in +1) + case $1 in + failsafe) + exec xterm -geometry 80x24-0-0 + ;; + esac +esac + +# redirect errors to a file in user's home directory if we can +for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done + +# clean up after xbanner +if which freetemp 2> /dev/null ; then + freetemp +fi + +startup=$HOME/.xsession + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +if [ -x "$startup" ]; then + exec "$startup" +elif [ -x "$HOME/.Xclients" ]; then + exec "$HOME/.Xclients" +elif [ -x /etc/X11/xinit/Xclients ]; then + exec /etc/X11/xinit/Xclients +elif [ -x /etc/X11/Xclients ]; then + exec /etc/X11/Xclients +else + exec xsm +fi diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh new file mode 100644 index 0000000000..f24be46dc4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# Author: Martin Schlemmer +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.5 2009/11/14 14:18:43 scarabeus Exp $ + +# Find a match for $XSESSION in /etc/X11/Sessions +GENTOO_SESSION="" +for x in /etc/X11/Sessions/* ; do + if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \ + = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then + GENTOO_SESSION=${x} + break + fi +done + +GENTOO_EXEC="" + +if [ -n "${XSESSION}" ]; then + if [ -f /etc/X11/Sessions/${XSESSION} ]; then + if [ -x /etc/X11/Sessions/${XSESSION} ]; then + GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}" + else + GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}" + fi + elif [ -n "${GENTOO_SESSION}" ]; then + if [ -x "${GENTOO_SESSION}" ]; then + GENTOO_EXEC="${GENTOO_SESSION}" + else + GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}" + fi + else + x="" + y="" + + for x in "${XSESSION}" \ + "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \ + "`echo ${XSESSION} | awk '{ print tolower($1) }'`" + do + # Fall through ... + if [ -x "`which ${x} 2>/dev/null`" ]; then + GENTOO_EXEC="`which ${x} 2>/dev/null`" + break + fi + done + fi +fi + +echo "${GENTOO_EXEC}" + + +# vim:ts=4 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh new file mode 100644 index 0000000000..9775b07ff7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.4 2007/04/05 15:30:19 uberlord Exp $ + +# We need to source /etc/profile for stuff like $LANG to work +# bug #10190. +. /etc/profile + +. /etc/init.d/functions.sh + +# baselayout-1 compat +if ! type get_options >/dev/null 2>/dev/null ; then + [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh +fi + +# Great new Gnome2 feature, AA +# We enable this by default +export GDK_USE_XFT=1 + +export SVCNAME=xdm +EXEC="$(get_options service)" +NAME="$(get_options name)" +PIDFILE="$(get_options pidfile)" + +start-stop-daemon --start --exec ${EXEC} \ +${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \ +eerror "ERROR: could not start the Display Manager" + +# vim:ts=4 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch new file mode 100644 index 0000000000..838171bb67 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch @@ -0,0 +1,14 @@ +diff --git a/xinit.c b/xinit.c +index 42ff008..2ab817f 100644 +--- a/xinit.c ++++ b/xinit.c +@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group. + #endif + + /* For PRIO_PROCESS and setpriority() */ +-#ifdef __DragonFly__ + #include + #include +-#endif /* __DragonFly__ */ + + #include diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc new file mode 100644 index 0000000000..b4de252874 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/X -nolisten tcp "$@" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild new file mode 100644 index 0000000000..2845869db2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $ + +EAPI=3 + +inherit xorg-2 + +DESCRIPTION="X Window System initializer" + +LICENSE="${LICENSE} GPL-2" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +IUSE="+minimal" + +RDEPEND=" + ! /etc/env.d/90xsession" + ewarn " env-update && source /etc/profile" +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile new file mode 100644 index 0000000000..9afd0f22d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile @@ -0,0 +1,6 @@ +LDLIBS = -lXmuu -lX11 +CFLAGS += -Wall +all: xset +install: + mkdir -p $(DESTDIR)/usr/bin + install -m 755 xset $(DESTDIR)/usr/bin/xset-mini diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c new file mode 100644 index 0000000000..68d25ba1d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c @@ -0,0 +1,311 @@ +/* + +Copyright 1985, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* Modified by Stephen so keyboard rate is set using XKB extensions */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define ON 1 +#define OFF 0 + +#define SERVER_DEFAULT (-1) +#define DONT_CHANGE -2 + +#define ALL -1 + +#define XKBDDELAY_DEFAULT 660 +#define XKBDRATE_DEFAULT (1000/40) + +static char *progName; + +static int error_status = 0; + +static int is_number(char *arg, int maximum); +static void set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold); +static void set_repeat(Display *dpy, int key, int auto_repeat_mode); +static void usage(char *fmt, ...) _X_NORETURN; +static int local_xerror(Display *dpy, XErrorEvent *rep); + +static void xkbset_repeatrate(Display *dpy, int delay, int rate); + +int +main(int argc, char *argv[]) +{ + register char *arg; + register int i; + int acc_num, acc_denom, threshold; + + int key, auto_repeat_mode; + + char *disp = NULL; + Display *dpy; + + int miscpresent = 0; + int xkbpresent = 0; + + int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion; + int xkbopcode, xkbevent, xkberror; + + progName = argv[0]; + if (argc < 2) { + usage(NULL, NULL); /* replace with window interface */ + } + + dpy = XOpenDisplay(disp); /* Open display and check for success */ + if (dpy == NULL) { + fprintf(stderr, "%s: unable to open display \"%s\"\n", + argv[0], XDisplayName(disp)); + exit(EXIT_FAILURE); + } + XSetErrorHandler(local_xerror); + for (i = 1; i < argc;) { + arg = argv[i++]; +/* Set pointer (mouse) settings: Acceleration and Threshold. */ + if (strcmp(arg, "m") == 0 || strcmp(arg, "mouse") == 0) { + acc_num = SERVER_DEFAULT; /* restore server defaults */ + acc_denom = SERVER_DEFAULT; + threshold = SERVER_DEFAULT; + if (i >= argc) { + set_mouse(dpy, acc_num, acc_denom, threshold); + break; + } + arg = argv[i]; + if (strcmp(arg, "default") == 0) { + i++; + } else if (*arg >= '0' && *arg <= '9') { + acc_denom = 1; + sscanf(arg, "%d/%d", &acc_num, &acc_denom); + i++; + if (i >= argc) { + set_mouse(dpy, acc_num, acc_denom, threshold); + break; + } + arg = argv[i]; + if (*arg >= '0' && *arg <= '9') { + threshold = atoi(arg); /* Set threshold as user specified. */ + i++; + } + } + set_mouse(dpy, acc_num, acc_denom, threshold); + } else if (strcmp(arg, "-r") == 0) { /* Turn off one or + all autorepeats */ + auto_repeat_mode = OFF; + key = ALL; /* None specified */ + arg = argv[i]; + if (i < argc) + if (is_number(arg, 255)) { + key = atoi(arg); + i++; + } + set_repeat(dpy, key, auto_repeat_mode); + } else if (strcmp(arg, "r") == 0) { /* Turn on one or + all autorepeats */ + auto_repeat_mode = ON; + key = ALL; /* None specified */ + arg = argv[i]; + if (i < argc) { + if (strcmp(arg, "on") == 0) { + i++; + } else if (strcmp(arg, "off") == 0) { /* ...except in + this case */ + auto_repeat_mode = OFF; + i++; + } + else if (strcmp(arg, "rate") == 0) { /* ...or this one. */ + int delay = 0, rate = 0; + + if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, + &xkberror, &xkbmajor, &xkbminor)) { + delay = XKBDDELAY_DEFAULT; + rate = XKBDRATE_DEFAULT; + xkbpresent = 1; + } + if (!xkbpresent && !miscpresent) + fprintf(stderr, + "server does not have extension for \"r rate\" option\n"); + i++; + arg = argv[i]; + if (i < argc) { + if (is_number(arg, 10000) && atoi(arg) > 0) { + delay = atoi(arg); + i++; + arg = argv[i]; + if (i < argc) { + if (is_number(arg, 255) && atoi(arg) > 0) { + rate = atoi(arg); + i++; + } + } + } + } + if (xkbpresent) { + xkbset_repeatrate(dpy, delay, 1000 / rate); + } + } + else if (is_number(arg, 255)) { + key = atoi(arg); + i++; + } + } + set_repeat(dpy, key, auto_repeat_mode); + } else + usage("unknown option %s", arg); + } + + XCloseDisplay(dpy); + + exit(error_status); /* Done. We can go home now. */ +} + +static int +is_number(char *arg, int maximum) +{ + register char *p; + + if (arg[0] == '-' && arg[1] == '1' && arg[2] == '\0') + return (1); + for (p = arg; isdigit(*p); p++) ; + if (*p || atoi(arg) > maximum) + return (0); + return (1); +} + +static void +set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold) +{ + int do_accel = True, do_threshold = True; + + if (acc_num == DONT_CHANGE) /* what an incredible crock... */ + do_accel = False; + if (threshold == DONT_CHANGE) + do_threshold = False; + if (acc_num < 0) /* shouldn't happen */ + acc_num = SERVER_DEFAULT; + if (acc_denom <= 0) /* prevent divide by zero */ + acc_denom = SERVER_DEFAULT; + if (threshold < 0) + threshold = SERVER_DEFAULT; + XChangePointerControl(dpy, do_accel, do_threshold, acc_num, + acc_denom, threshold); + return; +} + +static void +set_repeat(Display *dpy, int key, int auto_repeat_mode) +{ + XKeyboardControl values; + + values.auto_repeat_mode = auto_repeat_mode; + if (key != ALL) { + values.key = key; + XChangeKeyboardControl(dpy, KBKey | KBAutoRepeatMode, &values); + } else { + XChangeKeyboardControl(dpy, KBAutoRepeatMode, &values); + } + return; +} + +static void +xkbset_repeatrate(Display *dpy, int delay, int interval) +{ + XkbDescPtr xkb = XkbAllocKeyboard(); + + if (!xkb) + return; + XkbGetControls(dpy, XkbRepeatKeysMask, xkb); + xkb->ctrls->repeat_delay = delay; + xkb->ctrls->repeat_interval = interval; + XkbSetControls(dpy, XkbRepeatKeysMask, xkb); + XkbFreeKeyboard(xkb, 0, True); +} + +/* This is the usage function */ + +static void +usage(char *fmt, ...) +{ + va_list ap; + + if (fmt) { + fprintf(stderr, "%s: ", progName); + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "\n\n"); + } + + fprintf(stderr, "usage: %s option ...\n", progName); + fprintf(stderr, " To set mouse acceleration and threshold:\n"); + fprintf(stderr, "\t m [acc_mult[/acc_div] [thr]] m default\n"); + fprintf(stderr, " To set pixel colors:\n"); + fprintf(stderr, "\t-r [keycode] r off\n"); + fprintf(stderr, "\t r [keycode] r on\n"); + fprintf(stderr, "\t r rate [delay [rate]]\n"); + exit(EXIT_SUCCESS); +} + +static int +local_xerror(Display *dpy, XErrorEvent *rep) +{ + if (rep->request_code == X_SetFontPath && rep->error_code == BadValue) { + fprintf(stderr, + "%s: bad font path element (#%ld), possible causes are:\n", + progName, rep->resourceid); + fprintf(stderr, + " Directory does not exist or has wrong permissions\n"); + fprintf(stderr, " Directory missing fonts.dir\n"); + fprintf(stderr, " Incorrect font server address or syntax\n"); + } else if (rep->request_code == X_StoreColors) { + switch (rep->error_code) { + case BadAccess: + fprintf(stderr, + "%s: pixel not allocated read/write\n", progName); + break; + case BadValue: + fprintf(stderr, + "%s: cannot store in pixel 0x%lx, invalid pixel number\n", + progName, rep->resourceid); + break; + default: + XmuPrintDefaultErrorMessage(dpy, rep, stderr); + } + } else + XmuPrintDefaultErrorMessage(dpy, rep, stderr); + + error_status = -1; + + return (0); +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild new file mode 100644 index 0000000000..4798900430 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $ + +EAPI="4" + +inherit toolchain-funcs + +DESCRIPTION="X.Org xset application stripped down for just 'r' and 'm' commands" +HOMEPAGE="http://xorg.freedesktop.org/" +SRC_URI="" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="+minimal" + +RDEPEND="x11-libs/libXmu + x11-libs/libX11" +DEPEND="${RDEPEND}" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/* ./ || die +} + +src_configure() { + tc-export CC +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch new file mode 100644 index 0000000000..6bb7fe919f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch @@ -0,0 +1,201 @@ +diff --git a/Makefile.in b/Makefile.in +index 6f41217..ee8f40c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -488,7 +488,8 @@ distdir: $(DISTFILES) + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -532,17 +533,17 @@ dist dist-all: distdir + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +diff --git a/configure b/configure +index f25c412..3b328b7 100755 +--- a/configure ++++ b/configure +@@ -4837,6 +4837,54 @@ else + fi + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 ++$as_echo_n "checking for clock_gettime in -lrt... " >&6; } ++if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lrt $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char clock_gettime (); ++int ++main () ++{ ++return clock_gettime (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_rt_clock_gettime=yes ++else ++ ac_cv_lib_rt_clock_gettime=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 ++$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } ++if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBRT 1 ++_ACEOF ++ ++ LIBS="-lrt $LIBS" ++ ++else ++ as_fn_error "Could not find librt" "$LINENO" 5 ++fi ++ ++ + + ac_config_files="$ac_config_files Makefile" + +diff --git a/configure.ac b/configure.ac +index d611b38..583cf97 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,6 +24,8 @@ LIBS="$LIBS -lsocket -lnsl"; break],[AC_MSG_ERROR([Could not find socket library + fi + AC_CHECK_FUNC([getaddrinfo],,[AC_MSG_ERROR([Could not find getaddrinfo library function])]) + ++AC_CHECK_LIB(rt, clock_gettime, , [AC_MSG_ERROR([Could not find librt])]) ++ + dnl AC_CHECK_HEADER(X11/X.h,[],[AC_MSG_ERROR([Could not find X11/X.h])]) + dnl AC_CHECK_HEADER(X11/Xlib.h,[],[AC_MSG_ERROR([Could not find X11/Xlib.h])]) + dnl AC_CHECK_HEADER(X11/extensions/security.h,[],[AC_MSG_ERROR([Could not find X11/extensions/secruity.h])],[#include ]) +diff --git a/main.c b/main.c +index b6b27a6..a8e1725 100644 +--- a/main.c ++++ b/main.c +@@ -45,6 +45,7 @@ bool denyallextensions = false; + bool interactive = false; + bool print_timestamps = false; + bool print_reltimestamps = false; ++bool print_uptime = false; + static bool buffered = false; + size_t maxshownlistlen = SIZE_MAX; + +@@ -390,7 +391,7 @@ char *strndup(const char *str,size_t n) { + } + #endif + +-enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_VERSION, LO_HELP}; ++enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_UPTIME, LO_VERSION, LO_HELP}; + static int long_only_option = 0; + static const struct option longoptions[] = { + {"display", required_argument, NULL, 'd'}, +@@ -412,6 +413,7 @@ static const struct option longoptions[] = { + {"version", no_argument, &long_only_option, LO_VERSION}, + {"timestamps", no_argument, &long_only_option, LO_TIMESTAMPS}, + {"relative-timestamps", no_argument, &long_only_option, LO_RELTIMESTAMPS}, ++ {"uptime", no_argument, &long_only_option, LO_UPTIME}, + {NULL, 0, NULL, 0} + }; + +@@ -526,6 +528,9 @@ argv[0]); + case LO_RELTIMESTAMPS: + print_reltimestamps = true; + break; ++ case LO_UPTIME: ++ print_uptime = true; ++ break; + } + break; + case ':': +diff --git a/parse.c b/parse.c +index 8bdd363..b808766 100644 +--- a/parse.c ++++ b/parse.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + #include "xtrace.h" +@@ -46,6 +47,7 @@ static inline unsigned int padded(unsigned int s) { + static void startline(struct connection *c, enum package_direction d, const char *format, ...) { + va_list ap; + struct timeval tv; ++ struct timespec ts; + + if( (print_timestamps || print_reltimestamps) + && gettimeofday(&tv, NULL) == 0 ) { +@@ -60,6 +62,10 @@ static void startline(struct connection *c, enum package_direction d, const char + (unsigned int)((tt - c->starttime)%1000)); + } + } ++ if( print_uptime && clock_gettime(CLOCK_MONOTONIC, &ts ) == 0 ) { ++ fprintf(out, "%lu.%03u ", (unsigned long)ts.tv_sec, ++ (unsigned int)(ts.tv_nsec/1000000)); ++ } + va_start(ap, format); + fprintf(out, "%03d:%c:", c->id, (d == TO_SERVER)?'<':'>'); + vfprintf(out, format, ap); +@@ -1749,4 +1755,3 @@ const struct extension *find_extension(const uint8_t *name,size_t len) { + + return NULL; + } +- +diff --git a/xtrace.h b/xtrace.h +index 95a725a..1c9bd4a 100644 +--- a/xtrace.h ++++ b/xtrace.h +@@ -46,6 +46,7 @@ extern bool denyallextensions; + extern size_t maxshownlistlen; + extern bool print_timestamps; + extern bool print_reltimestamps; ++extern bool print_uptime; + + #ifdef __GNUC__ + #define UNUSED __attribute__ ((unused)) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch new file mode 100644 index 0000000000..80a2c7ed86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch @@ -0,0 +1,198 @@ +diff --git a/Makefile.am b/Makefile.am +index ba359c2..c611a14 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,7 +12,7 @@ dist_man_MANS = xtrace.1 + + MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in + +-dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto ++dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto + + distclean-local: + -rm -rf $(srcdir)/autom4te.cache +diff --git a/Makefile.in b/Makefile.in +index 6f41217..a611645 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -204,7 +204,7 @@ xtrace_LDFLAGS = -Wl,-z,defs + noinst_HEADERS = xtrace.h parse.h stringlist.h translate.h + dist_man_MANS = xtrace.1 + MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in +-dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto ++dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff --git a/all.proto b/all.proto +index b2fd22d..23d873d 100644 +--- a/all.proto ++++ b/all.proto +@@ -14,6 +14,7 @@ NEEDS "randr.proto" + NEEDS "render.proto" + NEEDS "saver.proto" + NEEDS "shape.proto" ++NEEDS "sync.proto" + NEEDS "vidmode.proto" + NEEDS "xinerama.proto" + NEEDS "xinput.proto" +diff --git a/sync.proto b/sync.proto +new file mode 100644 +index 0000000..e593c18 +--- /dev/null ++++ b/sync.proto +@@ -0,0 +1,154 @@ ++EXTENSION "SYNC" Sync ++USE core ++ ++REQUESTS ++Initialize RESPONDS ++ListSystemCounters RESPONDS ++CreateCounter ++SetCounter ++ChangeCounter ++QueryCounter RESPONDS ++DestroyCounter ++Await ++CreateAlarm ++ChangeAlarm ++QueryAlarm RESPONDS ++DestroyAlarm ++SetPriority ++GetPriority RESPONDS ++END ++ ++EVENTS ++CounterNotify ++AlarmNotify ++END ++ ++ERRORS ++BadCounter ++BadAlarm ++END ++ ++CONSTANTS alarm_state ++0 Active ++1 Inactive ++2 Destroyed ++END ++TYPE ALARM_STATE ENUM8 alarm_state ++ ++CONSTANTS test_type ++0 PositiveTransition ++1 NegativeTransition ++2 PositiveComparison ++3 NegativeComparison ++END ++TYPE TEST_TYPE ENUM32 test_type ++ ++REQUEST Initialize ++ 4 major-version UINT8 ++ 5 minor-version UINT8 ++END ++RESPONSE Initialize ++ 8 major-version UINT16 ++ 9 minor-version UINT16 ++END ++ ++REQUEST ListSystemCounters ALIASES Empty ++RESPONSE ListSystemCounters ++ 8 num-counters INT32 ++END ++ ++REQUEST CreateCounter ++ 4 counter UINT32 ++ 8 initial-value-high INT32 ++12 initial-value-low UINT32 ++END ++ ++REQUEST SetCounter ++ 4 counter UINT32 ++ 8 initial-value-high INT32 ++12 initial-value-low UINT32 ++END ++ ++REQUEST ChangeCounter ++ 4 counter UINT32 ++ 8 initial-value-high INT32 ++12 initial-value-low UINT32 ++END ++ ++REQUEST QueryCounter ++ 4 counter UINT32 ++END ++RESPONSE QueryCounter ++ 8 value-high INT32 ++12 value-low UINT32 ++END ++ ++REQUEST DestroyCounter ++ 4 counter UINT32 ++END ++ ++REQUEST Await ALIASES Empty ++ ++REQUEST CreateAlarm ++ 4 alarm UINT32 ++ 8 value-mask UINT32 ++END ++ ++REQUEST ChangeAlarm ++ 4 alarm UINT32 ++ 8 value-mask UINT32 ++END ++ ++REQUEST QueryAlarm ++ 4 alarm UINT32 ++END ++RESPONSE QueryAlarm ++ 8 counter UINT32 ++12 value-type UINT32 ++16 wait-value-high INT32 ++20 wait-value-low UINT32 ++24 test-type TEST_TYPE ++28 delta-high INT32 ++32 delta-low UINT32 ++36 events BOOL ++37 state ALARM_STATE ++END ++ ++REQUEST DestroyAlarm ++ 4 alarm UINT32 ++END ++ ++REQUEST SetPriority ++ 4 id UINT32 ++ 8 priority INT32 ++END ++ ++REQUEST GetPriority ++ 4 id UINT32 ++END ++RESPONSE GetPriority ++ 8 priority INT32 ++END ++ ++EVENT CounterNotify ++ 4 counter UINT32 ++ 8 wait-value-high INT32 ++12 wait-value-low UINT32 ++16 counter-value-high INT32 ++20 counter-value-low UINT32 ++24 time TIMESTAMP ++28 count INT16 ++30 destroyed BOOL ++END ++ ++EVENT AlarmNotify ++ 4 alarm UINT32 ++ 8 counter-value-high INT32 ++12 counter-value-low UINT32 ++16 alarm-value-high INT32 ++20 alarm-value-low UINT32 ++24 time TIMESTAMP ++28 state ALARM_STATE ++END ++ ++EOF diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild new file mode 100644 index 0000000000..058250f47c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild @@ -0,0 +1,27 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +inherit eutils + +DESCRIPTION="X11 proxy that logs communication between a client and a server" +HOMEPAGE="http://xtrace.alioth.debian.org/" +SRC_URI="http://alioth.debian.org/frs/download.php/3201/${MY_PN}_${PV}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +IUSE="" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PV}-print-uptime.patch + epatch "${FILESDIR}"/${PV}-sync-extension.patch +} + +src_install() { + emake DESTDIR="${D}" install || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild new file mode 100644 index 0000000000..12e60a3b12 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.3 2012/03/24 16:30:25 chithanh Exp $ + +EAPI=4 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd" + +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_cmt + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_joystick + input_devices_keyboard + input_devices_mouse + input_devices_mutouch + input_devices_penmount + input_devices_tslib + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_ark + video_cards_ast + video_cards_cirrus + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_geode + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_intel + video_cards_mach64 + video_cards_mga + video_cards_neomagic + video_cards_newport + video_cards_nouveau + video_cards_nv + video_cards_omapfb + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_s3 + video_cards_savage + video_cards_siliconmotion + video_cards_sis + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tga + video_cards_trident + video_cards_v4l + video_cards_vesa + video_cards_via + video_cards_virtualbox + video_cards_vmware + video_cards_voodoo + video_cards_fglrx + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_acecad? ( x11-drivers/xf86-input-acecad ) + input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) + input_devices_cmt? ( x11-drivers/xf86-input-cmt ) + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( x11-drivers/xf86-input-evdev ) + input_devices_fpit? ( x11-drivers/xf86-input-fpit ) + input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) + input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) + input_devices_mouse? ( x11-drivers/xf86-input-mouse ) + input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) + input_devices_penmount? ( x11-drivers/xf86-input-penmount ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + + video_cards_ark? ( x11-drivers/xf86-video-ark ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_i128? ( x11-drivers/xf86-video-i128 ) + video_cards_i740? ( x11-drivers/xf86-video-i740 ) + video_cards_intel? ( x11-drivers/xf86-video-intel ) + video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) + video_cards_mga? ( x11-drivers/xf86-video-mga ) + video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) + video_cards_newport? ( x11-drivers/xf86-video-newport ) + video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) + video_cards_nv? ( x11-drivers/xf86-video-nv ) + video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + video_cards_r128? ( x11-drivers/xf86-video-r128 ) + video_cards_radeon? ( x11-drivers/xf86-video-ati ) + video_cards_s3? ( x11-drivers/xf86-video-s3 ) + video_cards_savage? ( x11-drivers/xf86-video-savage ) + video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) + video_cards_sis? ( x11-drivers/xf86-video-sis ) + video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) + video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) + video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) + video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) + video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) + video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) + video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_tga? ( x11-drivers/xf86-video-tga ) + video_cards_trident? ( x11-drivers/xf86-video-trident ) + video_cards_v4l? ( x11-drivers/xf86-video-v4l ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) + video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) + + !x11-drivers/xf86-input-citron + !<=x11-drivers/xf86-video-apm-1.2.3 + !<=x11-drivers/xf86-video-chips-1.2.4 + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-nsc + !<=x11-drivers/xf86-video-rendition-4.2.4 + !<=x11-drivers/xf86-video-s3virge-1.10.4 + !<=x11-drivers/xf86-video-sisusb-0.9.4 + !x11-drivers/xf86-video-sunbw2 + !<=x11-drivers/xf86-video-tseng-1.2.4 +" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch new file mode 100644 index 0000000000..e00f555cd0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch @@ -0,0 +1,22 @@ +diff --git a/dix/window.c b/dix/window.c +index 823294b..d293e90 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -1083,12 +1083,8 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client) + if (pixID == None) { + if (pWin->backgroundState == BackgroundPixmap) + (*pScreen->DestroyPixmap) (pWin->background.pixmap); +- if (!pWin->parent) +- SetRootWindowBackground(pWin, pScreen, &index2); +- else { +- pWin->backgroundState = XaceBackgroundNoneState(pWin); +- pWin->background.pixel = pScreen->whitePixel; +- } ++ pWin->backgroundState = XaceBackgroundNoneState(pWin); ++ pWin->background.pixel = pScreen->whitePixel; + } + else if (pixID == ParentRelative) { + if (pWin->parent && +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch new file mode 100644 index 0000000000..c357c03ad8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch @@ -0,0 +1,333 @@ +diff --git a/configure.ac b/configure.ac +index f94b88c..03beb36 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -515,9 +515,9 @@ AC_MSG_RESULT([$FONTPATH]) + AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), + [ XKBPATH="$withval" ], + [ XKBPATH="${datadir}/X11/xkb" ]) +-AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]), ++AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]), + [ XKBOUTPUT="$withval" ], +- [ XKBOUTPUT="compiled" ]) ++ [ XKBOUTPUT="${localstatedir}/cache/xkb" ]) + AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], + [Keyboard ruleset (default: base/evdev)]), + [ XKB_DFLT_RULES="$withval" ], +@@ -1202,7 +1202,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir]) + dnl Make sure XKM_OUTPUT_DIR is an absolute path + XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` + if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then +- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" ++ AC_MSG_ERROR([xkb-output must be an absolute path.]) + fi + + dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed +diff --git a/xkb/README.compiled b/xkb/README.compiled +index 71caa2f..a4a2ae0 100644 +--- a/xkb/README.compiled ++++ b/xkb/README.compiled +@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients. The X server + or some other tool might destroy or replace the files in this directory, + so it is not a safe place to store compiled keymaps for long periods of + time. The default keymap for any server is usually stored in: +- X-default.xkm +-where is the display number of the server in question, which makes +-it possible for several servers *on the same host* to share the same +-directory. ++ server-.xkm ++ ++where is the SHA1 hash of keymap source, so that compiled ++keymap of different keymap sources are stored in different files. + + Unless the X server is modified, sharing this directory between servers on + different hosts could cause problems. +diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c +index 1961423..411b677 100644 +--- a/xkb/ddxLoad.c ++++ b/xkb/ddxLoad.c +@@ -30,6 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. + + #include + ++#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ ++# include ++#else /* Use OpenSSL's libcrypto */ ++# include /* buggy openssl/sha.h wants size_t */ ++# include ++#endif + #include + #include + #include +@@ -43,20 +49,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. + #define XKBSRV_NEED_FILE_FUNCS + #include + #include ++#include + #include "xkb.h" + +- /* +- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is +- * relative to the top-level XKB configuration directory. +- * Making the server write to a subdirectory of that directory +- * requires some work in the general case (install procedure +- * has to create links to /var or somesuch on many machines), +- * so we just compile into /usr/tmp for now. +- */ +-#ifndef XKM_OUTPUT_DIR +-#define XKM_OUTPUT_DIR "compiled/" +-#endif +- + #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" + #define ERROR_PREFIX "\"> \"" + #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" +@@ -166,13 +161,56 @@ OutputDirectory(char *outdir, size_t size) + } + + static Bool ++Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input) ++{ ++ int i; ++ unsigned char sha1[SHA_DIGEST_LENGTH]; ++ ++#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ ++ SHA1_CTX ctx; ++ ++ SHA1Init (&ctx); ++ SHA1Update (&ctx, input, strlen(input)); ++ SHA1Final (sha1, &ctx); ++#else /* Use OpenSSL's libcrypto */ ++ SHA_CTX ctx; ++ int success; ++ ++ success = SHA1_Init (&ctx); ++ if (! success) ++ return BadAlloc; ++ ++ success = SHA1_Update (&ctx, input, strlen(input)); ++ if (! success) ++ return BadAlloc; ++ ++ success = SHA1_Final (sha1, &ctx); ++ if (! success) ++ return BadAlloc; ++#endif ++ ++ /* convert sha1 to sha1_asc */ ++ for(i=0; i nameRtrnLen) && nameRtrn) { ++ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n"); ++ return FALSE; ++ } ++ strncpy(nameRtrn, xkmfile, nameRtrnLen); ++ ++ /* if the xkm file already exists, reuse it */ ++ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile); ++ if (access(canonicalXkmFileName, R_OK) == 0) { ++ /* yes, we can reuse the old xkm file */ ++ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName); ++ result = TRUE; ++ goto _ret; ++ } ++ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName); ++ ++ /* continue to call xkbcomp to compile the keymap. to avoid race ++ condition, we compile it to a tmpfile then rename it to ++ xkmfile */ ++ + #ifdef WIN32 + strcpy(tmpname, Win32TempDir()); + strcat(tmpname, "\\xkb_XXXXXX"); +@@ -214,15 +304,21 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, + } + } + ++ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) { ++ ErrorF("[xkb] Can't generate temp xkm file name"); ++ result = FALSE; ++ goto _ret; ++ } ++ + if (asprintf(&buf, + "\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" " +- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"", ++ "-em1 %s -emp %s -eml %s \"%s\"", + xkbbindir, xkbbindirsep, + ((xkbDebugFlags < 2) ? 1 : + ((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)), +- xkbbasedirflag ? xkbbasedirflag : "", xkmfile, ++ xkbbasedirflag ? xkbbasedirflag : "", xkbfile, + PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1, +- xkm_output_dir, keymap) == -1) ++ tmpXkmFile) == -1) + buf = NULL; + + free(xkbbasedirflag); +@@ -233,6 +329,11 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, + return FALSE; + } + ++ /* there's a potential race condition between calling tempnam() ++ and invoking xkbcomp to write the result file (potential temp ++ file name conflicts), but since xkbcomp is a standalone ++ program, we have to live with this */ ++ + #ifndef WIN32 + out = Popen(buf, "w"); + #else +@@ -240,32 +341,41 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, + #endif + + if (out != NULL) { +-#ifdef DEBUG +- if (xkbDebugFlags) { +- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); +- XkbWriteXKBKeymapForNames(stderr, names, xkb, want, need); ++ /* write XKBKeyMapBuf to xkbcomp */ ++ if (EOF==fputs(xkbKeyMapBuf, out)) ++ { ++ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); ++ result = FALSE; ++ goto _ret; + } +-#endif +- XkbWriteXKBKeymapForNames(out, names, xkb, want, need); + #ifndef WIN32 + if (Pclose(out) == 0) + #else + if (fclose(out) == 0 && System(buf) >= 0) + #endif + { ++ /* xkbcomp success */ + if (xkbDebugFlags) + DebugF("[xkb] xkb executes: %s\n", buf); +- if (nameRtrn) { +- strlcpy(nameRtrn, keymap, nameRtrnLen); ++ /* if canonicalXkmFileName already exists now, we simply ++ overwrite it, this is OK */ ++ ret = rename(tmpXkmFile, canonicalXkmFileName); ++ if (0 != ret) { ++ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", ++ tmpXkmFile, canonicalXkmFileName, ++ strerror(errno)); ++ ++ /* in case of error, don't unlink tmpXkmFile, leave it ++ for debugging */ ++ ++ result = FALSE; ++ goto _ret; + } +- free(buf); +-#ifdef WIN32 +- unlink(tmpname); +-#endif +- return TRUE; ++ result = TRUE; ++ goto _ret; + } + else +- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); ++ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); + #ifdef WIN32 + /* remove the temporary file */ + unlink(tmpname); +@@ -280,8 +390,15 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, + } + if (nameRtrn) + nameRtrn[0] = '\0'; ++ result = FALSE; ++ ++_ret: ++ if (tmpXkmFile) ++ free(tmpXkmFile); ++ if (canonicalXkmFileName) ++ xfree(canonicalXkmFileName); + free(buf); +- return FALSE; ++ return result; + } + + static FILE * +@@ -368,7 +485,6 @@ XkbDDXLoadKeymapByNames(DeviceIntPtr keybd, + (*xkbRtrn)->defined); + } + fclose(file); +- (void) unlink(fileName); + return (need | want) & (~missing); + } + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch new file mode 100644 index 0000000000..95778b10b1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch @@ -0,0 +1,113 @@ +diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c +index 30e14b1..ea447a8 100644 +--- a/dix/ptrveloc.c ++++ b/dix/ptrveloc.c +@@ -863,6 +863,82 @@ PowerProfile(DeviceIntPtr dev, + } + + /** ++ * Computes Acceleration based on the Chromium acceleration algorithm. ++ * This algorithm was taken from our Chromium MultiTouch touchpad driver. ++ * We think about acceleration curve taking an input velocity and returning ++ * an output velocity. The shape of the curve is parabolic at the low end ++ * and then at a certain point, it continues straight. The curve operates ++ * in units of inches/second. ++ * ++ * Note that X acceleration profile functions operate using very different ++ * units, generally, so a little bit of gynmastics is required to fit our ++ * curve to the X convention. ++ * ++ * Inputs: ++ * velocity: mouse velocity in inches per millisecond[1] ++ * threshold: if greater than 0, the X cutoff in 100ths of an inch/sec ++ * acc: multiplier applied to output, for user's speed preferences, multiplied ++ * by screen resolution (DPI). A good default for the user prefs is 1.0. ++ * A good default for the screen resolution is 125.[2] ++ * ++ * Outputs: ++ * Returns a multiplier m such that m * mouse counts = screen pixels. ++ * ++ * [1] To get this value to be inches per millisecond, the following xinput ++ * properties must be set accordingly: ++ * "Device Accel Velocity Scaling": 1.0 ++ * "Device Accel Constant Deceleration": CPI (Counts per inch) ++ * ++ * [2] To set this value for a particular device, do: ++ * xinput set-ptr-feedback 0 acc 1 # 0=thresh, acc/1 = num/den ++ * or for all devices(?): ++ * xset m acc/1 0 # num/den thresh ++ * ++ * Note about CPI: CPI is the resolution of the mouse. Many common mice at the ++ * time of writing have a CPI of approximately 1000, so that may be a good ++ * default value. ++ */ ++static double ++ChromiumMouseProfile( ++ DeviceIntPtr dev, ++ DeviceVelocityPtr vel, ++ double velocity, ++ double threshold, ++ double acc) ++{ ++ /* Parabola: v_out = a * v_in^2 + b * v_in ++ Line: v_out = m * v_in + b */ ++ /* These three constants seem to work well */ ++ const float kParabolaA = 1.3; ++ const float kParabolaB = 0.2; ++ /* v_in where we switch from parab. to line: */ ++ const float kCutoffX = threshold > 0 ? threshold * 0.01 : 8.0; ++ const float kCutoffY = ++ kParabolaA * kCutoffX * kCutoffX + kParabolaB * kCutoffX; ++ /* d/dx (ax^2 + bx) = 2ax + 1 */ ++ const float kLineM = 2.0 * kParabolaA * kCutoffX + kParabolaB; ++ const float kLineB = kCutoffY - kCutoffX * kLineM; ++ ++ float inch_per_sec = velocity * 1000.0; // inches/ms -> inches/s ++ float new_inch_per_sec; ++ if (velocity == 0.0) ++ return 1.0; ++ ++ /* acc defaults to a very small value, so if we see it, pick a better ++ default. It probably means that the user doesn't know how to properly ++ use this accel profile, but it sucks if we cause super slow mouse ++ movement. */ ++ if (acc < 50.0) ++ acc = 225.0; ++ ++ if (inch_per_sec <= kCutoffX) ++ return (kParabolaA * inch_per_sec + kParabolaB) * acc; ++ else ++ new_inch_per_sec = kLineM * inch_per_sec + kLineB; ++ return acc * new_inch_per_sec / inch_per_sec; ++} ++ ++/** + * just a smooth function in [0..1] -> [0..1] + * - point symmetry at 0.5 + * - f'(0) = f'(1) = 0 +@@ -988,6 +1064,8 @@ GetAccelerationProfile(DeviceVelocityPtr vel, int profile_num) + return LinearProfile; + case AccelProfileSmoothLimited: + return SmoothLimitedProfile; ++ case AccelProfileChromiumMouse: ++ return ChromiumMouseProfile; + case AccelProfileNone: + return NoProfile; + default: +diff --git a/include/ptrveloc.h b/include/ptrveloc.h +index 6f999a8..979bd30 100644 +--- a/include/ptrveloc.h ++++ b/include/ptrveloc.h +@@ -38,7 +38,8 @@ + #define AccelProfilePower 5 + #define AccelProfileLinear 6 + #define AccelProfileSmoothLimited 7 +-#define AccelProfileLAST AccelProfileSmoothLimited ++#define AccelProfileChromiumMouse 8 ++#define AccelProfileLAST AccelProfileChromiumMouse + + /* fwd */ + struct _DeviceVelocityRec; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch new file mode 100644 index 0000000000..9cb11caa74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch @@ -0,0 +1,54 @@ +From f1c50bbaf22a272b44d36441811ef9d8483838ca Mon Sep 17 00:00:00 2001 +From: David James +Date: Wed, 19 May 2010 09:24:39 -0700 +Subject: [PATCH] Discover monotonic clock using compile-time check. + +When xorg-xserver is being cross-compiled, there is currently no way +for us to detect whether the monotonic clock is available on the +target system, because we aren't able to run a test program. Currently, in +this situation, we default to not use the monotonic clock. One problem +with this situation is that the user will be treated as idle when the date +is updated. + +To fix this situation, we now use a compile-time check to detect whether the +monotonic clock is available. This check can run just fine when we are +cross-compiling. + +Signed-off-by: David James +--- + configure.ac | 14 ++++++-------- + 1 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1c7875e..36f7bdd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -935,19 +935,17 @@ if ! test "x$have_clock_gettime" = xno; then + CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" + fi + +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include ++#include + + int main(int argc, char *argv[[]]) { +- struct timespec tp; +- +- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) ++#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) ++ #error No monotonic clock ++#endif + return 0; +- else +- return 1; + } +- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no], +- [MONOTONIC_CLOCK="cross compiling"]) ++ ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) + + LIBS="$LIBS_SAVE" + CPPFLAGS="$CPPFLAGS_SAVE" +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch new file mode 100644 index 0000000000..18e265be78 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch @@ -0,0 +1,63 @@ +Subject: [PATCH] xorg-server: add the ability to run without root privileges. + +Of course we'll need more changes in our startup scripts for this to work. +--- + hw/xfree86/os-support/linux/lnx_init.c | 7 +++++++ + hw/xfree86/os-support/linux/lnx_video.c | 4 ++++ + 2 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c +index 2176985..70c99b0 100644 +--- a/hw/xfree86/os-support/linux/lnx_init.c ++++ b/hw/xfree86/os-support/linux/lnx_init.c +@@ -39,6 +39,7 @@ + #include + + static Bool KeepTty = FALSE; ++Bool NoHwAccess = FALSE; + static int activeVT = -1; + + static char vtname[11]; +@@ -314,6 +315,11 @@ xf86ProcessArgument(int argc, char *argv[], int i) + return 1; + } + ++ if (!strcmp(argv[i], "-nohwaccess")) ++ { ++ NoHwAccess = TRUE; ++ return(1); ++ } + if ((argv[i][0] == 'v') && (argv[i][1] == 't')) { + if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) { + UseMsg(); +@@ -331,4 +337,5 @@ xf86UseMsg(void) + ErrorF("vtXX use the specified VT number\n"); + ErrorF("-keeptty "); + ErrorF("don't detach controlling tty (for debugging only)\n"); ++ ErrorF("-nohwaccess don't access hardware ports directly\n"); + } +diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c +index 0d91f7a..42f42d6 100644 +--- a/hw/xfree86/os-support/linux/lnx_video.c ++++ b/hw/xfree86/os-support/linux/lnx_video.c +@@ -46,6 +46,7 @@ + #include + #endif + ++extern Bool NoHwAccess; + static Bool ExtendedEnabled = FALSE; + + #ifdef __ia64__ +@@ -488,6 +489,9 @@ xf86EnableIO(void) + int fd; + unsigned int ioBase_phys; + #endif ++ /* Fake it... */ ++ if (NoHwAccess) ++ return TRUE; + + if (ExtendedEnabled) + return TRUE; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch new file mode 100644 index 0000000000..c337550e4e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch @@ -0,0 +1,126 @@ +From 37093bb245ccd57b7ed65e71163ea5b65e949521 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Fri, 10 Dec 2010 11:30:34 +0000 +Subject: [PATCH] glx: Refcnt the GLXDrawable to avoid use after free with multiple FreeResource +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Although there may be more than one resource handles pointing to the +Drawable, we only want to destroy it once and only reference the +resource which may have just been deleted on the first instance. + +v2: Apply fixes and combine with another bug fix from Michel Dänzer, + https://bugs.freedesktop.org/show_bug.cgi?id=28181 + +Signed-off-by: Chris Wilson +Cc: Kristian Høgsberg +Cc: Michel Dänzer +--- + glx/glxcmds.c | 24 +++++++++++++++--------- + glx/glxdrawable.h | 3 +++ + glx/glxext.c | 19 ++++++++++--------- + 3 files changed, 28 insertions(+), 18 deletions(-) + +diff --git a/glx/glxcmds.c b/glx/glxcmds.c +index de9c3f0..b3ea784 100644 +--- a/glx/glxcmds.c ++++ b/glx/glxcmds.c +@@ -507,6 +507,7 @@ __glXGetDrawable(__GLXcontext * glxc, GLXDrawable drawId, ClientPtr client, + *error = BadAlloc; + return NULL; + } ++ pGlxDraw->refcnt++; + + return pGlxDraw; + } +@@ -1127,8 +1128,10 @@ __glXDrawableInit(__GLXdrawable * drawable, + drawable->pDraw = pDraw; + drawable->type = type; + drawable->drawId = drawId; ++ drawable->otherId = 0; + drawable->config = config; + drawable->eventMask = 0; ++ drawable->refcnt = 0; + + return GL_TRUE; + } +@@ -1158,15 +1161,18 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen * pGlxScreen, + pGlxDraw->destroy(pGlxDraw); + return BadAlloc; + } +- +- /* +- * Windows aren't refcounted, so track both the X and the GLX window +- * so we get called regardless of destruction order. +- */ +- if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW && +- !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) { +- pGlxDraw->destroy(pGlxDraw); +- return BadAlloc; ++ pGlxDraw->refcnt++; ++ ++ if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW) { ++ /* Add the glx drawable under the XID of the underlying X drawable ++ * too. That way we'll get a callback in DrawableGone and can ++ * clean up properly when the drawable is destroyed. */ ++ if (!AddResource(drawableId, __glXDrawableRes, pGlxDraw)) { ++ pGlxDraw->destroy (pGlxDraw); ++ return BadAlloc; ++ } ++ pGlxDraw->refcnt++; ++ pGlxDraw->otherId = drawableId; + } + + return Success; +diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h +index 2a365c5..80c3234 100644 +--- a/glx/glxdrawable.h ++++ b/glx/glxdrawable.h +@@ -51,8 +51,11 @@ struct __GLXdrawable { + void (*waitX) (__GLXdrawable *); + void (*waitGL) (__GLXdrawable *); + ++ int refcnt; /* number of resources handles referencing this */ ++ + DrawablePtr pDraw; + XID drawId; ++ XID otherId; /* for glx1.3 we need to track the original Drawable as well */ + + /* + ** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or +diff --git a/glx/glxext.c b/glx/glxext.c +index 4bd5d6b..77db8b0 100644 +--- a/glx/glxext.c ++++ b/glx/glxext.c +@@ -123,17 +123,18 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid) + { + __GLXcontext *c, *next; + +- if (glxPriv->type == GLX_DRAWABLE_WINDOW) { +- /* If this was created by glXCreateWindow, free the matching resource */ +- if (glxPriv->drawId != glxPriv->pDraw->id) { +- if (xid == glxPriv->drawId) +- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE); +- else +- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); +- } +- /* otherwise this window was implicitly created by MakeCurrent */ ++ if (glxPriv->otherId) { ++ XID other = glxPriv->otherId; ++ glxPriv->otherId = 0; ++ if (xid == other) ++ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); ++ else ++ FreeResourceByType(other, __glXDrawableRes, TRUE); + } + ++ if (--glxPriv->refcnt) ++ return True; ++ + for (c = glxAllContexts; c; c = next) { + next = c->next; + if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) { +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch new file mode 100644 index 0000000000..0355d0ba06 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch @@ -0,0 +1,101 @@ +diff --git a/dix/window.c b/dix/window.c +index d293e90..c33514b 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -550,9 +550,13 @@ InitRootWindow(WindowPtr pWin) + pWin->optional->cursor = rootCursor; + rootCursor->refcnt++; + ++ pWin->backingStore = defaultBackingStore; ++ pWin->forcedBS = (defaultBackingStore != NotUseful); ++ + if (party_like_its_1989) { + MakeRootTile(pWin); + backFlag |= CWBackPixmap; ++ (*pScreen->ChangeWindowAttributes)(pWin, backFlag); + } + else if (pScreen->canDoBGNoneRoot && bgNoneRoot) { + pWin->backgroundState = XaceBackgroundNoneState(pWin); +@@ -560,19 +564,9 @@ InitRootWindow(WindowPtr pWin) + backFlag |= CWBackPixmap; + } + else { +- pWin->backgroundState = BackgroundPixel; +- if (whiteRoot) +- pWin->background.pixel = pScreen->whitePixel; +- else +- pWin->background.pixel = pScreen->blackPixel; +- backFlag |= CWBackPixel; ++ /* nothing, handled in xf86CreateRootWindow */ + } + +- pWin->backingStore = defaultBackingStore; +- pWin->forcedBS = (defaultBackingStore != NotUseful); +- /* We SHOULD check for an error value here XXX */ +- (*pScreen->ChangeWindowAttributes) (pWin, backFlag); +- + MapWindow(pWin, serverClient); + } + +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index 5263b5f..eb530bb 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -60,6 +60,7 @@ + #ifdef XFreeXDGA + #include "dgaproc.h" + #endif ++#include "xace.h" + + #define XF86_OS_PRIVS + #include "xf86.h" +@@ -308,6 +309,7 @@ xf86CreateRootWindow(WindowPtr pWin) + int ret = TRUE; + int err = Success; + ScreenPtr pScreen = pWin->drawable.pScreen; ++ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + RootWinPropPtr pProp; + CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) + dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); +@@ -357,6 +359,15 @@ xf86CreateRootWindow(WindowPtr pWin) + } + } + ++ if (pScrn->canDoBGNoneRoot) { ++ pWin->backgroundState = XaceBackgroundNoneState(pWin); ++ pWin->background.pixel = pScreen->whitePixel; ++ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore); ++ } else { ++ pWin->background.pixel = pScreen->blackPixel; ++ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore); ++ } ++ + DebugF("xf86CreateRootWindow() returns %d\n", ret); + return ret; + } +diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h +index e2ca558..e1c5331 100644 +--- a/hw/xfree86/common/xf86str.h ++++ b/hw/xfree86/common/xf86str.h +@@ -497,7 +497,7 @@ typedef struct _confdrirec { + } confDRIRec, *confDRIPtr; + + /* These values should be adjusted when new fields are added to ScrnInfoRec */ +-#define NUM_RESERVED_INTS 16 ++#define NUM_RESERVED_INTS 15 + #define NUM_RESERVED_POINTERS 14 + #define NUM_RESERVED_FUNCS 10 + +@@ -758,6 +758,9 @@ typedef struct _ScrnInfoRec { + ClockRangePtr clockRanges; + int adjustFlags; + ++ /* -nr support */ ++ int canDoBGNoneRoot; ++ + /* + * These can be used when the minor ABI version is incremented. + * The NUM_* parameters must be reduced appropriately to keep the +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch new file mode 100644 index 0000000000..df7c4f304f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch @@ -0,0 +1,77 @@ +From: Yoshiki IGUCHI +Date: Mon, 12 Nov 2012 14:21:28 +0800 +Subject: [PATCH] Add the flag to specify the maximum VT number the user + can switch to. + +This CL adds the flag named '-maxvt', which specify the maximum VT +number the user can switch to with Ctrl-Alt-Fn keys. + +BUG=chromium:153961 +TEST=manual +--- + hw/xfree86/common/xf86Events.c | 4 +++- + os/utils.c | 12 ++++++++++++ + 2 files changed, 15 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c +index 3ad34b5..cfe92f0 100644 +--- a/hw/xfree86/common/xf86Events.c ++++ b/hw/xfree86/common/xf86Events.c +@@ -100,6 +100,8 @@ Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for + + extern fd_set EnabledDevices; + ++extern int maxVT; ++ + #ifdef XF86PM + extern void (*xf86OSPMClose) (void); + #endif +@@ -198,7 +200,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) + if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { + int vtno = *((int *) arg); + +- if (vtno != xf86Info.vtno) { ++ if ((maxVT < 0 || vtno <= maxVT) && vtno != xf86Info.vtno) { + if (!xf86VTActivate(vtno)) { + ErrorF("Failed to switch from vt%02d to vt%02d: %s\n", + xf86Info.vtno, vtno, strerror(errno)); +diff --git a/os/utils.c b/os/utils.c +index 04bcbc6..8b19838 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -202,6 +202,8 @@ Bool PanoramiXExtensionDisabledHack = FALSE; + + int auditTrailLevel = 1; + ++int maxVT = -1; ++ + char *SeatId = NULL; + + #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) +@@ -502,6 +504,7 @@ UseMsg(void) + #ifdef RLIMIT_STACK + ErrorF("-ls int limit stack space to N Kb\n"); + #endif ++ ErrorF("-maxvt int maximum switchable VT, -1 to permit any\n"); + ErrorF("-nolock disable the locking mechanism\n"); + ErrorF("-nolisten string don't listen on protocol\n"); + ErrorF("-noreset don't reset after last client exists\n"); +@@ -734,6 +737,15 @@ ProcessCommandLine(int argc, char *argv[]) + UseMsg(); + } + #endif ++ else if (strcmp(argv[i], "-maxvt") == 0) { ++ if (++i < argc) { ++ maxVT = atoi(argv[i]); ++ if (maxVT < 0) ++ maxVT = -1; ++ } ++ else ++ UseMsg(); ++ } + else if (strcmp(argv[i], "-nolock") == 0) { + #if !defined(WIN32) && !defined(__CYGWIN__) + if (getuid() != 0) +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch new file mode 100644 index 0000000000..bda376ba8d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch @@ -0,0 +1,46 @@ +From af88b43f9e604157b74270d609c08bdfa256a792 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 27 Apr 2012 16:31:17 +1000 +Subject: [PATCH] dix: don't emulate scroll events for non-existing axes + (#47281) + +Test case: +- create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set + that up as device with 1 relative axis +- move pointer to VGA1 +- xrandr --output VGA1 --off + +Warps the pointer to the new spot and calls GPE with the x/y mask bits set. +When running through the loop to check for scroll event, this overruns the +axes and may try to emulate scroll events based on random garbage in the +memory. If that memory contained non-zero for the scroll type but near-zero +for the increment field, the server would hang in an infinite loop. + +This was the trigger for this suggested, never-merged, patch here: +http://patchwork.freedesktop.org/patch/9543/ + +X.Org Bug 47281 + +Signed-off-by: Peter Hutterer +Reviewed-by: Chase Douglas +--- + dix/getevents.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 23bbe06..c960d44 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -1577,6 +1577,9 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, + /* Now turn the smooth-scrolling axes back into emulated button presses + * for legacy clients, based on the integer delta between before and now */ + for (i = 0; i < valuator_mask_size(&mask); i++) { ++ if (i >= pDev->valuator->numAxes) ++ break; ++ + if (!valuator_mask_isset(&mask, i)) + continue; + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch new file mode 100644 index 0000000000..990fd85a44 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch @@ -0,0 +1,26 @@ +Subject: [PATCH] xserver: Fix dri2 race + +The is a race where the client disappears after submitting the swapbuffers +but before completing the request. Don't attend the client if it is gone. +--- + hw/xfree86/dri2/dri2.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c +index 5cc9068..d03d082 100644 +--- a/hw/xfree86/dri2/dri2.c ++++ b/hw/xfree86/dri2/dri2.c +@@ -220,7 +220,9 @@ DRI2SwapLimit(DrawablePtr pDraw, int swap_limit) + + if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) { + if (pPriv->blockedClient) { +- AttendClient(pPriv->blockedClient); ++ if ((pPriv->blockedClient->clientState != ClientStateGone) && ++ (pPriv->blockedClient->clientState != ClientStateInitial)) ++ AttendClient(pPriv->blockedClient); + pPriv->blockedClient = NULL; + } + } +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch new file mode 100644 index 0000000000..cb92bc2068 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch @@ -0,0 +1,372 @@ +diff --git a/glx/glxcmds.c b/glx/glxcmds.c +index 5cd95f6..de22540 100644 +--- a/glx/glxcmds.c ++++ b/glx/glxcmds.c +@@ -784,7 +784,7 @@ __glXDisp_WaitGL(__GLXclientState * cl, GLbyte * pc) + } + + if (glxc && glxc->drawPriv->waitGL) +- (*glxc->drawPriv->waitGL) (glxc->drawPriv); ++ (*glxc->drawPriv->waitGL) (client, glxc->drawPriv); + + return Success; + } +@@ -811,7 +811,7 @@ __glXDisp_WaitX(__GLXclientState * cl, GLbyte * pc) + } + + if (glxc && glxc->drawPriv->waitX) +- (*glxc->drawPriv->waitX) (glxc->drawPriv); ++ (*glxc->drawPriv->waitX) (client, glxc->drawPriv); + + return Success; + } +@@ -1841,7 +1841,7 @@ __glXDisp_CopySubBufferMESA(__GLXclientState * cl, GLbyte * pc) + pGlxDraw->copySubBuffer == NULL) + return __glXError(GLXBadDrawable); + +- (*pGlxDraw->copySubBuffer) (pGlxDraw, x, y, width, height); ++ (*pGlxDraw->copySubBuffer) (client, pGlxDraw, x, y, width, height); + + return Success; + } +diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h +index 80c3234..7e71a23 100644 +--- a/glx/glxdrawable.h ++++ b/glx/glxdrawable.h +@@ -46,10 +46,10 @@ enum { + struct __GLXdrawable { + void (*destroy) (__GLXdrawable * private); + GLboolean(*swapBuffers) (ClientPtr client, __GLXdrawable *); +- void (*copySubBuffer) (__GLXdrawable * drawable, ++ void (*copySubBuffer) (ClientPtr client, __GLXdrawable * drawable, + int x, int y, int w, int h); +- void (*waitX) (__GLXdrawable *); +- void (*waitGL) (__GLXdrawable *); ++ void (*waitX) (ClientPtr client, __GLXdrawable *); ++ void (*waitGL) (ClientPtr client, __GLXdrawable *); + + int refcnt; /* number of resources handles referencing this */ + +diff --git a/glx/glxdri.c b/glx/glxdri.c +index 326f539..3fbf118 100644 +--- a/glx/glxdri.c ++++ b/glx/glxdri.c +@@ -270,7 +270,7 @@ __glXDRIdrawableSwapInterval(__GLXdrawable * baseDrawable, int interval) + } + + static void +-__glXDRIdrawableCopySubBuffer(__GLXdrawable * basePrivate, ++__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * basePrivate, + int x, int y, int w, int h) + { + __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate; +diff --git a/glx/glxdri2.c b/glx/glxdri2.c +index 5e524db..ff6145b 100644 +--- a/glx/glxdri2.c ++++ b/glx/glxdri2.c +@@ -114,10 +114,11 @@ __glXDRIdrawableDestroy(__GLXdrawable * drawable) + } + + static void +-__glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable, ++__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * drawable, + int x, int y, int w, int h) + { + __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable; ++ __GLXDRIscreen *screen = private->screen; + BoxRec box; + RegionRec region; + +@@ -127,12 +128,27 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable, + box.y2 = private->height - y; + RegionInit(®ion, &box, 0); + +- DRI2CopyRegion(drawable->pDraw, ®ion, +- DRI2BufferFrontLeft, DRI2BufferBackLeft); ++ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__); ++#if __DRI2_FLUSH_VERSION >= 3 ++ LogMessage(X_INFO, "%s:%d flushing\n",__func__,__LINE__); ++ if (screen->flush) { ++ LogMessage(X_INFO, "%s:%d flushing2\n",__func__,__LINE__); ++ (*screen->flush->flush)(private->driDrawable); ++ (*screen->flush->invalidate)(private->driDrawable); ++ } ++#else ++ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__); ++ if (screen->flush) ++ (*screen->flush->flushInvalidate)(private->driDrawable); ++#endif ++ ++ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__); ++ DRI2CopyRegion(client, drawable->pDraw, ®ion, ++ DRI2BufferFrontLeft, DRI2BufferBackLeft, TRUE); + } + + static void +-__glXDRIdrawableWaitX(__GLXdrawable * drawable) ++__glXDRIdrawableWaitX(ClientPtr client, __GLXdrawable * drawable) + { + __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable; + BoxRec box; +@@ -144,12 +160,12 @@ __glXDRIdrawableWaitX(__GLXdrawable * drawable) + box.y2 = private->height; + RegionInit(®ion, &box, 0); + +- DRI2CopyRegion(drawable->pDraw, ®ion, +- DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft); ++ DRI2CopyRegion(client, drawable->pDraw, ®ion, ++ DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft, FALSE); + } + + static void +-__glXDRIdrawableWaitGL(__GLXdrawable * drawable) ++__glXDRIdrawableWaitGL(ClientPtr client, __GLXdrawable * drawable) + { + __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable; + BoxRec box; +@@ -161,8 +177,8 @@ __glXDRIdrawableWaitGL(__GLXdrawable * drawable) + box.y2 = private->height; + RegionInit(®ion, &box, 0); + +- DRI2CopyRegion(drawable->pDraw, ®ion, +- DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft); ++ DRI2CopyRegion(client, drawable->pDraw, ®ion, ++ DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft, FALSE); + } + + static void +@@ -565,7 +581,7 @@ static void + dri2FlushFrontBuffer(__DRIdrawable * driDrawable, void *loaderPrivate) + { + (void) driDrawable; +- __glXDRIdrawableWaitGL((__GLXdrawable *) loaderPrivate); ++ __glXDRIdrawableWaitGL(NULL, (__GLXdrawable *) loaderPrivate); + } + + static const __DRIdri2LoaderExtension loaderExtension = { +diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c +index d03d082..28383fb 100644 +--- a/hw/xfree86/dri2/dri2.c ++++ b/hw/xfree86/dri2/dri2.c +@@ -87,6 +87,7 @@ typedef struct _DRI2Drawable { + int swap_limit; /* for N-buffering */ + unsigned long serialNumber; + Bool needInvalidate; ++ RegionPtr previous_region; + } DRI2DrawableRec, *DRI2DrawablePtr; + + typedef struct _DRI2Screen { +@@ -175,6 +176,7 @@ DRI2AllocateDrawable(DrawablePtr pDraw) + pPriv->swap_count = 0; + pPriv->target_sbc = -1; + pPriv->swap_interval = 1; ++ pPriv->previous_region = NULL; + /* Initialize last swap target from DDX if possible */ + if (!ds->GetMSC || !(*ds->GetMSC) (pDraw, &ust, &pPriv->last_swap_target)) + pPriv->last_swap_target = 0; +@@ -552,8 +554,8 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height, + box.y2 = pPriv->height; + RegionInit(®ion, &box, 0); + +- DRI2CopyRegion(pDraw, ®ion, DRI2BufferFakeFrontLeft, +- DRI2BufferFrontLeft); ++ DRI2CopyRegion(NULL, pDraw, ®ion, DRI2BufferFakeFrontLeft, ++ DRI2BufferFrontLeft, FALSE); + } + + pPriv->needInvalidate = TRUE; +@@ -661,9 +663,118 @@ DRI2BlockClient(ClientPtr client, DrawablePtr pDraw) + pPriv->blockedOnMsc = TRUE; + } + ++static Bool DRI2CopyRegionWithFlip(ClientPtr client, DrawablePtr pDraw, ++ RegionPtr pRegion, ++ DRI2BufferPtr pDestBuffer, ++ DRI2BufferPtr pSrcBuffer) ++{ ++ DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); ++ DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); ++ ScreenPtr pScreen = pPriv->dri2_screen->screen; ++ RegionPtr pPreviousRegion; ++ RegionPtr pCopyFrontToBack; ++ int ret; ++ DRI2SwapEventPtr func = NULL; ++ void *data = NULL; ++ PixmapPtr pWindowPix, pScreenPix; ++ CARD64 target_msc = 0, divisor = 0, remainder = 0; ++ CARD64 ust, current_msc; ++ CARD64 swap_target; ++ ++ /* Make sure we have a window */ ++ if (pDraw->type != DRAWABLE_WINDOW) ++ return FALSE; ++ ++ /* Ensure that our window is the screen pixmap */ ++ pWindowPix = pScreen->GetWindowPixmap((WindowPtr)pDraw); ++ pScreenPix = pScreen->GetScreenPixmap(pScreen); ++ if (pWindowPix != pScreenPix) ++ return FALSE; ++ ++ /* Create a region pCopyFrontToBack which brings over the changes from ++ * the last frame. Do this by subtracting the current region from the ++ * previous updates and copying the resulting bits. In the case where we ++ * don't have a previous region we'll update the whole drawable */ ++ pCopyFrontToBack = REGION_CREATE(pScreen, NULL, 0); ++ ++ if (pPriv->previous_region) { ++ pPreviousRegion = pPriv->previous_region; ++ } else { ++ BoxRec box; ++ box.x1 = pDraw->x; ++ box.y1 = pDraw->y; ++ box.x2 = box.x1 + pDraw->width; ++ box.y2 = box.y1 + pDraw->height; ++ pPreviousRegion = REGION_CREATE(pScreen, &box, 1); ++ } ++ ++ REGION_SUBTRACT(pScreen, pCopyFrontToBack, pPreviousRegion, pRegion); ++ REGION_DESTROY(pScreen, pPreviousRegion); ++ (*ds->CopyRegion)(pDraw, pCopyFrontToBack, pSrcBuffer, pDestBuffer); ++ ++ /* ++ * In the simple glXSwapBuffers case, all params will be 0, and we just ++ * need to schedule a swap for the last swap target + the swap interval. ++ */ ++ if (target_msc == 0 && divisor == 0 && remainder == 0) { ++ /* If the current vblank count of the drawable's crtc is lower ++ * than the count stored in last_swap_target from a previous swap ++ * then reinitialize last_swap_target to the current crtc's msc, ++ * otherwise the swap will hang. This will happen if the drawable ++ * is moved to a crtc with a lower refresh rate, or a crtc that just ++ * got enabled. ++ */ ++ if (ds->GetMSC) { ++ if (!(*ds->GetMSC)(pDraw, &ust, ¤t_msc)) ++ pPriv->last_swap_target = 0; ++ ++ if (current_msc < pPriv->last_swap_target) ++ pPriv->last_swap_target = current_msc; ++ ++ } ++ ++ /* ++ * Swap target for this swap is last swap target + swap interval since ++ * we have to account for the current swap count, interval, and the ++ * number of pending swaps. ++ */ ++ swap_target = pPriv->last_swap_target + pPriv->swap_interval; ++ ++ } else { ++ /* glXSwapBuffersMscOML could have a 0 target_msc, honor it */ ++ swap_target = target_msc; ++ } ++ ++ if (pPriv->swapsPending > 0) ++ return FALSE; ++ ++ pPriv->swapsPending++; ++ ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer, ++ &swap_target, divisor, remainder, func, data); ++ if (!ret) { ++ pPriv->swapsPending--; /* didn't schedule */ ++ return FALSE; ++ } ++ ++ pPriv->last_swap_target = swap_target; ++ ++ /* According to spec, return expected swapbuffers count SBC after this swap ++ * will complete. ++ */ ++ swap_target = pPriv->swap_count + pPriv->swapsPending; ++ ++ DRI2InvalidateDrawable(pDraw); ++ ++ pPriv->previous_region = REGION_CREATE(pScreen, NULL, 0); ++ REGION_COPY(pScreen, pPriv->previous_region, pRegion); ++ ++ REGION_DESTROY(pScreen, pCopyFrontToBack); ++ return TRUE; ++} ++ + int +-DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, +- unsigned int dest, unsigned int src) ++DRI2CopyRegion(ClientPtr client, DrawablePtr pDraw, RegionPtr pRegion, ++ unsigned int dest, unsigned int src, Bool invalidate) + { + DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); + DRI2DrawablePtr pPriv; +@@ -685,8 +796,13 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, + if (pSrcBuffer == NULL || pDestBuffer == NULL) + return BadValue; + +- (*ds->CopyRegion) (pDraw, pRegion, pDestBuffer, pSrcBuffer); ++ if (invalidate && ++ DRI2CopyRegionWithFlip(client, pDraw, pRegion, ++ pDestBuffer, pSrcBuffer)) ++ return Success; + ++ pPriv->previous_region = NULL; ++ (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer); + return Success; + } + +@@ -814,8 +930,8 @@ DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame, + box.x2 = pDraw->width; + box.y2 = pDraw->height; + RegionInit(®ion, &box, 0); +- DRI2CopyRegion(pDraw, ®ion, DRI2BufferFakeFrontLeft, +- DRI2BufferFrontLeft); ++ DRI2CopyRegion(client, pDraw, ®ion, DRI2BufferFakeFrontLeft, ++ DRI2BufferFrontLeft, FALSE); + + ust = ((CARD64) tv_sec * 1000000) + tv_usec; + if (swap_complete) +@@ -889,6 +1005,8 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc, + return BadDrawable; + } + ++ pPriv->previous_region = NULL; ++ + /* Old DDX or no swap interval, just blit */ + if (!ds->ScheduleSwap || !pPriv->swap_interval) { + BoxRec box; +@@ -1345,3 +1463,4 @@ DRI2Version(int *major, int *minor) + if (minor != NULL) + *minor = DRI2VersRec.minorversion; + } ++ +diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h +index a67e35f..e30fb7a 100644 +--- a/hw/xfree86/dri2/dri2.h ++++ b/hw/xfree86/dri2/dri2.h +@@ -248,9 +248,11 @@ extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw, + unsigned int *attachments, + int count, int *out_count); + +-extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw, ++extern _X_EXPORT int DRI2CopyRegion(ClientPtr client, ++ DrawablePtr pDraw, + RegionPtr pRegion, +- unsigned int dest, unsigned int src); ++ unsigned int dest, unsigned int src, ++ Bool invalidate); + + /** + * Determine the major and minor version of the DRI2 extension. +diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c +index 73ef7f2..dfa242a 100644 +--- a/hw/xfree86/dri2/dri2ext.c ++++ b/hw/xfree86/dri2/dri2ext.c +@@ -319,7 +319,7 @@ ProcDRI2CopyRegion(ClientPtr client) + + VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess); + +- status = DRI2CopyRegion(pDrawable, pRegion, stuff->dest, stuff->src); ++ status = DRI2CopyRegion(client, pDrawable, pRegion, stuff->dest, stuff->src, TRUE); + if (status != Success) + return status; + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch new file mode 100644 index 0000000000..00a978422d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch @@ -0,0 +1,48 @@ +From 758de0b68be0b2ace903d3c86fca65865f34d7cd Mon Sep 17 00:00:00 2001 +From: Yufeng Shen +Date: Fri, 20 Jul 2012 18:58:10 -0400 +Subject: [PATCH] x11-base/xorg-server: fix scale_to_desktop for edge ABS + events + +Scale_to_desktop() converts ABS events from device coordinates +to screen coordinates: +[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max] +[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max] + +An edge ABS event with X = dev_X_max (e.g., generated from the +edge of a touchscreen) will be converted to have screen X value += screen_X_max, which, however, will be filterd out when xserver +tries to find proper Window to receive the event, because the +range check for a Window to receive events is + window_X_min <= event_screen_X < window_X_max +Events with event_screen_X = screen_X_max will fail the test get +and rejected by the Window. + +To fix this, we change the device to screen coordinates mapping to +[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max-1] +[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max-1] + +Signed-off-by: Yufeng Shen +--- + dix/getevents.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index b78d5ce..9898c6a 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -890,9 +890,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask, + + /* scale x&y to desktop coordinates */ + *screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL, +- screenInfo.x, screenInfo.width); ++ screenInfo.x, screenInfo.width - 1); + *screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL, +- screenInfo.y, screenInfo.height); ++ screenInfo.y, screenInfo.height - 1); + + *devx = x; + *devy = y; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch new file mode 100644 index 0000000000..cfe03a43cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch @@ -0,0 +1,38 @@ +From d53e6e02a2595ced1882f5fcd34d08ea039b3b85 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 16 Aug 2012 13:54:42 +1000 +Subject: [PATCH] mi: don't check for core events in miPointerSetPosition + (#53568) + +As of 81cfe44b1ed0de84ad1941fe2ca74bebef3fc58d, miPointerSetPosition now +returns the screen pointer of the device. This broke floating slave devices, +as soon as a motion event was submitted, miPointerSetPosition returned NULL, +crashing the server. + +dev->coreEvents is only false if the device is a floating slave, in which +case it has a sprite. + +X.Org Bug 53568 + +Signed-off-by: Peter Hutterer +Reviewed-by: Keith Packard +--- + mi/mipointer.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mi/mipointer.c b/mi/mipointer.c +index a56838e..4defaf5 100644 +--- a/mi/mipointer.c ++++ b/mi/mipointer.c +@@ -575,7 +575,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, + + miPointerPtr pPointer; + +- if (!pDev || !pDev->coreEvents) ++ if (!pDev) + return NULL; + + pPointer = MIPOINTER(pDev); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch new file mode 100644 index 0000000000..9f04b259cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch @@ -0,0 +1,163 @@ +From: Daniel Kurtz +Date: Sat, 22 Sep 2012 19:58:22 +0800 +Subject: [PATCH] os: block signals when accessing global timer list + +X Input drivers, such as xf86-input-synaptics, tend to do all of their +processing in a SIGIO signal handler. This processing often involves +creating, modifying or canceling a timer. Any of these operations may +modify the global "timers" array. Therefore, all accesses of this global +must be done in critical sections during which signals are blocked. + +Otherwise, for example, a signal may clear the last timer between, which +sets timers global to NULL, between the NULL check and checking "expires", +which causes a SEGV. + +A previous patch protected write accesses. However, this is not +sufficient. ead accesses must also be made atomic such that a signal +cannot occur between the timers pointer NULL check and a subsequent +dereference. + +This change actually makes the Signal blocking in DoTimer() and +CheckAllTimers() redundant, since they are always called with signals +already blocked. + +Also, make the global volatile to ensure that the compiler does not +cache its value. + +Signed-off-by: Daniel Kurtz +--- + os/WaitFor.c | 27 +++++++++++++++++++-------- + 1 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/os/WaitFor.c b/os/WaitFor.c +index 852362e..f105acc 100644 +--- a/os/WaitFor.c ++++ b/os/WaitFor.c +@@ -122,7 +122,7 @@ struct _OsTimerRec { + + static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev); + static void CheckAllTimers(void); +-static OsTimerPtr timers = NULL; ++volatile static OsTimerPtr timers = NULL; + + /***************** + * WaitForSomething: +@@ -186,6 +186,7 @@ WaitForSomething(int *pClientsReady) + } + else { + wt = NULL; ++ OsBlockSignals(); + if (timers) { + now = GetTimeInMillis(); + timeout = timers->expires - now; +@@ -204,6 +205,7 @@ WaitForSomething(int *pClientsReady) + wt = &waittime; + } + } ++ OsReleaseSignals(); + XFD_COPYSET(&AllSockets, &LastSelectMask); + } + +@@ -251,6 +253,7 @@ WaitForSomething(int *pClientsReady) + if (*checkForInput[0] != *checkForInput[1]) + return 0; + ++ OsBlockSignals(); + if (timers) { + int expired = 0; + +@@ -261,14 +264,18 @@ WaitForSomething(int *pClientsReady) + while (timers && (int) (timers->expires - now) <= 0) + DoTimer(timers, now, &timers); + +- if (expired) ++ if (expired) { ++ OsReleaseSignals(); + return 0; ++ } + } ++ OsReleaseSignals(); + } + else { + fd_set tmp_set; + + if (*checkForInput[0] == *checkForInput[1]) { ++ OsBlockSignals(); + if (timers) { + int expired = 0; + +@@ -279,9 +286,12 @@ WaitForSomething(int *pClientsReady) + while (timers && (int) (timers->expires - now) <= 0) + DoTimer(timers, now, &timers); + +- if (expired) ++ if (expired) { ++ OsReleaseSignals(); + return 0; ++ } + } ++ OsReleaseSignals(); + } + if (someReady) + XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask); +@@ -382,7 +392,6 @@ CheckAllTimers(void) + OsTimerPtr timer; + CARD32 now; + +- OsBlockSignals(); + start: + now = GetTimeInMillis(); + +@@ -392,7 +401,6 @@ CheckAllTimers(void) + goto start; + } + } +- OsReleaseSignals(); + } + + static void +@@ -400,13 +408,11 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev) + { + CARD32 newTime; + +- OsBlockSignals(); + *prev = timer->next; + timer->next = NULL; + newTime = (*timer->callback) (timer, now, timer->arg); + if (newTime) + TimerSet(timer, 0, newTime, timer->callback, timer->arg); +- OsReleaseSignals(); + } + + OsTimerPtr +@@ -508,10 +514,13 @@ TimerFree(OsTimerPtr timer) + void + TimerCheck(void) + { +- CARD32 now = GetTimeInMillis(); ++ CARD32 now; + ++ OsBlockSignals(); ++ now = GetTimeInMillis(); + while (timers && (int) (timers->expires - now) <= 0) + DoTimer(timers, now, &timers); ++ OsReleaseSignals(); + } + + void +@@ -519,10 +528,12 @@ TimerInit(void) + { + OsTimerPtr timer; + ++ OsBlockSignals(); + while ((timer = timers)) { + timers = timer->next; + free(timer); + } ++ OsReleaseSignals(); + } + + #ifdef DPMSExtension +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch new file mode 100644 index 0000000000..109b226e95 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch @@ -0,0 +1,131 @@ +From 2011e215a101ce928f81baae4ffa9d9ae817ce33 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 27 Apr 2012 08:52:39 +0800 +Subject: [PATCH] os: make timers signal-safe + +If TimerSet() is called from a signal handler (synaptics tap handling code) +may result in list corruption if we're currently inside TimerSet(). + +See backtrace in +https://bugzilla.redhat.com/show_bug.cgi?id=814869 + +Block signals for all list manipulations in the timers. + +Signed-off-by: Peter Hutterer +Reviewed-by: Chase Douglas +(cherry picked from commit 08962951de969b9d8c870af8b6e47303dc0decfd) + +Conflicts: + + os/WaitFor.c +--- + os/WaitFor.c | 18 ++++++++++++++++-- + 1 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/os/WaitFor.c b/os/WaitFor.c +index 867cb04..236406e 100644 +--- a/os/WaitFor.c ++++ b/os/WaitFor.c +@@ -405,6 +405,7 @@ CheckAllTimers(void) + OsTimerPtr timer; + CARD32 now; + ++ OsBlockSignals(); + start: + now = GetTimeInMillis(); + +@@ -414,6 +415,7 @@ start: + goto start; + } + } ++ OsReleaseSignals(); + } + + static void +@@ -421,11 +423,13 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev) + { + CARD32 newTime; + ++ OsBlockSignals(); + *prev = timer->next; + timer->next = NULL; + newTime = (*timer->callback)(timer, now, timer->arg); + if (newTime) + TimerSet(timer, 0, newTime, timer->callback, timer->arg); ++ OsReleaseSignals(); + } + + OsTimerPtr +@@ -443,6 +447,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, + } + else + { ++ OsBlockSignals(); + for (prev = &timers; *prev; prev = &(*prev)->next) + { + if (*prev == timer) +@@ -453,6 +458,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, + break; + } + } ++ OsReleaseSignals(); + } + if (!millis) + return timer; +@@ -473,29 +479,35 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, + if (!millis) + return timer; + } ++ OsBlockSignals(); + for (prev = &timers; + *prev && (int) ((*prev)->expires - millis) <= 0; + prev = &(*prev)->next) + ; + timer->next = *prev; + *prev = timer; ++ OsReleaseSignals(); + return timer; + } + + Bool + TimerForce(OsTimerPtr timer) + { ++ int rc = FALSE; + OsTimerPtr *prev; + ++ OsBlockSignals(); + for (prev = &timers; *prev; prev = &(*prev)->next) + { + if (*prev == timer) + { + DoTimer(timer, GetTimeInMillis(), prev); +- return TRUE; ++ rc = TRUE; ++ break; + } + } +- return FALSE; ++ OsReleaseSignals(); ++ return rc; + } + + +@@ -506,6 +518,7 @@ TimerCancel(OsTimerPtr timer) + + if (!timer) + return; ++ OsBlockSignals(); + for (prev = &timers; *prev; prev = &(*prev)->next) + { + if (*prev == timer) +@@ -514,6 +527,7 @@ TimerCancel(OsTimerPtr timer) + break; + } + } ++ OsReleaseSignals(); + } + + void +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch new file mode 100644 index 0000000000..1752b78577 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch @@ -0,0 +1,85 @@ +From d09984016e41b602885e25b17582a0f563384e16 Mon Sep 17 00:00:00 2001 +From: Andrew de los Reyes +Date: Tue, 28 Aug 2012 14:33:45 -0700 +Subject: [PATCH] config/config.c: Workaround for handling udev REMOVED + messages. + +Details at http://code.google.com/p/chromium-os/issues/detail?id=33813 . + +The result of the bug is that sometimes a path will have the non-/sys part +of the prefix missing. For example, +'/sys/devices/pci0000:00/0000:00:1d.3/usb5/5-1/5-1:1.0/bluetooth/hci0/hci0:21/input32' +may come in as '/sys/hci0/hci0:21/input32'. This CL will look at the +suffixes to determine if there is a match. + +BUG=chromium-os:33813 +TEST=Reproduced error on ZGB. Saw log message appear and mouse +function. +--- + config/config.c | 39 +++++++++++++++++++++++++++++++++++++-- + 1 files changed, 37 insertions(+), 2 deletions(-) + +diff --git a/config/config.c b/config/config.c +index 0dae3ad..636abb8 100644 +--- a/config/config.c ++++ b/config/config.c +@@ -90,6 +90,41 @@ remove_device(const char *backend, DeviceIntPtr dev) + OsReleaseSignals(); + } + ++/** ++ * This is a workaround for ++ * http://code.google.com/p/chromium-os/issues/detail?id=33813 . ++ * We strip a prefix from the two strings we get, and if input_dev ++ * is a suffix of existing_dev, we consider it a match. ++ */ ++static Bool ++dev_same_suffix(const char* existing_dev, const char* input_dev) ++{ ++ const char PREFIX[] = "udev:/sys/"; ++ const size_t PREFIX_LEN = strlen(PREFIX); ++ size_t existing_len, input_len; ++ ++ if (strcmp(existing_dev, input_dev) == 0) ++ return TRUE; ++ /* If either doesn't have the magic prefix, abort */ ++ if (strncmp(existing_dev, PREFIX, PREFIX_LEN) != 0 || ++ strncmp(input_dev, PREFIX, PREFIX_LEN) != 0) ++ return FALSE; ++ existing_dev += PREFIX_LEN; ++ input_dev += PREFIX_LEN; ++ /* If input_dev is the suffix of existing_dev, return TRUE, else FALSE. */ ++ existing_len = strlen(existing_dev); ++ input_len = strlen(input_dev); ++ if (input_len > existing_len) ++ return FALSE; ++ if (strcmp(existing_dev + existing_len - input_len, input_dev) == 0) { ++ LogMessage(X_INFO, ++ "devices_same_suffix: matching %s with existing device %s\n", ++ input_dev, existing_dev); ++ return TRUE; ++ } ++ return FALSE; ++} ++ + void + remove_devices(const char *backend, const char *config_info) + { +@@ -97,12 +132,12 @@ remove_devices(const char *backend, const char *config_info) + + for (dev = inputInfo.devices; dev; dev = next) { + next = dev->next; +- if (dev->config_info && strcmp(dev->config_info, config_info) == 0) ++ if (dev->config_info && dev_same_suffix(dev->config_info, config_info)) + remove_device(backend, dev); + } + for (dev = inputInfo.off_devices; dev; dev = next) { + next = dev->next; +- if (dev->config_info && strcmp(dev->config_info, config_info) == 0) ++ if (dev->config_info && dev_same_suffix(dev->config_info, config_info)) + remove_device(backend, dev); + } + } +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch new file mode 100644 index 0000000000..a6d8871d8f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch @@ -0,0 +1,38 @@ +From 5b8cafec54186ffc038874102e53419c2339130b Mon Sep 17 00:00:00 2001 +From: Chris Wolfe +Date: Mon, 23 Jul 2012 15:54:47 -0400 +Subject: [PATCH] fixes: Prevent the cursor from leaking at corners + +This is a quick fix to prevent the cursor from leaking through between +xfixes boundaries at corners. Previously the barrier_is_blocking_direction +would consider e.g. a +X barrier to block -Y movement, so the second check +in CursorConstrainCursorHarder would repeat the same barrier in some +configurations. +--- + xfixes/cursor.c | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +diff --git a/xfixes/cursor.c b/xfixes/cursor.c +index 7c46269..b9d5c4b 100644 +--- a/xfixes/cursor.c ++++ b/xfixes/cursor.c +@@ -1055,7 +1055,15 @@ barrier_is_blocking_direction(const struct PointerBarrier * barrier, + int direction) + { + /* Barriers define which way is ok, not which way is blocking */ +- return (barrier->directions & direction) != direction; ++ int blocks; ++ if (barrier_is_vertical(barrier)) { ++ blocks = BarrierNegativeX | BarrierPositiveX; ++ } else { ++ blocks = BarrierNegativeY | BarrierPositiveY; ++ } ++ blocks &= ~barrier->directions; ++ ++ return (blocks & direction) != 0; + } + + /** +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch new file mode 100644 index 0000000000..cc334c4d1e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch @@ -0,0 +1,168 @@ +From 5dfb771f6e690b0a2f558f1b2c9d0787bc885587 Mon Sep 17 00:00:00 2001 +From: Daniel Kurtz +Date: Mon, 12 Nov 2012 14:39:33 +0800 +Subject: [PATCH] Per Randr CRTC pointer scaling + +Scale pointer motion based on the pixel density of the current "RandR" crtc +and whether or not it's internal. + +This implementation is very hacky since it directly accesses XRandR methods +and datastructures from within the X server proper. I'm not sure what +the proper way to solve this is. + +BUG=chromium-os:30822 +TEST=Tested on Link, Lucas w/ external display that pointer scaled +properly in each. +--- + dix/getevents.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 114 insertions(+), 0 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 7454cb4..5f00584 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -51,6 +51,7 @@ + #include "inpututils.h" + #include "mi.h" + #include "windowstr.h" ++#include "randrstr.h" + + #include + #include "xkbsrv.h" +@@ -72,6 +73,8 @@ + /* Number of motion history events to store. */ + #define MOTION_HISTORY_SIZE 256 + ++#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) ++ + /** + * InputEventList is the storage for input events generated by + * QueuePointerEvents, QueueKeyboardEvents, and QueueProximityEvents. +@@ -1262,6 +1265,115 @@ QueuePointerEvents(DeviceIntPtr device, int type, + queueEventList(device, InputEventList, nevents); + } + ++/* ++ * Return TRUE if (x, y) is within the bounds of the given X RandR CRTC. ++ * If so, it also returns whether the display is high DPI and/or internal. ++ */ ++static Bool ++RRCrtcContainsPosition(RRCrtcPtr crtc, int x, int y, ++ int *isHighDPI, int *isInternal) ++{ ++ int i; ++ int width, height; ++ const float maxLowDPmm = 160.0 / 25.4; /* 160 DPI / 25.4 mm/inch */ ++ const char * const integratedPrefixes[] = { "LVDS", "eDP" }; ++ ++ if (!crtc->mode) ++ return FALSE; ++ ++ RRCrtcGetScanoutSize(crtc, &width, &height); ++ ++ if (crtc->x <= x && x < crtc->x + width && ++ crtc->y <= y && y < crtc->y + height) { ++ /* Use the first output for extra return values */ ++ if (crtc->numOutputs) { ++ RROutputPtr output = crtc->outputs[0]; ++ /* Only consider HighDPI if the output has a mmWidth. */ ++ *isHighDPI = output->mmWidth && ++ width > maxLowDPmm * output->mmWidth; ++ *isInternal = FALSE; ++ for (i = 0; i < ARRAY_SIZE(integratedPrefixes); i++) { ++ if (!strncmp(integratedPrefixes[i], output->name, ++ strlen(integratedPrefixes[i]))) { ++ *isInternal = TRUE; ++ break; ++ } ++ } ++ } ++ return TRUE; ++ } ++ return FALSE; ++} ++ ++/* ++ * Find the X RandR CRTC (ie display) which contains desktop coordinate (x,y), ++ * and return whether it's high DPI and/or internal. ++ * ++ * Returns FALSE if (x, y) is not on any known X RandR CRTC. ++ */ ++static Bool ++RRGetContainingCrtcInfo(ScreenPtr pScreen, int x, int y, ++ int *isHighDPI, int *isInternal) ++{ ++ rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen); ++ RRCrtcPtr crtc = rrScrPriv->pointerCrtc; ++ int i; ++ ++ /* Check last known CRTC */ ++ if (crtc && RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) { ++ return TRUE; ++ } ++ ++ /* Check all CRTCs */ ++ for (i = 0; i < rrScrPriv->numCrtcs; i++) { ++ crtc = rrScrPriv->crtcs[i]; ++ if (RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) { ++ rrScrPriv->pointerCrtc = crtc; ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ ++/* ++ * Scale the motion vector in mask valuators 0 & 1 ++ * ++ * Find the RandR CRTC for the current pointer position for this device, and ++ * use its pixel density and whether or not it's integrated to scale pointer ++ * motion. Specifically: double all motion on High-DPI displays, add 20% more ++ * motion on non-integrated displays. ++ */ ++static void ++scaleMotionPerRRCrtc(DeviceIntPtr dev, ValuatorMask *mask) ++{ ++ ScreenPtr pScreen = miPointerGetScreen(dev); ++ double x, y, dx, dy, scale; ++ int isHighDPI = FALSE; ++ int isInternal = FALSE; ++ ++ x = dev->last.valuators[0]; ++ y = dev->last.valuators[1]; ++ ++ /* Find Size of RandR CRTC containing the current pointer (x, y) */ ++ if (!RRGetContainingCrtcInfo(pScreen, x, y, &isHighDPI, &isInternal)) ++ return; ++ ++ scale = 1.0; ++ if (isHighDPI) ++ scale *= 2.0; ++ if (!isInternal) ++ scale *= 1.2; ++ ++ if (scale != 1.0) { ++ if (valuator_mask_fetch_double(mask, 0, &dx)) ++ valuator_mask_set_double(mask, 0, dx * scale); ++ ++ if (valuator_mask_fetch_double(mask, 1, &dy)) ++ valuator_mask_set_double(mask, 1, dy * scale); ++ } ++} ++ ++ + /** + * Helper function for GetPointerEvents, which only generates motion and + * raw motion events for the slave device: does not update the master device. +@@ -1368,6 +1480,8 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + if ((flags & POINTER_NORAW) == 0) + set_raw_valuators(raw, &mask, raw->valuators.data); + ++ scaleMotionPerRRCrtc(pDev, &mask); ++ + moveRelative(pDev, &mask); + } + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch new file mode 100644 index 0000000000..c7e25cacda --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch @@ -0,0 +1,93 @@ +From e2e273e135bcdadde22c48cf2d70cbd22f268120 Mon Sep 17 00:00:00 2001 +From: Yuly Novikov +Date: Mon, 19 Nov 2012 21:04:57 -0500 +Subject: [PATCH] dix: Save touchpoint last coordinates before transform. + #49347 + +DDXTouchPointInfoRec.valuators used to store axis values after transform. +This resulted in Coordinate Transformation Matrix +being applied multiple times to the last coordinates, +in the case when only pressure changes in the last touch event. + +Changed DDXTouchPointInfoRec.valuators to store values before transform. + +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=49347 + +BUG=chromium-os:36115 +TEST=Follow the expected output in the bug desription. + +Signed-off-by: Yuly Novikov +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +(cherry picked from commit 3b9f1c701787965246638c1a6fd99fb2b6078114) + +Conflicts: + + dix/getevents.c +--- + dix/getevents.c | 22 +++++++++------------- + include/inputstr.h | 2 +- + 2 files changed, 10 insertions(+), 14 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 7454cb4..f1e7491 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -1895,32 +1895,28 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, + default: + return 0; + } +- if (t->mode == XIDirectTouch && !(flags & TOUCH_CLIENT_ID)) { +- if (!valuator_mask_isset(&mask, 0)) +- valuator_mask_set_double(&mask, 0, +- valuator_mask_get_double(touchpoint.ti-> +- valuators, 0)); +- if (!valuator_mask_isset(&mask, 1)) +- valuator_mask_set_double(&mask, 1, +- valuator_mask_get_double(touchpoint.ti-> +- valuators, 1)); +- } + + /* Get our screen event co-ordinates (root_x/root_y/event_x/event_y): + * these come from the touchpoint in Absolute mode, or the sprite in + * Relative. */ + if (t->mode == XIDirectTouch) { +- transformAbsolute(dev, &mask); +- + if (!(flags & TOUCH_CLIENT_ID)) { +- for (i = 0; i < valuator_mask_size(&mask); i++) { ++ for (i = 0; i < max(valuator_mask_size(&mask), 2); i++) { + double val; + + if (valuator_mask_fetch_double(&mask, i, &val)) + valuator_mask_set_double(touchpoint.ti->valuators, i, val); ++ /* If the device doesn't post new X and Y axis values, ++ * use the last values posted. ++ */ ++ else if (i < 2 && ++ valuator_mask_fetch_double(touchpoint.ti->valuators, i, ++ &val)) ++ valuator_mask_set_double(&mask, i, val); + } + } + ++ transformAbsolute(dev, &mask); + clipAbsolute(dev, &mask); + } + else { +diff --git a/include/inputstr.h b/include/inputstr.h +index 841e805..bce46cb 100644 +--- a/include/inputstr.h ++++ b/include/inputstr.h +@@ -331,7 +331,7 @@ typedef struct _DDXTouchPointInfo { + uint32_t ddx_id; /* touch ID given by the DDX */ + Bool emulate_pointer; + +- ValuatorMask *valuators; /* last recorded axis values */ ++ ValuatorMask *valuators; /* last axis values as posted, pre-transform */ + } DDXTouchPointInfoRec; + + typedef struct _TouchClassRec { +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch new file mode 100644 index 0000000000..edf5d6d9cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch @@ -0,0 +1,66 @@ +diff -aur xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c +--- xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c 2012-08-26 22:11:00.000000000 -0700 ++++ xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c 2012-10-26 16:34:34.316834000 -0700 +@@ -2208,6 +2208,53 @@ + } + + static Bool ++xf86TargetChromeOS(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, ++ DisplayModePtr *modes, Bool *enabled, ++ int width, int height) ++{ ++ int o, p; ++ DisplayModePtr main_output_mode; ++ xf86OutputPtr main_output = NULL; ++ Bool found = FALSE; ++ ++ /* Find the main output */ ++ for (o = -1; nextEnabledOutput(config, enabled, &o); ) ++ { ++ if ( !strncmp(config->output[o]->name, "LVDS", 4) || ++ !strncmp(config->output[o]->name, "eDP", 3) ) ++ { ++ main_output = config->output[o]; ++ break; ++ } ++ } ++ ++ /* If we didn't find anything, grab the first enabled output */ ++ if (!main_output) { ++ o = -1; ++ nextEnabledOutput(config, enabled, &o); ++ main_output = config->output[o]; ++ } ++ ++ if (!main_output) ++ return FALSE; ++ ++ if (!(main_output_mode = xf86OutputHasPreferredMode(main_output, ++ width, height))) ++ return FALSE; ++ ++ /* Actually do the modesetting: turn off all non-main monitors */ ++ for (o = -1; nextEnabledOutput(config, enabled, &o); ) ++ { ++ if (config->output[o] == main_output) ++ modes[o] = main_output_mode; ++ else ++ (*config->output[o]->funcs->dpms)(config->output[o], DPMSModeOff); ++ } ++ ++ return TRUE; ++} ++ ++static Bool + xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green, + float gamma_blue) + { +@@ -2369,6 +2416,8 @@ + else { + if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); ++ else if (xf86TargetChromeOS(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using ChromeOS mode for initial modes\n"); + else if (xf86TargetPreferred + (scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch new file mode 100644 index 0000000000..16e872e277 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch @@ -0,0 +1,90 @@ +Subject: [PATCH] no default cursor + +Revive the Xserver's null-root-cursor option. +--- + configure.ac | 7 +++++++ + dix/cursor.c | 17 +++++++++++++++++ + include/dix-config.h.in | 3 +++ + 3 files changed, 27 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 03beb36..e4d0163 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -566,6 +566,9 @@ AC_ARG_ENABLE(install-libxf86config, + [Install libxf86config (default: disabled)]), + [INSTALL_LIBXF86CONFIG=$enableval], + [INSTALL_LIBXF86CONFIG=no]) ++AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]), ++ [NULL_ROOT_CURSOR=$enableval], ++ [NULL_ROOT_CURSOR=no]) + AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]), + [SYMBOL_VISIBILITY=$enableval], + [SYMBOL_VISIBILITY=auto]) +@@ -1239,6 +1242,10 @@ XKB_LIB='$(top_builddir)/xkb/libxkb.la' + XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' + REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" + ++if test "x$NULL_ROOT_CURSOR" = xyes; then ++ AC_DEFINE(NULL_ROOT_CURSOR, 1, [Use an empty root cursor]) ++fi ++ + PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"]) + if test "x$have_libxdmcp" = xyes; then + AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS]) +diff --git a/dix/cursor.c b/dix/cursor.c +index 6bff447..8771abf 100644 +--- a/dix/cursor.c ++++ b/dix/cursor.c +@@ -455,10 +455,26 @@ CursorPtr + CreateRootCursor(char *unused1, unsigned int unused2) + { + CursorPtr curs; ++#ifdef NULL_ROOT_CURSOR ++ CursorMetricRec cm; ++#else + FontPtr cursorfont; + int err; + XID fontID; ++#endif ++ ++#ifdef NULL_ROOT_CURSOR ++ cm.width = 0; ++ cm.height = 0; ++ cm.xhot = 0; ++ cm.yhot = 0; + ++ AllocARGBCursor(NULL, NULL, NULL, &cm, 0, 0, 0, 0, 0, 0, ++ &curs, serverClient, (XID)0); ++ ++ if (curs == NullCursor) ++ return NullCursor; ++#else + fontID = FakeClientID(0); + err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync, + (unsigned) strlen(defaultCursorFont), defaultCursorFont); +@@ -472,6 +488,7 @@ CreateRootCursor(char *unused1, unsigned int unused2) + if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0, + &curs, serverClient, (XID) 0) != Success) + return NullCursor; ++#endif + + if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer) curs)) + return NullCursor; +diff --git a/include/dix-config.h.in b/include/dix-config.h.in +index 3fb6413..d9871d4 100644 +--- a/include/dix-config.h.in ++++ b/include/dix-config.h.in +@@ -402,6 +402,9 @@ + /* Support HAL for hotplug */ + #undef CONFIG_HAL + ++/* Use an empty root cursor */ ++#undef NULL_ROOT_CURSOR ++ + /* Have a monotonic clock from clock_gettime() */ + #undef MONOTONIC_CLOCK + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1 new file mode 100644 index 0000000000..365664e665 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1 @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $ + +depend() { + need localmount +} + +start() { + if get_bootparam "nox" ; then + touch /etc/.noxdm + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4 new file mode 100644 index 0000000000..c82fece01c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4 @@ -0,0 +1,10 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you haven't accidentally configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +DISPLAYMANAGER="xdm" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8 new file mode 100644 index 0000000000..539cac107c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8 @@ -0,0 +1,216 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $ + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + # (#390609) gdm-3 will fail when dbus is not running + # (#366753) starting keymaps after X causes problems + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + + # Start before X + use consolekit dbus xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE=/usr/bin/kdm + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/var/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(command -v ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch new file mode 100644 index 0000000000..9a8b9149e9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 2693ce7..ac752fc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then + linux_alpha=yes + ;; + i*86|amd64*|x86_64*|ia64*) +- linux_acpi="yes" + ;; + *) + ;; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf new file mode 100644 index 0000000000..5cd8112f58 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf @@ -0,0 +1,6 @@ +# Rebuild all X11 modules (mostly useful after xorg-server ABI change). +[x11-module-rebuild] +class = portage.sets.dbapi.VariableSet +world-candidate = false +variable = CATEGORY +includes = x11-drivers diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild new file mode 100644 index 0000000000..6648d602b4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild @@ -0,0 +1,335 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.9 2012/07/22 12:54:50 chithanh Exp $ + +EAPI=4 + +XORG_DOC=doc +XORG_EAUTORECONF="yes" +inherit flag-o-matic xorg-2 multilib versionator +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +# +suid needed because sparcs default off +IUSE="${IUSE_SERVERS} broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.14 + >=x11-proto/inputproto-2.1.99.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch + + # Allow usage of monotonic clock while cross-compiling. + "${FILESDIR}/1.11.99.902-monotonic-clock-fix.patch" + "${FILESDIR}/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch" + # Match the behaviour of monitor_reconfigure at X.Org startup time. + "${FILESDIR}/1.9.3-chromeos-mode.patch" + # Allow setting the root window background to nothing to further reduce + # flicker when showing and hiding the composite overlay window. + "${FILESDIR}/1.11.99.902-allow-root-none.patch" + # Refcount glxdrawables to avoid crashes on double free() + "${FILESDIR}/1.11.99.902-refcnt-glxdrawable.patch" + + "${FILESDIR}/1.11.99.902-chromium-mouse-accel-profile.patch" + + "${FILESDIR}/1.11.99.902-xserver-bg-none-root.patch" + # Dont load a default X cursor. + "${FILESDIR}/1.9.3-no-default-cursor.patch" + # Ability to run without root privs + "${FILESDIR}/1.11.99.902-nohwaccess.patch" + # Don't attend clients which are already gone, race condition in dri2 + "${FILESDIR}/1.12.0-do-not-attend-gone-clients.patch" + # crosbug.com/p/11408 + "${FILESDIR}/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch" + # Fix for xfixes pointer barriers + "${FILESDIR}/1.12.0-xfixes-safer-barriers.patch" + # crosbug.com/33813 + "${FILESDIR}/1.12.0-suffix-match-udev-paths.patch" + # crosbug.com/31570 + "${FILESDIR}/1.12.0-os-block-signals-when-accessing-global-timer-list.patch" + # Fix for crash with floating touchscreen (http://crosbug.com/27529) + "${FILESDIR}/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch" + # Add the flag to specify the maximum VT the user can switch to + "${FILESDIR}/1.12.0-add-maxvt-flag.patch" + # Save touchpoint last coordinates before transform + "${FILESDIR}/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch" + # crbug.com/30822 + "${FILESDIR}/1.12.4-Per-Randr-CRTC-pointer-scaling.patch" +) + +src_prepare() { + # Partial flips + if use broken_partialswaps; then + PATCHES+=( + "${FILESDIR}/1.12.0-emulate-partial-flips.patch" + ) + fi + xorg-2_src_prepare +} + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +pkg_setup() { + xorg-2_pkg_setup + + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !tegra dri) + $(use_enable !tegra dri2) + $(use_enable !arm glx) + $(use_enable !arm vgahw) + $(use_enable !arm vbe) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_enable suid install-setuid) + --sysconfdir=/etc/X11 + --localstatedir=/var + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + --disable-xvmc + --disable-xdmcp + --disable-screensaver + --disable-xdm-auth-1 + --disable-dbe + --disable-xinerama + --disable-dga + --disable-xace + --disable-config-dbus + --disable-config-hal + --disable-clientids + --disable-xf86vidmode + --disable-registry + --disable-xfake + --disable-dmx + --disable-xvfb + --disable-xnest + --enable-null-root-cursor + --with-default-font-path=built-ins + ) + + if use amd64 || use x86 ; then + XORG_CONFIGURE_OPTIONS+=( --enable-xaa) + else + XORG_CONFIGURE_OPTIONS+=( --disable-xaa) + fi + + # Things we may want to remove later: + # --disable-xaa (requires dropping all xaa drivers) + # --disable-xv (requires fixing the drivers) + # --disable-tcp-transport + # --disable-ipv6 + # --disable-secure-rpc + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" + + # Make breakage less obvious, bug #402285. + replace-flags -O3 -O2 +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-8 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf + + # crosbug.com/11553 + dosym /usr/bin/Xorg /usr/bin/X11/X || die +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from + +nvidia-drivers-270.18.ebuild: + Add new nvidia-drivers beta. Adds a new library and adds initial support for + X.org 1.10 + +*nvidia-drivers-260.19.36 (24 Jan 2011) + + 24 Jan 2011; Doug Goldstein + +nvidia-drivers-260.19.36.ebuild: + Version bump. Some minor fixes from upstream. + + 25 Dec 2010; Christian Faulhammer + nvidia-drivers-96.43.19.ebuild, nvidia-drivers-173.14.28.ebuild, + nvidia-drivers-260.19.29.ebuild: + stable x86, bug 348186 + + 24 Dec 2010; Samuli Suominen + nvidia-drivers-96.43.19.ebuild, nvidia-drivers-260.19.29.ebuild: + amd64 stable wrt #348186 + + 23 Dec 2010; Richard Freeman + nvidia-drivers-173.14.28.ebuild: + amd64 stable - 348186 + +*nvidia-drivers-260.19.29 (14 Dec 2010) + + 14 Dec 2010; Jeroen Roovers + +nvidia-drivers-260.19.29.ebuild: + Version bump (bug #347371). + +*nvidia-drivers-173.14.28 (06 Dec 2010) + + 06 Dec 2010; Jeroen Roovers + +nvidia-drivers-173.14.28.ebuild: + Version bump by radfoj (bug #342361). + +*nvidia-drivers-260.19.26 (01 Dec 2010) + + 01 Dec 2010; Michał Januszewski + +nvidia-drivers-260.19.26.ebuild: + Version bump. This is a beta version (and thus masked), but it is also the + first 260.x release that works with GF330M. + + 20 Nov 2010; Jeroen Roovers nvidia-drivers-96.43.19.ebuild: + Free xorg-server dependency (bug #345929). + +*nvidia-drivers-96.43.19 (19 Nov 2010) + + 19 Nov 2010; Jeroen Roovers +nvidia-drivers-96.43.19.ebuild: + Version bump by Miguel R. Caudevilla (bug #345929). + +*nvidia-drivers-260.19.21 (18 Nov 2010) + + 18 Nov 2010; Doug Goldstein + -nvidia-drivers-260.19.06.ebuild, -nvidia-drivers-260.19.12.ebuild, + +nvidia-drivers-260.19.21.ebuild: + Bump to the latest official release. Remove beta releases. + +*nvidia-drivers-260.19.12 (15 Oct 2010) + + 15 Oct 2010; Doug Goldstein + +nvidia-drivers-260.19.12.ebuild: + Version bump for new upstream release. Added a note about what USE=gtk + does when you disable it. + + 14 Oct 2010; Christian Faulhammer + nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild, + nvidia-drivers-195.36.31.ebuild: + stable x86, bug 332501 + + 21 Sep 2010; Markos Chandras + nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild, + nvidia-drivers-195.36.31.ebuild: + Stable on amd64. Bug #332501 + +*nvidia-drivers-260.19.06 (20 Sep 2010) + + 20 Sep 2010; Doug Goldstein + -nvidia-drivers-260.19.04.ebuild, +nvidia-drivers-260.19.06.ebuild: + beta version bump + + 11 Sep 2010; Tomáš Chvátal + -nvidia-drivers-185.18.36-r1.ebuild: + Remove version depending on deprecated xorg-server. + +*nvidia-drivers-260.19.04 (08 Sep 2010) + + 08 Sep 2010; Doug Goldstein + +nvidia-drivers-260.19.04.ebuild: + Version bump for latest beta release + +*nvidia-drivers-256.53 (31 Aug 2010) + + 31 Aug 2010; Doug Goldstein + +nvidia-drivers-256.53.ebuild: + version bump + + 30 Aug 2010; Doug Goldstein + nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: + fix up blocker with media-video/nvidia-settings + + 30 Aug 2010; Doug Goldstein + nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: + Implement installing nvidia-settings when USE=gtk is enabled as discussed + in bug #304255 + + 30 Aug 2010; Doug Goldstein + nvidia-drivers-256.52.ebuild: + Fix xorg-server depend to properly include the 1.9 series + + 30 Aug 2010; Doug Goldstein + -nvidia-drivers-96.43.14.ebuild, -nvidia-drivers-173.14.22.ebuild, + -nvidia-drivers-195.36.15.ebuild, -nvidia-drivers-256.35.ebuild: + Clear out some older versions that have been supplanted by newer stable + versions + + 30 Aug 2010; Doug Goldstein + -nvidia-drivers-71.86.11.ebuild: + Removee versions that rely on xorg-server-1.4 or older (which is no longer + in the tree). + +*nvidia-drivers-256.52 (30 Aug 2010) +*nvidia-drivers-256.44-r1 (30 Aug 2010) + + 30 Aug 2010; Doug Goldstein + +nvidia-drivers-256.44-r1.ebuild, +nvidia-drivers-256.52.ebuild: + version bump and several clean ups to bring the ebuild up to the state of + the current unmasked ebuilds + +*nvidia-drivers-256.44 (04 Aug 2010) + + 04 Aug 2010; Michał Januszewski + +nvidia-drivers-256.44.ebuild: + Version bump. + + 30 Jul 2010; Tomáš Chvátal + nvidia-drivers-71.86.11.ebuild, nvidia-drivers-96.43.14.ebuild, + nvidia-drivers-96.43.16.ebuild, nvidia-drivers-96.43.18.ebuild, + nvidia-drivers-173.14.22.ebuild, nvidia-drivers-173.14.25.ebuild, + nvidia-drivers-173.14.27.ebuild, nvidia-drivers-185.18.36-r1.ebuild, + nvidia-drivers-190.53-r1.ebuild, nvidia-drivers-195.36.15.ebuild, + nvidia-drivers-195.36.24.ebuild, nvidia-drivers-195.36.31.ebuild, + nvidia-drivers-256.35.ebuild: + Depend on proper emul lib to fix bug #330249. + + 27 Jul 2010; Michał Januszewski + nvidia-drivers-256.35.ebuild: + Add a dependency on x11-libs/libXvMC (bug #321061). + + 20 Jul 2010; Doug Goldstein + nvidia-drivers-173.14.27.ebuild: + Conditionally install CUDA support if it was found in the package. + Apparently 173.14.27 drops CUDA. fixes bug #328681 + + 17 Jul 2010; Christian Faulhammer + nvidia-drivers-173.14.25.ebuild: + stable x86, bug 327003 + + 16 Jul 2010; Maciej Mrozowski + nvidia-drivers-173.14.25.ebuild: + amd64 stable, bug 327003 + +*nvidia-drivers-173.14.27 (16 Jul 2010) +*nvidia-drivers-96.43.18 (16 Jul 2010) + + 16 Jul 2010; Doug Goldstein + +nvidia-drivers-96.43.18.ebuild, +nvidia-drivers-173.14.27.ebuild: + bump available legacy drivers. Added support for xorg-server-1.8 in + nvidia-drivers-173.14.27 + + 15 Jul 2010; Markos Chandras + nvidia-drivers-96.43.16.ebuild: + Stable on amd64 wrt bug #326323 + +*nvidia-drivers-195.36.31 (13 Jul 2010) + + 13 Jul 2010; Doug Goldstein + -nvidia-drivers-180.60.ebuild, -nvidia-drivers-190.42-r3.ebuild, + -nvidia-drivers-190.53.ebuild, -nvidia-drivers-195.30.ebuild, + +nvidia-drivers-195.36.31.ebuild: + Version bump to the latest 195.36.x. Remove older versions that will no + longer be supported. Fix bug #317049 while I'm at it + + 10 Jul 2010; Christian Faulhammer + nvidia-drivers-96.43.16.ebuild: + stable x86, bug 326323 + + 07 Jul 2010; Pawel Hajdan jr + nvidia-drivers-195.36.24.ebuild: + x86 stable wrt bug #325513 + + 30 Jun 2010; Jeroen Roovers metadata.xml: + Correct description. + + 26 Jun 2010; Samuli Suominen + nvidia-drivers-195.36.24.ebuild: + amd64 stable wrt #325513 + + 24 Jun 2010; Michał Januszewski + +files/256.35-unified-arch.patch, nvidia-drivers-256.35.ebuild: + Add a patch for the 'x86' unified kernel architecture. + +*nvidia-drivers-256.35 (24 Jun 2010) + + 24 Jun 2010; Michał Januszewski + +nvidia-drivers-256.35.ebuild: + Version bump. + +*nvidia-drivers-195.36.24 (25 Apr 2010) + + 25 Apr 2010; Justin Lecher + +nvidia-drivers-195.36.24.ebuild: + Version Bump on permission, #315141 + + 24 Mar 2010; Doug Goldstein + nvidia-drivers-195.36.15.ebuild: + clean up some QA warnings + + 24 Mar 2010; Doug Goldstein + nvidia-drivers-195.36.15.ebuild: + add missing nvidia.icd to fix bug #310277 + + 17 Mar 2010; Doug Goldstein + nvidia-drivers-173.14.20.ebuild: + still adding back 173.14.20, but repoman doesn't let me stable it right + away since the ebuild was stable when it was removed.. + + 17 Mar 2010; Doug Goldstein + +nvidia-drivers-173.14.20.ebuild: + add back 173.14.20 at the request of Giao Phan for bug + #294089 + +*nvidia-drivers-195.36.15 (17 Mar 2010) + + 17 Mar 2010; Doug Goldstein + +nvidia-drivers-195.36.15.ebuild: + add upstream's pre-release version of the 195.x.y series. Still needs to + be tested on further kernels and x86 before unmasking + + 10 Mar 2010; Doug Goldstein + -nvidia-drivers-71.86.09.ebuild, -nvidia-drivers-96.43.13.ebuild, + -nvidia-drivers-173.14.20.ebuild, -nvidia-drivers-173.14.20-r1.ebuild, + -nvidia-drivers-185.18.36.ebuild, -nvidia-drivers-190.29.ebuild: + spring cleaning + + 10 Mar 2010; Doug Goldstein + -nvidia-drivers-195.36.03.ebuild: + remove the broken drivers + + 28 Feb 2010; Fabio Erculiani + nvidia-drivers-190.53-r1.ebuild, + +files/nvidia-drivers-190.53-2.6.33.patch: + add 2.6.33 kernel support to 190.53 + +*nvidia-drivers-173.14.25 (27 Feb 2010) + + 27 Feb 2010; Maciej Mrozowski + +nvidia-drivers-173.14.25.ebuild: + Version bump, bug 305713 + +*nvidia-drivers-96.43.16 (15 Feb 2010) + + 15 Feb 2010; Jeroen Roovers + +nvidia-drivers-96.43.16.ebuild: + Version bump thanks to John Brendler (bug #304841). + + 09 Feb 2010; Pacho Ramos + nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild, + nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild: + amd64 stable, bug 299560 + +*nvidia-drivers-195.36.03 (08 Feb 2010) + + 08 Feb 2010; Michał Januszewski + +nvidia-drivers-195.36.03.ebuild: + Beta version bump (bug #303821). + + 07 Feb 2010; Michał Januszewski + +files/195.30-unified-arch.patch, nvidia-drivers-195.30.ebuild: + Add support for the unified 'x86' kernel architecture. + +*nvidia-drivers-195.30 (07 Feb 2010) + + 07 Feb 2010; Michał Januszewski + +nvidia-drivers-195.30.ebuild: + Add the latest beta drivers with support for CUDA 3.0. + + 01 Feb 2010; Christian Faulhammer + nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild, + nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild: + stable x86, bug 299560 + +*nvidia-drivers-190.53-r1 (04 Jan 2010) + + 04 Jan 2010; Doug Goldstein + +nvidia-drivers-190.53-r1.ebuild: + revert the change to install VDPAU drivers to /usr/lib/vdpau since + libvdpau's dlopen() usage is incorrect. Stop gap ebuild until the issue is + discussed further with upstream. + + 21 Dec 2009; Doug Goldstein + -nvidia-drivers-190.42-r2.ebuild: + remove old version + + 21 Dec 2009; Doug Goldstein + +nvidia-drivers-190.53.ebuild: + version bump + + 17 Dec 2009; Doug Goldstein + -nvidia-drivers-190.53.ebuild: + as stated in bug #296947, this breaks VDPAU, but apparently peper, who's + not a maintainer knows better. + +*nvidia-drivers-190.53 (16 Dec 2009) + + 16 Dec 2009; Piotr Jaroszyński + +nvidia-drivers-190.53.ebuild: + Add 190.53. + + 28 Nov 2009; Doug Goldstein + nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild: + fix bug #276815 + + 28 Nov 2009; Doug Goldstein + nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild: + remove defunct compat_device_check. bug #294896 and bug #294623 + + 21 Nov 2009; Doug Goldstein + nvidia-drivers-185.18.36.ebuild: + stabilize for bug #290555 + + 21 Nov 2009; Doug Goldstein + nvidia-drivers-71.86.11.ebuild: + stabilize for bug #290561 + +*nvidia-drivers-96.43.14 (13 Nov 2009) + + 13 Nov 2009; Doug Goldstein + +nvidia-drivers-96.43.14.ebuild: + version bump for xorg-server 1.7 support. ebuild uses the refactored + ebuild as a base + +*nvidia-drivers-173.14.22 (13 Nov 2009) + + 13 Nov 2009; Doug Goldstein + +nvidia-drivers-173.14.22.ebuild: + version bump for xorg-server 1.7 support. ebuild uses the refactored + ebuild as a base + + 12 Nov 2009; Doug Goldstein + nvidia-drivers-190.42-r3.ebuild: + fix bash syntax error + +*nvidia-drivers-190.29 (09 Nov 2009) + + 09 Nov 2009; Doug Goldstein + +nvidia-drivers-190.29.ebuild: + add 190.29 series for OpenCL support + + 06 Nov 2009; Doug Goldstein + nvidia-drivers-190.42-r3.ebuild: + oops. fix issue where we might remove vdpau and cuda files + + 06 Nov 2009; Doug Goldstein + nvidia-drivers-190.42-r3.ebuild: + more FreeBSD fixes + +*nvidia-drivers-190.42-r3 (06 Nov 2009) + + 06 Nov 2009; Doug Goldstein + +nvidia-drivers-190.42-r3.ebuild: + remove generation of libGL.la since eselect-opengl-1.0.9 and newer no + longer uses it. refactor installation of libraries to fix FreeBSD issues + + 06 Nov 2009; Doug Goldstein + nvidia-drivers-190.42-r2.ebuild: + add NV_X11_DRV and NV_X11_EXT to deal with different location of files on + FreeBSD + + 03 Nov 2009; Doug Goldstein + nvidia-drivers-190.42-r2.ebuild: + clean up x86 QA_ settings + + 03 Nov 2009; Doug Goldstein + nvidia-drivers-185.18.36-r1.ebuild, -nvidia-drivers-190.42-r1.ebuild, + nvidia-drivers-190.42-r2.ebuild: + no longer need to block newer mesa since eselect-opengl has been updated. + remove older revision of 190.42 + + 01 Nov 2009; Michael Sterrett + nvidia-drivers-173.14.20.ebuild, nvidia-drivers-173.14.20-r1.ebuild, + nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild, + nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild, + nvidia-drivers-190.42-r2.ebuild: + fix typo in elog (bug #291397) + +*nvidia-drivers-190.42-r2 (31 Oct 2009) + + 31 Oct 2009; Doug Goldstein + +nvidia-drivers-190.42-r2.ebuild: + reworked the ebuild for an overall improvement. Should fix several obscure + issues people have with different profiles. remove usage of non-TLS + libraries since Gentoo has TLS glibc's. still a work in progress for other + clean ups. + + 29 Oct 2009; Doug Goldstein + nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild: + Quadro NVS 140 support fixed in 185.18.36 + +*nvidia-drivers-173.14.20-r1 (29 Oct 2009) + + 29 Oct 2009; Doug Goldstein + +nvidia-drivers-173.14.20-r1.ebuild: + install nvidia-smi application and nvidia-xconfig man page + + 29 Oct 2009; Doug Goldstein + nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild, + nvidia-drivers-190.42-r1.ebuild: + fix QA_EXECSTACKS issue with libXvMCNVIDIA as reported in bug #290258 + + 29 Oct 2009; Doug Goldstein + nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, + nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild, + nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild, + nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild: + >=media-libs/mesa-7.6 makes changes to the libGL.la behavior with eselect + that will cause OpenGL to be broken + + 29 Oct 2009; Doug Goldstein + -nvidia-drivers-185.18.14.ebuild, -nvidia-drivers-185.18.29.ebuild, + -nvidia-drivers-185.18.31.ebuild, -nvidia-drivers-190.18.ebuild, + -nvidia-drivers-190.25.ebuild, -nvidia-drivers-190.32.ebuild, + -nvidia-drivers-190.36.ebuild, -nvidia-drivers-190.40.ebuild, + -nvidia-drivers-190.42.ebuild: + cull older version + + 29 Oct 2009; Doug Goldstein + nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild: + fix xorg-server version dependency + + 27 Oct 2009; Samuli Suominen + nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild: + Remove + -nvidia-drivers-96.43.09.ebuild, -nvidia-drivers-96.43.11.ebuild, + -nvidia-drivers-173.14.15.ebuild, -nvidia-drivers-173.14.18.ebuild, + -nvidia-drivers-180.29.ebuild: + Remove old 96, 173 and 180. + + 26 Oct 2009; Samuli Suominen + nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild: + amd64 stable wrt #281302 + + 22 Oct 2009; Doug Goldstein + nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild: + don't install the vdpau headers since libvdpau provides those now + +*nvidia-drivers-190.42-r1 (22 Oct 2009) +*nvidia-drivers-185.18.36-r1 (22 Oct 2009) + + 22 Oct 2009; Doug Goldstein + +nvidia-drivers-185.18.36-r1.ebuild, +nvidia-drivers-190.42-r1.ebuild: + Update to new way of shipping VDPAU wrapper in its own library from + Freedesktop after discussing distro packaging with NVIDIA. + +*nvidia-drivers-190.42 (22 Oct 2009) + + 22 Oct 2009; Piotr Jaroszyński + +nvidia-drivers-190.42.ebuild: + Add 190.42. + + 22 Oct 2009; Doug Goldstein + nvidia-drivers-185.18.31.ebuild, nvidia-drivers-185.18.36.ebuild, + nvidia-drivers-190.32.ebuild, nvidia-drivers-190.36.ebuild, + nvidia-drivers-190.40.ebuild: + add note about needing to add QA_LDFLAGS for nvidia-smi + +*nvidia-drivers-185.18.36 (21 Oct 2009) + + 21 Oct 2009; Jeroen Roovers + +nvidia-drivers-185.18.36.ebuild: + Version bump (bug #288591). + +*nvidia-drivers-190.40 (17 Oct 2009) + + 17 Oct 2009; Piotr Jaroszyński + +nvidia-drivers-190.40.ebuild: + Add 190.40. + + 06 Oct 2009; Jeroen Roovers + nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, + nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild, + nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild, + nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild, + nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, + nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, + nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, + nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild, + nvidia-drivers-190.36.ebuild: + Remove elibc_glibc dependency for now as it breaks horribly. + + 06 Oct 2009; Jeroen Roovers + nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, + nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild, + nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild, + nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild, + nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, + nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, + nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, + nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild, + nvidia-drivers-190.36.ebuild: + Replace built_with_use (bug #286961), go EAPI=2 compliant. + +*nvidia-drivers-190.36 (27 Sep 2009) + + 27 Sep 2009; Piotr Jaroszyński + +nvidia-drivers-190.36.ebuild: + Add 190.36. + + 26 Sep 2009; Michał Januszewski + nvidia-drivers-190.32.ebuild: + Fix bug #283572 (add a check for CONFIG_LOCKDEP). + + 26 Sep 2009; Michał Januszewski + nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.32.ebuild: + Fix bug #281895 (install manual pages). Also install the nvidia-smi tool + and prepare support for OpenCL (note that the current drivers do NOT + support OpenCL). + +*nvidia-drivers-190.32 (21 Sep 2009) + + 21 Sep 2009; Alex Alexander + +nvidia-drivers-190.32.ebuild: + version bump, beta 190.32 + + 19 Sep 2009; Tomáš Chvátal + -nvidia-drivers-71.86.07.ebuild: + Cleanup. Removal of old xorg versions. + +*nvidia-drivers-190.25 (02 Sep 2009) + + 02 Sep 2009; Piotr Jaroszyński + +nvidia-drivers-190.25.ebuild: + Add 190.25. + + 29 Aug 2009; Jeroen Roovers + nvidia-drivers-96.43.13.ebuild: + Stable for x86 (bug #273539). + + 27 Aug 2009; Raúl Porcel + nvidia-drivers-173.14.20.ebuild: + x86 stable + +*nvidia-drivers-71.86.11 (23 Aug 2009) + + 23 Aug 2009; Jeroen Roovers + +nvidia-drivers-71.86.11.ebuild: + Version bump (bug #280244). + + 03 Aug 2009; Michał Januszewski + nvidia-drivers-185.18.29.ebuild, nvidia-drivers-185.18.31.ebuild: + Add a device compatibility check (bug #280031, #279542). Users of graphics + cards known to be incompatible with a particular version of the drivers + will now be warned about the incompatibility when installing the package. + +*nvidia-drivers-173.14.20 (03 Aug 2009) + + 03 Aug 2009; Doug Goldstein + +nvidia-drivers-173.14.20.ebuild: + bump 173.x.y series to 173.14.20 + + 03 Aug 2009; Doug Goldstein metadata.xml: + update maintainer info + + 03 Aug 2009; Doug Goldstein + nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, + nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, + nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, + -files/eblits/paravirt_check.eblit: + remove paravirt check again. bug #264375 again + + 02 Aug 2009; nvidia-drivers-71.86.09.ebuild, + nvidia-drivers-96.43.11.ebuild: + Completely unable to find testers with sufficiently old hardware on AMD64 + kit; doing a Nike on this in agreement with Jeremy "darkside" Olexa & + VQuicksilver. Closes bug #275495. + +*nvidia-drivers-185.18.31 (01 Aug 2009) + + 01 Aug 2009; Michał Januszewski + +nvidia-drivers-185.18.31.ebuild: + Version bump. + + 31 Jul 2009; nvidia-drivers-173.14.18.ebuild, + nvidia-drivers-180.60.ebuild: + Marked stable as requested by Doug Goldstein in bug + #275495. Testing by Víctor "VQuicksilver" Enríquez on a Club3D GeForce + 7600GS. + +*nvidia-drivers-185.18.29 (29 Jul 2009) + + 29 Jul 2009; Michał Januszewski + +nvidia-drivers-185.18.29.ebuild: + Version bump (bug #279542). + +*nvidia-drivers-190.18 (27 Jul 2009) + + 27 Jul 2009; Michał Januszewski + +nvidia-drivers-190.18.ebuild: + Add the latest beta version of the NVIDIA drivers. This is the first + version of the drivers in the tree to support CUDA 2.3. This ebuild should + remain masked. + +*nvidia-drivers-185.18.14 (25 Jul 2009) + + 25 Jul 2009; Michał Januszewski + +nvidia-drivers-185.18.14.ebuild: + Version bump (bug #265238). + + 22 Jul 2009; Michał Januszewski metadata.xml: + Add myself as a maintainer. + +*nvidia-drivers-96.43.13 (02 Jul 2009) + + 02 Jul 2009; Jeroen Roovers + +nvidia-drivers-96.43.13.ebuild: + Version bump. + + 29 Jun 2009; Christian Faulhammer + nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild, + nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.60.ebuild: + stable x86, bug 275495 + + 29 Jun 2009; Jeroen Roovers metadata.xml: + Add myself as maintainer. + + 24 Jun 2009; Doug Goldstein + nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild, + nvidia-drivers-173.14.18.ebuild: + update supported xorg-server version + + 14 Jun 2009; Mike Frysinger +files/nvidia-169.07: + Restore nvidia-169.07 as it is still in use by newer ebuilds. + + 12 Jun 2009; Doug Goldstein + -files/NVIDIA_i2c-hwmon.patch, nvidia-drivers-96.43.09.ebuild, + nvidia-drivers-96.43.11.ebuild, nvidia-drivers-173.14.15.ebuild, + nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.29.ebuild, + nvidia-drivers-180.60.ebuild: + remove NVIDIA_i2c-hwmon.patch as requested by NVIDIA as this isn't safe + with certain NVIDIA skus. + + 12 Jun 2009; Doug Goldstein + -files/nvidia-2.6.28.patch, -nvidia-drivers-71.86.06.ebuild, + -nvidia-drivers-71.86.08.ebuild, -nvidia-drivers-96.43.07.ebuild, + -nvidia-drivers-96.43.10.ebuild, -nvidia-drivers-100.14.19.ebuild, + -files/nvidia-169.07, -nvidia-drivers-173.14.09.ebuild, + -nvidia-drivers-173.14.12.ebuild, -nvidia-drivers-173.14.16.ebuild, + -nvidia-drivers-173.14.17.ebuild, -nvidia-drivers-177.80.ebuild, + -nvidia-drivers-177.82.ebuild, -nvidia-drivers-180.22.ebuild, + -nvidia-drivers-180.27.ebuild, -nvidia-drivers-180.37.ebuild, + -nvidia-drivers-180.41.ebuild, -nvidia-drivers-180.44.ebuild, + -nvidia-drivers-180.51.ebuild, -files/NVIDIA_glx-makefile.patch: + cull old versions + + 12 Jun 2009; Doug Goldstein + nvidia-drivers-180.22.ebuild, nvidia-drivers-180.27.ebuild, + nvidia-drivers-180.29.ebuild, nvidia-drivers-180.37.ebuild, + nvidia-drivers-180.41.ebuild, nvidia-drivers-180.44.ebuild, + nvidia-drivers-180.51.ebuild, nvidia-drivers-180.60.ebuild: + fix paravirt check. bug #261696 + +*nvidia-drivers-180.60 (27 May 2009) + + 27 May 2009; Doug Goldstein + +nvidia-drivers-180.60.ebuild: + version bump. fix QA checks + + 06 May 2009; Mike Frysinger + nvidia-drivers-71.86.06.ebuild, nvidia-drivers-71.86.07.ebuild, + nvidia-drivers-71.86.08.ebuild, nvidia-drivers-71.86.09.ebuild, + nvidia-drivers-96.43.07.ebuild, nvidia-drivers-96.43.09.ebuild, + nvidia-drivers-96.43.10.ebuild, nvidia-drivers-96.43.11.ebuild, + nvidia-drivers-100.14.19.ebuild, nvidia-drivers-173.14.09.ebuild, + nvidia-drivers-173.14.12.ebuild, nvidia-drivers-173.14.15.ebuild, + nvidia-drivers-173.14.16.ebuild, nvidia-drivers-173.14.17.ebuild, + nvidia-drivers-173.14.18.ebuild, nvidia-drivers-177.80.ebuild, + nvidia-drivers-177.82.ebuild, nvidia-drivers-180.22.ebuild, + nvidia-drivers-180.27.ebuild, nvidia-drivers-180.29.ebuild, + nvidia-drivers-180.37.ebuild, nvidia-drivers-180.41.ebuild, + nvidia-drivers-180.44.ebuild, nvidia-drivers-180.51.ebuild: + Install modprobe.d file as nvidia.conf. + +*nvidia-drivers-180.51 (19 Apr 2009) + + 19 Apr 2009; Doug Goldstein + +nvidia-drivers-180.51.ebuild: + version bump + +*nvidia-drivers-180.44 (30 Mar 2009) + + 30 Mar 2009; Doug Goldstein + +nvidia-drivers-180.44.ebuild: + add latest driver release + +*nvidia-drivers-173.14.18 (23 Mar 2009) +*nvidia-drivers-71.86.09 (23 Mar 2009) + + 23 Mar 2009; +nvidia-drivers-71.86.09.ebuild, + +nvidia-drivers-173.14.18.ebuild: + Version bumps. + +*nvidia-drivers-180.41 (23 Mar 2009) + + 23 Mar 2009; +nvidia-drivers-180.41.ebuild: + Version bump. See http://www.nvnews.net/vbulletin/showthread.php?p=1963540 + +*nvidia-drivers-173.14.17 (17 Mar 2009) +*nvidia-drivers-96.43.11 (17 Mar 2009) + + 17 Mar 2009; Doug Goldstein + +nvidia-drivers-96.43.11.ebuild, +nvidia-drivers-173.14.17.ebuild: + version bumps + + 17 Mar 2009; Doug Goldstein + nvidia-drivers-180.29.ebuild: + mark 180.29 stable + +*nvidia-drivers-180.37 (09 Mar 2009) + + 09 Mar 2009; Doug Goldstein + -nvidia-drivers-180.35.ebuild, +nvidia-drivers-180.37.ebuild: + version bump for several bugs including errors with signal handling. + remove broken version + + 28 Feb 2009; Markus Meier metadata.xml: + custom-cflags is a global USE-flag + +*nvidia-drivers-180.35 (25 Feb 2009) + + 25 Feb 2009; Doug Goldstein + +nvidia-drivers-180.35.ebuild: + newer version. adds GPU support. fixes OpenGL 3.0 and VDPAU issues. + +*nvidia-drivers-180.29 (11 Feb 2009) + + 11 Feb 2009; Doug Goldstein + +nvidia-drivers-180.29.ebuild: + version bump + +*nvidia-drivers-173.14.16 (04 Feb 2009) + + 04 Feb 2009; Ricardo Mendoza + +nvidia-drivers-173.14.16.ebuild: + Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126937 + +*nvidia-drivers-71.86.08 (03 Feb 2009) + + 03 Feb 2009; Ricardo Mendoza + +nvidia-drivers-71.86.08.ebuild: + Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126955 + +*nvidia-drivers-96.43.10 (03 Feb 2009) + + 03 Feb 2009; Ricardo Mendoza + +nvidia-drivers-96.43.10.ebuild: + Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126954 + + 31 Jan 2009; Alexis Ballier + nvidia-drivers-96.43.09.ebuild: + Backport the missing bits from the 100. ebuild for x86-fbsd and keyword it + since this is apparently the version I need for my GeForce2 MX 400 + +*nvidia-drivers-180.27 (30 Jan 2009) + + 30 Jan 2009; Daniel Gryniewicz + +nvidia-drivers-180.27.ebuild: + Proxy bump to nvidia-drivers-180.27 for cardoe + + 20 Jan 2009; Peter Alfredsen + nvidia-drivers-96.43.09.ebuild: + Non-maintainer commit: Changing + +nvidia-drivers-180.22.ebuild: + add new version. add vdpau support + + 25 Dec 2008; Markus Meier + nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild, + nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild: + x86 stable, bug #252482 + + 25 Dec 2008; Thomas Anderson + nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild, + nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild: + stable amd64, bug 252482. Stable for linux 2.6.27 stabilization + + 25 Dec 2008; Mike Frysinger + +files/nvidia-2.6.28.patch, nvidia-drivers-177.82.ebuild: + Add patch from upstream for linux 2.6.28 support. + +*nvidia-drivers-173.14.15 (19 Dec 2008) + + 19 Dec 2008; +nvidia-drivers-173.14.15.ebuild: + Version bump. Fixes compilation issues with newer kernels. + +*nvidia-drivers-96.43.09 (18 Dec 2008) + + 18 Dec 2008; Doug Goldstein + +nvidia-drivers-96.43.09.ebuild: + add beta version of 96.x.y legacy drivers for kernel 2.6.27 support. Fixes + bug #242476 + + 18 Dec 2008; Doug Goldstein + -files/NVIDIA_kernel-169.12-2286310.diff, + -files/NVIDIA_kernel-173.08-2404825.diff, + -files/NVIDIA_kernel-173.14.05-2419292.diff: + remove files that went along with removed versions + + 18 Dec 2008; Doug Goldstein + nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: + Fix incorrectly not replacing CFLAGS when requested. bug #241800 + + 18 Dec 2008; Doug Goldstein + -nvidia-drivers-100.14.09.ebuild, -nvidia-drivers-100.14.11.ebuild, + -nvidia-drivers-100.14.23.ebuild, -nvidia-drivers-169.07.ebuild, + -nvidia-drivers-169.09.ebuild, -nvidia-drivers-169.09-r1.ebuild, + -nvidia-drivers-169.12.ebuild, -nvidia-drivers-173.08.ebuild, + -nvidia-drivers-173.14.05.ebuild, -nvidia-drivers-177.13.ebuild, + -nvidia-drivers-177.67.ebuild, -nvidia-drivers-177.68.ebuild, + -nvidia-drivers-177.70.ebuild: + remove outdated releases that no longer have support + + 18 Dec 2008; Doug Goldstein + +files/eblits/donvidia.eblit, +files/eblits/mtrr_check.eblit, + +files/eblits/paravirt_check.eblit, +files/eblits/src_install-libs.eblit, + +files/eblits/want_tls.eblit: + Add eblits in the same fashion as sys-libs/glibc that contain commonly + used code between all the different versions of nvidia-drivers + +*nvidia-drivers-71.86.07 (17 Dec 2008) + + 17 Dec 2008; Doug Goldstein + +nvidia-drivers-71.86.07.ebuild: + add 71.86.07 to the tree for 2.6.27 kernel support. This ebuild is + refactored like my past refactoring of the ebuilds. More changes to come. + Please report issues if you spot them in the ebuild, or suggest + improvements. + + 13 Dec 2008; Doug Goldstein + nvidia-drivers-71.86.06.ebuild, nvidia-drivers-96.43.07.ebuild, + nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild, + nvidia-drivers-169.07.ebuild, nvidia-drivers-169.09.ebuild, + nvidia-drivers-169.09-r1.ebuild, nvidia-drivers-169.12.ebuild, + nvidia-drivers-173.08.ebuild, nvidia-drivers-173.14.05.ebuild, + nvidia-drivers-173.14.09.ebuild, nvidia-drivers-173.14.12.ebuild, + nvidia-drivers-177.13.ebuild, nvidia-drivers-177.67.ebuild, + nvidia-drivers-177.68.ebuild, nvidia-drivers-177.70.ebuild, + nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: + update all versions to specify the exact xorg-server versions they're + compatible with + + 06 Dec 2008; Mike Frysinger + nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: + Use unpack_makeself rather than executing the script. + +*nvidia-drivers-177.82 (03 Dec 2008) + + 03 Dec 2008; Doug Goldstein + +nvidia-drivers-177.82.ebuild: + driver version bump. fixes known issues with firefox 3 image corruption. + mobile GPU resume from S3 issues. mobile GPU hotkey issues. + +*nvidia-drivers-177.80 (13 Oct 2008) + + 13 Oct 2008; Ricardo Mendoza + +nvidia-drivers-177.80.ebuild: + Version bump for new stable release as per bug #238969. Release notes can be + found at http://www.nvnews.net/vbulletin/showthread.php?t=120679 + +*nvidia-drivers-177.70 (28 Aug 2008) + + 28 Aug 2008; Ricardo Mendoza + +nvidia-drivers-177.70.ebuild: + Version bump for masked beta. Release highlights at + http://www.nvnews.net/vbulletin/showthread.php?p=1759793 + +*nvidia-drivers-177.68 (27 Aug 2008) + + 27 Aug 2008; Ricardo Mendoza + +nvidia-drivers-177.68.ebuild: + Version bump for masked beta per bug #235851. Also changed SRC_URI to the + generic URL due to being unable to find the file in the US mirror + +*nvidia-drivers-177.67 (20 Aug 2008) + + 20 Aug 2008; Ricardo Mendoza + +nvidia-drivers-177.67.ebuild: + Version bump for masked beta per bug #235231. Release highlights at + http://www.nvnews.net/vbulletin/showthread.php?t=118085 + + 18 Aug 2008; Ricardo Mendoza metadata.xml: + Change maintainer + + 05 Aug 2008; Doug Goldstein metadata.xml: + add GLEP 56 USE flag desc from use.local.desc + +*nvidia-drivers-173.14.12 (31 Jul 2008) + + 31 Jul 2008; nvidia-drivers-173.14.09.ebuild, + +nvidia-drivers-173.14.12.ebuild: + Version bump as requested by Wyatt Epp in bug #233418. + Ensure SYSVIPC is enabled as per cucu ionut in bug + #213157. Patch to respect custom CFLAGS by boris64 + closes bug #230273. Paravirt exports now usable, delete unnecessary check + as per Patrizio Bassi in bug #232883. + + 22 Jul 2008; + -files/NVIDIA_kernel-71.86.04-2305230.diff, + -files/NVIDIA_kernel-96.43.05-2290218.diff, + -nvidia-drivers-71.86.01.ebuild, -nvidia-drivers-71.86.04.ebuild, + nvidia-drivers-71.86.06.ebuild, -nvidia-drivers-96.43.01.ebuild, + -nvidia-drivers-96.43.05.ebuild, nvidia-drivers-96.43.07.ebuild: + X86 following the AMD64 lead in fasttrack stable for 71 & 96 branch + drivers. Arch testing by hoffie, permission granted by tsunam. Closes bug + #232624 by Mike Hammill . Cleaned up old ebuilds. + + 17 Jul 2008; nvidia-drivers-71.86.06.ebuild, + nvidia-drivers-96.43.07.ebuild: + Fasttrack AMD64 stable for 2.6.26-capable drivers in the 71 & 96 branches + that owners of older GeForces are stuck with. Compile & QA tested by + CCIEChad. + +*nvidia-drivers-96.43.07 (17 Jul 2008) +*nvidia-drivers-71.86.06 (17 Jul 2008) + + 17 Jul 2008; +nvidia-drivers-71.86.06.ebuild, + +nvidia-drivers-96.43.07.ebuild: + New upstream releases, both fix secondary TV output sometimes being black + & white on some GPUs and are compatible with the newly released 2.6.26 + kernel. Install modprobe control file to /etc/modprobe.d instead of the + deprecated /etc/modules.d location, closes bug #213878. + + 08 Jul 2008; Christian Faulhammer + nvidia-drivers-173.14.09.ebuild: + stable x86, bug 230369, thanks to all the testers + + 01 Jul 2008; Thomas Anderson + nvidia-drivers-173.14.09.ebuild: + stable amd64, bug 230369 + +*nvidia-drivers-177.13 (19 Jun 2008) + + 19 Jun 2008; +nvidia-drivers-177.13.ebuild: + Masked beta driver 177.13; unsupported by nVidia. Adds support for GeForce + GTX 260 & 280 products. Upstream release announcement at + http://www.nvnews.net/vbulletin/showthread.php?t=114955 + +*nvidia-drivers-173.14.09 (17 Jun 2008) + + 17 Jun 2008; +nvidia-drivers-173.14.09.ebuild: + Version bump, closes bug #224109. With thanks to Ludovic F. + for drawing my attention to this bugfix release. + +*nvidia-drivers-173.14.05 (28 May 2008) + + 28 May 2008; + +files/NVIDIA_kernel-173.14.05-2419292.diff, + +nvidia-drivers-173.14.05.ebuild: + Version bump. Supported release, upstream release highlights are at + http://www.nvnews.net/vbulletin/showthread.php?t=113919. + + 21 May 2008; + +files/NVIDIA_kernel-71.86.04-2305230.diff, + nvidia-drivers-71.86.04.ebuild: + Add patch to allow building on 2.6.25 kernels; thanks to Andreas + . No revision bump, the module didnt build + for affected users. Closes bug #223047. + + 09 May 2008; Mark Loeser + nvidia-drivers-173.08.ebuild: + Works on x86 for me, marking ~x86 + + 08 May 2008; + files/NVIDIA_kernel-173.08-2404825.diff: + Upstream corrected the patch after the fact, update it. No revision bump + as the package is masked. + + 07 May 2008; + nvidia-drivers-71.86.01.ebuild, nvidia-drivers-71.86.04.ebuild, + nvidia-drivers-96.43.01.ebuild, nvidia-drivers-96.43.05.ebuild, + nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, + nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: + Quote variables where appropriate. + +*nvidia-drivers-173.08 (07 May 2008) + + 07 May 2008; + +files/NVIDIA_kernel-173.08-2404825.diff, +nvidia-drivers-173.08.ebuild: + Masked beta driver 173.08 with upstream patch from Zander ( + http://www.nvnews.net/vbulletin/showpost.php?p=1648357&postcount=35 ) for + >=2.6.26-rc1 compatibility. Dropped keywords as this has only been tested + on 2.6.26-rc1-00166-gc0a1811 SMP x86_64 so far. Now installs module + control file in modprobe.d where it belongs. Upstream advises to use PAT + over MTRR. Some reports of low performance and 2D corruption, tread + carefully. + + 18 Apr 2008; Mike Frysinger + +files/NVIDIA_kernel-96.43.05-2290218.diff, + nvidia-drivers-96.43.05.ebuild: + Add fix from upstream for building with linux-2.6.25 #218178. + + 18 Apr 2008; Mike Frysinger + +files/NVIDIA_kernel-169.12-2286310.diff, nvidia-drivers-169.12.ebuild: + Add fix from upstream for building with linux-2.6.25 #218178. + + 10 Apr 2008; Doug Goldstein + nvidia-drivers-169.09-r1.ebuild: + revert previous commit due to it breaking the stable tree. it also flies + in the face of nvidia-drivers maintenance policies. + + 10 Apr 2008; William L. Thomson Jr. + nvidia-drivers-169.09-r1.ebuild: + De-stablizing package, lost 3+ hours debugging why a stable machine X was + at 99% for any 2d operation, thunderbird etc. + + 19 Mar 2008; Raúl Porcel + nvidia-drivers-96.43.05.ebuild: + x86 stable + + 05 Mar 2008; Christian Faulhammer + nvidia-drivers-169.09-r1.ebuild: + stable x86, bug 212290 + + 04 Mar 2008; Olivier Crête + nvidia-drivers-169.09-r1.ebuild: + Stable on amd64, bug #212290 + +*nvidia-drivers-169.12 (28 Feb 2008) + + 28 Feb 2008; Doug Goldstein +nvidia-drivers-169.12.ebuild: + version bump + + 18 Feb 2008; Doug Goldstein + nvidia-drivers-169.09-r1.ebuild: + revert libwfb.so change requested in bug #202978 + +*nvidia-drivers-169.09-r1 (15 Feb 2008) + + 15 Feb 2008; Doug Goldstein + +nvidia-drivers-169.09-r1.ebuild: + new ebuild that should fix bug #207298, #207299, #167413, #184593, #188552, + and #187149. and #202978, depending on the results of the discussion and + added work around for bug #137000 + +*nvidia-drivers-96.43.05 (04 Feb 2008) +*nvidia-drivers-71.86.04 (04 Feb 2008) + + 04 Feb 2008; Doug Goldstein + +nvidia-drivers-71.86.04.ebuild, +nvidia-drivers-96.43.05.ebuild: + new legacy driver releases for newer kernels and X.org servers + +*nvidia-drivers-169.09 (22 Jan 2008) + + 22 Jan 2008; Doug Goldstein nvidia-drivers-169.07.ebuild, + +nvidia-drivers-169.09.ebuild: + QA_WX_LOAD addition. new nvidia-drivers version + + 22 Jan 2008; Doug Goldstein +files/nvidia-169.07, + nvidia-drivers-169.07.ebuild: + provide newer /etc/modules.d file + +*nvidia-drivers-169.07 (16 Jan 2008) + + 16 Jan 2008; Doug Goldstein +nvidia-drivers-169.07.ebuild: + starting to rewrite the ebuild a bit. commiting masked so people can tinker + + 26 Dec 2007; Doug Goldstein + nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: + fix patch to nvidia-xconfig on FreeBSD. bug #199761 + + 21 Dec 2007; Doug Goldstein + -nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.9639.ebuild: + remove old versions + + 21 Dec 2007; Doug Goldstein + nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: + apply patch only when linux. bug #199759 + + 20 Nov 2007; Christian Faulhammer + nvidia-drivers-71.86.01.ebuild: + stable x86, bug 186490 + + 14 Nov 2007; Steve Dibb + nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild: + amd64 stable, bug 186490 + + 12 Nov 2007; Peter Weller + nvidia-drivers-100.14.19.ebuild: + Stable on amd64 wrt bug 186490 + +*nvidia-drivers-100.14.23 (01 Nov 2007) + + 01 Nov 2007; Doug Goldstein + +nvidia-drivers-100.14.23.ebuild: + adding beta NVIDIA driver for user demand. bug #196679 + + 31 Oct 2007; Raúl Porcel + nvidia-drivers-96.43.01.ebuild: + x86 stable + + 29 Oct 2007; Markus Ullmann + nvidia-drivers-100.14.19.ebuild: + Stable on x86 + + 29 Oct 2007; Doug Goldstein + nvidia-drivers-100.14.19.ebuild: + add x86-fbsd support for 100.14.19 since it's been released now + + 07 Oct 2007; Doug Goldstein + nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, + nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild, + nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, + nvidia-drivers-100.14.19.ebuild: + Quote some old $ROOT usage + + 07 Oct 2007; Doug Goldstein + nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild, + nvidia-drivers-100.14.19.ebuild: + nvidia-driver uses ACPI if it's installed. Add USE based dep on it. + + 01 Oct 2007; Doug Goldstein + nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: + mark the depends as not supporting xorg-server 1.4 + +*nvidia-drivers-96.43.01 (27 Sep 2007) +*nvidia-drivers-71.86.01 (27 Sep 2007) + + 27 Sep 2007; Doug Goldstein + +nvidia-drivers-71.86.01.ebuild, +nvidia-drivers-96.43.01.ebuild, + nvidia-drivers-100.14.19.ebuild: + bump both nvidia legacy drivers to their latest revisions. Remove hack since + it's no longer needed. + + 20 Sep 2007; Chris Gianelloni -files/nvidia-2, + -files/NVIDIA_kernel-2.6.19.patch, files/nvidia, + nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.8776-r1.ebuild, + -nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild, + -nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755-r1.ebuild, + nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, + nvidia-drivers-100.14.19.ebuild: + Removing older ebuilds where newer ebuilds in the same class have the same + KEYWORDS or better, moving nvidia-2 to nvidia, since nothing uses the old + file anymore, simplified sed by changing ${PACKAGE} to PACKAGE, and changed + a newins to doins, since we were not renaming anything. + +*nvidia-drivers-100.14.19 (18 Sep 2007) + + 18 Sep 2007; Doug Goldstein + +nvidia-drivers-100.14.19.ebuild: + new drivers from nVidia. no FreeBSD support. + + 26 Aug 2007; Anant Narayanan Manifest: + Fix Manifest + + 30 Jul 2007; Donnie Berkholz ; + nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.8776-r1.ebuild, + nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild, + nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, + nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: + Move eselect-opengl into DEPEND only, so it can be uninstalled later. + + 28 Jul 2007; Steve Dibb + nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, + nvidia-drivers-100.14.09.ebuild: + amd64 stable, bug 183567 + + 20 Jul 2007; Doug Goldstein + nvidia-drivers-1.0.7185.ebuild: + remove i2c-hwmon, libnvidia-cfg, nvidia-xconfig, and README.txt from 7185 + since they don't exist + + 19 Jul 2007; Raúl Porcel + nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, + nvidia-drivers-100.14.09.ebuild + x86 stable wrt security #183567 + + 19 Jul 2007; Doug Goldstein + +nvidia-drivers-100.14.09.ebuild: + adding back 100.14.09 based off 100.14.11 ebuild + + 18 Jul 2007; Doug Goldstein + nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, + nvidia-drivers-100.14.11.ebuild: + QA EXECSTACK handling + +*nvidia-drivers-1.0.7185 (14 Jul 2007) + + 14 Jul 2007; Doug Goldstein + +nvidia-drivers-1.0.7185.ebuild: + add 1.0.7185 drivers + +*nvidia-drivers-1.0.9639 (14 Jul 2007) + + 14 Jul 2007; Doug Goldstein + -files/nvidia-settings.desktop, -files/nvidia-settings.png, + +nvidia-drivers-1.0.9639.ebuild, -nvidia-drivers-100.14.09.ebuild, + nvidia-drivers-100.14.11.ebuild: + add ebuild for 1.0.9639 drivers. Merge in updates from 100.14.11 drivers. + Removed old 100.14.09 drivers. No longer build nvidia-settings part of the + drivers but PDEPEND on it via gtk USE flag. Other misc cleanups. + + 13 Jul 2007; Doug Goldstein + nvidia-drivers-100.14.11.ebuild: + fix bug #185171 + + 12 Jul 2007; Doug Goldstein + nvidia-drivers-100.14.11.ebuild: + Fixes #177231, #182622, #184432, #184795 + + 07 Jul 2007; Doug Goldstein +files/nvidia-2, + +files/NVIDIA_i2c-hwmon.patch, +files/nvidia-settings.desktop, + +files/nvidia-settings.png, nvidia-drivers-100.14.11.ebuild: + work in progress. fixes bug #183567, #169740, #182933, #184432. More will be + fixed before unmask + + 05 Jul 2007; Mike Frysinger + nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild, + nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, + nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: + If glibc does not have IUSE=nptl, assume it is enabled as newer versions + only support nptl. + +*nvidia-drivers-100.14.11 (04 Jul 2007) + + 04 Jul 2007; Christian Parpart + +nvidia-drivers-100.14.11.ebuild: + version bump to 100.14.11 + + 02 Jul 2007; Piotr Jaroszyński + nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild: + (QA) RESTRICT clean up. + + 01 Jul 2007; Piotr Jaroszyński + nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild, + nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, + nvidia-drivers-100.14.09.ebuild: + (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true" + +*nvidia-drivers-100.14.09 (19 Jun 2007) + + 19 Jun 2007; Christian Parpart + +nvidia-drivers-100.14.09.ebuild: + version bump. wrt bug #176135 and bug #175674 + + 13 Apr 2007; Chris Gianelloni + -nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.8776-r1.ebuild: + Stable on amd64/x86 wrt bug #114893. + +*nvidia-drivers-1.0.9755-r1 (13 Mar 2007) +*nvidia-drivers-1.0.9746-r1 (13 Mar 2007) +*nvidia-drivers-1.0.9631-r1 (13 Mar 2007) +*nvidia-drivers-1.0.8776-r1 (13 Mar 2007) + + 13 Mar 2007; Jeremy Huddleston + +nvidia-drivers-1.0.8776-r1.ebuild, -nvidia-drivers-1.0.9631.ebuild, + +nvidia-drivers-1.0.9631-r1.ebuild, -nvidia-drivers-1.0.9746.ebuild, + +nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755.ebuild, + +nvidia-drivers-1.0.9755-r1.ebuild: + Install libnvidia-cfg.so. Fixes bug #114893. + +*nvidia-drivers-1.0.9755 (07 Mar 2007) + + 07 Mar 2007; Chris Gianelloni + +nvidia-drivers-1.0.9755.ebuild: + Version bump to latest version of the drivers. + + 19 Feb 2007; Chris Gianelloni + nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, + nvidia-drivers-1.0.9746.ebuild: + Removing dlloader USE flag wrt bug #166759. + + 07 Feb 2007; Chris Gianelloni + nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, + nvidia-drivers-1.0.9746.ebuild: + Fixed the executable stack warnings with a patch from Vlastimil Babka + and closing bug #114894. + + 07 Feb 2007; Chris Gianelloni + -nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9742.ebuild: + Cleaning up some older versions. + +*nvidia-drivers-1.0.9746 (28 Dec 2006) + + 28 Dec 2006; Chris Gianelloni + +nvidia-drivers-1.0.9746.ebuild: + Added version 9746 and closing bug #158889. + + 26 Dec 2006; Mike Frysinger + nvidia-drivers-1.0.9742.ebuild: + Style touchups and create relative symlinks in /usr/lib. + + 12 Dec 2006; Chris Gianelloni + nvidia-drivers-1.0.9631.ebuild, nvidia-drivers-1.0.9742.ebuild: + Update Gentoo/FreeBSD support with a patch from Timothy Redaelli + . Closing bug #157625. + + 06 Dec 2006; Chris Gianelloni + -nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild: + Added patch from Joshua Napoli to install + libnvidia-wfb and closing bug #155532. Removing 9629, as it has problems + with NV2x cards. + + 05 Dec 2006; Chris Gianelloni + files/NVIDIA_kernel-2.6.19.patch: + Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978. + +*nvidia-drivers-1.0.9631 (05 Dec 2006) + + 05 Dec 2006; Chris Gianelloni + +nvidia-drivers-1.0.9631.ebuild: + Version bump to 1.0.9631 for bug #157194. This should also close bug + #105656, bug #150080, bug #154739, and bug #156886. + + 05 Dec 2006; Chris Gianelloni files/nvidia: + Updated the nvidia file which installs to /etc/modules.d for bug #139756. + + 04 Dec 2006; Chris Gianelloni + nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild, + nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild: + Fixing up executable stacks and closing bug #114894. + + 10 Nov 2006; Chris Gianelloni + -files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, -nvidia-drivers-1.0.9626.ebuild: + Removing the 1.0-9626 driver, since it has been known to cause a black + screen at X startup and is superceded by the 9629 driver. + +*nvidia-drivers-1.0.9742 (09 Nov 2006) +*nvidia-drivers-1.0.9629 (09 Nov 2006) + + 09 Nov 2006; Kristopher Kersey + +nvidia-drivers-1.0.9629.ebuild, +nvidia-drivers-1.0.9742.ebuild: + Added new stable driver 1.0.9629 and unstable driver 1.0.9742. + + 24 Oct 2006; Simon Stelling + nvidia-drivers-1.0.8776.ebuild: + stable on amd64 + + 24 Oct 2006; Joshua Jackson + nvidia-drivers-1.0.8776.ebuild: + Stable x86; bug #151635 + + 20 Oct 2006; Chris Gianelloni + nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild, + nvidia-drivers-1.0.9626.ebuild: + Added fix for bug #145968. + +*nvidia-drivers-1.0.8776 (20 Oct 2006) + + 20 Oct 2006; Chris Gianelloni + -files/1.0.8178/NVIDIA-1.0.8178-1423627.diff, + -files/1.0.8178/NVIDIA-1.0.8178-1427453.diff, + -files/1.0.8178/NVIDIA-1.0.8178-1435131.diff, + -files/1.0.8178/NVIDIA-1.0.8178-1450608.diff, + -files/1.0.8178/NVIDIA-1.0.8178-1453708.diff, + -files/1.0.8178/NVIDIA-1.0.8178-U012206.diff, + -nvidia-drivers-1.0.8178.ebuild, +nvidia-drivers-1.0.8776.ebuild: + Added 8776 for bug #151635 and removing 8178, since it is vulnerable. + + 18 Oct 2006; Chris Gianelloni + nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8774.ebuild, + nvidia-drivers-1.0.9626.ebuild: + Use pkg2 for AMD64 since the other ones don't ship the 32-bit libraries. How + lame is that? Closing bug #151759. + + 17 Oct 2006; Chris Gianelloni + -files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, + +files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, nvidia-drivers-1.0.8178.ebuild, + nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9625.ebuild, + nvidia-drivers-1.0.9626.ebuild: + Changed pkg1 and pkg2 to pkg0 for bug #146182. + + 17 Oct 2006; Olivier Crête + nvidia-drivers-1.0.9626.ebuild: + Patch version is 1.0.9625 + + 16 Oct 2006; Chris Gianelloni + nvidia-drivers-1.0.9626.ebuild: + It looks like the i2c patch is still needed. + +*nvidia-drivers-1.0.9626 (16 Oct 2006) + + 16 Oct 2006; Chris Gianelloni + +nvidia-drivers-1.0.9626.ebuild: + Updated to 1.0.9626, which adds support for NVIDIA Quadro Plex configurations. + + 13 Oct 2006; Chris Gianelloni + +files/NVIDIA_kernel-2.6.19.patch: + Added patch from Daniel Drake for compiling on 2.6.19 and + closing bug #151177. + + 12 Oct 2006; Chris Gianelloni + +files/1.0.8178/NVIDIA-1.0.8178-1423627.diff, + +files/1.0.8178/NVIDIA-1.0.8178-1427453.diff, + +files/1.0.8178/NVIDIA-1.0.8178-1435131.diff, + +files/1.0.8178/NVIDIA-1.0.8178-1450608.diff, + +files/1.0.8178/NVIDIA-1.0.8178-1453708.diff, + +files/1.0.8178/NVIDIA-1.0.8178-U012206.diff, + ,files/1.0.8762/NVIDIA-1.0.8762-U062606.diff: + Added patches from nvnews.net for 8178, removing 8762, and adding a notice + to 9625 about AddARGBGLXVisuals for compiz. + + 09 Oct 2006; Chris Gianelloni + nvidia-drivers-1.0.8178.ebuild, -nvidia-drivers-1.0.8762.ebuild, + nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, + nvidia-drivers-1.0.9625.ebuild: + Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and + nvidia-glx, since they're no longer in the tree, changed nostrip to strip, + and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing + bug #114894. + + 04 Oct 2006; Chris Gianelloni + nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild, + nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, + nvidia-drivers-1.0.9625.ebuild: + Removed PROVIDE=virtual/opengl since opengl is a new-style virtual. + + 04 Oct 2006; Chris Gianelloni + nvidia-drivers-1.0.8774.ebuild: + Stable on amd64/x86 for bug #144549. + + 04 Oct 2006; Chris Gianelloni + nvidia-drivers-1.0.8178.ebuild: + Stable on amd64/x86 for bug #143814. + + 25 Sep 2006; Chris Gianelloni + +files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, nvidia-drivers-1.0.9625.ebuild: + Added patch from Zander to remove i2c functionality from the drivers until + it is fixed upstream. + + 25 Sep 2006; Chris Gianelloni + nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild, + nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, + nvidia-drivers-1.0.9625.ebuild: + Commented out the Makefile patch. + +*nvidia-drivers-1.0.9625 (25 Sep 2006) +*nvidia-drivers-1.0.8178 (25 Sep 2006) + + 25 Sep 2006; Chris Gianelloni + +files/NVIDIA_glx-makefile.patch, +nvidia-drivers-1.0.8178.ebuild, + nvidia-drivers-1.0.8762.ebuild, nvidia-drivers-1.0.8762-r1.ebuild, + nvidia-drivers-1.0.8774.ebuild, +nvidia-drivers-1.0.9625.ebuild: + Added 8178 ebuild for bug #143814. Also added a (masked) 9625 beta ebuild. + + 27 Aug 2006; Hanno Boeck files/libGL.la-r2: + Fix libdir in libGL.la (bug #140982). + + 27 Aug 2006; Donnie Berkholz + nvidia-drivers-1.0.8774.ebuild: + Remove blocker on xorg-server 1.1. + + 25 Aug 2006; Donnie Berkholz +metadata.xml: + Someone forgot to add metadata. + +*nvidia-drivers-1.0.8774 (25 Aug 2006) + + 25 Aug 2006; Kristopher Kersey + +nvidia-drivers-1.0.8774.ebuild: + Added ebuild for NVIDIA driver release 1.0-8774. + + 08 Aug 2006; Joshua Jackson + nvidia-drivers-1.0.8762-r1.ebuild: + Stable x86; bug #140922 + + 06 Aug 2006; Simon Stelling + nvidia-drivers-1.0.8762-r1.ebuild: + stable on amd64 + +*nvidia-drivers-1.0.8762-r1 (07 Jul 2006) + + 07 Jul 2006; Kristopher Kersey + +files/1.0.8762/NVIDIA-1.0.8762-U062606.diff, + +nvidia-drivers-1.0.8762-r1.ebuild: + Added Zander's patch to allow building with latest kernels (>= + 2.6.17-rc4-mm1, >= 2.6.17-git7). + + 06 Jul 2006; Kristopher Kersey + nvidia-drivers-1.0.8762.ebuild: + Quick fix to close bug #133138. + +*nvidia-drivers-1.0.8762 (06 Jul 2006) + + 06 Jul 2006; Kristopher Kersey +files/09nvidia, + +files/NVIDIA_glx-defines.patch, +files/NVIDIA_glx-glheader.patch, + +files/libGL.la-r2, +files/nvidia, +nvidia-drivers-1.0.8762.ebuild: + Initial import of x11-drivers/nvidia-drivers that will take the place of + media-video/nvidia-kernel and media-video/nvidia-glx. + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia new file mode 100644 index 0000000000..1fcbef41fc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia @@ -0,0 +1,2 @@ +# Has to precede X11's own libraries! +LDPATH=/opt/nvidia/lib diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch new file mode 100644 index 0000000000..eff06a50d0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch @@ -0,0 +1,30 @@ +diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh +--- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100 ++++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100 +@@ -82,7 +82,7 @@ build_cflags() { + + if [ "$OUTPUT" != "$SOURCES" ]; then + MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -91,7 +91,7 @@ build_cflags() { + fi + else + MACH_CFLAGS="-I$HEADERS/asm/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -102,7 +102,7 @@ build_cflags() { + + CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS" + +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" + fi + if [ -n "$BUILD_PARAMS" ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch new file mode 100644 index 0000000000..da92b8f080 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch @@ -0,0 +1,30 @@ +diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh +--- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh 2010-05-19 05:38:57.000000000 +0200 ++++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh 2010-05-22 02:13:56.000000000 +0200 +@@ -101,7 +101,7 @@ build_cflags() { + + if [ "$OUTPUT" != "$SOURCES" ]; then + MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -110,7 +110,7 @@ build_cflags() { + fi + else + MACH_CFLAGS="-I$HEADERS/asm/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -121,7 +121,7 @@ build_cflags() { + + CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" + +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" + fi + if [ -n "$BUILD_PARAMS" ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch new file mode 100644 index 0000000000..da9933f633 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch @@ -0,0 +1,11 @@ +diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h +--- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100 ++++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100 +@@ -39,6 +39,7 @@ + typedef XID GLXPixmap; + typedef XID GLXDrawable; + typedef XID GLXPbuffer; ++typedef XID GLXPbufferSGIX; + typedef XID GLXWindow; + typedef XID GLXFBConfigID; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch new file mode 100644 index 0000000000..e0393e1b9a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch @@ -0,0 +1,13 @@ +--- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000 ++++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000 +@@ -66,6 +66,10 @@ + typedef double GLclampd; + typedef void GLvoid; + ++/* Patching for some better defines in the global system */ ++#ifndef GL_GLEXT_LEGACY ++#include ++#endif + + /*************************************************************/ + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit new file mode 100644 index 0000000000..75b39cfbd9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit @@ -0,0 +1,21 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ + +# Install nvidia library: +# the first parameter is the place where to install it +# the second parameter is the base name of the library +# the third parameter is the provided soversion +donvidia() { + dodir $1 + exeinto $1 + + libname=$(basename $2) + + # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully + if [ -e $2.$3 ] ; then + doexe $2.$3 + dosym ${libname}.$3 $1/${libname} + [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit new file mode 100644 index 0000000000..b14df34b10 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit @@ -0,0 +1,19 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ + +mtrr_check() { + ebegin "Checking for MTRR support" + linux_chkconfig_present MTRR + eend $? + + if [[ $? -ne 0 ]] ; then + eerror "Please enable MTRR support in your kernel config, found at:" + eerror + eerror " Processor type and features" + eerror " [*] MTRR (Memory Type Range Register) support" + eerror + eerror "and recompile your kernel ..." + die "MTRR support not detected!" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit new file mode 100644 index 0000000000..e48d11ce96 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit @@ -0,0 +1,116 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distribnuted under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ +# +src_install-libs() { + local pkglibdir=lib + local inslibdir=$(get_libdir) + + if [[ ${#} -eq 2 ]] ; then + pkglibdir=${1} + inslibdir=${2} + elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then + pkglibdir=lib32 + fi + + local usrpkglibdir=usr/${pkglibdir} + local libdir=usr/X11R6/${pkglibdir} + local drvdir=${libdir}/modules/drivers + local extdir=${libdir}/modules/extensions + local incdir=usr/include/GL + local sover=${PV} + local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" + local NO_TLS_ROOT="${NV_ROOT}/no-tls" + local TLS_ROOT="${NV_ROOT}/tls" + local X11_LIB_DIR="/usr/${inslibdir}/xorg" + + if use x86-fbsd; then + # on FreeBSD everything is on obj/ + pkglibdir=obj + usrpkglibdir=obj + x11pkglibdir=obj + drvdir=obj + extdir=obj + + # don't ask me why the headers are there.. glxext.h is missing + incdir=doc + + # on FreeBSD it has just .1 suffix + sover=1 + fi + + # The GLX libraries + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} + + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} + + dodir ${NO_TLS_ROOT} + donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} + + if ! use x86-fbsd; then + donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} + fi + + if want_tls ; then + dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib + dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib + dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib + else + dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib + dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib + dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib + fi + + if ! use x86-fbsd; then + # Install the .la file for libtool, to prevent e.g. bug #176423 + [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" + local ver1=$(get_version_component_range 1) + local ver2=$(get_version_component_range 2) + local ver3=$(get_version_component_range 3) + sed -e "s:\${PV}:${PV}:" \ + -e "s:\${ver1}:${ver1}:" \ + -e "s:\${ver2}:${ver2}:" \ + -e "s:\${ver3}:${ver3}:" \ + -e "s:\${libdir}:${inslibdir}:" \ + "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la + fi + + exeinto ${X11_LIB_DIR}/modules/drivers + + [[ -f ${drvdir}/nvidia_drv.so ]] && \ + doexe ${drvdir}/nvidia_drv.so + + insinto /usr/${inslibdir} + [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ + doins ${libdir}/libXvMCNVIDIA.a + exeinto /usr/${inslibdir} + # fix Bug 131315 + [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ + doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ + dosym libXvMCNVIDIA.so.${PV} \ + /usr/${inslibdir}/libXvMCNVIDIA.so + + exeinto ${NV_ROOT}/extensions + [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ + newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so + [[ -f ${extdir}/libglx.so.${sover} ]] && \ + newexe ${extdir}/libglx.so.${sover} libglx.so + + # Includes + insinto ${NV_ROOT}/include + doins ${incdir}/*.h + + #cuda + if [[ -f usr/include/cuda/cuda.h ]]; then + dodir /usr/include/cuda + insinto /usr/include/cuda + doins usr/include/cuda/*.h + + if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then + dolib.so usr/${pkglibdir}/libcuda.so.${PV} + dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 + dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so + fi + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit new file mode 100644 index 0000000000..4debb85d3a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit @@ -0,0 +1,33 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ + +want_tls() { + # For uclibc or anything non glibc, return false + has_version sys-libs/glibc || return 1 + + # Old versions of glibc were lt/no-tls only + has_version '=sys-libs/glibc-2.3.5' ; then + case ${CHOST/-*} in + i486|i586) return 1 ;; + esac + fi + + # These versions built linuxthreads version to support tls, too + has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 + + return 1 +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 new file mode 100644 index 0000000000..863d184419 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 @@ -0,0 +1,32 @@ +# libGL.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libGL.so.1' + +# Names of this library. +library_names='libGL.so.${PV} libGL.so.1 libGL.so' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' + +# Version information for libGL. +current=${ver1} +age=${ver2} +revision=${ver3} + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/${libdir}' diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia new file mode 100644 index 0000000000..7cf0f7c078 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia @@ -0,0 +1,40 @@ +# Nvidia drivers support +alias char-major-195 nvidia +alias /dev/nvidiactl char-major-195 + +# To tweak the driver the following options can be used, note that +# you should be careful, as it could cause instability!! For more +# options see /usr/share/doc/PACKAGE/README +# +# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 +# +# To enable Fast Writes: NVreg_EnableAGPFW=1 +# +# To enable both for instance, uncomment following line: +# +#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 +# If you have a mobile chip, you may need to enable this option +# if you have hard lockups when starting X. +# +# See: Appendix I. Configuring your laptop +# In /usr/share/doc/PACKAGE/README for full details +# +# Choose the appropriate value for NVreg_Mobile from the table: +# Value Meaning +# ---------- -------------------------------------------------- +# 0xFFFFFFFF let the kernel module autodetect the correct value +# 1 Dell laptops +# 2 non-Compal Toshiba laptops +# 3 all other laptops +# 4 Compal Toshiba laptops +# 5 Gateway laptops +# +#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 + + +# !!! SECURITY WARNING !!! +# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW +# WHAT YOU ARE DOING. +# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, +# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. +options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 new file mode 100644 index 0000000000..a96b0cd1e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 @@ -0,0 +1,14 @@ +# Nvidia drivers support +alias char-major-195 nvidia +alias /dev/nvidiactl char-major-195 + +# To tweak the driver the following options can be used, note that +# you should be careful, as it could cause instability!! For more +# options see /usr/share/doc/PACKAGE/README +# +# !!! SECURITY WARNING !!! +# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW +# WHAT YOU ARE DOING. +# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, +# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. +options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch new file mode 100644 index 0000000000..75daad33ec --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch @@ -0,0 +1,92 @@ +Index: usr/src/nv/conftest.sh +=================================================================== +--- usr/src/nv/conftest.sh ++++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530 +@@ -32,14 +32,14 @@ + # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats + # the kernel as a stand-alone kernel. + # +- FILE="linux/autoconf.h" ++ FILE="generated/autoconf.h" + + if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then + # + # We are looking at a configured source tree; verify + # that it's not a Xen kernel. + # +- echo "#include ++ echo "#include + #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) + #error CONFIG_XEN defined! + #endif +@@ -111,7 +111,12 @@ + fi + } + +-CONFTEST_PREAMBLE="#include ++CONFTEST_PREAMBLE="#include ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) ++ #include ++ #else ++ #include ++ #endif + #if defined(CONFIG_XEN) && \ + defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) + #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION +@@ -1294,7 +1299,7 @@ + echo ""; + fi + fi +- exit $RET ++# exit $RET + ;; + + get_uname) +@@ -1316,11 +1321,11 @@ + # tree or at headers shipped for a specific kernel. + # Determine the kernel version using a compile check. + # +- FILE="linux/utsrelease.h" ++ FILE="generated/utsrelease.h" + + if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then + echo "$CONFTEST_PREAMBLE +- #include ++ #include + int main() { + printf(\"%s\", UTS_RELEASE); + return 0; +@@ -1375,7 +1380,7 @@ + # + RET=1 + VERBOSE=$6 +- FILE="linux/autoconf.h" ++ FILE="generated/autoconf.h" + + if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then + # +@@ -1429,7 +1434,7 @@ + # + RET=1 + VERBOSE=$6 +- FILE="linux/autoconf.h" ++ FILE="generated/autoconf.h" + + if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then + # +Index: usr/src/nv/nvacpi.c +=================================================================== +--- usr/src/nv/nvacpi.c ++++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530 +@@ -49,6 +49,10 @@ + }; + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) ++#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL) ++#endif ++ + static struct acpi_driver *nv_acpi_driver; + static acpi_handle nvif_handle = NULL; + static acpi_handle dsm_handle = NULL; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml new file mode 100644 index 0000000000..843e746128 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml @@ -0,0 +1,17 @@ + + + +no-herd + + cardoe@gentoo.org + General maintainer and POC with NVIDIA + + + jer@gentoo.org + + + spock@gentoo.org + Focused on CUDA and new kernel support + +NVIDIA X11 driver and GLX libraries + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild new file mode 100644 index 0000000000..97e8a6a943 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild @@ -0,0 +1,529 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild,v 1.1 2011/01/24 15:39:30 cardoe Exp $ + +EAPI="2" + +inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver + +X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" +X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" + +DESCRIPTION="NVIDIA X11 driver and GLX libraries" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) + amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) + x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" + +LICENSE="NVIDIA" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +IUSE="acpi custom-cflags gtk multilib kernel_linux" +RESTRICT="strip" +EMULTILIB_PKG="true" + +COMMON="=sys-libs/glibc-2.6.1 ) + multilib? ( app-emulation/emul-linux-x86-xlibs ) + >=app-admin/eselect-opengl-1.0.9 + !" + eerror " [ ] Lock debugging: detect incorrect freeing of live locks" + eerror " [ ] Lock debugging: prove locking correctness" + eerror " [ ] Lock usage statistics" + eerror "in 'menuconfig'" + die "LOCKDEP enabled" + fi +} + +pkg_setup() { + # try to turn off distcc and ccache for people that have a problem with it + export DISTCC_DISABLE=1 + export CCACHE_DISABLE=1 + + if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then + eerror "This ebuild doesn't currently support changing your default abi." + die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" + fi + + if use kernel_linux; then + linux-mod_pkg_setup + MODULE_NAMES="nvidia(video:${S}/kernel)" + BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ + SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)" + mtrr_check + lockdep_check + fi + + # On BSD userland it wants real make command + use userland_BSD && MAKE="$(get_bmake)" + + export _POSIX2_VERSION="199209" + + # Since Nvidia ships 3 different series of drivers, we need to give the user + # some kind of guidance as to what version they should install. This tries + # to point the user in the right direction but can't be perfect. check + # nvidia-driver.eclass + nvidia-driver-check-warning + + # set variables to where files are in the package structure + if use kernel_FreeBSD; then + NV_DOC="${S}/doc" + NV_EXEC="${S}/obj" + NV_LIB="${S}/obj" + NV_SRC="${S}/src" + NV_MAN="${S}/x11/man" + NV_X11="${S}/obj" + NV_X11_DRV="${NV_X11}" + NV_X11_EXT="${NV_X11}" + NV_SOVER=1 + elif use kernel_linux; then + NV_DOC="${S}" + NV_EXEC="${S}" + NV_LIB="${S}" + NV_SRC="${S}/kernel" + NV_MAN="${S}" + NV_X11="${S}" + NV_X11_DRV="${NV_X11}" + NV_X11_EXT="${NV_X11}" + NV_SOVER=${PV} + else + die "Could not determine proper NVIDIA package" + fi +} + +src_unpack() { + if use kernel_linux && kernel_is lt 2 6 7; then + echo + ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + ewarn "This is not officially supported for ${P}. It is likely you" + ewarn "will not be able to compile or use the kernel module." + ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" + echo + ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." + fi + + if ! use x86-fbsd; then + cd "${S}" + unpack_makeself + else + unpack ${A} + fi +} + +src_prepare() { + # Please add a brief description for every added patch + use x86-fbsd && cd doc + + if use kernel_linux; then + # Quiet down warnings the user does not need to see + sed -i \ + -e 's:-Wsign-compare::g' \ + "${NV_SRC}"/Makefile.kbuild + + # Add support for the 'x86' unified kernel arch in conftest.sh + epatch "${FILESDIR}"/256.35-unified-arch.patch + + # If you set this then it's your own fault when stuff breaks :) + use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* + + # If greater than 2.6.5 use M= instead of SUBDIR= + convert_to_m "${NV_SRC}"/Makefile.kbuild + fi +} + +src_compile() { + # This is already the default on Linux, as there's no toplevel Makefile, but + # on FreeBSD there's one and triggers the kernel module build, as we install + # it by itself, pass this. + + cd "${NV_SRC}" + if use x86-fbsd; then + MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ + LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die + elif use kernel_linux; then + linux-mod_src_compile + fi +} + +src_install() { + if use kernel_linux; then + linux-mod_src_install + + VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" + if [ -z "$VIDEOGROUP" ]; then + eerror "Failed to determine the video group gid." + die "Failed to determine the video group gid." + fi + + # Add the aliases + [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" + sed -e 's:PACKAGE:'${PF}':g' \ + -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ + "${WORKDIR}"/nvidia + insinto /etc/modprobe.d + newins "${WORKDIR}"/nvidia nvidia.conf || die + elif use x86-fbsd; then + insinto /boot/modules + doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die + + exeinto /boot/modules + doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die + fi + + # NVIDIA kernel <-> userspace driver config lib + dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ + die "failed to install libnvidia-cfg" + dosym /usr/$(get_libdir)/libnvidia-cfg.so.${NV_SOVER} \ + /usr/$(get_libdir)/libnvidia-cfg.so || \ + die "failed to create libnvidia-cfg.so symlink" + + # NVIDIA video decode <-> CUDA + dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ + die "failed to install libnvcuvid.so" + dosym /usr/$(get_libdir)/libnvcuvid.so.${NV_SOVER} \ + /usr/$(get_libdir)/libnvcuvid.so || \ + die "failed to create libnvcuvid.so symlink" + + # Xorg DDX driver + insinto /usr/$(get_libdir)/xorg/modules/drivers + doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" + + # Xorg GLX driver + insinto /usr/$(get_libdir)/opengl/nvidia/extensions + doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ + die "failed to install libglx.so" + dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \ + /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ + die "failed to create libglx.so symlink" + + # XvMC driver + dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ + die "failed to install libXvMCNVIDIA.so" + dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ + die "failed to install libXvMCNVIDIA.so" + dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \ + die "failed to create libXvMCNVIDIA.so symlink" + + # OpenCL ICD for NVIDIA + if use kernel_linux; then + dodir /etc/OpenCL/vendors + insinto /etc/OpenCL/vendors + doins nvidia.icd + fi + + # Documentation + dohtml ${NV_DOC}/html/* + if use x86-fbsd; then + dodoc "${NV_DOC}/README" + doman "${NV_MAN}/nvidia-xconfig.1" + use gtk && doman "${NV_MAN}/nvidia-settings.1" + else + # Docs + newdoc "${NV_DOC}/README.txt" README + dodoc "${NV_DOC}/NVIDIA_Changelog" + doman "${NV_MAN}/nvidia-smi.1.gz" + doman "${NV_MAN}/nvidia-xconfig.1.gz" + use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" + fi + + # Helper Apps + dobin ${NV_EXEC}/nvidia-xconfig || die + if use gtk; then + dobin ${NV_EXEC}/nvidia-settings || die + fi + dobin ${NV_EXEC}/nvidia-bug-report.sh || die + if use kernel_linux; then + dobin ${NV_EXEC}/nvidia-smi || die + fi + + # Desktop entries for nvidia-settings + if use gtk; then + sed -e 's:__UTILS_PATH__:/usr/bin:' \ + -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ + -i "${NV_EXEC}/nvidia-settings.desktop" + domenu ${NV_EXEC}/nvidia-settings.desktop + + doicon ${NV_EXEC}/nvidia-settings.png + fi + + if has_multilib_profile ; then + local OABI=${ABI} + for ABI in $(get_install_abis) ; do + src_install-libs + done + ABI=${OABI} + unset OABI + else + src_install-libs + fi + + is_final_abi || die "failed to iterate through all ABIs" +} + +# Install nvidia library: +# the first parameter is the place where to install it +# the second parameter is the base name of the library +# the third parameter is the provided soversion +donvidia() { + dodir $1 + exeinto $1 + + libname=$(basename $2) + + doexe $2.$3 || die "failed to install $2" + dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" + [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 +} + +src_install-libs() { + local inslibdir=$(get_libdir) + local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" + local libdir= sover= + + if use kernel_linux; then + if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then + libdir=32 + else + libdir=. + fi + sover=${PV} + else + libdir=obj + # on FreeBSD it has just .1 suffix + sover=1 + fi + + # The GLX libraries + donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} + donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} + if use x86-fbsd; then + donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} + else + donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} + fi + + # VDPAU + donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} + + # CUDA & OpenCL + if use kernel_linux; then + donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} + donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} + donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0 + dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so + fi +} + +pkg_preinst() { + if use kernel_linux; then + linux-mod_pkg_postinst + fi + + # Clean the dynamic libGL stuff's home to ensure + # we dont have stale libs floating around + if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then + rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* + fi + # Make sure we nuke the old nvidia-glx's env.d file + if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then + rm -f "${ROOT}"/etc/env.d/09nvidia + fi +} + +pkg_postinst() { + if use kernel_linux; then + linux-mod_pkg_postinst + fi + + # Switch to the nvidia implementation + eselect opengl set --use-old nvidia + + echo + elog "You must be in the video group to use the NVIDIA device" + elog "For more info, read the docs at" + elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" + elog + + elog "This ebuild installs a kernel module and X driver. Both must" + elog "match explicitly in their version. This means, if you restart" + elog "X, you must modprobe -r nvidia before starting it back up" + elog + + elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" + elog + elog "NVIDIA has requested that any bug reports submitted have the" + elog "output of /usr/bin/nvidia-bug-report.sh included." + elog + elog "To work with compiz, you must enable the AddARGBGLXVisuals option." + elog + elog "If you are having resolution problems, try disabling DynamicTwinView." + elog + + if ! use gtk; then + elog "USE=gtk controls whether the nvidia-settings application" + elog "is installed. If you would like to use it, enable that" + elog "flag and re-emerge this ebuild. media-video/nvidia-settings" + elog "no longer installs nvidia-settings but only installs the" + elog "associated user space libraries." + fi +} + +pkg_postrm() { + if use kernel_linux; then + linux-mod_pkg_postrm + fi + eselect opengl set --use-old xorg-x11 +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild new file mode 100644 index 0000000000..823713d10e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild @@ -0,0 +1,40 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb" +CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b" +CROS_WORKON_PROJECT="chromiumos/third_party/khronos" + +inherit cros-workon + +DESCRIPTION="OpenGL|ES headers." +HOMEPAGE="http://www.khronos.org/opengles/2_X/" +SRC_URI="" +LICENSE="SGI-B-2.0" +SLOT="0" +KEYWORDS="x86 arm" +IUSE="" + +RDEPEND="" +DEPEND="" + +CROS_WORKON_LOCALNAME="khronos" + +src_install() { + # headers + insinto /usr/include/EGL + doins "${S}/include/EGL/egl.h" + doins "${S}/include/EGL/eglplatform.h" + doins "${S}/include/EGL/eglext.h" + insinto /usr/include/KHR + doins "${S}/include/KHR/khrplatform.h" + insinto /usr/include/GLES + doins "${S}/include/GLES/gl.h" + doins "${S}/include/GLES/glext.h" + doins "${S}/include/GLES/glplatform.h" + insinto /usr/include/GLES2 + doins "${S}/include/GLES2/gl2.h" + doins "${S}/include/GLES2/gl2ext.h" + doins "${S}/include/GLES2/gl2platform.h" +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild new file mode 100644 index 0000000000..99a5beb18b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 +CROS_WORKON_PROJECT="chromiumos/third_party/khronos" + +inherit cros-workon + +DESCRIPTION="OpenGL|ES headers." +HOMEPAGE="http://www.khronos.org/opengles/2_X/" +SRC_URI="" +LICENSE="SGI-B-2.0" +SLOT="0" +KEYWORDS="~x86 ~arm" +IUSE="" + +RDEPEND="" +DEPEND="" + +CROS_WORKON_LOCALNAME="khronos" + +src_install() { + # headers + insinto /usr/include/EGL + doins "${S}/include/EGL/egl.h" + doins "${S}/include/EGL/eglplatform.h" + doins "${S}/include/EGL/eglext.h" + insinto /usr/include/KHR + doins "${S}/include/KHR/khrplatform.h" + insinto /usr/include/GLES + doins "${S}/include/GLES/gl.h" + doins "${S}/include/GLES/glext.h" + doins "${S}/include/GLES/glplatform.h" + insinto /usr/include/GLES2 + doins "${S}/include/GLES2/gl2.h" + doins "${S}/include/GLES2/gl2ext.h" + doins "${S}/include/GLES2/gl2platform.h" +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild new file mode 100644 index 0000000000..51fbaf71df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild @@ -0,0 +1,33 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb" +CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b" +CROS_WORKON_PROJECT="chromiumos/third_party/khronos" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="OpenGL|ES mock library" +HOMEPAGE="http://www.khronos.org/opengles/2_X/" +SRC_URI="" + +LICENSE="SGI-B-2.0" +SLOT="0" +KEYWORDS="arm x86" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-drivers/opengles-headers" +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="khronos" + +src_compile() { + tc-export AR CC CXX LD NM RANLIB + scons || die +} + +src_install() { + dolib libEGL.so libGLESv2.so +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild new file mode 100644 index 0000000000..e6a1b4792a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild @@ -0,0 +1,31 @@ +# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/third_party/khronos" + +inherit toolchain-funcs cros-workon + +DESCRIPTION="OpenGL|ES mock library" +HOMEPAGE="http://www.khronos.org/opengles/2_X/" +SRC_URI="" + +LICENSE="SGI-B-2.0" +SLOT="0" +KEYWORDS="~arm ~x86" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-drivers/opengles-headers" +DEPEND="${RDEPEND}" + +CROS_WORKON_LOCALNAME="khronos" + +src_compile() { + tc-export AR CC CXX LD NM RANLIB + scons || die +} + +src_install() { + dolib libEGL.so libGLESv2.so +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild new file mode 100644 index 0000000000..5920fc414b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild @@ -0,0 +1,45 @@ +# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="d15b481e374f58ad82812b5ec9193307a937cfbe" +CROS_WORKON_TREE="7d097ae9d618817e2c9a274a07c3ec207a631583" +CROS_WORKON_PROJECT="chromiumos/platform/touchpad-tests" + +XORG_EAUTORECONF="yes" +BASE_INDIVIDUAL_URI="" +inherit autotools-utils cros-workon + +DESCRIPTION="Chromium OS multitouch driver regression tests." +CROS_WORKON_LOCALNAME="../platform/touchpad-tests" + +KEYWORDS="arm amd64 x86" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="chromeos-base/gestures + chromeos-base/libevdev + app-misc/utouch-evemu + x11-proto/inputproto" + +DEPEND=${RDEPEND} + +DOCS="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + emake all +} + +src_install() { + # install to autotest deps directory for dependency + emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild new file mode 100644 index 0000000000..34583147b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild @@ -0,0 +1,43 @@ +# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/touchpad-tests" + +XORG_EAUTORECONF="yes" +BASE_INDIVIDUAL_URI="" +inherit autotools-utils cros-workon + +DESCRIPTION="Chromium OS multitouch driver regression tests." +CROS_WORKON_LOCALNAME="../platform/touchpad-tests" + +KEYWORDS="~arm amd64 ~x86" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="chromeos-base/gestures + chromeos-base/libevdev + app-misc/utouch-evemu + x11-proto/inputproto" + +DEPEND=${RDEPEND} + +DOCS="" + +src_prepare() { + cros-workon_src_prepare +} + +src_configure() { + cros-workon_src_configure +} + +src_compile() { + emake all +} + +src_install() { + # install to autotest deps directory for dependency + emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild new file mode 100644 index 0000000000..94286cb0bf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild @@ -0,0 +1,36 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_COMMIT="43e047f66e76514f6ff153724482440bc45a09d2" +CROS_WORKON_TREE="3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1" +CROS_WORKON_PROJECT="chromiumos/platform/xf86-input-cmt" + +XORG_EAUTORECONF="yes" +BASE_INDIVIDUAL_URI="" +inherit autotools-utils cros-workon + +DESCRIPTION="Chromium OS multitouch input driver for Xorg X server." +CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt" + +KEYWORDS="arm amd64 x86" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="chromeos-base/gestures + chromeos-base/libevdev + x11-base/xorg-server" +DEPEND="${RDEPEND} + x11-proto/inputproto" + +DOCS="README" + +src_prepare() { + eautoreconf +} + +src_install() { + autotools-utils_src_install + remove_libtool_files all +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild new file mode 100644 index 0000000000..08a7f1a165 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +CROS_WORKON_PROJECT="chromiumos/platform/xf86-input-cmt" + +XORG_EAUTORECONF="yes" +BASE_INDIVIDUAL_URI="" +inherit autotools-utils cros-workon + +DESCRIPTION="Chromium OS multitouch input driver for Xorg X server." +CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt" + +KEYWORDS="~arm ~amd64 ~x86" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="chromeos-base/gestures + chromeos-base/libevdev + x11-base/xorg-server" +DEPEND="${RDEPEND} + x11-proto/inputproto" + +DOCS="README" + +src_prepare() { + eautoreconf +} + +src_install() { + autotools-utils_src_install + remove_libtool_files all +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest new file mode 100644 index 0000000000..1ad2d203e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest @@ -0,0 +1 @@ +DIST xf86-input-evdev-2.7.3.tar.bz2 364819 SHA256 eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504 SHA512 edd5691bc6878bb491d7ffb04b35ab60cd70853ae702883c672c53c9f6cb8e81817f94cc03feaaca4e4a02a2a436f1417bd1e1e5f52a151a416fd04306159879 WHIRLPOOL 750605a0efabcb078e65d08b7ea610fdfc4cab49b73a2676247f95f50fcf7d17e80ab2186ef103830865a564dc695f035739f1b88e28f68c981fc703e26610a6 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch new file mode 100644 index 0000000000..5c1bb2a846 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch @@ -0,0 +1,374 @@ +From: Ang Pan +Date: Thu, 15 Nov 2012 15:38:44 +0800 +Subject: [PATCH] Accelerate wheel scrolling + +--- + include/evdev-properties.h | 4 + + src/evdev.c | 198 +++++++++++++++++++++++++++++++++++++++---- + src/evdev.h | 13 +++ + 3 files changed, 196 insertions(+), 19 deletions(-) + +diff --git a/include/evdev-properties.h b/include/evdev-properties.h +--- a/include/evdev-properties.h ++++ b/include/evdev-properties.h +@@ -87,4 +87,8 @@ + */ + #define EVDEV_PROP_FUNCTION_KEYS "Evdev Function Keys" + ++/* Mouse scroll wheel axes acceleration. */ ++/* BOOL */ ++#define EVDEV_PROP_WHEEL_ACCEL_AXES "Evdev Wheel Axes Acceleration" ++ + #endif +diff --git a/src/evdev.c b/src/evdev.c +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -99,6 +99,9 @@ + #define ABS_MT_TRACKING_ID 0x39 + #endif + ++#define AXIS_LABEL_PROP_ABS_DBL_START_TIME "Abs Dbl Start Timestamp" ++#define AXIS_LABEL_PROP_ABS_DBL_END_TIME "Abs Dbl End Timestamp" ++ + static const char *evdevDefaults[] = { + "XkbRules", "evdev", + "XkbModel", "evdev", +@@ -156,12 +159,17 @@ static Atom prop_axis_label; + static Atom prop_btn_label; + static Atom prop_device; + static Atom prop_virtual; ++static Atom prop_wheel_accel_axes; + + /* All devices the evdev driver has allocated and knows about. + * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK) + * cannot be used by evdev, leaving us with a space of 2 at the end. */ + static EvdevPtr evdev_devices[MAXDEVICES] = {NULL}; + ++static double TimevalToDouble(const struct timeval* tv) { ++ return (double)(tv->tv_sec) + (double)(tv->tv_usec) / 1000000.0; ++} ++ + static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode) + { + InputInfoPtr pInfo; +@@ -702,6 +710,103 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev) + EvdevQueueKbdEvent(pInfo, ev, value); + } + ++#ifndef HAVE_SMOOTH_SCROLLING ++/** ++ * Normal CDF seems like a good curve to simulate scroll wheel acceleration ++ * curve. Use following methods to generate the coefficients of a degree-4 ++ * polynomial regression for a specific normal cdf in matlab. ++ * ++ * Note: x for click_speed, y for scroll pixels. ++ * In reality, x ranges from 1 to 120+ for an Apple Mighty Mouse, use range ++ * greater than that to minimize approximation error at the end points. ++ * In our case, the range is [-50, 200]. ++ * ++ * matlab code to generate accel_params below: ++ * x=[-50:200]; ++ * y=600*normcdf(x,77,40); ++ * a=polyfit(x,y,4); ++ */ ++static const double accel_params[] = { ++ -9.528484576366295e-08, ++ -1.515738095456648e-04, ++ 3.940238948978762e-02, ++ 1.732410732791920, ++ 4.412651786252371, ++}; ++ ++/* when x is 155, the polinomial curve gives 600, the max pixels to scroll */ ++static const double max_allowed_click_speed = 155; ++ ++/** ++ * Get the number of pixels to scroll, used for axes_scroll. ++ */ ++static double ++EvdevGetPixelsToScroll(double click_speed) ++{ ++ double pixels = 0; ++ double term = 1; ++ double allowed_click_speed = fabs(click_speed); ++ if (allowed_click_speed > max_allowed_click_speed) ++ allowed_click_speed = max_allowed_click_speed; ++ int i; ++ for (i = 1; i <= ArrayLength(accel_params); i++) ++ { ++ pixels += term * accel_params[ArrayLength(accel_params) - i]; ++ term *= allowed_click_speed; ++ } ++ if (click_speed < 0) ++ pixels *= -1; ++ return pixels; ++} ++ ++/** ++ * Mouse scroll acceleration. ++ */ ++static void ++EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) ++{ ++ double pixels; ++ double dt; /* seconds */ ++ double click_speed; /* clicks / second */ ++ EvdevPtr pEvdev = pInfo->private; ++ double start_time; ++ double end_time = TimevalToDouble(&ev->time); ++ int map; ++ EvdevRelWheelPtr wheel = (ev->code == REL_WHEEL) ? &pEvdev->wheel : ++ &pEvdev->hwheel; ++ ++ /* Check if this scroll is in same direction as previous scroll event */ ++ if ((wheel->value < 0 && ev->value < 0) || ++ (wheel->value > 0 && ev->value > 0)) { ++ start_time = wheel->time; ++ } else { ++ start_time = end_time; ++ } ++ ++ /* If start_time == end_time, compute click_speed using dt = 1 second */ ++ dt = (end_time - start_time) ?: 1.0; ++ click_speed = ev->value / dt; ++ ++ wheel->value = ev->value; ++ wheel->time = end_time; ++ ++ pixels = EvdevGetPixelsToScroll(click_speed); ++ /* For historical reasons the vertical wheel (REL_WHEEL) is inverted */ ++ pixels *= (ev->code == REL_WHEEL) ? -1 : 1; ++ ++ valuator_mask_zero(pEvdev->vals); ++ map = pEvdev->axis_map[ev->code]; ++ valuator_mask_set_double(pEvdev->vals, map, pixels); ++ if (pEvdev->start_time_valuator_index >= 0) ++ valuator_mask_set_double(pEvdev->vals, ++ pEvdev->start_time_valuator_index, start_time); ++ if (pEvdev->end_time_valuator_index >= 0) ++ valuator_mask_set_double(pEvdev->vals, ++ pEvdev->end_time_valuator_index, end_time); ++ xf86PostMotionEventM(pInfo->dev, TRUE, pEvdev->vals); ++} ++#endif ++ + /** + * Take the relative motion input event and process it accordingly. + */ +@@ -712,6 +817,14 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev) + EvdevPtr pEvdev = pInfo->private; + int map; + ++#ifndef HAVE_SMOOTH_SCROLLING ++ if (pEvdev->scroll_axes && (ev->code == REL_WHEEL || ++ ev->code == REL_HWHEEL)) { ++ EvdevAccelWheel(pInfo, ev); ++ return; ++ } ++#endif ++ + /* Get the signed value, earlier kernels had this as unsigned */ + value = ev->value; + +@@ -1894,12 +2007,6 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + goto out; + + #ifndef HAVE_SMOOTH_SCROLLING +- /* Wheels are special, we post them as button events. So let's ignore them +- * in the axes list too */ +- if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_WHEEL)) +- num_axes--; +- if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_HWHEEL)) +- num_axes--; + if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_DIAL)) + num_axes--; + +@@ -1907,17 +2014,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + goto out; + #endif + +- if (num_axes > MAX_VALUATORS) { +- xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS); +- num_axes = MAX_VALUATORS; ++ /* -2 to leave room for start and end timestamps */ ++ if (num_axes > MAX_VALUATORS - 2) { ++ xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS - 2); ++ num_axes = MAX_VALUATORS - 2; + } + +- pEvdev->num_vals = num_axes; +- if (num_axes > 0) { +- pEvdev->vals = valuator_mask_new(num_axes); +- if (!pEvdev->vals) +- goto out; +- } ++ pEvdev->start_time_valuator_index = num_axes; ++ pEvdev->end_time_valuator_index = num_axes + 1; ++ ++ /* +2 for timestamp valuators */ ++ pEvdev->num_vals = num_axes + 2; ++ pEvdev->vals = valuator_mask_new(pEvdev->num_vals); ++ if (!pEvdev->vals) ++ goto out; + atoms = malloc(pEvdev->num_vals * sizeof(Atom)); + + for (axis = REL_X; i < MAX_VALUATORS && axis <= REL_MAX; axis++) +@@ -1925,7 +2035,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + pEvdev->axis_map[axis] = -1; + #ifndef HAVE_SMOOTH_SCROLLING + /* We don't post wheel events, so ignore them here too */ +- if (axis == REL_WHEEL || axis == REL_HWHEEL || axis == REL_DIAL) ++ if (axis == REL_DIAL) + continue; + #endif + if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis)) +@@ -1934,9 +2044,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + i++; + } + +- EvdevInitAxesLabels(pEvdev, Relative, pEvdev->num_vals, atoms); ++ /* Initialize all axis label atoms except Start & End Timestamps */ ++ EvdevInitAxesLabels(pEvdev, Relative, num_axes, atoms); ++ ++ /* Create atoms for Start & End Timestamps */ ++ atoms[pEvdev->start_time_valuator_index] = ++ MakeAtom(AXIS_LABEL_PROP_ABS_DBL_START_TIME, ++ strlen(AXIS_LABEL_PROP_ABS_DBL_START_TIME), ++ TRUE); ++ atoms[pEvdev->end_time_valuator_index] = ++ MakeAtom(AXIS_LABEL_PROP_ABS_DBL_END_TIME, ++ strlen(AXIS_LABEL_PROP_ABS_DBL_END_TIME), ++ TRUE); + +- if (!InitValuatorClassDeviceStruct(device, num_axes, atoms, ++ if (!InitValuatorClassDeviceStruct(device, pEvdev->num_vals, atoms, + GetMotionHistorySize(), Relative)) { + xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n"); + goto out; +@@ -1951,11 +2072,18 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + for (axis = REL_X; axis <= REL_MAX; axis++) + { + int axnum = pEvdev->axis_map[axis]; ++ int mode = Relative; + + if (axnum == -1) + continue; ++ ++#ifndef HAVE_SMOOTH_SCROLLING ++ if (axis == REL_WHEEL || axis == REL_HWHEEL) ++ mode = Absolute; ++#endif ++ + xf86InitValuatorAxisStruct(device, axnum, atoms[axnum], -1, -1, 1, 0, 1, +- Relative); ++ mode); + xf86InitValuatorDefaults(device, axnum); + #ifdef HAVE_SMOOTH_SCROLLING + if (axis == REL_WHEEL) +@@ -1967,6 +2095,17 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + #endif + } + ++#ifndef HAVE_SMOOTH_SCROLLING ++ /* Initialize valuators for scroll wheel Start & End Timestamps */ ++ xf86InitValuatorAxisStruct(device, pEvdev->start_time_valuator_index, ++ atoms[pEvdev->start_time_valuator_index], ++ 0, INT_MAX, 1, 0, 1, Absolute); ++ ++ xf86InitValuatorAxisStruct(device, pEvdev->end_time_valuator_index, ++ atoms[pEvdev->end_time_valuator_index], ++ 0, INT_MAX, 1, 0, 1, Absolute); ++#endif ++ + free(atoms); + + return Success; +@@ -2128,6 +2267,9 @@ EvdevInit(DeviceIntPtr device) + for(i = 0; i < max(ABS_CNT,REL_CNT); i++) + pEvdev->axis_map[i]=-1; + ++ pEvdev->start_time_valuator_index = -1; ++ pEvdev->end_time_valuator_index = -1; ++ + if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS) + EvdevAddKeyClass(device); + if (pEvdev->flags & EVDEV_BUTTON_EVENTS) +@@ -3218,6 +3360,7 @@ EvdevInitProperty(DeviceIntPtr dev) + if (pEvdev->flags & (EVDEV_RELATIVE_EVENTS | EVDEV_ABSOLUTE_EVENTS)) + { + BOOL invert[2]; ++ int axis_accel_conf_val; + invert[0] = pEvdev->invert_x; + invert[1] = pEvdev->invert_y; + +@@ -3264,6 +3407,16 @@ EvdevInitProperty(DeviceIntPtr dev) + + XISetDevicePropertyDeletable(dev, prop_swap, FALSE); + ++ prop_wheel_accel_axes = MakeAtom(EVDEV_PROP_WHEEL_ACCEL_AXES, ++ strlen(EVDEV_PROP_WHEEL_ACCEL_AXES), TRUE); ++ axis_accel_conf_val = xf86SetBoolOption(pInfo->options, EVDEV_PROP_WHEEL_ACCEL_AXES, 0); ++ pEvdev->scroll_axes = axis_accel_conf_val != 0; ++ rc = XIChangeDeviceProperty(dev, prop_wheel_accel_axes, XA_INTEGER, 8, ++ PropModeReplace, 1, &pEvdev->scroll_axes, FALSE); ++ if (rc != Success) ++ return; ++ ++ XISetDevicePropertyDeletable(dev, prop_wheel_accel_axes, FALSE); + /* Axis labelling */ + if ((pEvdev->num_vals > 0) && (prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) + { +@@ -3333,6 +3486,13 @@ EvdevSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, + + if (!checkonly) + pEvdev->swap_axes = *((BOOL*)val->data); ++ } else if (atom == prop_wheel_accel_axes) ++ { ++ if (val->format != 8 || val->type != XA_INTEGER || val->size != 1) ++ return BadMatch; ++ ++ if (!checkonly) ++ pEvdev->scroll_axes = *((BOOL*)val->data); + } else if (atom == prop_axis_label || atom == prop_btn_label || + atom == prop_product_id || atom == prop_device || + atom == prop_virtual) +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -155,6 +155,12 @@ typedef struct { + #endif + } EventQueueRec, *EventQueuePtr; + ++/* Mouse scroll wheel state for one axis (REL_WHEEL or REL_WHEEL) */ ++typedef struct { ++ int value; /* last scroll wheel value */ ++ double time; /* evdev timestamp of last scroll event */ ++} EvdevRelWheelRec, *EvdevRelWheelPtr; ++ + typedef struct { + unsigned short id_vendor; + unsigned short id_product; +@@ -252,6 +258,9 @@ typedef struct { + unsigned long led_bitmask[NLONGS(LED_CNT)]; + struct input_absinfo absinfo[ABS_CNT]; + ++ int start_time_valuator_index; ++ int end_time_valuator_index; ++ + /* minor/major number */ + dev_t min_maj; + +@@ -266,6 +275,10 @@ typedef struct { + struct timeval before_sync_time; + struct timeval after_sync_time; + int32_t cached_tid[MAX_SLOT_COUNT]; ++ ++ BOOL scroll_axes; ++ EvdevRelWheelRec wheel; /* scroll state for REL_WHEEL */ ++ EvdevRelWheelRec hwheel; /* scroll state for REL_HWHEEL */ + } EvdevRec, *EvdevPtr; + + typedef struct { +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch new file mode 100644 index 0000000000..083a6fecef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch @@ -0,0 +1,89 @@ +From: Yufeng Shen +Date: Mon, 20 Aug 2012 14:55:57 -0400 +Subject: [PATCH] x11-drivers/xf86-input-evdev: Use monotonic timestamps for + input events + +This patch adds the support for xf86-input-evdev to turn on monotonic +timestamps if kernel supports it. + +The clock source is set in EvdevOn() instead of EvdevCache() because the +latter is only called once when X registers the input device fd with kernel, +and if later X closes and reopens the input device fd (e.g. when the +system goes through suspend/resume cycle), the clock source setting +will be lost. EvdevOn() is the right place to set clock source since +it is called whenever X wants to open the input device and use it. + +BUG=chrome-os-partner:12187 +TEST=On Link, grep "time stamps" /var/log/Xorg.0.log + Make sure monotonic timestamp is used for evdev + Run "xinput test-xi2" and move fingers on touch device + Note that valuator 4 (Touch Timestamp) is using + monotonic timestamp. + Suspend and resume the device and make sure the timestamp + does not change back to real world timestamp. +--- + src/evdev.c | 16 ++++++++++++++++ + src/evdev.h | 1 + + 2 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/src/evdev.c b/src/evdev.c +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -61,6 +62,11 @@ + #define XI_PROP_VIRTUAL_DEVICE "Virtual Device" + #endif + ++/* Set clockid to be used for timestamps */ ++#ifndef EVIOCSCLOCKID ++#define EVIOCSCLOCKID _IOW('E', 0xa0, int) ++#endif ++ + /* removed from server, purge when dropping support for server 1.10 */ + #define XI86_SEND_DRAG_EVENTS 0x08 + +@@ -1809,6 +1815,12 @@ EvdevInit(DeviceIntPtr device) + return Success; + } + ++static int ++EvdevEnableMonotonic(InputInfoPtr pInfo) { ++ unsigned int clk = CLOCK_MONOTONIC; ++ return (ioctl(pInfo->fd, EVIOCSCLOCKID, &clk) == 0) ? Success : !Success; ++} ++ + /** + * Init all extras (wheel emulation, etc.) and grab the device. + */ +@@ -1826,6 +1838,10 @@ EvdevOn(DeviceIntPtr device) + if (rc != Success) + return rc; + ++ pEvdev->is_monotonic = (EvdevEnableMonotonic(pInfo) == Success); ++ xf86IDrvMsg(pInfo, X_PROBED, "Using %s input event time stamps\n", ++ pEvdev->is_monotonic ? "monotonic" : "realtime"); ++ + EvdevGrabDevice(pInfo, 1, 0); + + xf86FlushInput(pInfo->fd); +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -173,6 +173,7 @@ typedef struct { + BOOL swap_axes; + BOOL invert_x; + BOOL invert_y; ++ BOOL is_monotonic; + + int delta[REL_CNT]; + unsigned int abs_queued, rel_queued, prox_queued; +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch new file mode 100644 index 0000000000..36100440c8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch @@ -0,0 +1,120 @@ +From: Chung-yih Wang +Date: Thu, 6 Dec 2012 17:43:04 +0800 +Subject: [PATCH] Add block reading support + + This patch adds a new xinput property "Block Event Reading" that blocks + event reading by skipping read() calls in ReadInput() in order to + generate the SYN_DROPPED event for testing the SYN_DROPPED handling. +--- + src/debug.c | 37 +++++++++++++++++++++++++++++++++++++ + src/evdev.c | 6 +++++- + src/evdev.h | 6 ++++++ + 3 files changed, 48 insertions(+), 1 deletions(-) + +diff --git a/src/debug.c b/src/debug.c +--- a/src/debug.c ++++ b/src/debug.c +@@ -19,10 +19,12 @@ + #include + #include + ++#define XI_PROP_BLOCK_READ_INPUT "Block Event Reading" + #define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log" + + #define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat" + ++static Atom block_read_prop; + static Atom dump_debug_log_prop; + + static void +@@ -112,3 +114,38 @@ EvdevDebugInitProperty(DeviceIntPtr dev) + XIRegisterPropertyHandler(dev, EvdevDebugSetProperty, + EvdevDebugGetProperty, NULL); + } ++ ++static int ++EvdevBlockSetProperty(DeviceIntPtr dev, Atom atom, ++ XIPropertyValuePtr val, BOOL checkonly) ++{ ++ InputInfoPtr pInfo = dev->public.devicePrivate; ++ EvdevPtr pEvdev = pInfo->private; ++ ++ if (atom == block_read_prop) { ++ if (val->type != XA_INTEGER || val->format != 8 || val->size != 1) ++ return BadMatch; ++ ++ if (!checkonly) ++ pEvdev->block_input = *(BOOL *)val->data; ++ } ++ return Success; ++} ++ ++void ++EvdevBlockInitProperty(DeviceIntPtr dev) ++{ ++ InputInfoPtr pInfo = dev->public.devicePrivate; ++ EvdevPtr pEvdev = pInfo->private; ++ ++ block_read_prop = MakeAtom(XI_PROP_BLOCK_READ_INPUT, ++ strlen(XI_PROP_BLOCK_READ_INPUT), TRUE); ++ ++ pEvdev->block_input = FALSE; ++ ++ XIChangeDeviceProperty(dev, block_read_prop, XA_INTEGER, ++ /* format */ 8, PropModeReplace, /* size */ 1, ++ &pEvdev->block_input, FALSE); ++ XISetDevicePropertyDeletable(dev, block_read_prop, FALSE); ++ XIRegisterPropertyHandler(dev, EvdevBlockSetProperty, NULL, NULL); ++} +diff --git a/src/evdev.c b/src/evdev.c +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -1569,11 +1569,14 @@ EvdevReadInput(InputInfoPtr pInfo) + struct input_event ev[NUM_EVENTS]; + int i, len = sizeof(ev); + BOOL sync_evdev_state = FALSE; ++ EvdevPtr pEvdev = pInfo->private; ++ ++ if (pEvdev->block_input) ++ return; + + while (len == sizeof(ev)) + { + #ifdef MULTITOUCH +- EvdevPtr pEvdev = pInfo->private; + + if (pEvdev->mtdev) + len = mtdev_get(pEvdev->mtdev, pInfo->fd, ev, NUM_EVENTS) * +@@ -2361,6 +2364,7 @@ EvdevInit(DeviceIntPtr device) + EvdevDragLockInitProperty(device); + EvdevAppleInitProperty(device); + EvdevDebugInitProperty(device); ++ EvdevBlockInitProperty(device); + + return Success; + } +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -291,6 +291,8 @@ typedef struct { + BOOL scroll_axes; + EvdevRelWheelRec wheel; /* scroll state for REL_WHEEL */ + EvdevRelWheelRec hwheel; /* scroll state for REL_HWHEEL */ ++ ++ BOOL block_input; /* block read for SYN_DROPPED test */ + } EvdevRec, *EvdevPtr; + + typedef struct { +@@ -352,5 +354,9 @@ void Evdev3BEmuInitProperty(DeviceIntPtr); + void EvdevWheelEmuInitProperty(DeviceIntPtr); + void EvdevDragLockInitProperty(DeviceIntPtr); + void EvdevAppleInitProperty(DeviceIntPtr); ++ ++/* For debugging and testing */ + void EvdevDebugInitProperty(DeviceIntPtr); ++void EvdevBlockInitProperty(DeviceIntPtr); ++ + #endif +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch new file mode 100644 index 0000000000..cb652196c0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch @@ -0,0 +1,200 @@ +From: Yufeng Shen +Date: Wed, 7 Mar 2012 20:39:09 +1000 +Subject: [PATCH] x11-drivers/xf86-input-evdev: Add kernel timestamp to touch + events + +This CL passes kernel timestamp for touch events to X (hence Chrome) +as a valuator named "Touch Timestamp". The timestamp for all the X +touch events generated within one evdev sync report is set to be the +same as the last EV_SYN event's timestamp. + +BUG=chrome-os-partner:12187 +TEST=Run "xinput list 12" on Link and see something like + Class originated from: 12. Type: XIValuatorClass + Detail for Valuator 4: + Label: Touch Timestamp + Range: 0.000000 - 2147483647.000000 + Resolution: 1 units/m + Mode: absolute + Current value: 0.000000 +TEST=Run "xinput test-xi2" on Link and check that for each + touch event there is timestamp at the correct valuator: + EVENT type 6 (Motion) + device: 12 (12) + detail: 0 + flags: emulated + ... + valuators: + 0: 135.95 + 1: 116.93 + 2: 18.00 + 3: 100.00 + 4: 1348803480.46 <- Touch Timestamp + EVENT type 18 (TouchBegin) + device: 12 (12) + detail: 1 + valuators: + 0: 135.95 + 1: 116.93 + 2: 18.00 + 3: 100.00 + 4: 1348803480.46 <- Touch Timestamp +TEST=Run "xinput test-xi2" on Link and check that for non-touch events + (ie USB mouse) there is no Touch Timestamp: + EVENT type 6 (Motion) + device: 2 (13) + ... + valuators: + 0: 1.19 +--- + src/evdev.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- + src/evdev.h | 4 ++++ + 2 files changed, 46 insertions(+), 5 deletions(-) + +diff --git a/src/evdev.c b/src/evdev.c +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -102,6 +102,8 @@ + #define AXIS_LABEL_PROP_ABS_DBL_START_TIME "Abs Dbl Start Timestamp" + #define AXIS_LABEL_PROP_ABS_DBL_END_TIME "Abs Dbl End Timestamp" + ++#define AXIS_LABEL_PROP_TOUCH_TIME "Touch Timestamp" ++ + static const char *evdevDefaults[] = { + "XkbRules", "evdev", + "XkbModel", "evdev", +@@ -1097,7 +1099,7 @@ EvdevPostProximityEvents(InputInfoPtr pInfo, int which, int num_v, int first_v, + * Post the queued key/button events. + */ + static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, +- int v[MAX_VALUATORS]) ++ int v[MAX_VALUATORS], struct input_event *ev) + { + int i; + EvdevPtr pEvdev = pInfo->private; +@@ -1127,6 +1129,10 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, + break; + #ifdef MULTITOUCH + case EV_QUEUE_TOUCH: ++ if (pEvdev->touch_time_valuator_index >= 0) ++ valuator_mask_set_double(pEvdev->queue[i].touchMask, ++ pEvdev->touch_time_valuator_index, ++ TimevalToDouble(&ev->time)); + xf86PostTouchEvent(pInfo->dev, pEvdev->queue[i].detail.touch, + pEvdev->queue[i].val, 0, + pEvdev->queue[i].touchMask); +@@ -1161,7 +1167,7 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) + EvdevPostProximityEvents(pInfo, TRUE, num_v, first_v, v); + EvdevPostRelativeMotionEvents(pInfo, num_v, first_v, v); + EvdevPostAbsoluteMotionEvents(pInfo, num_v, first_v, v); +- EvdevPostQueuedEvents(pInfo, num_v, first_v, v); ++ EvdevPostQueuedEvents(pInfo, num_v, first_v, v, ev); + EvdevPostProximityEvents(pInfo, FALSE, num_v, first_v, v); + + memset(pEvdev->delta, 0, sizeof(pEvdev->delta)); +@@ -1723,6 +1729,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) + int num_mt_axes = 0, /* number of MT-only axes */ + num_mt_axes_total = 0; /* total number of MT axes, including + double-counted ones, excluding blacklisted */ ++ int num_ts_vals = 0; /* number of Timestamp valuators */ ++ int num_valuators; + Atom *atoms; + + pInfo = device->public.devicePrivate; +@@ -1785,6 +1793,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) + } + #ifdef MULTITOUCH + if (num_mt_axes_total > 0) { ++ /* A Touch Timestamp is only appended to Touch events */ ++ num_ts_vals = 1; ++ + pEvdev->num_mt_vals = num_mt_axes_total; + pEvdev->mt_mask = valuator_mask_new(num_mt_axes_total); + if (!pEvdev->mt_mask) { +@@ -1813,8 +1824,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) + } + + for (i = 0; i < EVDEV_MAXQUEUE; i++) { ++ /* Touch Timestamp is appended directly to the touchMask */ + pEvdev->queue[i].touchMask = +- valuator_mask_new(num_mt_axes_total); ++ valuator_mask_new(num_mt_axes_total + 1); + if (!pEvdev->queue[i].touchMask) { + xf86Msg(X_ERROR, "%s: failed to allocate MT valuator masks for " + "evdev event queue.\n", device->name); +@@ -1823,7 +1835,10 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) + } + } + #endif +- atoms = malloc((pEvdev->num_vals + num_mt_axes) * sizeof(Atom)); ++ ++ num_valuators = num_axes + num_mt_axes + num_ts_vals; ++ ++ atoms = malloc(num_valuators * sizeof(Atom)); + + i = 0; + for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) { +@@ -1853,9 +1868,22 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) + i++; + } + ++ /* Note: touch timestamp, if present, is initialized separately */ + EvdevInitAxesLabels(pEvdev, Absolute, pEvdev->num_vals + num_mt_axes, atoms); + +- if (!InitValuatorClassDeviceStruct(device, num_axes + num_mt_axes, atoms, ++#ifdef MULTITOUCH ++ if (num_ts_vals > 0) { ++ /* Manually setup the atom for Touch Timestamp since it did not happen ++ * in EvdevInitAxesLabels(). It will always be the last valuator. */ ++ pEvdev->touch_time_valuator_index = num_valuators - 1; ++ atoms[pEvdev->touch_time_valuator_index] = ++ MakeAtom(AXIS_LABEL_PROP_TOUCH_TIME, ++ strlen(AXIS_LABEL_PROP_TOUCH_TIME), ++ TRUE); ++ } ++#endif ++ ++ if (!InitValuatorClassDeviceStruct(device, num_valuators, atoms, + GetMotionHistorySize(), Absolute)) { + xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n"); + goto out; +@@ -1945,6 +1973,14 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) + resolution, 0, resolution, + Absolute); + } ++ ++ /* Manually configure touch_time axis */ ++ if (num_ts_vals > 0) { ++ xf86InitValuatorAxisStruct(device, pEvdev->touch_time_valuator_index, ++ atoms[pEvdev->touch_time_valuator_index], ++ 0, INT_MAX, 1, 0, 1, Absolute); ++ } ++ + #endif + + free(atoms); +@@ -2279,6 +2315,7 @@ EvdevInit(DeviceIntPtr device) + + pEvdev->start_time_valuator_index = -1; + pEvdev->end_time_valuator_index = -1; ++ pEvdev->touch_time_valuator_index = -1; + + if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS) + EvdevAddKeyClass(device); +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -260,6 +260,10 @@ typedef struct { + unsigned long led_bitmask[NLONGS(LED_CNT)]; + struct input_absinfo absinfo[ABS_CNT]; + ++ /* touch_time_valuator_index is the index for the "Touch Timestamp" ++ * property in the device valuator array. We will set it to be the ++ * last valuator in EvdevAddAbsValuatorClass(); */ ++ int touch_time_valuator_index; + int start_time_valuator_index; + int end_time_valuator_index; + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch new file mode 100644 index 0000000000..0160cba5ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch @@ -0,0 +1,222 @@ +From: Michael Spang +Date: Mon, 13 Aug 2012 11:35:32 -0400 +Subject: [PATCH] Add events debug log support + +This adds a new xinput property "Dump Debug Logs" that dumps the last +64k input events to /var/log/evdev_input_events.dat. +--- + src/Makefile.am | 3 +- + src/debug.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/evdev.c | 13 ++++++- + src/evdev.h | 11 +++++ + 4 files changed, 139 insertions(+), 2 deletions(-) + create mode 100644 src/debug.c + +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -39,5 +39,6 @@ AM_CPPFLAGS =-I$(top_srcdir)/include + emuThird.c \ + emuWheel.c \ + draglock.c \ +- apple.c ++ apple.c \ ++ debug.c + +diff --git a/src/debug.c b/src/debug.c +new file mode 100644 +--- /dev/null ++++ b/src/debug.c +@@ -0,0 +1,114 @@ ++// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log" ++ ++#define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat" ++ ++static Atom dump_debug_log_prop; ++ ++static void ++EvdevDumpLog(InputInfoPtr pInfo) { ++ EvdevPtr pEvdev = pInfo->private; ++ int i; ++ ++ FILE *fp = fopen(INPUT_EVENTS_LOG_FILE, "w"); ++ if (!fp) { ++ xf86IDrvMsg(pInfo, X_ERROR, "fopen: %s: %s\n", ++ INPUT_EVENTS_LOG_FILE, strerror(errno)); ++ return; ++ } ++ ++ fprintf(fp, "# device: %s\n", pInfo->name); ++ ++ for (i = ABS_X; i <= ABS_MAX; i++) { ++ if (EvdevBitIsSet(pEvdev->abs_bitmask, i)) { ++ fprintf(fp, "# absinfo: %d %d %d %d %d %d\n", ++ /* event code (axis) */ i, ++ pEvdev->absinfo[i].minimum, ++ pEvdev->absinfo[i].maximum, ++ pEvdev->absinfo[i].fuzz, ++ pEvdev->absinfo[i].flat, ++ pEvdev->absinfo[i].resolution); ++ } ++ } ++ ++ for (i = 0; i < DEBUG_BUF_SIZE; ++i) { ++ struct debug_event *de = ++ &pEvdev->debug_buf[(pEvdev->debug_buf_tail + i) % DEBUG_BUF_SIZE]; ++ if (de->ev.time.tv_sec == 0 && de->ev.time.tv_usec == 0) ++ continue; ++ fprintf(fp, "E: %ld.%06ld %04x %04x %d %d\n", ++ de->ev.time.tv_sec, ++ de->ev.time.tv_usec, ++ de->ev.type, ++ de->ev.code, ++ de->ev.value, ++ de->slot); ++ } ++ ++ fclose(fp); ++} ++ ++static int ++EvdevDebugGetProperty(DeviceIntPtr dev, Atom property) ++{ ++ return Success; ++} ++ ++static int ++EvdevDebugSetProperty(DeviceIntPtr dev, Atom atom, ++ XIPropertyValuePtr val, BOOL checkonly) ++{ ++ InputInfoPtr pInfo = dev->public.devicePrivate; ++ CARD32 data; ++ ++ if (atom == dump_debug_log_prop) { ++ if (val->type != XA_INTEGER || val->format != 32 || val->size != 1) ++ return BadMatch; ++ ++ data = *(CARD32 *)val->data; ++ ++ if (data != 1) ++ return BadValue; ++ ++ if (!checkonly) ++ EvdevDumpLog(pInfo); ++ } ++ ++ return Success; ++} ++ ++void ++EvdevDebugInitProperty(DeviceIntPtr dev) ++{ ++ ++ dump_debug_log_prop = MakeAtom(XI_PROP_DUMP_DEBUG_LOG, ++ strlen(XI_PROP_DUMP_DEBUG_LOG), TRUE); ++ CARD32 prop_dump_debug_log_init = 0; ++ ++ XIChangeDeviceProperty(dev, dump_debug_log_prop, XA_INTEGER, ++ /* format */ 32, PropModeReplace, /* size */ 1, ++ &prop_dump_debug_log_init, FALSE); ++ XISetDevicePropertyDeletable(dev, dump_debug_log_prop, FALSE); ++ XIRegisterPropertyHandler(dev, EvdevDebugSetProperty, ++ EvdevDebugGetProperty, NULL); ++} +diff --git a/src/evdev.c b/src/evdev.c +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -219,7 +219,7 @@ static size_t EvdevCountBits(unsigned long *array, size_t nlongs) + return count; + } + +-static inline int EvdevBitIsSet(const unsigned long *array, int bit) ++inline int EvdevBitIsSet(const unsigned long *array, int bit) + { + return !!(array[bit / LONG_BITS] & (1LL << (bit % LONG_BITS))); + } +@@ -1208,6 +1208,16 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) + syn_dropped = EvdevProcessSyncEvent(pInfo, ev); + break; + } ++ ++ // Add touch events to the debug log. Keypresses are not included. ++ if (ev->type == EV_ABS || ev->type == EV_SYN || ++ (ev->type == EV_KEY && ev->code == BTN_TOUCH)) { ++ EvdevPtr pEvdev = pInfo->private; ++ pEvdev->debug_buf[pEvdev->debug_buf_tail].ev = *ev; ++ pEvdev->debug_buf[pEvdev->debug_buf_tail].slot = pEvdev->cur_slot; ++ pEvdev->debug_buf_tail++; ++ pEvdev->debug_buf_tail %= DEBUG_BUF_SIZE; ++ } + return syn_dropped; + } + +@@ -2308,6 +2318,7 @@ EvdevInit(DeviceIntPtr device) + EvdevWheelEmuInitProperty(device); + EvdevDragLockInitProperty(device); + EvdevAppleInitProperty(device); ++ EvdevDebugInitProperty(device); + + return Success; + } +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -101,6 +101,8 @@ + /* Number of longs needed to hold the given number of bits */ + #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) + ++#define DEBUG_BUF_SIZE 65536 ++ + #define _ABS_MT_FIRST ABS_MT_TOUCH_MAJOR + #define _ABS_MT_LAST ABS_MT_DISTANCE + #define _ABS_MT_CNT (_ABS_MT_LAST - _ABS_MT_FIRST + 1) +@@ -268,6 +270,12 @@ typedef struct { + int num_queue; + EventQueueRec queue[EVDEV_MAXQUEUE]; + ++ struct debug_event { ++ struct input_event ev; ++ int slot; ++ } debug_buf[DEBUG_BUF_SIZE]; ++ size_t debug_buf_tail; ++ + enum fkeymode fkeymode; + + /* Sync timestamps */ +@@ -329,9 +337,12 @@ BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv); + void EvdevDragLockPreInit(InputInfoPtr pInfo); + BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value); + ++int EvdevBitIsSet(const unsigned long *array, int bit); ++ + void EvdevMBEmuInitProperty(DeviceIntPtr); + void Evdev3BEmuInitProperty(DeviceIntPtr); + void EvdevWheelEmuInitProperty(DeviceIntPtr); + void EvdevDragLockInitProperty(DeviceIntPtr); + void EvdevAppleInitProperty(DeviceIntPtr); ++void EvdevDebugInitProperty(DeviceIntPtr); + #endif +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch new file mode 100644 index 0000000000..7d0c107715 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch @@ -0,0 +1,163 @@ +From: Chung-yih Wang +Date: Wed, 14 Nov 2012 15:42:36 +0800 +Subject: [PATCH] Accelerate emulated wheel events + +Use the Chromium OS Mouse Wheel acceleration for Emulated Wheel +events. This acceleration replaces the simpler "accumulated inertia +mapped to number of button clicks" approach. + +The main motivation of this change is to send Emulated Wheel events to +Chrome using the scroll valuators instead of legacy button events. +--- + src/emuWheel.c | 48 +++++++++--------------------------------------- + src/evdev.c | 20 +++++++++++++++++++- + src/evdev.h | 4 ++++ + 3 files changed, 32 insertions(+), 40 deletions(-) + +diff --git a/src/emuWheel.c b/src/emuWheel.c +--- a/src/emuWheel.c ++++ b/src/emuWheel.c +@@ -50,9 +50,6 @@ static Atom prop_wheel_inertia = 0; + static Atom prop_wheel_timeout = 0; + static Atom prop_wheel_button = 0; + +-/* Local Funciton Prototypes */ +-static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value); +- + /* Filter mouse button events */ + BOOL + EvdevWheelEmuFilterButton(InputInfoPtr pInfo, unsigned int button, int value) +@@ -148,8 +145,15 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv) + */ + if (pAxis) + { +- if (EvdevWheelEmuInertia(pInfo, pAxis, value)) +- pOtherAxis->traveled_distance = 0; ++ if (pAxis->up_button) { ++ /* ++ * Try to emit an emulated wheel event. For REL_Y, up is - ++ * and down is + but, for REL_WHEEL, up is + and down is -. ++ */ ++ pEv->code = (pEv->code == REL_Y) ? REL_WHEEL : REL_HWHEEL; ++ pEv->value *= (pEv->code == REL_WHEEL) ? -1 : 1; ++ EvdevProcessRelativeMotionEvent(pInfo, pEv); ++ } + } + + /* Eat motion events while emulateWheel button pressed. */ +@@ -159,40 +163,6 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv) + return FALSE; + } + +-/* Simulate inertia for our emulated mouse wheel. +- Returns the number of wheel events generated. +- */ +-static int +-EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value) +-{ +- EvdevPtr pEvdev = (EvdevPtr)pInfo->private; +- int button; +- int inertia; +- int rc = 0; +- +- /* if this axis has not been configured, just eat the motion */ +- if (!axis->up_button) +- return rc; +- +- axis->traveled_distance += value; +- +- if (axis->traveled_distance < 0) { +- button = axis->up_button; +- inertia = -pEvdev->emulateWheel.inertia; +- } else { +- button = axis->down_button; +- inertia = pEvdev->emulateWheel.inertia; +- } +- +- /* Produce button press events for wheel motion */ +- while(abs(axis->traveled_distance) > pEvdev->emulateWheel.inertia) { +- axis->traveled_distance -= inertia; +- EvdevQueueButtonClicks(pInfo, button, 1); +- rc++; +- } +- return rc; +-} +- + /* Handle button mapping here to avoid code duplication, + returns true if a button mapping was found. */ + static BOOL +diff --git a/src/evdev.c b/src/evdev.c +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -131,6 +131,7 @@ static BOOL EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab); + static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int calibration[4]); + static int EvdevOpenDevice(InputInfoPtr pInfo); + static void EvdevCloseDevice(InputInfoPtr pInfo); ++static void EvdevForceWheel(InputInfoPtr pInfo); + + static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, + uint16_t code, int32_t value); +@@ -787,6 +788,8 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) + + /* If start_time == end_time, compute click_speed using dt = 1 second */ + dt = (end_time - start_time) ?: 1.0; ++ if (pEvdev->emulateWheel.enabled) ++ dt *= pEvdev->emulateWheel.inertia; + click_speed = ev->value / dt; + + wheel->value = ev->value; +@@ -812,7 +815,7 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) + /** + * Take the relative motion input event and process it accordingly. + */ +-static void ++void + EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev) + { + int value; +@@ -2048,6 +2051,8 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + if (!EvdevBitIsSet(pEvdev->bitmask, EV_REL)) + goto out; + ++ EvdevForceWheel(pInfo); ++ + num_axes = EvdevCountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); + if (num_axes < 1) + goto out; +@@ -2583,6 +2588,19 @@ EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab) + } + + /** ++ * Some devices require REL_WHEEL and REL_HWHEEL axes to emulate wheel ++ * activities. ++ */ ++static void ++EvdevForceWheel(InputInfoPtr pInfo) ++{ ++ EvdevPtr pEvdev = pInfo->private; ++ ++ EvdevSetBit(pEvdev->rel_bitmask, REL_WHEEL); ++ EvdevSetBit(pEvdev->rel_bitmask, REL_HWHEEL); ++} ++ ++/** + * Some devices only have other axes (e.g. wheels), but we + * still need x/y for these. The server relies on devices having + * x/y as axes 0/1 and core/XI 1.x clients expect it too (#44655) +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -314,6 +314,10 @@ void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, + int v[MAX_VALUATORS]); + unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code); + ++/* Event processing functions */ ++void EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, ++ struct input_event *ev); ++ + /* Middle Button emulation */ + int EvdevMBEmuTimer(InputInfoPtr); + BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch new file mode 100644 index 0000000000..9a4c9a408c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch @@ -0,0 +1,537 @@ +From: Chung-yih Wang +Date: Thu, 15 Nov 2012 16:17:12 +0800 +Subject: [PATCH] x11-drivers/xf86-input-evdev: Add SYN_DROPPED handling + +If an evdev client cannot consume evdev events in its queue fast enough, the +evdev kernel driver will enqueue a SYN_DROPPED event and clear the queue +once the client's queue is full. The result is that the X driver will be out +of sync with respect to the kernel driver state. The patch tries to handle the +SYN_DROPPED event by retrieving the kernel driver's state. Retrieving this +state is inherently non-atomic, since it requires a sequence of ioctls. We use +a simple before and after time stamping approach to deal with the race +condition between partially syncing state and any potentially stale events that +arrive during synchronization. +--- + src/evdev.c | 371 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + src/evdev.h | 17 +++ + 2 files changed, 381 insertions(+), 7 deletions(-) + +diff --git a/src/evdev.c b/src/evdev.c +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -127,11 +127,27 @@ static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int cal + static int EvdevOpenDevice(InputInfoPtr pInfo); + static void EvdevCloseDevice(InputInfoPtr pInfo); + ++static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, ++ uint16_t code, int32_t value); + static void EvdevInitAxesLabels(EvdevPtr pEvdev, int mode, int natoms, Atom *atoms); + static void EvdevInitButtonLabels(EvdevPtr pEvdev, int natoms, Atom *atoms); + static void EvdevInitProperty(DeviceIntPtr dev); + static int EvdevSetProperty(DeviceIntPtr dev, Atom atom, + XIPropertyValuePtr val, BOOL checkonly); ++static void EvdevSyncState(InputInfoPtr pInfo); ++static void EvdevGetKernelTime(struct timeval *current_time, ++ BOOL use_monotonic); ++static int EvdevKeyStateSync(InputInfoPtr pInfo); ++static int EvdevAbsAxesSync(InputInfoPtr pInfo); ++static int EvdevAbsMtSlotSync(InputInfoPtr pInfo); ++static int EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index, ++ uint16_t code, int32_t value); ++static int EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots, ++ int *count_after_synreport); ++static int EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots); ++static int EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport); ++static int EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport); ++ + static Atom prop_product_id; + static Atom prop_invert; + static Atom prop_calibration; +@@ -205,6 +221,11 @@ static inline void EvdevSetBit(unsigned long *array, int bit) + array[bit / LONG_BITS] |= (1LL << (bit % LONG_BITS)); + } + ++static inline void EvdevClearBit(unsigned long *array, int bit) ++{ ++ array[bit / LONG_BITS] &= ~(1LL << (bit % LONG_BITS)); ++} ++ + static int + EvdevGetMajorMinor(InputInfoPtr pInfo) + { +@@ -660,6 +681,11 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev) + /* Get the signed value, earlier kernels had this as unsigned */ + value = ev->value; + ++ if (ev->value) ++ EvdevSetBit(pEvdev->key_state_bitmask, ev->code); ++ else ++ EvdevClearBit(pEvdev->key_state_bitmask, ev->code); ++ + /* Handle drag lock */ + if (EvdevDragLockFilterEvent(pInfo, button, value)) + return; +@@ -787,6 +813,7 @@ EvdevProcessTouchEvent(InputInfoPtr pInfo, struct input_event *ev) + if (pEvdev->slot_state == SLOTSTATE_EMPTY) + pEvdev->slot_state = SLOTSTATE_UPDATE; + if (ev->code == ABS_MT_TRACKING_ID) { ++ pEvdev->cached_tid[slot_index] = ev->value; + if (ev->value >= 0) { + pEvdev->slot_state = SLOTSTATE_OPEN; + +@@ -1000,7 +1027,7 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, + * Take the synchronization input event and process it accordingly; the motion + * notify events are sent first, then any button/key press/release events. + */ +-static void ++static BOOL + EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) + { + int i; +@@ -1008,6 +1035,11 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) + int v[MAX_VALUATORS] = {}; + EvdevPtr pEvdev = pInfo->private; + ++ if (ev->code == SYN_DROPPED) { ++ xf86IDrvMsg(pInfo, X_INFO, "+++ SYN_DROPPED +++\n"); ++ return TRUE; ++ } ++ + EvdevProcessProximityState(pInfo); + + EvdevProcessValuators(pInfo); +@@ -1035,16 +1067,20 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) + pEvdev->abs_queued = 0; + pEvdev->rel_queued = 0; + pEvdev->prox_queued = 0; +- ++ return FALSE; + } + + /** + * Process the events from the device; nothing is actually posted to the server +- * until an EV_SYN event is received. ++ * until an EV_SYN event is received. As the SYN_DROPPED event indicates that the ++ * state of evdev driver will be out of sync with the event queue, additional ++ * handling is required for processing the SYN_DROPPED event. The function returns ++ * TRUE if a SYN_DROPPED event is received, FALSE otherwise. + */ +-static void ++static BOOL + EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) + { ++ BOOL syn_dropped = FALSE; + switch (ev->type) { + case EV_REL: + EvdevProcessRelativeMotionEvent(pInfo, ev); +@@ -1056,9 +1092,10 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) + EvdevProcessKeyEvent(pInfo, ev); + break; + case EV_SYN: +- EvdevProcessSyncEvent(pInfo, ev); ++ syn_dropped = EvdevProcessSyncEvent(pInfo, ev); + break; + } ++ return syn_dropped; + } + + #undef ABS_X_VALUE +@@ -1089,6 +1126,308 @@ EvdevFreeMasks(EvdevPtr pEvdev) + #endif + } + ++static void ++EvdevGetKernelTime(struct timeval *current_time, BOOL use_monotonic) { ++ struct timespec now; ++ clockid_t clockid = (use_monotonic) ? CLOCK_MONOTONIC : CLOCK_REALTIME; ++ ++ clock_gettime(clockid, &now); ++ current_time->tv_sec = now.tv_sec; ++ current_time->tv_usec = now.tv_nsec / 1000; ++} ++ ++static int ++EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, uint16_t code, ++ int32_t value) { ++ EvdevPtr pEvdev = pInfo->private; ++ struct input_event ev; ++ ++ ev.type = type; ++ ev.code = code; ++ ev.value = value; ++ EvdevGetKernelTime(&ev.time, pEvdev->is_monotonic); ++ /* Inject the event by processing it */ ++ EvdevProcessEvent(pInfo, &ev); ++ return 1; ++} ++ ++static int ++EvdevKeyStateSync(InputInfoPtr pInfo) { ++ EvdevPtr pEvdev = pInfo->private; ++ unsigned long key_state_bitmask[NLONGS(KEY_CNT)]; ++ int i, ev_count = 0; ++ int len = sizeof(key_state_bitmask); ++ ++ if (ioctl(pInfo->fd, EVIOCGKEY(len), key_state_bitmask) < 0) { ++ xf86IDrvMsg(pInfo, X_ERROR, ++ "ioctl EVIOCGKEY failed: %s\n", strerror(errno)); ++ return !Success; ++ } ++ for (i = 0; i < KEY_CNT; i++) { ++ int orig_value, current_value; ++ if (!EvdevBitIsSet(pEvdev->key_bitmask, i)) ++ continue; ++ orig_value = EvdevBitIsSet(pEvdev->key_state_bitmask, i); ++ current_value = EvdevBitIsSet(key_state_bitmask, i); ++ if (current_value == orig_value) ++ continue; ++ ev_count += EvdevInjectEvent(pInfo, EV_KEY, i, current_value); ++ } ++ return ev_count; ++} ++ ++static int ++EvdevAbsAxesSync(InputInfoPtr pInfo) { ++ EvdevPtr device = pInfo->private; ++ struct input_absinfo absinfo; ++ int i, ev_count = 0; ++ ++ /* Sync all ABS_ axes excluding ABS_MT_ axes */ ++ for (i = ABS_X; i < ABS_MAX; i++) { ++ if (i >= ABS_MT_SLOT && i <= _ABS_MT_LAST) ++ continue; ++ if (!EvdevBitIsSet(device->abs_bitmask, i)) ++ continue; ++ if (ioctl(pInfo->fd, EVIOCGABS(i), &absinfo) < 0) { ++ xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(%zu) failed: %s\n", ++ i, strerror(errno)); ++ } else if (absinfo.value != device->absinfo[i].value) { ++ ev_count += EvdevInjectEvent(pInfo, EV_ABS, i, absinfo.value); ++ } ++ } ++ return ev_count; ++} ++ ++static int ++EvdevAbsMtSlotSync(InputInfoPtr pInfo) { ++ EvdevPtr device = pInfo->private; ++ struct input_absinfo absinfo; ++ int ev_count = 0; ++ ++ if (ioctl(pInfo->fd, EVIOCGABS(ABS_MT_SLOT), &absinfo) < 0) { ++ xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(ABS_MT_SLOT) failed: %s\n", ++ strerror(errno)); ++ return 0; ++ } ++ if (device->cur_slot != absinfo.value) ++ ev_count = EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, absinfo.value); ++ return ev_count; ++} ++ ++static int ++EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index, ++ uint16_t code, int32_t value) { ++ EvdevPtr device = pInfo->private; ++ int ev_count = 0; ++ ++ if (device->cur_slot != slot_index) ++ ev_count += EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, slot_index); ++ ev_count += EvdevInjectEvent(pInfo, EV_ABS, code, value); ++ return ev_count; ++} ++ ++static int ++EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots, ++ int *count_after_synreport) ++{ ++ EvdevPtr device = pInfo->private; ++ int i, j, ev_count = 0; ++ int total_ev_count = 0; ++ ++ /* ++ * There will be five conditions of a slot change after SYN_DROPPED: ++ * a. Finger leaving, i.e., tracking id changes from a non-negative ++ * number to -1. ++ * b. Finger arriving, i.e., tracking id changes from -1 to a ++ * non-negative number. ++ * c. Finger changing, i.e., original finger leaving and new finger ++ * arriving, tracking id changes from a non-negative number to ++ * another one. ++ * d. Same finger, but axes change, i.e., no tracking id changes, but some ++ * axes values have changed. ++ * e. Fingers arrive and leave: tracking ID was -1, and is still -1, but ++ * some axes values have changed. ++ * f. nothing changed ++ * ++ * To have X server seamless of SYN_DROPPED event, additional event ++ * injections will be required except for conditions e and f: ++ * ++ * Finger leaving (a): all axes of the slot should be updated first, then ++ * followed with tracking id change (-1). ++ * ++ * Finger arriving (b): new tracking id should be injected first, followed ++ * with all axes updates. ++ * ++ * Finger changing (c): first, inject finger leaving with tracking id -1, ++ * followed with new tracking id event, then update all axes data. ++ * ++ * Same finger, but axes change (d): all axes updates should be injected ++ * ++ */ ++ ++ for (i = 0; i < num_slots(device); i++) { ++ int curr_tid = slots[ABS_MT_TRACKING_ID - _ABS_MT_FIRST].values[i]; ++ int orig_tid = device->cached_tid[i]; ++ ++ /* For conditions b and c, inject the tracking id change events first */ ++ if (orig_tid != curr_tid && curr_tid != -1) { ++ /* For (c), inject the leaving event for original finger */ ++ if (orig_tid != -1) { ++ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, ++ i, ++ ABS_MT_TRACKING_ID, ++ -1); ++ ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0); ++ /* Reset the count_after_synreport after SYN_REPORT event */ ++ total_ev_count += ev_count; ++ *count_after_synreport = ev_count = 0; ++ } ++ /* For (b) and (c), set the new tid before updating axes */ ++ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, ++ i, ++ ABS_MT_TRACKING_ID, ++ curr_tid); ++ } ++ ++ ++ for (j = _ABS_MT_FIRST; j <= _ABS_MT_LAST; j++) { ++ int axis = j - _ABS_MT_FIRST; ++ int map, orig_value, curr_value; ++ if ((j == ABS_MT_TRACKING_ID) || ++ ((map = device->axis_map[j]) == -1)) ++ continue; ++ if (!EvdevBitIsSet(device->abs_bitmask, j)) ++ continue; ++ ++ orig_value = valuator_mask_get(device->last_mt_vals[i], map); ++ curr_value = slots[axis].values[i]; ++ ++ if (orig_value == curr_value) ++ continue; ++ ++ /* For condition e, internal axes values should be updated */ ++ if (orig_tid == -1 && curr_tid == -1) { ++ valuator_mask_set(device->last_mt_vals[i], map, curr_value); ++ continue; ++ } ++ ++ /* In addition to condition d, all axes updates will be injected */ ++ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, ++ i, ++ j, ++ curr_value); ++ } ++ ++ /* For condition a, inject finger leaving event */ ++ if (orig_tid != -1 && curr_tid == -1) { ++ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, ++ i, ++ ABS_MT_TRACKING_ID, ++ -1); ++ } ++ } ++ /* Update current slot index if it is different from cur_slot value */ ++ ev_count += EvdevAbsMtSlotSync(pInfo); ++ *count_after_synreport += ev_count; ++ ++ return total_ev_count + ev_count; ++} ++ ++static int ++EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots) ++{ ++ EvdevPtr device = pInfo->private; ++ int i; ++ ++ /* Retrieve current ABS_MT_ axes for all slots */ ++ for (i = _ABS_MT_FIRST; i <= _ABS_MT_LAST; i++) { ++ MTSlotInfoPtr req = &slots[i - _ABS_MT_FIRST]; ++ if (!EvdevBitIsSet(device->abs_bitmask, i)) ++ continue; ++ req->code = i; ++ if (ioctl(pInfo->fd, EVIOCGMTSLOTS((sizeof(*req))), req) < 0) { ++ xf86IDrvMsg(pInfo, X_ERROR, ++ "ioctl EVIOCGMTSLOTS(req.code=%d) failed: %s\n", ++ req->code, strerror(errno)); ++ return !Success; ++ } ++ } ++ ++ return Success; ++} ++ ++static int ++EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport) { ++ MTSlotInfo slots[_ABS_MT_CNT]; ++ int ev_count = 0; ++ ++ /* Get all current slots axes, then check if there is any update required */ ++ if (EvdevGetAllSlotVals(pInfo, slots) == Success) { ++ ev_count = EvdevCheckAbsMtAxesChange(pInfo, slots, ++ count_after_synreport); ++ } ++ ++ return ev_count; ++} ++ ++static int ++EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport) { ++ EvdevPtr device = pInfo->private; ++ int ev_count; ++ ++ /* Sync all ABS_ axes */ ++ ev_count = EvdevAbsAxesSync(pInfo); ++ *count_after_synreport += ev_count; ++ ++ /* Sync ABS_MT_ axes for all slots if exists */ ++ if (device->num_mt_vals) ++ ev_count += EvdevAbsMtStateSync(pInfo, count_after_synreport); ++ ++ return ev_count; ++} ++ ++/** ++ * Synchronize the current state with kernel evdev driver. ++ */ ++static void ++EvdevSyncState(InputInfoPtr pInfo) ++{ ++ int ev_count = 0; ++ int ev_count_after_synreport = 0; ++ EvdevPtr device = pInfo->private; ++ ++ EvdevGetKernelTime(&device->before_sync_time, device->is_monotonic); ++ ++ ev_count = EvdevKeyStateSync(pInfo); ++ ev_count_after_synreport += ev_count; ++ ++ /* ++ * TODO: sync all led, switch and sound states as well. We probably need ++ * to post events out actively if the new states are different from the ++ * cached ones. ++ */ ++ ++ /* sync abs and abs_mt value/limits */ ++ ev_count += EvdevAbsStateSync(pInfo, &ev_count_after_synreport); ++ ++ /* ++ * Push SYN_REPORT event out if there is any event injected ++ * during the state synchronization. ++ */ ++ if (ev_count_after_synreport) ++ ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0); ++ ++ EvdevGetKernelTime(&device->after_sync_time, device->is_monotonic); ++ ++ xf86IDrvMsg(pInfo, X_INFO, ++ "Sync_State: before %ld.%ld after %ld.%ld injected events=%d\n", ++ device->before_sync_time.tv_sec, ++ device->before_sync_time.tv_usec, ++ device->after_sync_time.tv_sec, ++ device->after_sync_time.tv_usec, ++ ev_count); ++} ++ + /* just a magic number to reduce the number of reads */ + #define NUM_EVENTS 16 + +@@ -1097,6 +1436,7 @@ EvdevReadInput(InputInfoPtr pInfo) + { + struct input_event ev[NUM_EVENTS]; + int i, len = sizeof(ev); ++ BOOL sync_evdev_state = FALSE; + + while (len == sizeof(ev)) + { +@@ -1131,9 +1471,23 @@ EvdevReadInput(InputInfoPtr pInfo) + break; + } + +- for (i = 0; i < len/sizeof(ev[0]); i++) +- EvdevProcessEvent(pInfo, &ev[i]); ++ for (i = 0; i < len/sizeof(ev[0]); i++) { ++ if (sync_evdev_state) ++ break; ++ if (timercmp(&ev[i].time, &pEvdev->before_sync_time, <)) { ++ /* Ignore events before last sync time */ ++ continue; ++ } else if (timercmp(&ev[i].time, &pEvdev->after_sync_time, >)) { ++ /* Event_Process returns TRUE if SYN_DROPPED detected */ ++ sync_evdev_state = EvdevProcessEvent(pInfo, &ev[i]); ++ } else { ++ /* If the event occurred during sync, then sync again */ ++ sync_evdev_state = TRUE; ++ } ++ } + } ++ if (sync_evdev_state) ++ EvdevSyncState(pInfo); + } + + static void +@@ -1325,6 +1679,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) + } + + for (i = 0; i < num_slots(pEvdev); i++) { ++ pEvdev->cached_tid[i] = -1; + pEvdev->last_mt_vals[i] = valuator_mask_new(num_mt_axes_total); + if (!pEvdev->last_mt_vals[i]) { + xf86IDrvMsg(pInfo, X_ERROR, +@@ -1850,6 +2205,8 @@ EvdevOn(DeviceIntPtr device) + Evdev3BEmuOn(pInfo); + pEvdev->flags |= EVDEV_INITIALIZED; + device->public.on = TRUE; ++ pEvdev->slot_state = SLOTSTATE_EMPTY; ++ EvdevSyncState(pInfo); + + return Success; + } +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -97,6 +97,12 @@ + /* Number of longs needed to hold the given number of bits */ + #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) + ++#define _ABS_MT_FIRST ABS_MT_TOUCH_MAJOR ++#define _ABS_MT_LAST ABS_MT_DISTANCE ++#define _ABS_MT_CNT (_ABS_MT_LAST - _ABS_MT_FIRST + 1) ++ ++#define MAX_SLOT_COUNT 64 ++ + /* Function key mode */ + enum fkeymode { + FKEYMODE_UNKNOWN = 0, +@@ -250,8 +256,19 @@ typedef struct { + EventQueueRec queue[EVDEV_MAXQUEUE]; + + enum fkeymode fkeymode; ++ ++ /* Sync timestamps */ ++ unsigned long key_state_bitmask[NLONGS(KEY_CNT)]; ++ struct timeval before_sync_time; ++ struct timeval after_sync_time; ++ int32_t cached_tid[MAX_SLOT_COUNT]; + } EvdevRec, *EvdevPtr; + ++typedef struct { ++ uint32_t code; ++ int32_t values[MAX_SLOT_COUNT]; ++} MTSlotInfo, *MTSlotInfoPtr; ++ + /* Event posting functions */ + void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value); + void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch new file mode 100644 index 0000000000..e3bd81f601 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch @@ -0,0 +1,32 @@ +From: Daniel Erat +Date: Wed, 21 Mar 2012 10:44:51 -0700 +Subject: [PATCH] Disable smooth scrolling in xf86-input-evdev. + +This caused additional valuator-containing motion events to +be sent on behalf of the scrollwheel, which Chrome treated +identically to touchpad scroll events, resulting in the +scrollwheel being unusable. + +BUG=chromium:118608 +TEST=manual: we scroll 106 pixels for each scrollwheel click on stumpy +--- + src/evdev.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/evdev.h b/src/evdev.h +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -67,6 +67,10 @@ + #define HAVE_SMOOTH_SCROLLING 1 + #endif + ++/* Smooth scrolling results in the mousewheel generating motion events with ++ * valuators that confuse Chrome: http://crosbug.com/118608 */ ++#undef HAVE_SMOOTH_SCROLLING ++ + #define EVDEV_MAXBUTTONS 32 + #define EVDEV_MAXQUEUE 32 + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild new file mode 120000 index 0000000000..cfca3b06c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild @@ -0,0 +1 @@ +xf86-input-evdev-2.7.3.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild new file mode 100644 index 0000000000..6a67e767e0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild,v 1.1 2012/08/14 01:24:15 chithanh Exp $ + +EAPI=4 +XORG_EAUTORECONF=yes + +inherit xorg-2 + +DESCRIPTION="Generic Linux input driver" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86" +IUSE="" +RDEPEND=">=x11-base/xorg-server-1.10[udev] + sys-libs/mtdev" +DEPEND="${RDEPEND} + >=x11-proto/inputproto-2.1.99.3 + >=sys-kernel/linux-headers-2.6" + +PATCHES=( + "${FILESDIR}"/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch + # crosbug.com/35291 + "${FILESDIR}"/evdev-2.7.3-Add-SYN_DROPPED-handling.patch + "${FILESDIR}/evdev-disable-smooth-scrolling.patch" + "${FILESDIR}/evdev-2.6.99-wheel-accel.patch" + "${FILESDIR}"/evdev-2.7.0-feedback-log.patch + "${FILESDIR}"/evdev-2.7.0-add-touch-event-timestamp.patch + # crosbug.com/p/13787 + "${FILESDIR}"/evdev-2.7.0-fix-emulated-wheel.patch + "${FILESDIR}"/evdev-2.7.0-add-block-reading-support.patch +) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild new file mode 100644 index 0000000000..1fab3d2371 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild @@ -0,0 +1,26 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="9eb527e3cf926175eda9063fa0ef65504c816364" +CROS_WORKON_TREE="0d2d6cd5e23e84585ebe72df251360086c8408bf" +CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc" +CROS_WORKON_LOCALNAME="xf86-video-armsoc" + +XORG_DRI="always" +XORG_EAUTORECONF="yes" + +inherit xorg-2 cros-workon + +DESCRIPTION="X.Org driver for ARM devices" + +KEYWORDS="-* arm" + +RDEPEND=">=x11-base/xorg-server-1.9" +DEPEND="${RDEPEND}" + +src_unpack() { + cros-workon_src_unpack + mkdir -p "${S}"/m4 +} + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild new file mode 100644 index 0000000000..894d9824f7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc" +CROS_WORKON_LOCALNAME="xf86-video-armsoc" + +XORG_DRI="always" +XORG_EAUTORECONF="yes" + +inherit xorg-2 cros-workon + +DESCRIPTION="X.Org driver for ARM devices" + +KEYWORDS="-* ~arm" + +RDEPEND=">=x11-base/xorg-server-1.9" +DEPEND="${RDEPEND}" + +src_unpack() { + cros-workon_src_unpack + mkdir -p "${S}"/m4 +} + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest new file mode 100644 index 0000000000..0d8026d6c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest @@ -0,0 +1 @@ +DIST xf86-video-intel-2.16.0.tar.bz2 1249069 RMD160 9eb9aeabecfbe9f6dde6c81a59c07d9d90f2dc69 SHA1 53441ea4d4335b501d32809b6b92593cbb1f79cf SHA256 77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch new file mode 100644 index 0000000000..60e474aacd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch @@ -0,0 +1,12 @@ +Disable gamma setting. We set this early at boot and we don't want X to mess with our settings. +diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c +--- xf86-video-intel-2.14.0.orig/src/intel_display.c 2011-01-10 15:02:16.534513000 -0800 ++++ xf86-video-intel-2.14.0.work/src/intel_display.c 2011-04-18 13:40:46.586165000 -0700 +@@ -617,6 +617,7 @@ static void + intel_crtc_gamma_set(xf86CrtcPtr crtc, + CARD16 *red, CARD16 *green, CARD16 *blue, int size) + { ++ return; + struct intel_crtc *intel_crtc = crtc->driver_private; + struct intel_mode *mode = intel_crtc->mode; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch new file mode 100644 index 0000000000..3a703258f3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch @@ -0,0 +1,41 @@ +diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c +--- xf86-video-intel-2.14.0.orig/src/intel_display.c 2011-01-10 15:02:16.534513000 -0800 ++++ xf86-video-intel-2.14.0.work/src/intel_display.c 2011-05-19 15:06:39.732535000 -0700 +@@ -57,6 +57,8 @@ struct intel_mode { + unsigned int fe_tv_sec; + unsigned int fe_tv_usec; + ++ unsigned int last_queued_frame; ++ + struct list outputs; + struct list crtcs; + }; +@@ -1435,6 +1437,12 @@ intel_do_pageflip(intel_screen_private * + int i, old_fb_id; + + /* ++ * Discard this flip since we already have one pending for this frame. ++ */ ++ if ( flip_info->frame <= mode->last_queued_frame ) ++ return FALSE; ++ ++ /* + * Create a new handle for the back buffer + */ + old_fb_id = mode->fb_id; +@@ -1490,11 +1498,15 @@ intel_do_pageflip(intel_screen_private * + } + + mode->old_fb_id = old_fb_id; ++ mode->last_queued_frame = flip_info->frame; + return TRUE; + + error_undo: + drmModeRmFB(mode->fd, mode->fb_id); + mode->fb_id = old_fb_id; ++ for (i = 0; i < config->num_crtc; i++) ++ if (config->crtc[i]->enabled) ++ mode->flip_count--; + + error_out: + xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n", diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch new file mode 100644 index 0000000000..99c9cb9b5e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch @@ -0,0 +1,72 @@ +commit 46f97127c22ea42bc8fdae59d2a133e4b8b6c997 +Author: Chris Wilson +Date: Sun Oct 16 21:40:15 2011 +0100 + + snb,ivb: Workaround unknown blitter death + + The first workaround was a performance killing MI_FLUSH_DW after every + op. This workaround appears to be a stable compromise instead, only + requiring a redundant command after every BLT command with little + impact on throughput. + + Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=27892 + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39524 + Tested-by: Daniel Vetter + Signed-off-by: Chris Wilson + +diff --git a/src/intel_uxa.c b/src/intel_uxa.c +index 30717d0..9e58c69 100644 +--- a/src/intel_uxa.c ++++ b/src/intel_uxa.c +@@ -340,13 +340,6 @@ static void intel_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2) + } + } + +-static void intel_uxa_done_solid(PixmapPtr pixmap) +-{ +- ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; +- +- intel_debug_flush(scrn); +-} +- + /** + * TODO: + * - support planemask using FULL_BLT_CMD? +@@ -501,9 +494,19 @@ intel_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1, + } + } + +-static void intel_uxa_done_copy(PixmapPtr dest) ++static void intel_uxa_done(PixmapPtr pixmap) + { +- ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum]; ++ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; ++ intel_screen_private *intel = intel_get_screen_private(scrn); ++ ++ if (IS_GEN6(intel) || IS_GEN7(intel)) { ++ /* workaround a random BLT hang */ ++ BEGIN_BATCH_BLT(3); ++ OUT_BATCH(XY_SETUP_CLIP_BLT_CMD); ++ OUT_BATCH(0); ++ OUT_BATCH(0); ++ ADVANCE_BATCH(); ++ } + + intel_debug_flush(scrn); + } +@@ -1225,13 +1228,13 @@ Bool intel_uxa_init(ScreenPtr screen) + intel->uxa_driver->check_solid = intel_uxa_check_solid; + intel->uxa_driver->prepare_solid = intel_uxa_prepare_solid; + intel->uxa_driver->solid = intel_uxa_solid; +- intel->uxa_driver->done_solid = intel_uxa_done_solid; ++ intel->uxa_driver->done_solid = intel_uxa_done; + + /* Copy */ + intel->uxa_driver->check_copy = intel_uxa_check_copy; + intel->uxa_driver->prepare_copy = intel_uxa_prepare_copy; + intel->uxa_driver->copy = intel_uxa_copy; +- intel->uxa_driver->done_copy = intel_uxa_done_copy; ++ intel->uxa_driver->done_copy = intel_uxa_done; + + /* Composite */ + if (IS_GEN2(intel)) { diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch new file mode 100644 index 0000000000..4bebd60ab5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch @@ -0,0 +1,156 @@ +diff --git a/src/intel.h b/src/intel.h +index 42afaf4..22527df 100644 +--- a/src/intel.h ++++ b/src/intel.h +@@ -465,6 +465,7 @@ extern void intel_mode_fini(intel_screen_private *intel); + extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); + extern int intel_crtc_id(xf86CrtcPtr crtc); + extern int intel_output_dpms_status(xf86OutputPtr output); ++extern void intel_copy_fb(ScrnInfoPtr pScrn); + + enum DRI2FrameEventType { + DRI2_SWAP, +diff --git a/src/intel_display.c b/src/intel_display.c +index 84c7c08..e52ca67 100644 +--- a/src/intel_display.c ++++ b/src/intel_display.c +@@ -30,6 +30,7 @@ + #endif + + #include ++#include + #include + #include + #include +@@ -1435,6 +1436,109 @@ fail: + return FALSE; + } + ++static PixmapPtr ++intel_create_pixmap_for_fbcon(ScrnInfoPtr pScrn) ++{ ++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ++ drmModeFBPtr fbcon = NULL; ++ PixmapPtr pixmap = NULL; ++ struct drm_gem_flink flink; ++ drm_intel_bo *bo; ++ ++ struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private; ++ struct intel_mode *intel_mode = intel_crtc->mode; ++ intel_screen_private *intel = intel_get_screen_private(pScrn); ++ int i; ++ ++ for (i = 0; i < intel_mode->mode_res->count_crtcs; i++) { ++ intel_crtc = xf86_config->crtc[i]->driver_private; ++ ++ fbcon = drmModeGetFB(intel_mode->fd, intel_crtc->mode_crtc->buffer_id); ++ if (fbcon != NULL) break; ++ } ++ if (fbcon == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't find an fbcon\n."); ++ return NULL; ++ } ++ flink.handle = fbcon->handle; ++ if (ioctl(intel_mode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't flink fbcon handle\n"); ++ return NULL; ++ } ++ bo = drm_intel_bo_gem_create_from_name(intel->bufmgr, ++ "fbcon", flink.name); ++ ++ if (bo == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't allocate bo for fbcon handle\n"); ++ return NULL; ++ } ++ ++ pixmap = GetScratchPixmapHeader(pScreen, ++ fbcon->width, fbcon->height, ++ fbcon->depth, fbcon->bpp, ++ fbcon->pitch, NULL); ++ if (pixmap == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't allocate pixmap fbcon contents\n"); ++ return NULL; ++ } ++ ++ intel_set_pixmap_bo(pixmap, bo); ++ drm_intel_bo_unreference(bo); ++ drmModeFreeFB(fbcon); ++ ++ return pixmap; ++} ++ ++void intel_copy_fb(ScrnInfoPtr pScrn) ++{ ++ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ++ intel_screen_private *intel = intel_get_screen_private(pScrn); ++ PixmapPtr src, dst; ++ unsigned int pitch = pScrn->displayWidth * intel->cpp; ++ int savePMSize; ++ int pixmap_size; ++ ++ /* Ugly: this runs before CreateScratchPixmap() which normally calculates ++ this number :( ++ */ ++ pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP); ++ savePMSize = pScreen->totalPixmapSize; ++ pScreen->totalPixmapSize = BitmapBytePad(pixmap_size * 8); ++ ++ src = intel_create_pixmap_for_fbcon(pScrn); ++ if (src == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't create pixmap for fbcon\n"); ++ pScreen->totalPixmapSize = savePMSize; ++ return; ++ } ++ ++ /* We dont have a screen Pixmap yet */ ++ dst = GetScratchPixmapHeader(pScreen, ++ pScrn->virtualX, pScrn->virtualY, ++ pScrn->depth, pScrn->bitsPerPixel, ++ pitch, ++ NULL); ++ pScreen->totalPixmapSize = savePMSize; ++ intel_set_pixmap_bo(dst,intel->front_buffer); ++ intel->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES); ++ ++ intel->uxa_driver->copy(dst, 0, 0, 0, 0, ++ pScrn->virtualX, pScrn->virtualY); ++ intel->uxa_driver->done_copy(dst); ++ ++ intel_batch_submit(pScrn); ++ ++ (*pScreen->DestroyPixmap)(src); ++ (*pScreen->DestroyPixmap)(dst); ++ ++} ++ + Bool + intel_do_pageflip(intel_screen_private *intel, + dri_bo *new_front, +@@ -1584,6 +1688,8 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp) + unsigned int i; + int has_flipping; + ++ scrn->canDoBGNoneRoot = TRUE; ++ + mode = calloc(1, sizeof *mode); + if (!mode) + return FALSE; +diff --git a/src/intel_driver.c b/src/intel_driver.c +index 7fc1c1a..40ff396 100644 +--- a/src/intel_driver.c ++++ b/src/intel_driver.c +@@ -1154,6 +1154,8 @@ static Bool I830EnterVT(int scrnIndex, int flags) + + intel_set_gem_max_sizes(scrn); + ++ intel_copy_fb(scrn); ++ + if (!xf86SetDesiredModes(scrn)) + return FALSE; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch new file mode 100644 index 0000000000..8f2a407372 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch @@ -0,0 +1,45 @@ +From e1f718b600029d43bb2e2e4a6b50e5a990c6d08d Mon Sep 17 00:00:00 2001 +From: Chris Wolfe +Date: Mon, 5 Nov 2012 11:10:24 -0500 +Subject: [PATCH] xf86-video-intel: Avoid display corruption when unable to + flip. + +This replaces the previous patch to xorg-server for crosbug/33775. +That change avoids calling ScheduleSwap when a flip would not be +classically possible, so interferes with the upcoming per-crtc +flip feature. + +BUG=chromium-os:35796 +TEST=Rapidly minimize/restore/tile window so that the animation spans + monitors, observe that none of the preview shadow is left behind. +--- + src/intel_dri.c | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/intel_dri.c b/src/intel_dri.c +index 1227dbb..938a022 100644 +--- a/src/intel_dri.c ++++ b/src/intel_dri.c +@@ -1151,10 +1151,16 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, + + /* Flips need to be submitted one frame before */ + if (can_exchange(draw, front, back)) { +- swap_type = DRI2_FLIP; +- flip = 1; ++ swap_type = DRI2_FLIP; ++ flip = 1; ++ } else { ++ /* Using the DRI2_SWAP path defers the back-to-front blit until ++ * the frame event handler. If another swap comes in before that ++ * event executes, our two-frame damage tracking will copy from ++ * the unfinished frame and cause corruption. To avoid this ++ * problem we force an immediate blit here. */ ++ goto blit_fallback; + } +- + swap_info->type = swap_type; + + /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP. +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch new file mode 100644 index 0000000000..29cb999694 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch @@ -0,0 +1,22 @@ +diff --git a/src/intel_display.c b/src/intel_display.c +index 84c7c08..a9dee28 100644 +--- a/src/intel_display.c ++++ b/src/intel_display.c +@@ -400,7 +400,6 @@ intel_crtc_apply(xf86CrtcPtr crtc) + continue; + + intel_output = output->driver_private; +- intel_output_dpms_backlight(output, intel_output->dpms_mode, DPMSModeOn); + intel_output->dpms_mode = DPMSModeOn; + } + } +@@ -950,9 +949,6 @@ intel_output_dpms(xf86OutputPtr output, int dpms) + intel_output->output_id, + props->prop_id, + dpms); +- intel_output_dpms_backlight(output, +- intel_output->dpms_mode, +- dpms); + intel_output->dpms_mode = dpms; + drmModeFreeProperty(props); + return; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch new file mode 100644 index 0000000000..3dd4a57e0e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch @@ -0,0 +1,12 @@ +diff --git a/src/intel_driver.c b/src/intel_driver.c +index 9d1c4e8..3e4f664 100644 +--- a/src/intel_driver.c ++++ b/src/intel_driver.c +@@ -677,6 +677,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) + xf86ReturnOptValBool(intel->Options, + OPTION_TRIPLE_BUFFER, + TRUE); ++ intel->use_triple_buffer = FALSE; + xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n", + intel->use_triple_buffer ? "enabled" : "disabled"); + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch new file mode 100644 index 0000000000..5a38919e4e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch @@ -0,0 +1,1490 @@ +From 715ca0c0ccd94650948efd36a9e7b4592c306906 Mon Sep 17 00:00:00 2001 +From: Chris Wolfe +Date: Thu, 20 Dec 2012 15:27:59 -0500 +Subject: [PATCH] xf86-video-intel: Split framebuffer and flip crtcs. + +Try to allocate a separate framebuffer for each CRTC and flip those +directly with the back-buffer of updated drawables. This avoids +blitting content when the drawable size matches the crtc size. + +When CopyRegion is used top copy content into or out of the screen +buffer, it may be redirected to exactly one scanout buffer. This is +enough to support our one-drawable-per-crtc case, but not sufficient +in general. + +This change also moves page flip state that was previously centralized +in the intel_mode structure into the intel_crtc structure associated +with the reference crtc for a flip. This allows flips to pending on +multiple pipes simultaneously. + +Tested with the WebGL aquarium and space rocks demos, a Youtube +video and WebKit poster circle demo. Added and removed displays while +active and while suspended. +--- + src/intel.h | 55 ++++- + src/intel_display.c | 685 ++++++++++++++++++++++++++++++++++++++++++--------- + src/intel_dri.c | 180 ++++++++++++-- + src/intel_driver.c | 10 + + src/intel_uxa.c | 48 ++++ + src/intel_video.c | 11 +- + 6 files changed, 851 insertions(+), 138 deletions(-) + +diff --git a/src/intel.h b/src/intel.h +index 22527df..99b2cfe 100644 +--- a/src/intel.h ++++ b/src/intel.h +@@ -185,6 +185,8 @@ struct intel_pixmap { + int8_t batch_write :1; + int8_t offscreen :1; + int8_t pinned :1; ++ ++ uint32_t fb; + }; + + #if HAS_DEVPRIVATEKEYREC +@@ -429,6 +431,7 @@ typedef struct intel_screen_private { + Bool has_kernel_flush; + Bool needs_flush; + Bool use_shadow; ++ Bool use_split_framebuffer; + + struct _DRI2FrameEvent *pending_flip[2]; + +@@ -462,15 +465,43 @@ extern void intel_mode_init(struct intel_screen_private *intel); + extern void intel_mode_remove_fb(intel_screen_private *intel); + extern void intel_mode_fini(intel_screen_private *intel); + ++extern void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap); ++ + extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); + extern int intel_crtc_id(xf86CrtcPtr crtc); + extern int intel_output_dpms_status(xf86OutputPtr output); + extern void intel_copy_fb(ScrnInfoPtr pScrn); + ++struct intel_scanout { ++ PixmapPtr pixmap; ++ BoxRec area; /* area of the virtual screen provided by this scanout */ ++}; ++ ++/* Splits the screen buffer into one scanout per distinct crtc region. */ ++extern Bool intel_split_fb(intel_screen_private *intel); ++ ++/* Merges any scanouts into the screen buffer. */ ++extern void intel_merge_fb(intel_screen_private *intel); ++ ++/* Finds a scanout that exactly matches the area, and stores it in |out_scanout|. ++ * Will return FALSE if any scanout partially intersects the area. If no scanout ++ * includes the area, will return TRUE with |out_scanout| set to NULL. ++ */ ++extern Bool intel_find_scanout(intel_screen_private *intel, BoxPtr area, ++ struct intel_scanout **out_scanout); ++ ++/* Finds a scanout that contains the area, and stores it in |out_scanout|. ++ * Will return FALSE if any scanout partially intersects the area. If no scanout ++ * includes the area, will return TRUE with |out_scanout| set to NULL. ++ */ ++extern Bool intel_covering_scanout(intel_screen_private *intel, BoxPtr area, ++ struct intel_scanout **out_scanout); ++ + enum DRI2FrameEventType { + DRI2_SWAP, + DRI2_SWAP_CHAIN, +- DRI2_FLIP, ++ DRI2_FLIP_FRONT, ++ DRI2_FLIP_SPLIT, + DRI2_WAITMSC, + }; + +@@ -495,13 +526,14 @@ typedef struct _DRI2FrameEvent { + void *event_data; + DRI2BufferPtr front; + DRI2BufferPtr back; ++ BoxRec area; /* screen rectangle being flipped */ + + struct _DRI2FrameEvent *chain; + } DRI2FrameEventRec, *DRI2FrameEventPtr; + + extern Bool intel_do_pageflip(intel_screen_private *intel, +- dri_bo *new_front, +- DRI2FrameEventPtr flip_info, int ref_crtc_hw_id); ++ PixmapPtr new_front, ++ DRI2FrameEventPtr flip_info); + + static inline intel_screen_private * + intel_get_screen_private(ScrnInfoPtr scrn) +@@ -529,6 +561,11 @@ extern void I915EmitInvarientState(ScrnInfoPtr scrn); + extern void I830EmitFlush(ScrnInfoPtr scrn); + + extern void I830InitVideo(ScreenPtr pScreen); ++ ++extern void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b); ++extern void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box); ++extern void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box); ++ + extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box, + xf86CrtcPtr desired, BoxPtr crtc_box_ret); + +@@ -734,6 +771,18 @@ void intel_uxa_block_handler(intel_screen_private *intel); + Bool intel_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table, + int num_bos); + ++/* Copies a box between pixmaps using intel->uxa_driver. */ ++extern Bool intel_uxa_driver_copy_pixmap(intel_screen_private *intel, ++ PixmapPtr src, PixmapPtr dst, ++ int src_x, int src_y, ++ int dst_x, int dst_y, ++ int w, int h); ++ ++/* Fills a box of a pixmap using intel->uxa_driver. */ ++extern Bool intel_uxa_driver_fill_pixmap(intel_screen_private *intel, ++ uint32_t src, PixmapPtr dst, ++ int x, int y, int w, int h); ++ + /* intel_shadow.c */ + void intel_shadow_blt(intel_screen_private *intel); + void intel_shadow_create(struct intel_screen_private *intel); +diff --git a/src/intel_display.c b/src/intel_display.c +index bac3f8f..8908386 100644 +--- a/src/intel_display.c ++++ b/src/intel_display.c +@@ -44,27 +44,33 @@ + #include "xf86drmMode.h" + #include "X11/Xatom.h" + ++#define MAX_SCANOUTS (4) ++ ++enum intel_scanout_state { ++ INTEL_SCANOUT_INVALID = 0, ++ INTEL_SCANOUT_FRONT, ++ INTEL_SCANOUT_SPLIT, ++}; ++ + struct intel_mode { + int fd; +- uint32_t fb_id; + drmModeResPtr mode_res; + int cpp; + + drmEventContext event_context; +- DRI2FrameEventPtr flip_info; +- int old_fb_id; +- int flip_count; +- unsigned int fe_frame; +- unsigned int fe_tv_sec; +- unsigned int fe_tv_usec; ++ ++ uint32_t front_fb_id; ++ ++ int scanout_state; ++ struct intel_scanout scanouts[MAX_SCANOUTS]; + + struct list outputs; + struct list crtcs; + }; + + struct intel_pageflip { +- struct intel_mode *mode; +- Bool dispatch_me; ++ struct intel_crtc *reference_crtc; ++ struct intel_crtc *flipped_crtc; + }; + + struct intel_crtc { +@@ -72,10 +78,20 @@ struct intel_crtc { + drmModeModeInfo kmode; + drmModeCrtcPtr mode_crtc; + int pipe; ++ ++ struct { ++ int pending; /* number of outstanding flip requests */ ++ unsigned int frame; ++ unsigned int tv_sec; ++ unsigned int tv_usec; ++ DRI2FrameEventPtr info; ++ } flip; ++ + dri_bo *cursor; + dri_bo *rotate_bo; + uint32_t rotate_pitch; + uint32_t rotate_fb_id; ++ + xf86CrtcPtr crtc; + struct list link; + }; +@@ -109,6 +125,9 @@ struct intel_output { + }; + + static void ++intel_crtc_merge_scanouts(intel_screen_private *intel); ++ ++static void + intel_output_dpms(xf86OutputPtr output, int mode); + + static void +@@ -330,16 +349,97 @@ intel_crtc_dpms(xf86CrtcPtr intel_crtc, int mode) + + } + ++/* Get a scratch pixmap attached to the current front buffer. This needs to be ++ * used rather than GetScreenPixmap before the screen is fully initialized, ++ * and during intel_xf86crtc_resize when the state is inconsistent. ++ */ ++static PixmapPtr intel_get_scratch_front_pixmap(intel_screen_private *intel) ++{ ++ ScrnInfoPtr scrn = intel->scrn; ++ PixmapPtr pixmap; ++ ++ pixmap = GetScratchPixmapHeader( ++ scrn->pScreen, ++ scrn->virtualX, ++ scrn->virtualY, ++ scrn->depth, ++ scrn->bitsPerPixel, ++ intel->front_pitch, ++ NULL); ++ ++ intel_set_pixmap_bo(pixmap, intel->front_buffer); ++ return pixmap; ++} ++ ++static void intel_free_scratch_front_pixmap(PixmapPtr pixmap) ++{ ++ if (pixmap == NULL) ++ return; ++ intel_set_pixmap_bo(pixmap, NULL); ++ FreeScratchPixmapHeader(pixmap); ++} ++ ++static uint32_t ++intel_pixmap_ensure_fb(intel_screen_private *intel, PixmapPtr pixmap) ++{ ++ struct intel_mode *mode = intel->modes; ++ struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap); ++ int ret; ++ ++ if (intel_pixmap->fb != 0) ++ return intel_pixmap->fb; ++ ++ ret = drmModeAddFB(mode->fd, ++ pixmap->drawable.width, ++ pixmap->drawable.height, ++ intel->scrn->depth, ++ intel->scrn->bitsPerPixel, ++ intel_pixmap_pitch(pixmap), ++ intel_get_pixmap_bo(pixmap)->handle, ++ &intel_pixmap->fb); ++ if (ret < 0) { ++ xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR, ++ "failed to add fb for pixmap: %s\n", ++ strerror(-ret)); ++ return FALSE; ++ } ++ ++ return intel_pixmap->fb; ++} ++ ++void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap) ++{ ++ struct intel_mode *mode = intel->modes; ++ struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap); ++ int ret; ++ ++ if (intel_pixmap->fb == 0) ++ return; ++ ++ ret = drmModeRmFB(mode->fd, intel_pixmap->fb); ++ if (ret < 0) { ++ xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR, ++ "failed to remove fb for pixmap: %s\n", ++ strerror(-ret)); ++ } ++ ++ intel_pixmap->fb = 0; ++} ++ + static Bool + intel_crtc_apply(xf86CrtcPtr crtc) + { + ScrnInfoPtr scrn = crtc->scrn; ++ intel_screen_private *intel = intel_get_screen_private(scrn); ++ struct intel_mode *mode = intel->modes; + struct intel_crtc *intel_crtc = crtc->driver_private; +- struct intel_mode *mode = intel_crtc->mode; ++ BoxRec crtc_box; ++ struct intel_scanout *scanout; + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); + uint32_t *output_ids; + int output_count = 0; +- int fb_id, x, y; ++ uint32_t fb_id; ++ int x, y; + int i, ret = FALSE; + + output_ids = calloc(sizeof(uint32_t), xf86_config->num_output); +@@ -372,9 +472,20 @@ intel_crtc_apply(xf86CrtcPtr crtc) + crtc->gamma_blue, crtc->gamma_size); + #endif + ++ fb_id = mode->front_fb_id; + x = crtc->x; + y = crtc->y; +- fb_id = mode->fb_id; ++ ++ intel_crtc_box(crtc, &crtc_box); ++ if (!intel_find_scanout(intel, &crtc_box, &scanout)) { ++ /* partially intersects a scanout; merge everything */ ++ intel_crtc_merge_scanouts(intel); ++ } ++ if (scanout != NULL) { ++ fb_id = intel_pixmap_ensure_fb(intel, scanout->pixmap); ++ x -= scanout->area.x1; ++ y -= scanout->area.y1; ++ } + if (intel_crtc->rotate_fb_id) { + fb_id = intel_crtc->rotate_fb_id; + x = 0; +@@ -396,7 +507,6 @@ intel_crtc_apply(xf86CrtcPtr crtc) + for (i = 0; i < xf86_config->num_output; i++) { + xf86OutputPtr output = xf86_config->output[i]; + struct intel_output *intel_output; +- + if (output->crtc != crtc) + continue; + +@@ -421,20 +531,20 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, + { + ScrnInfoPtr scrn = crtc->scrn; + intel_screen_private *intel = intel_get_screen_private(scrn); ++ struct intel_mode *intel_mode = intel->modes; + struct intel_crtc *intel_crtc = crtc->driver_private; +- struct intel_mode *intel_mode = intel_crtc->mode; + int saved_x, saved_y; + Rotation saved_rotation; + DisplayModeRec saved_mode; +- int ret = TRUE; +- unsigned int pitch = scrn->displayWidth * intel->cpp; ++ int ret; + +- if (intel_mode->fb_id == 0) { ++ if (intel_mode->front_fb_id == 0) { + ret = drmModeAddFB(intel_mode->fd, + scrn->virtualX, scrn->virtualY, + scrn->depth, scrn->bitsPerPixel, +- pitch, intel->front_buffer->handle, +- &intel_mode->fb_id); ++ scrn->displayWidth * intel->cpp, ++ intel->front_buffer->handle, ++ &intel_mode->front_fb_id); + if (ret < 0) { + ErrorF("failed to add fb\n"); + return FALSE; +@@ -454,14 +564,17 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, + intel_batch_submit(crtc->scrn); + + mode_to_kmode(crtc->scrn, &intel_crtc->kmode, mode); +- ret = intel_crtc_apply(crtc); +- if (!ret) { +- crtc->x = saved_x; +- crtc->y = saved_y; +- crtc->rotation = saved_rotation; +- crtc->mode = saved_mode; +- } +- return ret; ++ if (!intel_crtc_apply(crtc)) ++ goto error_undo; ++ ++ return TRUE; ++ ++error_undo: ++ crtc->x = saved_x; ++ crtc->y = saved_y; ++ crtc->rotation = saved_rotation; ++ crtc->mode = saved_mode; ++ return FALSE; + } + + static void +@@ -1349,31 +1462,51 @@ intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num) + list_add(&intel_output->link, &mode->outputs); + } + ++static void ++intel_destroy_scanout(struct intel_scanout *scanout) ++{ ++ if (!scanout) ++ return; ++ ++ if (scanout->pixmap) { ++ intel_set_pixmap_bo(scanout->pixmap, NULL); ++ FreeScratchPixmapHeader(scanout->pixmap); ++ } ++ memset(scanout, 0, sizeof(*scanout)); ++} ++ + static Bool + intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) + { + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); +- struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private; +- struct intel_mode *mode = intel_crtc->mode; + intel_screen_private *intel = intel_get_screen_private(scrn); ++ struct intel_mode *mode = intel->modes; + drm_intel_bo *old_front = NULL; +- Bool ret; ++ int ret; + uint32_t old_fb_id; + int i, old_width, old_height, old_pitch; + unsigned long pitch; + uint32_t tiling; + ++ intel_batch_submit(scrn); ++ + if (scrn->virtualX == width && scrn->virtualY == height) + return TRUE; + +- intel_batch_submit(scrn); ++ for (i = 0; i < MAX_SCANOUTS; i++) { ++ intel_destroy_scanout(&mode->scanouts[i]); ++ } ++ mode->scanout_state = INTEL_SCANOUT_INVALID; + + old_width = scrn->virtualX; + old_height = scrn->virtualY; + old_pitch = scrn->displayWidth; +- old_fb_id = mode->fb_id; ++ old_fb_id = mode->front_fb_id; + old_front = intel->front_buffer; + ++ intel->front_buffer = NULL; ++ mode->front_fb_id = 0; ++ + if (intel->back_buffer) { + drm_intel_bo_unreference(intel->back_buffer); + intel->back_buffer = NULL; +@@ -1390,7 +1523,7 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) + ret = drmModeAddFB(mode->fd, width, height, scrn->depth, + scrn->bitsPerPixel, pitch, + intel->front_buffer->handle, +- &mode->fb_id); ++ &mode->front_fb_id); + if (ret) + goto fail; + +@@ -1426,9 +1559,9 @@ fail: + scrn->virtualX = old_width; + scrn->virtualY = old_height; + scrn->displayWidth = old_pitch; +- if (old_fb_id != mode->fb_id) +- drmModeRmFB(mode->fd, mode->fb_id); +- mode->fb_id = old_fb_id; ++ if (old_fb_id != mode->front_fb_id) ++ drmModeRmFB(mode->fd, mode->front_fb_id); ++ mode->front_fb_id = old_fb_id; + + return FALSE; + } +@@ -1536,86 +1669,408 @@ void intel_copy_fb(ScrnInfoPtr pScrn) + + } + ++static PixmapPtr intel_create_split_fb(intel_screen_private *intel, int width, int height) ++{ ++ ScrnInfoPtr scrn = intel->scrn; ++ drm_intel_bo *pixmap_bo = NULL; ++ PixmapPtr pixmap = NULL; ++ unsigned long pitch; ++ uint32_t tiling; ++ ++ pixmap_bo = intel_allocate_framebuffer(scrn, width, height, intel->cpp, ++ &pitch, &tiling); ++ if (!pixmap_bo) ++ goto fail; ++ ++ pixmap = GetScratchPixmapHeader(scrn->pScreen, ++ width, height, ++ scrn->depth, ++ scrn->bitsPerPixel, ++ pitch, ++ NULL); ++ if (!pixmap) ++ goto fail; ++ ++ intel_set_pixmap_bo(pixmap, pixmap_bo); ++ drm_intel_bo_unreference(pixmap_bo); ++ pixmap_bo = NULL; ++ ++ return pixmap; ++fail: ++ drm_intel_bo_unreference(pixmap_bo); ++ return NULL; ++} ++ + Bool +-intel_do_pageflip(intel_screen_private *intel, +- dri_bo *new_front, +- DRI2FrameEventPtr flip_info, int ref_crtc_hw_id) ++intel_split_fb(intel_screen_private *intel) + { + ScrnInfoPtr scrn = intel->scrn; ++ struct intel_mode *mode = intel->modes; + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); +- struct intel_crtc *crtc = config->crtc[0]->driver_private; +- struct intel_mode *mode = crtc->mode; +- unsigned int pitch = scrn->displayWidth * intel->cpp; +- struct intel_pageflip *flip; +- int i, old_fb_id; ++ struct intel_scanout *scanout; ++ PixmapPtr screen_pixmap; ++ BoxRec crtc_box; ++ int i, j, old_state; + +- /* +- * Create a new handle for the back buffer +- */ +- old_fb_id = mode->fb_id; +- if (drmModeAddFB(mode->fd, scrn->virtualX, scrn->virtualY, +- scrn->depth, scrn->bitsPerPixel, pitch, +- new_front->handle, &mode->fb_id)) +- goto error_out; ++ if (mode->scanout_state == INTEL_SCANOUT_SPLIT) ++ return TRUE; /* nothing to do */ ++ ++ old_state = mode->scanout_state; ++ mode->scanout_state = INTEL_SCANOUT_SPLIT; ++ ++ screen_pixmap = intel_get_scratch_front_pixmap(intel); ++ ++ for (i = 0; i < config->num_crtc; i++) { ++ xf86CrtcPtr crtc = config->crtc[i]; ++ if (!crtc->enabled) ++ continue; ++ ++ intel_crtc_box(crtc, &crtc_box); ++ ++ for (j = 0; j < MAX_SCANOUTS; j++) { ++ scanout = &mode->scanouts[j]; ++ if (scanout->pixmap == NULL) ++ break; /* beyond the last valid entry */ ++ ++ if (crtc_box.x1 == scanout->area.x1 && ++ crtc_box.y1 == scanout->area.y1 && ++ crtc_box.x2 == scanout->area.x2 && ++ crtc_box.y2 == scanout->area.y2) ++ break; /* already have a scanout for this crtc */ ++ } ++ if (j == MAX_SCANOUTS) { ++ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, ++ "failed to split framebuffer: all scanouts in use\n"); ++ goto fail; ++ } ++ ++ if (scanout->pixmap) ++ continue; /* already have a complete scanout for this crtc */ ++ ++ /* need to allocate a new scanout bo for this crtc */ ++ scanout->pixmap = intel_create_split_fb(intel, ++ crtc->mode.HDisplay, crtc->mode.VDisplay); ++ if (!scanout->pixmap) { ++ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, ++ "failed to split framebuffer: allocation failure\n"); ++ goto fail; ++ } ++ ++ scanout->area.x1 = crtc_box.x1; ++ scanout->area.y1 = crtc_box.y1; ++ scanout->area.x2 = crtc_box.x2; ++ scanout->area.y2 = crtc_box.y2; ++ ++ if (old_state == INTEL_SCANOUT_FRONT) { ++ /* copy current content from the front buffer */ ++ intel_uxa_driver_copy_pixmap(intel, ++ screen_pixmap, scanout->pixmap, ++ crtc_box.x1, crtc_box.y1, 0, 0, ++ crtc_box.x2 - crtc_box.x1, ++ crtc_box.y2 - crtc_box.y1); ++ } ++ } + + intel_batch_submit(scrn); + +- /* +- * Queue flips on all enabled CRTCs +- * Note that if/when we get per-CRTC buffers, we'll have to update this. +- * Right now it assumes a single shared fb across all CRTCs, with the +- * kernel fixing up the offset of each CRTC as necessary. +- * +- * Also, flips queued on disabled or incorrectly configured displays +- * may never complete; this is a configuration error. +- */ +- mode->fe_frame = 0; +- mode->fe_tv_sec = 0; +- mode->fe_tv_usec = 0; ++ for (i = 0; i < config->num_crtc; i++) { ++ xf86CrtcPtr crtc = config->crtc[i]; ++ if (!crtc->enabled) ++ continue; ++ ++ if (!intel_crtc_apply(crtc)) ++ goto fail; ++ } ++ ++ intel_free_scratch_front_pixmap(screen_pixmap); ++ ++ return TRUE; ++ ++fail: ++ mode->scanout_state = old_state; ++ intel_free_scratch_front_pixmap(screen_pixmap); ++ return FALSE; ++} ++ ++static void ++intel_crtc_merge_scanouts(intel_screen_private *intel) ++{ ++ struct intel_mode *mode = intel->modes; ++ PixmapPtr screen_pixmap; ++ int i, old_state; ++ ++ old_state = mode->scanout_state; ++ mode->scanout_state = INTEL_SCANOUT_FRONT; ++ ++ screen_pixmap = intel_get_scratch_front_pixmap(intel); ++ ++ for (i = 0; i < MAX_SCANOUTS; i++) { ++ struct intel_scanout *scanout = &mode->scanouts[i]; ++ if (scanout->pixmap == NULL) ++ continue; ++ ++ if (old_state == INTEL_SCANOUT_SPLIT) { ++ /* copy current content from the split buffer */ ++ intel_uxa_driver_copy_pixmap(intel, ++ scanout->pixmap, screen_pixmap, ++ 0, 0, ++ scanout->area.x1, scanout->area.y1, ++ scanout->area.x2 - scanout->area.x1, ++ scanout->area.y2 - scanout->area.y1); ++ } ++ ++ intel_destroy_scanout(scanout); ++ } ++ ++ intel_free_scratch_front_pixmap(screen_pixmap); ++} ++ ++void ++intel_merge_fb(intel_screen_private *intel) ++{ ++ ScrnInfoPtr scrn = intel->scrn; ++ struct intel_mode *mode = intel->modes; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); ++ int i; ++ ++ if (mode->scanout_state == INTEL_SCANOUT_FRONT) ++ return; /* nothing to do */ ++ ++ intel_crtc_merge_scanouts(intel); ++ intel_batch_submit(scrn); + + for (i = 0; i < config->num_crtc; i++) { +- if (!config->crtc[i]->enabled) ++ xf86CrtcPtr crtc = config->crtc[i]; ++ if (!crtc->enabled) + continue; + +- mode->flip_info = flip_info; +- mode->flip_count++; ++ if (!intel_crtc_apply(crtc)) ++ continue; /* update as many crtcs as possible */ ++ } ++} ++ ++Bool ++intel_find_scanout(intel_screen_private *intel, BoxPtr area, ++ struct intel_scanout **out_scanout) ++{ ++ struct intel_mode *mode = intel->modes; ++ BoxRec intersect_box; ++ int i; ++ ++ *out_scanout = NULL; ++ ++ if (mode->scanout_state != INTEL_SCANOUT_SPLIT) ++ return TRUE; /* always use screen buffer */ ++ ++ for (i = 0; i < MAX_SCANOUTS; i++) { ++ struct intel_scanout *scanout = &mode->scanouts[i]; ++ if (scanout->pixmap == NULL) ++ continue; ++ ++ if (scanout->area.x1 == area->x1 && ++ scanout->area.y1 == area->y1 && ++ scanout->area.x2 == area->x2 && ++ scanout->area.y2 == area->y2) { ++ *out_scanout = scanout; ++ return TRUE; ++ } ++ ++ intel_box_intersect(&intersect_box, &scanout->area, area); ++ if (intersect_box.x1 != intersect_box.x2 || ++ intersect_box.y1 != intersect_box.y2) { ++ /* partial intersection; must merge to use area. */ ++ return FALSE; ++ } ++ } + +- crtc = config->crtc[i]->driver_private; ++ /* did not intersect any scanouts; use the screen. */ ++ return TRUE; ++} + +- flip = calloc(1, sizeof(struct intel_pageflip)); +- if (flip == NULL) { ++Bool ++intel_covering_scanout(intel_screen_private *intel, BoxPtr area, ++ struct intel_scanout **out_scanout) ++{ ++ struct intel_mode *mode = intel->modes; ++ BoxRec intersect_box; ++ int i; ++ ++ *out_scanout = NULL; ++ ++ if (mode->scanout_state != INTEL_SCANOUT_SPLIT) ++ return TRUE; /* always use screen buffer */ ++ ++ for (i = 0; i < MAX_SCANOUTS; i++) { ++ struct intel_scanout *scanout = &mode->scanouts[i]; ++ if (scanout->pixmap == NULL) ++ continue; ++ ++ if (scanout->area.x1 <= area->x1 && ++ scanout->area.y1 <= area->y1 && ++ scanout->area.x2 >= area->x2 && ++ scanout->area.y2 >= area->y2) { ++ *out_scanout = scanout; ++ return TRUE; ++ } ++ ++ intel_box_intersect(&intersect_box, &scanout->area, area); ++ if (intersect_box.x1 != intersect_box.x2 || ++ intersect_box.y1 != intersect_box.y2) { ++ /* partial intersection; must merge to use area. */ ++ return FALSE; ++ } ++ } ++ ++ /* did not intersect any scanouts; use the screen. */ ++ return TRUE; ++} ++ ++Bool ++intel_do_pageflip(intel_screen_private *intel, ++ PixmapPtr new_front, ++ DRI2FrameEventPtr flip_info) ++{ ++ struct intel_mode *mode = intel->modes; ++ ScrnInfoPtr scrn = intel->scrn; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); ++ struct intel_pageflip **flip_data = NULL; ++ uint32_t new_front_fb_id; ++ struct intel_crtc *reference_crtc; ++ BoxRec crtc_box, intersect_box; ++ int i, ret; ++ ++ if (mode->scanout_state == INTEL_SCANOUT_INVALID) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "flip queue failed: scanout state not configured.\n"); ++ return FALSE; ++ } ++ ++ new_front_fb_id = intel_pixmap_ensure_fb(intel, new_front); ++ if (new_front_fb_id == 0) ++ goto error_undo; ++ ++ flip_data = calloc(config->num_crtc, sizeof(*flip_data)); ++ if (!flip_data) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "flip queue failed: memory allocation error.\n"); ++ goto error_undo; ++ } ++ ++ /* Find the reference CRTC, check safety and allocate flip data. */ ++ reference_crtc = NULL; ++ for (i = 0; i < config->num_crtc; i++) { ++ xf86CrtcPtr crtc = config->crtc[i]; ++ struct intel_crtc *intel_crtc = crtc->driver_private; ++ if (!crtc->enabled) ++ continue; ++ ++ if (flip_info->pipe == intel_crtc->pipe) ++ reference_crtc = intel_crtc; ++ ++ intel_crtc_box(crtc, &crtc_box); ++ intel_box_intersect(&intersect_box, &crtc_box, &flip_info->area); ++ ++ if (intersect_box.x1 == intersect_box.x2 || ++ intersect_box.y1 == intersect_box.y2) { ++ /* Skip crtcs unaffected by this update. */ ++ if (reference_crtc == intel_crtc) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "flip queue failed: updated area does " ++ "not include the reference crtc.\n"); ++ goto error_undo; ++ } ++ continue; ++ } ++ ++ if (intersect_box.x1 != crtc_box.x1 || ++ intersect_box.y1 != crtc_box.y1 || ++ intersect_box.x2 != crtc_box.x2 || ++ intersect_box.y2 != crtc_box.y2) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, +- "flip queue: carrier alloc failed.\n"); ++ "flip queue failed: updated area partially " ++ "intersects crtc %d.\n", ++ crtc_id(intel_crtc)); + goto error_undo; + } + +- /* Only the reference crtc will finally deliver its page flip +- * completion event. All other crtc's events will be discarded. +- */ +- flip->dispatch_me = (intel_crtc_to_pipe(crtc->crtc) == ref_crtc_hw_id); +- flip->mode = mode; ++ flip_data[i] = calloc(1, sizeof(**flip_data)); ++ if (!flip_data[i]) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "flip queue failed: memory allocation error.\n"); ++ goto error_undo; ++ } ++ } ++ if (reference_crtc == NULL) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "flip queue failed: no reference crtc for pipe %d.\n", ++ flip_info->pipe); ++ goto error_undo; ++ } ++ if (reference_crtc->flip.info) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "flip queue failed: reference crtc %d (for pipe %d) " ++ "already has a flip pending.\n", ++ crtc_id(reference_crtc), ++ flip_info->pipe); ++ goto error_undo; ++ } ++ ++ intel_batch_submit(scrn); ++ ++ reference_crtc->flip.pending = 0; ++ reference_crtc->flip.frame = 0; ++ reference_crtc->flip.tv_sec = 0; ++ reference_crtc->flip.tv_usec = 0; ++ ++ /* Defer storing the flip info until we have successfully queued all of ++ * the flips. If this function returns FALSE, the caller will free the ++ * flip_info structure, so any successful flips must not access it. ++ */ ++ reference_crtc->flip.info = NULL; ++ ++ /* ++ * Queue flips on all updated CRTCs. ++ * Flips queued on disabled or incorrectly-configured crtcs may never ++ * complete. This type of configuration error will result in the ++ * flip never completing, and leak some objects. ++ */ ++ for (i = 0; i < config->num_crtc; i++) { ++ struct intel_crtc *intel_crtc = config->crtc[i]->driver_private; ++ if (!flip_data[i]) ++ continue; ++ ++ flip_data[i]->reference_crtc = reference_crtc; ++ flip_data[i]->flipped_crtc = intel_crtc; + +- if (drmModePageFlip(mode->fd, +- crtc_id(crtc), +- mode->fb_id, +- DRM_MODE_PAGE_FLIP_EVENT, flip)) { ++ ret = drmModePageFlip(mode->fd, ++ crtc_id(intel_crtc), ++ new_front_fb_id, ++ DRM_MODE_PAGE_FLIP_EVENT, ++ flip_data[i]); ++ if (ret < 0) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, +- "flip queue failed: %s\n", strerror(errno)); +- free(flip); ++ "flip queue failed: error flipping crtc %d: %s\n", ++ crtc_id(intel_crtc), strerror(-ret)); + goto error_undo; + } ++ /* The flip_data object will be freed when the flip completes. */ ++ flip_data[i] = NULL; ++ ++ reference_crtc->flip.pending++; + } + +- mode->old_fb_id = old_fb_id; ++ reference_crtc->flip.info = flip_info; ++ free(flip_data); + return TRUE; + + error_undo: +- drmModeRmFB(mode->fd, mode->fb_id); +- mode->fb_id = old_fb_id; +- +-error_out: +- xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n", +- strerror(errno)); ++ if (flip_data) { ++ /* Free any unused flip data objects. */ ++ for (i = 0; i < config->num_crtc; i++) { ++ free(flip_data[i]); ++ } ++ free(flip_data); ++ } + return FALSE; + } + +@@ -1635,31 +2090,33 @@ intel_page_flip_handler(int fd, unsigned int frame, unsigned int tv_sec, + unsigned int tv_usec, void *event_data) + { + struct intel_pageflip *flip = event_data; +- struct intel_mode *mode = flip->mode; +- +- /* Is this the event whose info shall be delivered to higher level? */ +- if (flip->dispatch_me) { +- /* Yes: Cache msc, ust for later delivery. */ +- mode->fe_frame = frame; +- mode->fe_tv_sec = tv_sec; +- mode->fe_tv_usec = tv_usec; ++ struct intel_crtc *reference_crtc = flip->reference_crtc; ++ struct intel_crtc *flipped_crtc = flip->flipped_crtc; ++ ++ if (reference_crtc == flipped_crtc) { ++ /* Cache information from the reference crtc's flip for the event handler. */ ++ reference_crtc->flip.frame = frame; ++ reference_crtc->flip.tv_sec = tv_sec; ++ reference_crtc->flip.tv_usec = tv_usec; + } ++ + free(flip); + +- /* Last crtc completed flip? */ +- mode->flip_count--; +- if (mode->flip_count > 0) ++ /* Was this the last pending flip? */ ++ reference_crtc->flip.pending--; ++ if (reference_crtc->flip.pending > 0) + return; + +- /* Release framebuffer */ +- drmModeRmFB(mode->fd, mode->old_fb_id); +- +- if (mode->flip_info == NULL) ++ if (reference_crtc->flip.info == NULL) + return; + +- /* Deliver cached msc, ust from reference crtc to flip event handler */ +- I830DRI2FlipEventHandler(mode->fe_frame, mode->fe_tv_sec, +- mode->fe_tv_usec, mode->flip_info); ++ /* Deliver cached info from reference crtc to flip event handler */ ++ I830DRI2FlipEventHandler( ++ reference_crtc->flip.frame, ++ reference_crtc->flip.tv_sec, ++ reference_crtc->flip.tv_usec, ++ reference_crtc->flip.info); ++ reference_crtc->flip.info = NULL; + } + + static void +@@ -1714,6 +2171,7 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp) + + for (i = 0; i < mode->mode_res->count_connectors; i++) + intel_output_init(scrn, mode, i); ++ intel_output_init(scrn, mode, i); + + xf86InitialConfiguration(scrn, TRUE); + +@@ -1746,7 +2204,6 @@ intel_mode_init(struct intel_screen_private *intel) + * feedback on every server generation, so perform the + * registration within ScreenInit and not PreInit. + */ +- mode->flip_count = 0; + AddGeneralSocket(mode->fd); + RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, + drm_wakeup_handler, mode); +@@ -1758,9 +2215,9 @@ intel_mode_remove_fb(intel_screen_private *intel) + { + struct intel_mode *mode = intel->modes; + +- if (mode->fb_id) { +- drmModeRmFB(mode->fd, mode->fb_id); +- mode->fb_id = 0; ++ if (mode->front_fb_id != 0) { ++ drmModeRmFB(mode->fd, mode->front_fb_id); ++ mode->front_fb_id = 0; + } + } + +@@ -1768,6 +2225,7 @@ void + intel_mode_fini(intel_screen_private *intel) + { + struct intel_mode *mode = intel->modes; ++ int i; + + while(!list_is_empty(&mode->crtcs)) { + xf86CrtcDestroy(list_first_entry(&mode->crtcs, +@@ -1781,8 +2239,9 @@ intel_mode_fini(intel_screen_private *intel) + link)->output); + } + +- if (mode->fb_id) +- drmModeRmFB(mode->fd, mode->fb_id); ++ for (i = 0; i < MAX_SCANOUTS; i++) { ++ intel_destroy_scanout(&mode->scanouts[i]); ++ } + + /* mode->rotate_fb_id should have been destroyed already */ + +diff --git a/src/intel_dri.c b/src/intel_dri.c +index 938a022..d8768a6 100644 +--- a/src/intel_dri.c ++++ b/src/intel_dri.c +@@ -457,6 +457,12 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, + ? drawable : &dstPrivate->pixmap->drawable; + RegionPtr pCopyClip; + GCPtr gc; ++ BoxRec draw_box; ++ struct intel_scanout *scanout; ++ ++ if (pRegion->extents.x1 == pRegion->extents.x2 || ++ pRegion->extents.y1 == pRegion->extents.y2) ++ return; /* nothing actually being copied */ + + gc = GetScratchGC(dst->depth, screen); + if (!gc) +@@ -542,6 +548,22 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, + } + } + ++ if (pixmap_is_scanout(get_drawable_pixmap(dst))) { ++ intel_drawable_box(drawable, &draw_box); ++ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) ++ intel_merge_fb(intel); ++ else ++ dst = &scanout->pixmap->drawable; ++ } ++ ++ if (pixmap_is_scanout(get_drawable_pixmap(src))) { ++ intel_drawable_box(drawable, &draw_box); ++ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) ++ intel_merge_fb(intel); ++ else ++ src = &scanout->pixmap->drawable; ++ } ++ + /* It's important that this copy gets submitted before the + * direct rendering client submits rendering for the next + * frame, but we don't actually need to submit right now. The +@@ -764,10 +786,11 @@ i830_dri2_del_frame_event(DrawablePtr drawable, DRI2FrameEventPtr info) + static void + I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back) + { ++ ScreenPtr pScreen = draw->pScreen; ++ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ++ intel_screen_private *intel = intel_get_screen_private(scrn); + I830DRI2BufferPrivatePtr front_priv, back_priv; + struct intel_pixmap *front_intel, *back_intel; +- ScreenPtr screen; +- intel_screen_private *intel; + int tmp; + + front_priv = front->driverPrivate; +@@ -784,14 +807,42 @@ I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr bac + intel_set_pixmap_private(front_priv->pixmap, back_intel); + intel_set_pixmap_private(back_priv->pixmap, front_intel); + +- screen = draw->pScreen; +- intel = intel_get_screen_private(xf86Screens[screen->myNum]); +- + dri_bo_unreference (intel->front_buffer); + intel->front_buffer = back_intel->bo; + dri_bo_reference (intel->front_buffer); + +- intel_set_pixmap_private(screen->GetScreenPixmap(screen), back_intel); ++ intel_set_pixmap_private(pScreen->GetScreenPixmap(pScreen), back_intel); ++ back_intel->busy = 1; ++ front_intel->busy = -1; ++} ++ ++static void ++I830DRI2ExchangeBuffersSplit(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back) ++{ ++ ScreenPtr pScreen = draw->pScreen; ++ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ++ intel_screen_private *intel = intel_get_screen_private(scrn); ++ I830DRI2BufferPrivatePtr back_priv; ++ struct intel_pixmap *front_intel, *back_intel; ++ struct intel_scanout *scanout; ++ BoxRec draw_box; ++ ++ back_priv = back->driverPrivate; ++ ++ intel_drawable_box(draw, &draw_box); ++ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) { ++ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, ++ "failed to exchange with scanout"); ++ return; ++ } ++ ++ front_intel = intel_get_pixmap_private(scanout->pixmap); ++ back_intel = intel_get_pixmap_private(back_priv->pixmap); ++ intel_set_pixmap_private(scanout->pixmap, back_intel); ++ intel_set_pixmap_private(back_priv->pixmap, front_intel); ++ ++ back->name = pixmap_flink(back_priv->pixmap); ++ + back_intel->busy = 1; + front_intel->busy = -1; + } +@@ -806,16 +857,19 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel, + DRI2FrameEventPtr info) + { + I830DRI2BufferPrivatePtr priv = info->back->driverPrivate; +- drm_intel_bo *new_back, *old_back; ++ drm_intel_bo *new_back; + + if (!intel->use_triple_buffer) { +- if (!intel_do_pageflip(intel, +- intel_get_pixmap_bo(priv->pixmap), +- info, info->pipe)) ++ if (!intel_do_pageflip(intel, priv->pixmap, info)) + return FALSE; + +- info->type = DRI2_SWAP; +- I830DRI2ExchangeBuffers(draw, info->front, info->back); ++ if (info->type == DRI2_FLIP_SPLIT) { ++ info->type = DRI2_SWAP; ++ I830DRI2ExchangeBuffersSplit(draw, info->front, info->back); ++ } else { ++ info->type = DRI2_SWAP; ++ I830DRI2ExchangeBuffers(draw, info->front, info->back); ++ } + return TRUE; + } + +@@ -846,8 +900,7 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel, + intel->back_buffer = NULL; + } + +- old_back = intel_get_pixmap_bo(priv->pixmap); +- if (!intel_do_pageflip(intel, old_back, info, info->pipe)) { ++ if (!intel_do_pageflip(intel, priv->pixmap, info)) { + intel->back_buffer = new_back; + return FALSE; + } +@@ -916,6 +969,79 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back) + return TRUE; + } + ++static Bool ++can_exchange_split(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back) ++{ ++ struct intel_screen_private *intel = intel_get_screen_private(xf86Screens[drawable->pScreen->myNum]); ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(intel->scrn); ++ I830DRI2BufferPrivatePtr front_priv = front->driverPrivate; ++ I830DRI2BufferPrivatePtr back_priv = back->driverPrivate; ++ PixmapPtr front_pixmap = front_priv->pixmap; ++ PixmapPtr back_pixmap = back_priv->pixmap; ++ struct intel_pixmap *front_intel = intel_get_pixmap_private(front_pixmap); ++ struct intel_pixmap *back_intel = intel_get_pixmap_private(back_pixmap); ++ WindowPtr draw_win; ++ Bool found_match, found_conflict; ++ BoxRec draw_box, crtc_box, intersect_box; ++ int i; ++ ++ if (drawable == NULL || ++ drawable->type != DRAWABLE_WINDOW || ++ intel->shadow_present || ++ !intel->use_pageflipping || ++ !intel->use_split_framebuffer) ++ return FALSE; ++ ++ if (!pixmap_is_scanout(front_pixmap)) ++ return FALSE; ++ ++ /* Reject cases where the drawable and backing store have different ++ * sizes. This occurs occasionally when a resize and an update happen ++ * simultaneously. */ ++ if (drawable->width != back_pixmap->drawable.width || ++ drawable->height != back_pixmap->drawable.height) ++ return FALSE; ++ ++ /* Reported depth differs because the scanout pixmap has no alpha, ++ * however the formats are still interchangeable. */ ++ if (front_pixmap->drawable.bitsPerPixel != back_pixmap->drawable.bitsPerPixel || ++ front_intel->tiling != back_intel->tiling) ++ return FALSE; ++ ++ /* Can only do a split exchange if the window is completely exposed. */ ++ draw_win = (WindowPtr)drawable; ++ if (!RegionEqual(&draw_win->clipList, &draw_win->winSize)) ++ return FALSE; ++ ++ /* Only split if the area matches at least one crtc, and does not ++ * partially intersect any crtcs. */ ++ found_match = FALSE; ++ found_conflict = FALSE; ++ intel_drawable_box(drawable, &draw_box); ++ for (i = 0; i < config->num_crtc; i++) { ++ xf86CrtcPtr crtc = config->crtc[i]; ++ if (!crtc->enabled) ++ continue; ++ ++ intel_crtc_box(crtc, &crtc_box); ++ if (crtc_box.x1 == draw_box.x1 && ++ crtc_box.y1 == draw_box.y1 && ++ crtc_box.x2 == draw_box.x2 && ++ crtc_box.y2 == draw_box.y2) { ++ /* regions are equal, so can flip with this crtc */ ++ found_match = TRUE; ++ continue; ++ } ++ ++ /* not equal, so any intersection indicates a conflict */ ++ intel_box_intersect(&intersect_box, &draw_box, &crtc_box); ++ if (intersect_box.x1 != intersect_box.x2 && ++ intersect_box.y1 != intersect_box.y2) ++ found_conflict = TRUE; ++ } ++ return found_match && !found_conflict; ++} ++ + void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, + unsigned int tv_usec, DRI2FrameEventPtr swap_info) + { +@@ -935,11 +1061,18 @@ void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, + + + switch (swap_info->type) { +- case DRI2_FLIP: ++ case DRI2_FLIP_SPLIT: ++ if (can_exchange_split(drawable, swap_info->front, swap_info->back)) { ++ if (I830DRI2ScheduleFlip(intel, drawable, swap_info)) ++ return; ++ } ++ ++ case DRI2_FLIP_FRONT: + /* If we can still flip... */ +- if (can_exchange(drawable, swap_info->front, swap_info->back) && +- I830DRI2ScheduleFlip(intel, drawable, swap_info)) +- return; ++ if (can_exchange(drawable, swap_info->front, swap_info->back)) { ++ if (I830DRI2ScheduleFlip(intel, drawable, swap_info)) ++ return; ++ } + + /* else fall through to exchange/blit */ + case DRI2_SWAP: { +@@ -1124,6 +1257,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, + swap_info->front = front; + swap_info->back = back; + swap_info->pipe = I830DRI2DrawablePipe(draw); ++ intel_drawable_box(draw, &swap_info->area); + + if (!i830_dri2_add_frame_event(swap_info)) { + free(swap_info); +@@ -1151,7 +1285,13 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, + + /* Flips need to be submitted one frame before */ + if (can_exchange(draw, front, back)) { +- swap_type = DRI2_FLIP; ++ intel_merge_fb(intel); ++ swap_type = DRI2_FLIP_FRONT; ++ flip = 1; ++ } else if (can_exchange_split(draw, front, back)) { ++ if (!intel_split_fb(intel)) ++ goto blit_fallback; ++ swap_type = DRI2_FLIP_SPLIT; + flip = 1; + } else { + /* Using the DRI2_SWAP path defers the back-to-front blit until +@@ -1163,7 +1303,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, + } + swap_info->type = swap_type; + +- /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP. ++ /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP_*. + * Do it early, so handling of different timing constraints + * for divisor, remainder and msc vs. target_msc works. + */ +diff --git a/src/intel_driver.c b/src/intel_driver.c +index cdd7713..12ff9a1 100644 +--- a/src/intel_driver.c ++++ b/src/intel_driver.c +@@ -101,6 +101,7 @@ typedef enum { + OPTION_DEBUG_WAIT, + OPTION_HOTPLUG, + OPTION_RELAXED_FENCING, ++ OPTION_SPLIT_FRAMEBUFFER, + } I830Opts; + + static OptionInfoRec I830Options[] = { +@@ -122,6 +123,7 @@ static OptionInfoRec I830Options[] = { + {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE}, + {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, TRUE}, + {OPTION_RELAXED_FENCING, "RelaxedFencing", OPTV_BOOLEAN, {0}, TRUE}, ++ {OPTION_SPLIT_FRAMEBUFFER, "SplitFramebuffer", OPTV_BOOLEAN, {0}, TRUE}, + {-1, NULL, OPTV_NONE, {0}, FALSE} + }; + /* *INDENT-ON* */ +@@ -669,6 +671,14 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) + xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n", + intel->use_triple_buffer ? "enabled" : "disabled"); + ++ intel->use_split_framebuffer = ++ xf86ReturnOptValBool(intel->Options, ++ OPTION_SPLIT_FRAMEBUFFER, ++ TRUE); ++ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Split framebuffer? %s\n", ++ intel->use_split_framebuffer ? "enabled" : "disabled"); ++ ++ + xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n", + intel->tiling & INTEL_TILING_FB ? "tiled" : "linear"); + xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n", +diff --git a/src/intel_uxa.c b/src/intel_uxa.c +index b55b285..c811fbe 100644 +--- a/src/intel_uxa.c ++++ b/src/intel_uxa.c +@@ -636,6 +636,7 @@ void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo) + if (priv->bo == bo) + return; + ++ intel_pixmap_remove_fb(intel, pixmap); + priv->dst_bound = priv->src_bound = 0; + if (list_is_empty(&priv->batch)) { + dri_bo_unreference(priv->bo); +@@ -704,6 +705,9 @@ static Bool intel_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access) + dri_bo *bo = priv->bo; + int ret; + ++ if (pixmap_is_scanout(pixmap)) ++ intel_merge_fb(intel); ++ + if (!list_is_empty(&priv->batch) && + (access == UXA_ACCESS_RW || priv->batch_write)) + intel_batch_submit(scrn); +@@ -765,8 +769,13 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap, + int w, int h, + char *src, int src_pitch) + { ++ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; ++ intel_screen_private *intel = intel_get_screen_private(scrn); + struct intel_pixmap *priv; + ++ if (pixmap_is_scanout(pixmap)) ++ intel_merge_fb(intel); ++ + priv = intel_get_pixmap_private(pixmap); + if (!intel_pixmap_is_busy(priv)) { + /* bo is not busy so can be replaced without a stall, upload in-place. */ +@@ -882,6 +891,8 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, + int w, int h, + char *dst, int dst_pitch) + { ++ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; ++ intel_screen_private *intel = intel_get_screen_private(scrn); + struct intel_pixmap *priv; + PixmapPtr scratch = NULL; + Bool ret; +@@ -893,6 +904,24 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, + * Also the gpu is much faster at detiling. + */ + ++ if (pixmap_is_scanout(pixmap)) { ++ struct intel_scanout *scanout; ++ BoxRec get_box; ++ ++ get_box.x1 = x; ++ get_box.x2 = x + w; ++ get_box.y1 = y; ++ get_box.y2 = y + h; ++ if (!intel_covering_scanout(intel, &get_box, &scanout) || scanout == NULL) { ++ intel_merge_fb(intel); ++ } else { ++ /* Adjust the copy to come from the scanout. */ ++ pixmap = scanout->pixmap; ++ x -= scanout->area.x1; ++ y -= scanout->area.y1; ++ } ++ } ++ + priv = intel_get_pixmap_private(pixmap); + if (intel_pixmap_is_busy(priv) || priv->tiling != I915_TILING_NONE) { + ScreenPtr screen = pixmap->drawable.pScreen; +@@ -1191,6 +1220,25 @@ intel_limits_init(intel_screen_private *intel) + } + } + ++Bool ++intel_uxa_driver_copy_pixmap(intel_screen_private *intel, ++ PixmapPtr src, PixmapPtr dst, ++ int src_x, int src_y, ++ int dst_x, int dst_y, ++ int w, int h) ++{ ++ if (!intel->uxa_driver->check_copy(src, dst, GXcopy, FB_ALLONES)) ++ return FALSE; ++ ++ if (!intel->uxa_driver->prepare_copy(src, dst, -1, -1, ++ GXcopy, FB_ALLONES)) ++ return FALSE; ++ ++ intel->uxa_driver->copy(dst, src_x, src_y, dst_x, dst_y, w, h); ++ intel->uxa_driver->done_copy(dst); ++ return TRUE; ++} ++ + Bool intel_uxa_init(ScreenPtr screen) + { + ScrnInfoPtr scrn = xf86Screens[screen->myNum]; +diff --git a/src/intel_video.c b/src/intel_video.c +index 021ca5f..17fd0d7 100644 +--- a/src/intel_video.c ++++ b/src/intel_video.c +@@ -1033,7 +1033,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, + return TRUE; + } + +-static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) ++void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) + { + dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1; + dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2; +@@ -1043,7 +1043,7 @@ static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) + dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0; + } + +-static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) ++void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) + { + if (crtc->enabled) { + crtc_box->x1 = crtc->x; +@@ -1056,6 +1056,13 @@ static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) + crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; + } + ++void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box) { ++ draw_box->x1 = draw->x; ++ draw_box->x2 = draw->x + draw->width; ++ draw_box->y1 = draw->y; ++ draw_box->y2 = draw->y + draw->height; ++} ++ + static int intel_box_area(BoxPtr box) + { + return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild new file mode 100644 index 0000000000..3183eb4fae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild,v 1.1 2011/08/11 15:51:43 chithanh Exp $ + +EAPI=4 + +XORG_DRI=dri +inherit linux-info xorg-2 + +DESCRIPTION="X.Org driver for Intel cards" + +KEYWORDS="amd64 ~ia64 x86 -x86-fbsd" +IUSE="dri sna xvmc broken_partialswaps" + +RDEPEND="x11-libs/libXext + x11-libs/libXfixes + xvmc? ( + x11-libs/libXvMC + ) + >=x11-libs/libxcb-1.5 + >=x11-libs/libdrm-2.4.23[video_cards_intel] + sna? ( + >=x11-base/xorg-server-1.10 + )" +DEPEND="${RDEPEND} + >=x11-proto/dri2proto-2.6" + +PATCHES=( + # Copy the initial framebuffer contents when starting X so we can get + # seamless transitions. + "${FILESDIR}/2.16.0-copy-fb.patch" + # Prevent X from touching boot-time gamma settings. + "${FILESDIR}/2.14.0-no-gamma.patch" + # BLT ring hang fix. + "${FILESDIR}/2.16.0-blt-hang.patch" + # Disable backlight adjustments on DPMS mode changes. + "${FILESDIR}/2.16.0-no-backlight.patch" + # Avoid display corruption when unable to flip + "${FILESDIR}/2.16.0-fix-blt-damage.patch" + # Split framebuffer and flip crtcs indepenently. + "${FILESDIR}/2.16.0-per-crtc-flip.patch" +) + +src_prepare() { + # Disable triple buffering since we need double buffering + # to implement partial updates on top of flips + if use broken_partialswaps; then + PATCHES+=( + "${FILESDIR}/2.16.0-no-triple.patch" + ) + fi + + for patch_file in "${PATCHES[@]}"; do + epatch $patch_file + done +} + +pkg_setup() { + xorg-2_pkg_setup + CONFIGURE_OPTIONS="$(use_enable dri) --disable-xvmc --enable-kms-only" +} + +pkg_postinst() { + if linux_config_exists \ + && ! linux_chkconfig_present DRM_I915_KMS; then + echo + ewarn "This driver requires KMS support in your kernel" + ewarn " Device Drivers --->" + ewarn " Graphics support --->" + ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->" + ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->" + ewarn " i915 driver" + ewarn " [*] Enable modesetting on intel by default" + echo + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest new file mode 100644 index 0000000000..d950086f82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest @@ -0,0 +1 @@ +DIST xf86-video-vesa-2.3.0.tar.bz2 264539 RMD160 7e7c11f6cc094bb898c57d26a70f6c4c0ab83d0f SHA1 4689b7c295d7a8d7326302dafecb812739617134 SHA256 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch new file mode 100644 index 0000000000..e27a355d48 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch @@ -0,0 +1,12 @@ +diff --git a/src/vesa.c b/src/vesa.c +index 61d3550..1136ac3 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -1299,3 +1299,7 @@ VESAMapVidMem(ScrnInfoPtr pScrn) ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + pVesa->ioBase = pScrn->domainIOBase; ++#else ++ pVesa->ioBase = 0; ++#endif + + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch new file mode 100644 index 0000000000..ea3d68a9b3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch @@ -0,0 +1,55 @@ +From 1f84310ddf49778f776a39810aa98211c812e8ab Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Wed, 19 Oct 2011 08:33:07 +0000 +Subject: Build fix for ABI Version 12 + +ABI Version 12 removes support for multiple PCI domains. If you need to +use this driver on a system with more than one PCI domain, you should +either port this driver to using libpciaccess directly or stick with an +older server. + +Signed-off-by: Jeremy Huddleston +--- +diff --git a/src/vesa.c b/src/vesa.c +index 1136ac3..5a0120c 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn) + & pVesa->base); + } + else +- pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo, +- pScrn->memPhysBase, pVesa->mapSize); ++ (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase, ++ pVesa->mapSize, ++ PCI_DEV_MAP_FLAG_WRITABLE, ++ & pVesa->base); + + if (pVesa->base) { + if (pVesa->mapPhys != 0xa0000) +- pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0, +- pVesa->pciInfo, +- 0xa0000, 0x10000); ++ (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000, ++ PCI_DEV_MAP_FLAG_WRITABLE, ++ & pVesa->VGAbase); + else + pVesa->VGAbase = pVesa->base; + +@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn) + if (pVesa->mapPhys != 0xa0000) { + (void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base, + pVesa->mapSize); +- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000); ++ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase, ++ 0x10000); + } + else { +- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); ++ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base, ++ pVesa->mapSize); + } + #else + xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); +-- +cgit v0.9.0.2-2-gbebe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch new file mode 100644 index 0000000000..50ff3d1f2b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch @@ -0,0 +1,202 @@ +diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.c xf86-video-vesa-2.3.0.work/src/vesa.c +--- xf86-video-vesa-2.3.0.orig/src/vesa.c 2010-01-04 11:19:13.000000000 -0800 ++++ xf86-video-vesa-2.3.0.work/src/vesa.c 2011-03-08 11:06:58.264579000 -0800 +@@ -143,8 +143,6 @@ vesaUpdatePacked(ScreenPtr pScreen, shad + shadowUpdatePacked(pScreen, pBuf); + } + +-static Bool VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen); +- + enum GenericTypes + { + CHIP_VESA_GENERIC +@@ -1050,8 +1048,6 @@ VESAScreenInit(int scrnIndex, ScreenPtr + return FALSE; + } + +- VESADGAInit(pScrn, pScreen); +- + xf86SetBlackWhitePixels(pScreen); + miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); +@@ -1121,11 +1117,6 @@ VESACloseScreen(int scrnIndex, ScreenPtr + shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen)); + xfree(pVesa->shadow); + } +- if (pVesa->pDGAMode) { +- xfree(pVesa->pDGAMode); +- pVesa->pDGAMode = NULL; +- pVesa->nDGAMode = 0; +- } + pScrn->vtSema = FALSE; + + pScrn->EnableDisableFBAccess = pVesa->EnableDisableFBAccess; +@@ -1652,143 +1643,3 @@ VESADisplayPowerManagementSet(ScrnInfoPt + VBEDPMSSet(pVesa->pVbe, mode); + } + +-/*********************************************************************** +- * DGA stuff +- ***********************************************************************/ +-static Bool VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName, +- unsigned char **ApertureBase, +- int *ApertureSize, int *ApertureOffset, +- int *flags); +-static Bool VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode); +-static void VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags); +- +-static Bool +-VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName, +- unsigned char **ApertureBase, int *ApertureSize, +- int *ApertureOffset, int *flags) +-{ +- VESAPtr pVesa = VESAGetRec(pScrn); +- +- *DeviceName = NULL; /* No special device */ +- *ApertureBase = (unsigned char *)(long)(pVesa->mapPhys); +- *ApertureSize = pVesa->mapSize; +- *ApertureOffset = pVesa->mapOff; +- *flags = DGA_NEED_ROOT; +- +- return (TRUE); +-} +- +-static Bool +-VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode) +-{ +- DisplayModePtr pMode; +- int scrnIdx = pScrn->pScreen->myNum; +- int frameX0, frameY0; +- +- if (pDGAMode) { +- pMode = pDGAMode->mode; +- frameX0 = frameY0 = 0; +- } +- else { +- if (!(pMode = pScrn->currentMode)) +- return (TRUE); +- +- frameX0 = pScrn->frameX0; +- frameY0 = pScrn->frameY0; +- } +- +- if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0)) +- return (FALSE); +- (*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0); +- +- return (TRUE); +-} +- +-static void +-VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags) +-{ +- (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags); +-} +- +-static int +-VESADGAGetViewport(ScrnInfoPtr pScrn) +-{ +- return (0); +-} +- +-static DGAFunctionRec VESADGAFunctions = +-{ +- VESADGAOpenFramebuffer, +- NULL, /* CloseFramebuffer */ +- VESADGASetMode, +- VESADGASetViewport, +- VESADGAGetViewport, +- NULL, /* Sync */ +- NULL, /* FillRect */ +- NULL, /* BlitRect */ +- NULL, /* BlitTransRect */ +-}; +- +-static void +-VESADGAAddModes(ScrnInfoPtr pScrn) +-{ +- VESAPtr pVesa = VESAGetRec(pScrn); +- DisplayModePtr pMode = pScrn->modes; +- DGAModePtr pDGAMode; +- +- do { +- pDGAMode = xrealloc(pVesa->pDGAMode, +- (pVesa->nDGAMode + 1) * sizeof(DGAModeRec)); +- if (!pDGAMode) +- break; +- +- pVesa->pDGAMode = pDGAMode; +- pDGAMode += pVesa->nDGAMode; +- (void)memset(pDGAMode, 0, sizeof(DGAModeRec)); +- +- ++pVesa->nDGAMode; +- pDGAMode->mode = pMode; +- pDGAMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE; +- pDGAMode->byteOrder = pScrn->imageByteOrder; +- pDGAMode->depth = pScrn->depth; +- pDGAMode->bitsPerPixel = pScrn->bitsPerPixel; +- pDGAMode->red_mask = pScrn->mask.red; +- pDGAMode->green_mask = pScrn->mask.green; +- pDGAMode->blue_mask = pScrn->mask.blue; +- pDGAMode->visualClass = pScrn->bitsPerPixel > 8 ? +- TrueColor : PseudoColor; +- pDGAMode->xViewportStep = 1; +- pDGAMode->yViewportStep = 1; +- pDGAMode->viewportWidth = pMode->HDisplay; +- pDGAMode->viewportHeight = pMode->VDisplay; +- +- pDGAMode->bytesPerScanline = pVesa->maxBytesPerScanline; +- pDGAMode->imageWidth = pMode->HDisplay; +- pDGAMode->imageHeight = pMode->VDisplay; +- pDGAMode->pixmapWidth = pDGAMode->imageWidth; +- pDGAMode->pixmapHeight = pDGAMode->imageHeight; +- pDGAMode->maxViewportX = pScrn->virtualX - +- pDGAMode->viewportWidth; +- pDGAMode->maxViewportY = pScrn->virtualY - +- pDGAMode->viewportHeight; +- +- pDGAMode->address = pVesa->base; +- +- pMode = pMode->next; +- } while (pMode != pScrn->modes); +-} +- +-static Bool +-VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) +-{ +- VESAPtr pVesa = VESAGetRec(pScrn); +- +- if (pScrn->depth < 8 || pVesa->mapPhys == 0xa0000L) +- return (FALSE); +- +- if (!pVesa->nDGAMode) +- VESADGAAddModes(pScrn); +- +- return (DGAInit(pScreen, &VESADGAFunctions, +- pVesa->pDGAMode, pVesa->nDGAMode)); +-} +Only in xf86-video-vesa-2.3.0.work/src: vesa.c~ +diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.h xf86-video-vesa-2.3.0.work/src/vesa.h +--- xf86-video-vesa-2.3.0.orig/src/vesa.h 2010-01-04 11:19:13.000000000 -0800 ++++ xf86-video-vesa-2.3.0.work/src/vesa.h 2011-03-08 11:01:24.443622000 -0800 +@@ -64,9 +64,6 @@ + /* Int 10 support */ + #include "xf86int10.h" + +-/* Dga definitions */ +-#include "dgaproc.h" +- + #include "fb.h" + + #ifdef XSERVER_LIBPCIACCESS +@@ -108,9 +105,6 @@ typedef struct _VESARec + CARD32 windowAoffset; + /* Don't override the default refresh rate. */ + Bool defaultRefresh; +- /* DGA info */ +- DGAModePtr pDGAMode; +- int nDGAMode; + CloseScreenProcPtr CloseScreen; + CreateScreenResourcesProcPtr CreateScreenResources; + xf86EnableDisableFBAccessProc *EnableDisableFBAccess; +Only in xf86-video-vesa-2.3.0.work/src: vesa.h~ diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild new file mode 100644 index 0000000000..df0fe20abc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild,v 1.3 2010/02/08 15:31:28 fauli Exp $ + +inherit x-modular + +DESCRIPTION="Generic VESA video driver" +KEYWORDS="-* ~alpha amd64 ~ia64 x86 ~x86-fbsd" +RDEPEND=">=x11-base/xorg-server-1.0.99" +DEPEND="${RDEPEND} + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/renderproto + x11-proto/xextproto + x11-proto/xproto" +PATCHES=( + "${FILESDIR}/no-dga.patch" + "${FILESDIR}/2.3.0-r1-domainiobase.patch" + "${FILESDIR}/2.3.0-r1-xf86MapDomainMemory.patch" +) + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/Manifest new file mode 100644 index 0000000000..bff262754d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/Manifest @@ -0,0 +1 @@ +DIST cairo-1.10.2.tar.gz 23558405 RMD160 8c8de00120398fe2b3a60a08ff59a464b2eebf47 SHA1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/cairo-1.10.2-r2.ebuild new file mode 100644 index 0000000000..f10963cd36 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/cairo-1.10.2-r2.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.9 2011/03/05 17:52:48 xarthisius Exp $ + +EAPI=3 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" +[[ ${PV} == *9999 ]] && GIT_ECLASS="git" + +inherit eutils flag-o-matic autotools ${GIT_ECLASS} + +DESCRIPTION="A vector graphics library with cross-device output support" +HOMEPAGE="http://cairographics.org/" +[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz" + +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg + xcb cairo-perf-trace" + +# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it +RESTRICT="test" + +RDEPEND="media-libs/fontconfig + media-libs/freetype:2 + media-libs/libpng + sys-libs/zlib + >=x11-libs/pixman-0.18.4 + directfb? ( dev-libs/DirectFB ) + opengl? ( virtual/opengl ) + openvg? ( media-libs/mesa[gallium] ) + qt4? ( >=x11-libs/qt-gui-4.4:4 ) + svg? ( dev-libs/libxml2 ) + X? ( + >=x11-libs/libXrender-0.6 + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXft + drm? ( + >=sys-fs/udev-136 + gallium? ( media-libs/mesa[gallium] ) + ) + ) + xcb? ( + x11-libs/libxcb + x11-libs/xcb-util + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/libtool-2 + doc? ( + >=dev-util/gtk-doc-1.6 + ~app-text/docbook-xml-dtd-4.2 + ) + X? ( + x11-proto/renderproto + drm? ( + x11-proto/xproto + >=x11-proto/xextproto-7.1 + ) + )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch + epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch + + # Slightly messed build system YAY + if [[ ${PV} == *9999* ]]; then + touch boilerplate/Makefile.am.features + touch src/Makefile.am.features + touch ChangeLog + fi + + # We need to run elibtoolize to ensure correct so versioning on FreeBSD + # upgraded to an eautoreconf for the above interix patch. + eautoreconf +} + +src_configure() { + local myopts + + [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT + + # tracing fails to compile, because Solaris' libelf doesn't do large files + [[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace" + + # 128-bits long arithemetic functions are missing + [[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=* + + #gets rid of fbmmx.c inlining warnings + append-flags -finline-limit=1200 + + if use X; then + myopts+=" + --enable-tee=yes + $(use_enable drm) + " + + if use drm; then + myopts+=" + $(use_enable gallium) + $(use_enable xcb xcb-drm) + " + else + use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now." + myopts+=" + --disable-gallium + --disable-xcb-drm + " + fi + else + use drm && ewarn "drm use requires X use enabled. So disabling for now." + myopts+=" + --disable-drm + --disable-gallium + --disable-xcb-drm + " + fi + + # --disable-xcb-lib: + # do not override good xlib backed by hardforcing rendering over xcb + econf \ + --disable-dependency-tracking \ + $(use_with X x) \ + $(use_enable X xlib) \ + $(use_enable X xlib-xrender) \ + $(use_enable aqua quartz) \ + $(use_enable aqua quartz-image) \ + $(use_enable debug test-surfaces) \ + $(use_enable directfb) \ + $(use_enable doc gtk-doc) \ + $(use_enable openvg vg) \ + $(use_enable opengl gl) \ + $(use_enable qt4 qt) \ + $(use_enable static-libs static) \ + $(use_enable svg) \ + $(use_enable xcb) \ + $(use_enable xcb xcb-shm) \ + --enable-ft \ + --enable-pdf \ + --enable-png \ + --enable-ps \ + --disable-xlib-xcb \ + ${myopts} +} + +src_compile() { + emake || die "Build failed" + + if use cairo-perf-trace; then + emake -C "${S}/perf" cairo-perf-trace || \ + die "cairo-perf-trace build failed" + fi +} + +src_install() { + # parallel make install fails + emake -j1 DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS ChangeLog NEWS README || die + + if use cairo-perf-trace; then + dobin "${S}/perf/.libs/cairo-perf-trace" || die + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 0000000000..a58c2f8f41 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch @@ -0,0 +1,17 @@ +http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch +http://bugs.gentoo.org/336696 + +--- src/cairo-xlib-display.c ++++ src/cairo-xlib-display.c +@@ -353,11 +353,7 @@ + /* Prior to Render 0.10, there is no protocol support for gradients and + * we call function stubs instead, which would silently consume the drawing. + */ +-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10 + display->buggy_gradients = TRUE; +-#else +- display->buggy_gradients = FALSE; +-#endif + display->buggy_pad_reflect = FALSE; + display->buggy_repeat = FALSE; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch new file mode 100644 index 0000000000..dc20714ae2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch @@ -0,0 +1,16 @@ +diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools +--- cairo-1.8.8.orig/build/configure.ac.tools 2009-09-30 13:36:42 +0200 ++++ cairo-1.8.8/build/configure.ac.tools 2009-09-30 13:50:50 +0200 +@@ -21,5 +21,12 @@ + *) PKGCONFIG_REQUIRES="Requires.private"; ;; + esac + ++dnl hmm... on interix, things go really bad with Requires.private, since libpng12 ++dnl is missing on the final link commands, so gtk+'s configure checks for cairo ++dnl fail miserably with unresolved symbols to it. ++case "$host_os" in ++interix*) PKGCONFIG_REQUIRES="Requires" ;; ++esac ++ + AC_SUBST(PKGCONFIG_REQUIRES) + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog new file mode 100644 index 0000000000..89ab30cbf6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog @@ -0,0 +1,1916 @@ +# ChangeLog for x11-libs/gtk+ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.447 2010/03/11 14:52:23 pacho Exp $ + +*gtk+-2.18.7-r1 (11 Mar 2010) + + 11 Mar 2010; Pacho Ramos +gtk+-2.18.7-r1.ebuild, + +files/gtk+-2.18.7-destroy-crash.patch: + Fix bug 308985, thanks to Michael Bombach for reporting and finding the + fix. + + 06 Mar 2010; Pacho Ramos gtk+-2.18.7.ebuild: + amd64 stable, bug 304777 + + 06 Mar 2010; Pawel Hajdan jr gtk+-2.18.6.ebuild: + x86 stable wrt bug #304777 + + 06 Mar 2010; Samuli Suominen gtk+-2.18.6.ebuild: + amd64 stable wrt #304777 + + 23 Feb 2010; Christian Faulhammer gtk+-2.18.7.ebuild: + Use libresolv from sys-libs/itx-bin on Interix Prefix + +*gtk+-2.18.7 (23 Feb 2010) + + 23 Feb 2010; Romain Perier +gtk+-2.18.7.ebuild: + Version bump, many bugsfixes and translation updates, per bug #306187. + Thanks to LeBarJack for tests. + + 19 Jan 2010; Samuli Suominen gtk+-2.18.5.ebuild, + gtk+-2.18.6.ebuild: + Require SLOT="0" of media-libs/jpeg wrt #301551. + +*gtk+-2.18.6 (15 Jan 2010) + + 15 Jan 2010; Romain Perier +gtk+-2.18.6.ebuild: + Version bump, various bugs fixes and translation update. + + 09 Jan 2010; Christian Faulhammer gtk+-2.18.5.ebuild: + keyword ~x86-freebsd + + 24 Dec 2009; Jonathan Callen gtk+-2.18.5.ebuild, + +files/gtk+-2.18.5-macosx-aqua.patch: + Add patch for Aqua on Mac OS X; move prefix keywords from overlay + +*gtk+-2.18.5 (13 Dec 2009) + + 13 Dec 2009; Nirbheek Chauhan -gtk+-2.18.3.ebuild, + +gtk+-2.18.5.ebuild: + Bump to 2.18.5; remove old -- many bugfixes; a few translation updates + + 31 Oct 2009; Nirbheek Chauhan gtk+-2.18.3.ebuild: + Depend on cairo[svg]; fixes bug 291283 (we probably want to do +svg in + cairo) + +*gtk+-2.18.3 (29 Oct 2009) + + 29 Oct 2009; Gilles Dartiguelongue +gtk+-2.18.3.ebuild: + New version for GNOME 2.28. + + 26 Oct 2009; Raúl Porcel gtk+-2.16.6.ebuild: + ia64/sh/sparc stable wrt #285586 + + 08 Oct 2009; Markus Meier gtk+-2.16.6.ebuild: + arm stable, bug #285586 + + 03 Oct 2009; Tobias Klausmann gtk+-2.16.6.ebuild: + Stable on alpha, bug #285586 + + 30 Sep 2009; Jeroen Roovers gtk+-2.16.6.ebuild: + Stable for HPPA (bug #285586). + + 27 Sep 2009; nixnut gtk+-2.16.6.ebuild: + ppc stable #285586 + + 25 Sep 2009; Brent Baude gtk+-2.16.6.ebuild: + Marking gtk+-2.16.6 ppc64 stable for bug 285586 + + 22 Sep 2009; Markus Meier gtk+-2.16.6.ebuild: + x86 stable, bug #285586 + + 20 Sep 2009; Mart Raudsepp + +files/gtk+-2.16.6-fix-pltcheck-test.patch, gtk+-2.16.6.ebuild: + Fix tests, bug 285698 + + 20 Sep 2009; Mart Raudsepp -gtk+-2.16.1.ebuild, + -gtk+-2.16.5.ebuild, -gtk+-2.16.5-r1.ebuild: + Remove old + + 19 Sep 2009; Olivier Crête gtk+-2.16.6.ebuild: + Stable on amd64, bug #285586 + +*gtk+-2.16.6 (19 Sep 2009) + + 19 Sep 2009; Mart Raudsepp +gtk+-2.16.6.ebuild: + Version bump. Various safe bug fixes + +*gtk+-2.16.5-r1 (06 Sep 2009) + + 06 Sep 2009; Romain Perier + +gtk+-2.16.5-r1.ebuild, + +files/gtk+-2.16.5-jpeg-backward-compatibility.patch: + Fix jpeg7 blured images in gdk-pixbuf due to jpeg7 scale specs changes, + per bug #282744. + +*gtk+-2.16.5 (19 Jul 2009) + + 19 Jul 2009; Gilles Dartiguelongue +gtk+-2.16.5.ebuild: + Version bump. Lots of bug fixes, disable tests broken in gentoo env. + +*gtk+-2.16.1 (04 May 2009) + + 04 May 2009; Gilles Dartiguelongue -gtk+-2.10.14.ebuild, + +gtk+-2.16.1.ebuild: + New version for GNOME 2.26. New GtkOrientable API, a lot of bug fixes and + polish all over the place. + + 27 Apr 2009; Jeroen Roovers gtk+-2.14.7-r2: + Stable for HPPA (bug #260063). + + 22 Apr 2009; Mart Raudsepp + -files/gtk+-2.12.1-cupsutils.patch, -gtk+-2.12.8.ebuild, + -gtk+-2.14.4.ebuild, -gtk+-2.14.5.ebuild, -gtk+-2.14.7.ebuild, + -gtk+-2.14.7-r1.ebuild: + Remove old + + 12 Apr 2009; Friedrich Oslage ChangeLog: + Stable on sparc, bug #260063 + + 29 Mar 2009; Raúl Porcel gtk+-2.14.7-r2.ebuild: + arm/sh/sparc stable + + 18 Mar 2009; Raúl Porcel gtk+-2.14.7-r2.ebuild: + alpha/ia64 stable wrt #260063 + + 15 Mar 2009; Markus Meier gtk+-2.14.7-r2.ebuild: + x86 stable, bug #260063 + + 11 Mar 2009; Daniel Gryniewicz gtk+-2.14.7-r2.ebuild: + Marked stable on amd64 + + 06 Mar 2009; Brent Baude gtk+-2.14.7-r2.ebuild: + Marking gtk+-2.14.7-r2 ppc stable for bug 260063 + + 05 Mar 2009; Brent Baude gtk+-2.14.7-r2.ebuild: + Marking gtk+-2.14.7-r2 ppc64 stable for bug 260063 + +*gtk+-2.14.7-r2 (01 Mar 2009) + + 01 Mar 2009; Gilles Dartiguelongue + +files/gtk+-2.14.7-ignore-gtkcurve.patch, + +files/gtk+-2.14.7-uncertain-mime.patch, +gtk+-2.14.7-r2.ebuild: + Bump to 2.14.7-r2. Hopefully fix test failures, bug #238995, and enhance + mime-type resolution, bug #257980. + + 15 Feb 2009; Raúl Porcel gtk+-2.12.11.ebuild: + arm/sh stable + +*gtk+-2.14.7-r1 (29 Jan 2009) + + 29 Jan 2009; Daniel Gryniewicz + +files/gtk+-2.14.7-filechooser.patch, +gtk+-2.14.7-r1.ebuild: + Fix for filechooser centering: bug #239360 + +*gtk+-2.14.7 (15 Jan 2009) + + 15 Jan 2009; Mart Raudsepp +gtk+-2.14.7.ebuild: + Version bump for various bug fixes. This is a stable candidate. + + 30 Nov 2008; Gilles Dartiguelongue gtk+-2.10.14.ebuild, + gtk+-2.12.8.ebuild, gtk+-2.12.11.ebuild, gtk+-2.12.12.ebuild, + gtk+-2.14.4.ebuild, gtk+-2.14.5.ebuild: + Update comment about preview command, bug #236547. + +*gtk+-2.14.5 (27 Nov 2008) + + 27 Nov 2008; Mart Raudsepp + -files/gtk+-2.12.9-filechooser-fix-icon-size.patch, + -files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch, + -files/gtk+-2.12.9-print-backend-64bit.patch, + -files/gtk+-2.12.9-treeview-search-window-type.patch, + -files/gtk+-2.12.10-fix-get_frame_extents.patch, + -files/gtk+-2.12.10-fix-treeview_sort_indicators.patch, + -files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch, + -files/gtk+-2.14.3-fix-combining-broken-diacritics.patch, + -files/gtk+-2.14.3-fix-filesystem-double-free.patch, + -files/gtk+-2.14.3-fix-lpr_write-double-free.patch, + -files/gtk+-2.14.3-fix-password-dialog-on-mount.patch, + -files/gtk+-2.14.3-notebook-tab-draw-correctness.patch, + -files/gtk+-2.14.3-reorder-compose-key-table-order.patch, + -gtk+-2.12.9-r1.ebuild, -gtk+-2.12.9-r2.ebuild, -gtk+-2.12.10-r1.ebuild, + -gtk+-2.14.3-r1.ebuild, -gtk+-2.14.3-r2.ebuild, +gtk+-2.14.5.ebuild: + Version bump for various bug fixes. Remove old + + 17 Nov 2008; Diego E. Pettenò + files/gtk+-2.10.7-mozilla-dnd-fix.patch: + Fix patch with absolute paths. + + 13 Nov 2008; Brent Baude gtk+-2.12.11.ebuild: + Marking gtk+-2.12.11 ppc64 stable for bug 236971 + +*gtk+-2.14.4 (19 Oct 2008) + + 19 Oct 2008; Mart Raudsepp +gtk+-2.14.4.ebuild: + Version bump for various bug fixes + + 18 Oct 2008; Brent Baude gtk+-2.12.11.ebuild: + Marking gtk+-2.12.11 ppc stable for bug 236971 + +*gtk+-2.14.3-r2 (01 Oct 2008) + + 01 Oct 2008; Rémi Cardona + +files/gtk+-2.14.3-fix-combining-broken-diacritics.patch, + +files/gtk+-2.14.3-reorder-compose-key-table-order.patch, + +gtk+-2.14.3-r2.ebuild: + fix broken diacritics on intl keyboards (see gnome bug #554192) + +*gtk+-2.14.3-r1 (29 Sep 2008) + + 29 Sep 2008; Mart Raudsepp + +files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch, + +files/gtk+-2.14.3-fix-filesystem-double-free.patch, + +files/gtk+-2.14.3-fix-lpr_write-double-free.patch, + +files/gtk+-2.14.3-fix-password-dialog-on-mount.patch, + +files/gtk+-2.14.3-notebook-tab-draw-correctness.patch, + -gtk+-2.14.3.ebuild, +gtk+-2.14.3-r1.ebuild: + Add a few fixes from upstream unreleased code + + 28 Sep 2008; Mart Raudsepp + +files/gtk+-2.14.3-limit-gtksignal-includes.patch, gtk+-2.14.3.ebuild: + Adjust a header so that packages using GtkCList will remain buildable + + 25 Sep 2008; Jeroen Roovers gtk+-2.12.11.ebuild: + Stable for HPPA (bug #236971). + +*gtk+-2.14.3 (25 Sep 2008) + + 25 Sep 2008; Mart Raudsepp +gtk+-2.14.3.ebuild: + Major version bump. Uses GIO (and indirectly gvfs for remote file support) + directly for filechooser, with improved auto-completion; printer dialog + can show status information; includes gail accessibility library with + other a11y improvements; better keyboard compose sequences; jpeg2000 + support for gdk-pixbuf with USE=jpeg2k; uses Xrandr for more and better + monitor information; new API that helps removing use of libgnome(ui) by + applications; and much much more + +*gtk+-2.12.12 (22 Sep 2008) + + 22 Sep 2008; Mart Raudsepp +gtk+-2.12.12.ebuild: + Version bump for bug fixes in the 2.12 series + + 09 Sep 2008; Raúl Porcel gtk+-2.12.11.ebuild: + alpha/ia64/sparc stable wrt #236971 + + 08 Sep 2008; Markus Meier gtk+-2.12.11.ebuild: + x86 stable, bug #236971 + + 07 Sep 2008; Olivier Crête gtk+-2.12.11.ebuild: + amd64 stable, bug #236971 + + 12 Aug 2008; Raúl Porcel gtk+-2.12.10-r1.ebuild: + alpha/ia64/sparc stable wrt #229709 + + 10 Aug 2008; Markus Meier gtk+-2.12.10-r1.ebuild: + x86 stable, bug #229709 + + 31 Jul 2008; Gilles Dartiguelongue + gtk+-1.2.10-r12.ebuild, -gtk+-2.12.1-r2.ebuild, -gtk+-2.12.5-r1.ebuild, + -gtk+-2.12.9.ebuild, -gtk+-2.12.10.ebuild: + drop gtk+-1 to ~mips for repoman check. + clean up old revisions. + + 30 Jul 2008; Brent Baude gtk+-2.12.10-r1.ebuild: + Marking gtk+-2.12.10-r1 ppc stable for bug 229709 + + 26 Jul 2008; Olivier Crête gtk+-2.12.10-r1.ebuild: + Stable on amd64, bug #229709 + +*gtk+-2.12.11 (16 Jul 2008) + + 16 Jul 2008; Gilles Dartiguelongue +gtk+-2.12.11.ebuild: + version bump for various bug fixes and translation updates. + +*gtk+-2.12.10-r1 (11 Jun 2008) + + 11 Jun 2008; Mart Raudsepp + +files/gtk+-2.12.10-fix-get_frame_extents.patch, + +files/gtk+-2.12.10-fix-nocxx.patch, + +files/gtk+-2.12.10-fix-treeview_sort_indicators.patch, + +files/gtk+-2.12.10-no-libintl.patch, +gtk+-2.12.10-r1.ebuild: + Fix bug #225339 in gdk_window_get_frame_extents causing window + misplacements by various programs; fix sort indicator on treeview not + showing in certain circumstances; also include some patches that benefit + embedded use cases + + 07 Jun 2008; nixnut gtk+-2.12.9-r2.ebuild: + Stable on ppc wrt bug 224817 + + 07 Jun 2008; Kenneth Prugh gtk+-2.12.9-r2.ebuild: + amd64 stable, bug #224817 + + 04 Jun 2008; Raúl Porcel gtk+-2.12.9-r2.ebuild: + alpha/ia64/sparc stable wrt #224817 + + 04 Jun 2008; Markus Rothe gtk+-2.12.9-r2.ebuild: + Stable on ppc64; bug #224817 + + 04 Jun 2008; Dawid Węgliński gtk+-2.12.9-r2.ebuild: + Stable on x86 (bug #224817) + + 04 Jun 2008; Jeroen Roovers gtk+-2.12.9-r2.ebuild: + Stable for HPPA (bug #224817). + +*gtk+-2.12.10 (04 Jun 2008) + + 04 Jun 2008; Mart Raudsepp +gtk+-2.12.10.ebuild: + Version bump for various bug fixes + + 28 Apr 2008; Gilles Dartiguelongue + +files/gtk+-2.12.9-libtool-2.patch, gtk+-2.12.9-r2.ebuild: + Fix libtool usage for configure stage, bug #213789. Fix bug #197899 by + raising gtk-doc to 1.8 (as per upstream svn). + +*gtk+-2.12.9-r2 (10 Apr 2008) + + 10 Apr 2008; Mart Raudsepp + +files/gtk+-2.12.9-filechooser-fix-icon-size.patch, + +files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch, + +files/gtk+-2.12.9-print-backend-64bit.patch, + +files/gtk+-2.12.9-treeview-search-window-type.patch, + +gtk+-2.12.9-r2.ebuild: + Fix 64bit printing dialogs, especially seen in Eclipse, bugs 214863 and + 215318; Improve ~ handling in gtk+ filechooser backend (outside GNOME usage + mostly), bug 215146; Also add patches to fix treeview search popup window + type for compiz benefits and filechooser icon size inconsistencies that were + best seen with GVFS bookmark icons + +*gtk+-2.12.9-r1 (26 Mar 2008) + + 26 Mar 2008; Rémi Cardona +gtk+-2.12.9-r1.ebuild: + fix cups support (fixes bug #214017, patch by Octavio Ruiz) + + 22 Mar 2008; Daniel Gryniewicz gtk+-2.12.8.ebuild: + Marked stable on amd64 for bug #212986 + +*gtk+-2.12.9 (17 Mar 2008) + + 17 Mar 2008; Mart Raudsepp +gtk+-2.12.9.ebuild: + Version bump for mostly bug fixes + + 17 Mar 2008; Jeroen Roovers gtk+-2.12.8.ebuild: + Stable for HPPA (bug #212986). + + 15 Mar 2008; nixnut gtk+-2.12.8.ebuild: + Stable on ppc wrt bug 212986 + + 14 Mar 2008; Raúl Porcel gtk+-2.12.8.ebuild: + alpha/ia64/sparc stable wrt #212986 + + 12 Mar 2008; Christian Faulhammer gtk+-2.12.8.ebuild: + stable x86, bug 212986 + + 12 Mar 2008; Brent Baude gtk+-2.12.8.ebuild: + Marking gtk+-2.12.8 ppc64 for bug 212986 + +*gtk+-2.12.8 (14 Feb 2008) + + 14 Feb 2008; Mart Raudsepp +gtk+-2.12.8.ebuild: + Version bump for assorted bug fixes, including multiple filechooser + improvements + + 04 Feb 2008; Jeroen Roovers gtk+-2.12.5-r1.ebuild: + Stable for HPPA (bug #208366). + +*gtk+-2.12.7 (03 Feb 2008) + + 03 Feb 2008; Mart Raudsepp +gtk+-2.12.7.ebuild: + Version bump + + 03 Feb 2008; Raúl Porcel gtk+-2.12.5-r1.ebuild: + alpha/ia64/sparc stable wrt #208366 + + 02 Feb 2008; Chris Gianelloni gtk+-2.12.5-r1.ebuild: + Stable on amd64 wrt bug #208366. + + 01 Feb 2008; Brent Baude gtk+-2.12.5-r1.ebuild: + Marking gtk+-2.12.5-r1 ppc64 and ppc stable for bug 208366 + + 01 Feb 2008; Christian Faulhammer + gtk+-2.12.5-r1.ebuild: + stable x86, bug 208366 + +*gtk+-2.12.5-r1 (13 Jan 2008) + + 13 Jan 2008; Gilles Dartiguelongue + +gtk+-2.12.5-r1.ebuild: + apply flash & OOo fix again (bug #205515) + +*gtk+-2.12.5 (10 Jan 2008) + + 10 Jan 2008; Gilles Dartiguelongue +gtk+-2.12.5.ebuild: + bump to 2.12.5, numerous fixes (firefox, OOo, pixbufs, and many more) + + 14 Dec 2007; Saleem Abdulrasool + -files/gtk+-2.2.1-disable_icons_smooth_alpha.patch, + -files/gtk+-2.4.9-ppc64.patch, + -files/gtk+-2.12.0-icon-cache-speedup.patch, + -files/gtk+-2.12.0-libtracker_so.patch, + -files/gtk+-2.12.0-searchenginesimple-crash-fix.patch, + -files/gtk+-2.12.0-swt-tooltips-fix.patch, -files/gtk+-2-xpm_loader.patch, + -gtk+-2.6.10-r1.ebuild, -gtk+-2.8.19.ebuild, -gtk+-2.8.20-r1.ebuild, + -gtk+-2.10.13.ebuild, -gtk+-2.12.1-r1.ebuild: + prune unused versions + + 23 Nov 2007; Jeroen Roovers gtk+-2.12.1-r2.ebuild: + Stable for HPPA (bug #198845). + + 23 Nov 2007; Jeroen Roovers gtk+-2.12.1-r1.ebuild: + Stable for HPPA (bug #198845). + +*gtk+-2.12.1-r2 (21 Nov 2007) + + 21 Nov 2007; Samuli Suominen +gtk+-2.12.1-r2.ebuild: + gdk-pixbuf.loaders installation was broken by einstall passing sysconfdir, + revert back to using make with destdir wrt #199746. + + 20 Nov 2007; Joshua Kinard gtk+-2.12.1-r1.ebuild: + Stable on mips, per #198845. + + 20 Nov 2007; Joshua Kinard gtk+-2.10.14.ebuild: + Stable on mips, per #190019. + + 19 Nov 2007; Markus Rothe gtk+-2.12.1-r1.ebuild: + Stable on ppc64; bug #198845 + + 17 Nov 2007; nixnut gtk+-2.12.1-r1.ebuild: + Stable on ppc wrt bug 198845 + + 14 Nov 2007; Raúl Porcel gtk+-2.12.1-r1.ebuild: + sparc stable wrt #198845 + + 14 Nov 2007; Raúl Porcel gtk+-2.12.1-r1.ebuild: + alpha/ia64 stable wrt #198845 + + 13 Nov 2007; Christian Faulhammer + gtk+-2.12.1-r1.ebuild: + stable x86, bug 198845 + + 13 Nov 2007; Mart Raudsepp gtk+-2.6.10-r1.ebuild, + gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild, gtk+-2.10.13.ebuild, + gtk+-2.10.14.ebuild: + QA: Fix quoting of variables in old versions + + 13 Nov 2007; Mart Raudsepp -gtk+-2.10.11.ebuild, + -gtk+-2.12.0-r2.ebuild, -gtk+-2.12.1.ebuild: + Remove old unnecessary versions + + 12 Nov 2007; Samuli Suominen gtk+-2.12.1-r1.ebuild: + amd64 stable wrt #198845 + +*gtk+-2.12.1-r1 (05 Nov 2007) + + 05 Nov 2007; Daniel Gryniewicz + +files/gtk+-2.12.1-cupsutils.patch, +gtk+-2.12.1-r1.ebuild: + Bump to 2.12.1-r1 + Include patch to fix printing on ppc64; bug #197639 + + 28 Oct 2007; Gilles Dartiguelongue gtk+-2.12.1.ebuild: + add vim-syntax support, fix bug #152275 + add a note about evince being the default backend for printing preview + +*gtk+-2.12.1 (20 Oct 2007) + + 20 Oct 2007; Mart Raudsepp + +files/gtk+-2.12.1-firefox-print-preview.patch, -gtk+-2.12.0.ebuild, + -gtk+-2.12.0-r1.ebuild, +gtk+-2.12.1.ebuild: + Version bump. Include patch to fix firefox print preview crash for bug #195644 + +*gtk+-2.12.0-r2 (25 Sep 2007) + + 25 Sep 2007; Mart Raudsepp + +files/gtk+-2.12.0-openoffice-freeze-workaround.patch, + +files/gtk+-2.12.0-searchenginesimple-crash-fix.patch, + +gtk+-2.12.0-r2.ebuild: + Fix a crash in file chooser search functionality and freezes in OpenOffice + when ran outside Gnome; upstream bug #480123 and our bug #193513 + respectively + + 25 Sep 2007; Mart Raudsepp gtk+-2.12.0-r1.ebuild: + QA: Some quoting and other fixes, thanks to Donnie Berkholz + +*gtk+-2.12.0-r1 (24 Sep 2007) + + 24 Sep 2007; Mart Raudsepp + +files/gtk+-2.12.0-flash-workaround.patch, + +files/gtk+-2.12.0-swt-tooltips-fix.patch, +gtk+-2.12.0-r1.ebuild: + Hopefully fix netscape-flash crashes and infinite loops and Java SWT + tooltips weird behaviour and related crashes. Bug #193513 and part of bug + #192310 and self-observation + +*gtk+-2.12.0 (21 Sep 2007) + + 21 Sep 2007; Rémi Cardona + +files/gtk+-2.12.0-icon-cache-speedup.patch, +gtk+-2.12.0.ebuild: + Add gtk+-2.12.0 (Gnome 2.20) + + 21 Sep 2007; Brent Baude gtk+-2.10.14.ebuild: + Marking gtk+-2.10.14 ppc64 for bug #190019 + + 28 Aug 2007; nixnut gtk+-2.10.14.ebuild: + Stable on ppc wrt bug 190019 + + 28 Aug 2007; Jeroen Roovers gtk+-2.10.14.ebuild: + Stable for HPPA (bug #190019). + + 25 Aug 2007; Raúl Porcel gtk+-2.10.14.ebuild: + alpha/ia64/x86 stable wrt #190019 + + 24 Aug 2007; Wulf C. Krueger gtk+-2.10.14.ebuild: + Marked stable on amd64 as per bug 190019. + + 24 Aug 2007; Gustavo Zacarias gtk+-2.10.14.ebuild: + Stable on sparc wrt #190019 + + 31 Jul 2007; Joshua Kinard gtk+-2.10.13.ebuild: + Stable on mips, per #185614. + + 23 Jul 2007; nixnut gtk+-2.10.13.ebuild: + Stable on ppc wrt bug 185614 + + 22 Jul 2007; Donnie Berkholz ; + gtk+-1.2.10-r12.ebuild, gtk+-2.6.10-r1.ebuild, gtk+-2.8.19.ebuild, + gtk+-2.8.20-r1.ebuild: + Drop virtual/x11 references. + + 19 Jul 2007; Christoph Mende gtk+-2.10.13.ebuild: + Stable on amd64 wrt bug #185614 + + 18 Jul 2007; Raúl Porcel gtk+-2.10.13.ebuild: + alpha/ia64/x86 stable wrt #185614 + + 17 Jul 2007; Jeroen Roovers gtk+-2.10.13.ebuild: + Stable for HPPA (bug #185614). + + 17 Jul 2007; Markus Rothe gtk+-2.10.13.ebuild: + Stable on ppc64; bug #185614 + + 17 Jul 2007; Gustavo Zacarias gtk+-2.10.13.ebuild: + Stable on sparc wrt #185614 + +*gtk+-2.10.14 (16 Jul 2007) + + 16 Jul 2007; Mart Raudsepp + -files/gtk+-2.10.7-textview-fix.patch, -gtk+-2.10.6.ebuild, + -gtk+-2.10.7-r1.ebuild, -gtk+-2.10.9.ebuild, -gtk+-2.10.12.ebuild, + +gtk+-2.10.14.ebuild: + Version bump and remove some old versions + + 02 Jul 2007; Piotr Jaroszyński gtk+-2.8.19.ebuild, + gtk+-2.8.20-r1.ebuild, gtk+-2.10.6.ebuild, gtk+-2.10.7-r1.ebuild, + gtk+-2.10.9.ebuild, gtk+-2.10.11.ebuild, gtk+-2.10.12.ebuild, + gtk+-2.10.13.ebuild: + (QA) RESTRICT clean up. + + 27 Jun 2007; Mike Frysinger + +files/gtk+-1.2.10-automake.patch, +files/gtk+-1.2.10-cleanup.patch, + gtk+-1.2.10-r12.ebuild: + Fixup autotool handling #168198. + +*gtk+-2.10.13 (14 Jun 2007) + + 14 Jun 2007; Mart Raudsepp +gtk+-2.10.13.ebuild: + Version bump for bug fixes. Should also fix our bug #180669 + + 02 Jun 2007; Brent Baude gtk+-2.10.11.ebuild: + Marking gtk+-2.10.11 ppc stable for bug #171107 + + 31 May 2007; Jeroen Roovers gtk+-2.10.11.ebuild: + Stable for HPPA (bug #171107). + + 31 May 2007; Daniel Gryniewicz gtk+-2.10.11.ebuild: + Marked stable on amd64 for bug #171107 + + 31 May 2007; Brent Baude gtk+-2.10.11.ebuild: + Marking gtk+-2.10.11 ppc64 stable for bug #171107 + + 30 May 2007; Raúl Porcel gtk+-2.10.11.ebuild: + alpha/ia64 stable wrt #171107 + + 29 May 2007; Andrej Kacian gtk+-2.10.11.ebuild: + Stable on x86, bug #171107. + + 29 May 2007; Gustavo Zacarias gtk+-2.10.11.ebuild: + Stable on sparc wrt #171107 + + 27 May 2007; Joshua Kinard gtk+-2.10.11.ebuild: + Stable on mips. + + 26 May 2007; Daniel Gryniewicz gtk+-2.10.11.ebuild: + icon cache patch shouldn't have gone into .11 + + 22 May 2007; Daniel Gryniewicz + +files/gtk+-2.10.11-update-icon-subdirs.patch, gtk+-2.10.11.ebuild, + gtk+-2.10.12.ebuild: + Add patch to check intelligently for icon cache updates + +*gtk+-2.10.12 (03 May 2007) + + 03 May 2007; Saleem Abdulrasool + +gtk+-2.10.12.ebuild: + Version bump from upstream with numerous bug fixes + + 22 Mar 2007; Chris Gianelloni gtk+-2.10.9.ebuild: + Stable on alpha/ia64/ppc wrt bug #163678. + + 15 Mar 2007; Markus Rothe gtk+-2.10.9.ebuild: + Stable on ppc64; bug #163678 + + 15 Mar 2007; Gustavo Zacarias gtk+-2.10.9.ebuild: + Stable on sparc wrt #163678 + + 15 Mar 2007; Jeroen Roovers gtk+-2.10.9.ebuild: + Stable for HPPA (bug #163678). + +*gtk+-2.10.11 (14 Mar 2007) + + 14 Mar 2007; Daniel Gryniewicz +gtk+-2.10.11.ebuild: + Bump to 2.10.11 + - Tons of bug fixes... + + 14 Mar 2007; Simon Stelling gtk+-2.10.9.ebuild: + stable on amd64; security bug 163678 + + 14 Mar 2007; Christian Faulhammer gtk+-2.10.9.ebuild: + stable x86, bug 163678 + + 21 Feb 2007; Simon Stelling gtk+-2.10.6.ebuild, + gtk+-2.10.9.ebuild: + we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore + +*gtk+-2.10.9 (25 Jan 2007) + + 25 Jan 2007; Mart Raudsepp +gtk+-2.10.9.ebuild: + Version bump + +*gtk+-2.10.7-r1 (16 Jan 2007) + + 16 Jan 2007; Mart Raudsepp + +files/gtk+-2.10.7-mozilla-dnd-fix.patch, -gtk+-2.10.7.ebuild, + +gtk+-2.10.7-r1.ebuild: + Fix drag and drop problem in mozilla products, bug 162362 + +*gtk+-2.10.7 (14 Jan 2007) + + 14 Jan 2007; Mart Raudsepp + +files/gtk+-2.10.7-textview-fix.patch, +gtk+-2.10.7.ebuild: + Version bump, also fix bug 158179 + + 10 Jan 2007; Mart Raudsepp -gtk+-1.2.10-r11.ebuild: + Remove old gtk1 revision + + 09 Jan 2007; Mart Raudsepp + -files/gtk+-gdk-pixbuf-testfix.patch, -gtk+-2.8.8.ebuild, + -gtk+-2.8.12.ebuild: + Remove some old versions + + 06 Jan 2007; Stephen P. Becker gtk+-1.2.10-r12.ebuild: + stable on mips + + 05 Jan 2007; Diego Pettenò gtk+-2.8.8.ebuild, + gtk+-2.8.12.ebuild, gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild, + gtk+-2.10.6.ebuild: + Remove debug.eclass usage. + + 09 Dec 2006; Bryan Østergaard gtk+-2.10.6.ebuild: + Stable on Alpha. + + 07 Dec 2006; Mart Raudsepp gtk+-2.10.6.ebuild: + Fix the broken syntax in elog for the module rebuild suggestion, bug #157419 + + 07 Dec 2006; Doug Goldstein gtk+-2.10.6.ebuild: + Removed pdf USE flag check since cairo no longer has the pdf USE flag + + 01 Dec 2006; Gustavo Zacarias gtk+-2.10.6.ebuild: + Stable on hppa wrt #156572 + + 01 Dec 2006; Markus Rothe gtk+-2.10.6.ebuild: + Stable on ppc64; bug #156572 + + 01 Dec 2006; Gustavo Zacarias gtk+-2.10.6.ebuild: + Stable on sparc wrt #156572 + + 30 Nov 2006; Tobias Scherbaum gtk+-2.10.6.ebuild: + ppc stable, bug #156572 + + 30 Nov 2006; Christian Faulhammer gtk+-2.10.6.ebuild: + stable x86, bug #156572 + + 29 Nov 2006; Olivier Crête gtk+-2.10.6.ebuild: + Stable on amd64 for bugs #156572 + + 12 Nov 2006; Donnie Berkholz ; gtk+-2.8.8.ebuild, + gtk+-2.8.12.ebuild, gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild, + gtk+-2.10.6.ebuild: + Remove warning about Nvidia drivers RENDER accel being broken (Andy Ritger, + Nvidia). It's reported fixed on >=8756 and current stable is 8776. + + 05 Nov 2006; Mart Raudsepp gtk+-1.2.10-r12.ebuild: + Fix automake dependency, bug #150503 + + 01 Nov 2006; Bryan Østergaard gtk+-1.2.10-r12.ebuild: + Stable on Alpha, bug 150355. + + 20 Oct 2006; Simon Stelling Manifest: + repoman broke the manifest + + 20 Oct 2006; Simon Stelling gtk+-1.2.10-r12.ebuild: + stable on amd64 + + 19 Oct 2006; Bryan Østergaard gtk+-2.8.19.ebuild: + Stable on Alpha. + + 14 Oct 2006; Aron Griffis gtk+-1.2.10-r12.ebuild: + Mark 1.2.10-r12 stable on ia64. #150355 + + 11 Oct 2006; Stephanie Lockwood-Childs + gtk+-1.2.10-r12.ebuild: + stable on ppc (Bug #150355) + + 10 Oct 2006; Gustavo Zacarias + gtk+-1.2.10-r12.ebuild: + Stable on sparc wrt #150355 + + 09 Oct 2006; Jeroen Roovers gtk+-1.2.10-r12.ebuild: + Stable for HPPA (bug #150355). + +*gtk+-2.10.6 (07 Oct 2006) + + 07 Oct 2006; Mart Raudsepp + -files/gtk+-2.10.5-buildfile_typo.patch, -gtk+-2.10.4.ebuild, + -gtk+-2.10.5.ebuild, +gtk+-2.10.6.ebuild: + New version in the 2.10 series + + 07 Oct 2006; Markus Rothe gtk+-1.2.10-r12.ebuild: + Stable on ppc64; bug #150355 + + 07 Oct 2006; Andrej Kacian gtk+-1.2.10-r12.ebuild: + Stable on x86, bug #150355. + +*gtk+-1.2.10-r12 (07 Oct 2006) + + 07 Oct 2006; Alin Nastac + +files/gtk+-1.2.10-as-needed.patch, +gtk+-1.2.10-r12.ebuild: + Strip unsupported languages from LINGUAS (#114797). Fix broken compilation + of dependent packages when they're build with LDFLAGS=-Wl,--as-needed + (#133819). + +*gtk+-2.10.5 (02 Oct 2006) + + 02 Oct 2006; Mart Raudsepp + +files/gtk+-2.10.5-buildfile_typo.patch, +gtk+-2.10.5.ebuild: + Version bump for 2.10 series. + +*gtk+-2.10.4 (28 Sep 2006) + + 28 Sep 2006; Mart Raudsepp -gtk+-2.10.2.ebuild, + -gtk+-2.10.3.ebuild, +gtk+-2.10.4.ebuild: + Add 2.10.4, and clean up older 2.10 versions + + 25 Sep 2006; Daniel Gryniewicz Manifest: + Fix digest + + 23 Sep 2006; Markus Rothe gtk+-2.8.19.ebuild, + gtk+-2.8.20-r1.ebuild, gtk+-2.10.2.ebuild, gtk+-2.10.3.ebuild: + Do not filter -mminimal-toc on ppc64, else it won't build + + 15 Sep 2006; John N. Laliberte Manifest: + fix digest, #147632 + + 14 Sep 2006; Daniel Gryniewicz + +files/gtk+-gdk-pixbuf-testfix.patch, +gtk+-2.8.8.ebuild: + Oops, missed a hard dep on 2.8.8. Thanks, mr-bones + + 13 Sep 2006; Daniel Gryniewicz gtk+-2.8.19.ebuild, + gtk+-2.8.20-r1.ebuild, gtk+-2.10.2.ebuild, gtk+-2.10.3.ebuild: + Only allow upstream-supported CFLAGS. Bug #133469 + + 13 Sep 2006; Daniel Gryniewicz + -files/gtk+-gdk-pixbuf-testfix.patch, -gtk+-1.2.10-r10.ebuild, + -gtk+-2.8.8.ebuild, -gtk+-2.8.17.ebuild, -gtk+-2.8.18.ebuild, + -gtk+-2.8.20.ebuild: + Clean up old versions + + 12 Sep 2006; Daniel Gryniewicz gtk+-2.10.3.ebuild: + Remove monolithic X deps + +*gtk+-2.10.3 (05 Sep 2006) + + 05 Sep 2006; Daniel Gryniewicz -gtk+-2.10.0.ebuild, + -gtk+-2.10.1.ebuild, +gtk+-2.10.3.ebuild: + Add 2.10.3, and clean up older 2.10 versions + + 05 Sep 2006; Joshua Kinard gtk+-2.8.19.ebuild: + Marked stable on mips. + + 04 Sep 2006; Gustavo Zacarias + gtk+-1.2.10-r11.ebuild: + Stable on sparc + + 27 Aug 2006; Saleem Abdulrasool + gtk+-1.2.10-r11.ebuild: + Add an if block around the warning for gtkrc as per bug #141253 + +*gtk+-2.10.2 (26 Aug 2006) + + 26 Aug 2006; Saleem Abdulrasool +gtk+-2.10.2.ebuild: + version bump from upstream + + 16 Aug 2006; Markus Rothe gtk+-2.8.19.ebuild: + Stable on ppc64 + + 26 Jul 2006; Stefan Schweizer gtk+-2.10.1.ebuild: + Pango 1.12 is enough thanks to Todd Merrill in + bug 141797 + +*gtk+-2.10.1 (24 Jul 2006) + + 24 Jul 2006; Stefan Schweizer +gtk+-2.10.1.ebuild: + version bump + + 19 Jul 2006; Olivier Crête files/digest-gtk+-2.8.19: + Fix digest + +*gtk+-2.8.20-r1 (18 Jul 2006) + + 18 Jul 2006; John N. Laliberte + +gtk+-2.8.20-r1.ebuild, gtk+-2.10.0.ebuild: + we now create a gtkrc file with the fallback theme set to gnome. fixes #133241 + + 17 Jul 2006; Daniel Gryniewicz gtk+-2.8.19.ebuild: + Marked stable on amd64 for bug #139612 + +*gtk+-2.8.20 (17 Jul 2006) + + 17 Jul 2006; Daniel Gryniewicz +gtk+-2.8.20.ebuild: + Bump to 2.8.20 and fix bug #140222 + + 16 Jul 2006; Tobias Scherbaum gtk+-2.8.19.ebuild: + hppa stable, bug #139612 + + 14 Jul 2006; Tobias Scherbaum gtk+-2.8.19.ebuild: + ppc stable, bug #139612 + + 12 Jul 2006; Chris Gianelloni gtk+-2.8.19.ebuild: + Stable on x86 wrt bug #139612. + + 12 Jul 2006; Chris Gianelloni gtk+-2.8.19.ebuild: + Stable on x86 wrt bug #139612. + + 10 Jul 2006; Gustavo Zacarias gtk+-2.8.19.ebuild: + Stable on sparc wrt #139612 + + 08 Jul 2006; Stefan Schweizer gtk+-2.10.0.ebuild: + Add elog message about rebuilding the gtk-engines + +*gtk+-2.10.0 (05 Jul 2006) + + 05 Jul 2006; Stefan Schweizer +gtk+-2.10.0.ebuild: + version bump thanks to Milosz Kosobucki and Josef + Reidinger in bug 139195 + + 25 Jun 2006; Javier Villavicencio + gtk+-2.8.19.ebuild: + Add ~x86-fbsd keyword. + +*gtk+-2.8.19 (16 Jun 2006) + + 16 Jun 2006; Leonardo Boshell +gtk+-2.8.19.ebuild: + New release. + +*gtk+-2.8.18 (26 May 2006) + + 26 May 2006; John N. Laliberte -gtk+-2.8.11.ebuild, + -gtk+-2.8.13.ebuild, -gtk+-2.8.16.ebuild, +gtk+-2.8.18.ebuild: + new version, cleanup old versions. + +*gtk+-2.8.17 (01 May 2006) + + 01 May 2006; Daniel Gryniewicz +gtk+-2.8.17.ebuild: + Bump for 2.14.1 + + 21 Apr 2006; Thomas Cort gtk+-2.8.12.ebuild: + Stable on alpha wrt Bug #126321. + + 21 Apr 2006; Marinus Schraal gtk+-2.8.16.ebuild : + Always enable png, so we actually can display icons + + 15 Apr 2006; Stephen P. Becker gtk+-2.8.12.ebuild: + stable on mips + + 12 Apr 2006; Diego Pettenò gtk+-1.2.10-r11.ebuild: + Add ~x86-fbsd keyword. + + 07 Apr 2006; Diego Pettenò gtk+-2.8.13.ebuild, + gtk+-2.8.16.ebuild: + Restrict confcache on gtk+ as it might cause spurious failures during build + (not during configure). + + 24 Mar 2006; Aron Griffis gtk+-2.8.12.ebuild: + Mark 2.8.12 stable on ia64 + + 20 Mar 2006; Seemant Kulleen gtk+-2.8.16.ebuild: + fix the make check stage which wants to run a gtk+ app (so run it in a + virtual X display). + + 19 Mar 2006; Markus Rothe gtk+-2.8.12.ebuild: + Stable on ppc64 + + 18 Mar 2006; Olivier Crête gtk+-2.8.12.ebuild: + Stable on amd64 per bug #126321 + + 17 Mar 2006; Chris Gianelloni gtk+-2.8.12.ebuild: + Stable on x86 wrt bug #126321. + + 17 Mar 2006; Tobias Scherbaum gtk+-2.8.12.ebuild: + Stable gnome-2.12.3 for ppc, bug #126321 + + 16 Mar 2006; John N. Laliberte gtk+-2.8.16.ebuild: + add missing inherit on autotools eclass. fixes #126455 + +*gtk+-2.8.16 (16 Mar 2006) + + 16 Mar 2006; John N. Laliberte -gtk+-2.8.15.ebuild, + +gtk+-2.8.16.ebuild: + new version + + 14 Mar 2006; Gustavo Zacarias gtk+-2.8.12.ebuild: + Stable on hppa + +*gtk+-2.8.15 (13 Mar 2006) + + 13 Mar 2006; Saleem Abdulrasool +gtk+-2.8.15.ebuild: + Version bump from upstream. allanonjl dropped disable_icons_smooth_alpha + patch, and bumped glib dependency to 2.10.1. + + 13 Mar 2006; Gustavo Zacarias gtk+-2.8.12.ebuild: + Stable on sparc + +*gtk+-2.8.13 (03 Mar 2006) + + 03 Mar 2006; Saleem Abdulrasool +gtk+-2.8.13.ebuild: + Version bump from upstream + + 20 Feb 2006; Saleem Abdulrasool + gtk+-1.2.10-r11.ebuild: + Fixing mod-z deps as per bug #123453 + + 12 Feb 2006; John N. Laliberte gtk+-2.8.12.ebuild: + add AT_M4DIR to fix compilation when user does not have gtk-doc installed + +*gtk+-2.8.12 (12 Feb 2006) + + 12 Feb 2006; John N. Laliberte +gtk+-2.8.12.ebuild: + new version. this includes the patch to fix the slow repainting with ATI + cards. remove smoothscroll patch, use eautoreconf. + + 12 Feb 2006; Donnie Berkholz ; + gtk+-1.2.10-r10.ebuild, gtk+-1.2.10-r11.ebuild, gtk+-2.6.10-r1.ebuild: + Fix for modular X. + + 03 Feb 2006; Aron Griffis gtk+-2.8.8.ebuild: + Mark 2.8.8 stable on ia64 + + 03 Feb 2006; Guy Martin gtk+-2.8.8.ebuild: + Stable on hppa. + +*gtk+-2.8.11 (29 Jan 2006) + + 29 Jan 2006; John N. Laliberte -gtk+-2.8.9.ebuild, + -gtk+-2.8.10.ebuild, +gtk+-2.8.11.ebuild: + version bump. cleanup old ebuilds. remove abicheck.sh patch since it is now + applied upstream. + + 14 Jan 2006; +files/gtk+-2.8.10-xinerama.patch, + gtk+-2.8.10.ebuild: + Make xinerama support optional. Bug #118744 + + 13 Jan 2006; Fernando J. Pereda gtk+-2.8.8.ebuild: + Stable on alpha wrt bug #117505 + +*gtk+-2.8.10 (13 Jan 2006) + + 13 Jan 2006; John N. Laliberte + +files/gtk+-gdk-pixbuf-testfix.patch, gtk+-2.8.8.ebuild, + gtk+-2.8.9.ebuild, +gtk+-2.8.10.ebuild: + apply patch to fix #118722 . Attached patch to gnome bug #317961 + + 08 Jan 2006; Tobias Scherbaum gtk+-2.8.8.ebuild: + ppc stable, bug #117505 + + 04 Jan 2006; Mark Loeser gtk+-2.8.8.ebuild: + Stable on x86; bug #117505 + + 03 Jan 2006; Luis Medinas gtk+-2.8.8.ebuild: + Stable on amd64. For bug #117505. + + 03 Jan 2006; Markus Rothe gtk+-2.8.8.ebuild: + Stable on ppc64 + + 03 Jan 2006; Gustavo Zacarias gtk+-2.8.8.ebuild: + Stable on sparc wrt #117505 + + 02 Jan 2006; John N. Laliberte + -files/gtk+-2.8.6-freebsd.patch, -gtk+-2.6.8.ebuild, + -gtk+-2.8.6-r1.ebuild, -gtk+-2.8.7.ebuild, gtk+-2.8.8.ebuild, + gtk+-2.8.9.ebuild: + cleanup old builds, add informational message about RenderAccel bug, bump + atk dep to fix #111741 + +*gtk+-2.8.9 (13 Dec 2005) + + 13 Dec 2005; +gtk+-2.8.9.ebuild: + New upstream version + + 13 Dec 2005; Seemant Kulleen gtk+-1.2.10-r11.ebuild: + modular X deps, committing Donnie's fixes in bug #115232 + +*gtk+-2.8.8 (01 Dec 2005) + + 01 Dec 2005; +gtk+-2.8.8.ebuild: + New upstream release + + 20 Nov 2005; Hardave Riar gtk+-2.6.10-r1.ebuild: + Stable on mips, bug #112608. + +*gtk+-2.8.7 (18 Nov 2005) + + 18 Nov 2005; Leonardo Boshell +gtk+-2.8.7.ebuild: + New version. Dropped patches that have been integrated upstream. + +*gtk+-2.8.6-r1 (15 Nov 2005) +*gtk+-2.6.10-r1 (15 Nov 2005) + + 15 Nov 2005; Leonardo Boshell + +files/gtk+-2-xpm_loader.patch, -gtk+-2.6.10.ebuild, + +gtk+-2.6.10-r1.ebuild, -gtk+-2.8.6.ebuild, +gtk+-2.8.6-r1.ebuild: + Added patch to fix a probem inside gdk-pixbuf regarding the XPM loader + (bug #112608). Marked 2.6.10-r1 stable on all arches that reported back + successful testing. + + 11 Nov 2005; Michael Hanselmann gtk+-2.6.10.ebuild: + Stable on hppa, ppc. + + 04 Nov 2005; gtk+-2.8.6.ebuild: + Make sure cairo was built with X. bug 111483 + + 02 Nov 2005; Gustavo Zacarias gtk+-2.6.10.ebuild: + Stable on sparc + + 01 Nov 2005; John N. Laliberte gtk+-2.6.10.ebuild: + stable on x86 + + 31 Oct 2005; Leonardo Boshell gtk+-2.6.10.ebuild, + gtk+-2.8.6.ebuild: + Fix logic around GTK2_CONFDIR to make the postinst hook work on binary + packages. + + 27 Oct 2005; Diego Pettenò + +files/gtk+-2.8.6-freebsd.patch, gtk+-2.8.6.ebuild: + Added patch to compile on FreeBSD as per bug #109519. + + 22 Oct 2005; Yuta SATOH gtk+-2.6.8.ebuild, + gtk+-2.6.10.ebuild: + also fixes #109089 of 2.6.x + + 19 Oct 2005; Yuta SATOH gtk+-2.8.6.ebuild: + Fixes #109089 by not applying the patch which fixes the problem of the + cursor key for ppc64. + + 10 Oct 2005; Hardave Riar gtk+-2.6.8.ebuild: + Stable on mips. + +*gtk+-2.8.6 (08 Oct 2005) + + 08 Oct 2005; Leonardo Boshell -gtk+-2.8.4.ebuild, + +gtk+-2.8.6.ebuild: + New version. + +*gtk+-2.8.4 (27 Sep 2005) + + 27 Sep 2005; Leonardo Boshell + -files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3-r1.ebuild, + +gtk+-2.8.4.ebuild: + New version. + + 17 Sep 2005; Aron Griffis gtk+-2.6.8.ebuild: + Mark 2.6.8 stable on alpha + +*gtk+-2.8.3-r1 (04 Sep 2005) + + 04 Sep 2005; Leonardo Boshell + +files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3.ebuild, + +gtk+-2.8.3-r1.ebuild: + Avoid passing --disable-debug. Added patch with various bug fixes from + upstream CVS repository. + + 03 Sep 2005; Michael Hanselmann gtk+-2.6.8.ebuild: + Stable on ppc. + + 03 Sep 2005; Markus Rothe gtk+-2.6.8.ebuild: + Stable on ppc64 + +*gtk+-2.8.3 (01 Sep 2005) + + 01 Sep 2005; Leonardo Boshell + -files/gtk+-2.8.0-dep_checks.patch, -files/gtk+-2.8.0-gdk_fix.patch, + -gtk+-2.8.0-r2.ebuild, -gtk+-2.8.2.ebuild, +gtk+-2.8.3.ebuild: + New version. + + 31 Aug 2005; Herbie Hopkins gtk+-2.6.8.ebuild: + Stable on amd64. + + 29 Aug 2005; Guy Martin gtk+-2.6.8.ebuild: + Stable on hppa. + + 26 Aug 2005; Gustavo Zacarias gtk+-2.6.8.ebuild: + Stable on sparc + +*gtk+-2.8.2 (25 Aug 2005) + + 25 Aug 2005; Doug Goldstein +gtk+-2.8.2.ebuild: + rev bump. modular X depends. clean up old cruft from the 2.0.x days. + + 25 Aug 2005; Aron Griffis gtk+-2.6.8.ebuild: + stable on ia64 + + 25 Aug 2005; Leonardo Boshell + gtk+-2.6.8.ebuild: + Stable on x86. + + 23 Aug 2005; Aron Griffis gtk+-2.6.7.ebuild: + stable on ia64 + + 19 Aug 2005; Leonardo Boshell gtk+-2.6.10.ebuild, + gtk+-2.8.0-r2.ebuild: + Fix invocation of epatch (bug #103042). + +*gtk+-2.8.0-r2 (19 Aug 2005) + + 19 Aug 2005; Leonardo Boshell + +files/gtk+-2.8.0-dep_checks.patch, +files/gtk+-2.8.0-gdk_fix.patch, + +gtk+-2.8.0-r2.ebuild: + Patches from upstream CVS to fix gdk warnings and related side-effects, as + wall as sanitizing some dependencies (bug #102854). + +*gtk+-2.6.10 (18 Aug 2005) + + 18 Aug 2005; Leonardo Boshell +gtk+-2.6.10.ebuild: + New version from the stable branch. + +*gtk+-2.8.0-r1 (17 Aug 2005) + + 17 Aug 2005; Herbie Hopkins + +files/gtk+-2.8.0-multilib.patch, +gtk+-2.8.0-r1.ebuild: + Updated the multilib patch for 2.8, bug 101289 + +*gtk+-2.8.0 (15 Aug 2005) + + 15 Aug 2005; Leonardo Boshell gtk+-2.8.0.ebuild: + New version. + +*gtk+-2.7.4 (31 Jul 2005) + + 31 Jul 2005; Marinus Schraal gtk+-2.7.4.ebuild : + New release + + 12 Jul 2005; Stephen P. Becker gtk+-2.6.7.ebuild: + stable on mips + +*gtk+-2.6.8 (22 Jun 2005) + + 22 Jun 2005; Marinus Schraal gtk+-2.6.8.ebuild : + New release + + 12 Jun 2005; Olivier Crête gtk+-2.6.7.ebuild: + Stable on amd64 + + 12 Jun 2005; Tobias Scherbaum gtk+-2.6.7.ebuild: + Stable on ppc. + + 12 Jun 2005; Bryan Østergaard gtk+-2.6.7.ebuild: + Stable on alpha. + + 10 Jun 2005; Rene Nussbaumer gtk+-2.6.7.ebuild: + Stable on hppa. + + 06 Jun 2005; Gustavo Zacarias gtk+-2.6.7.ebuild: + Stable on sparc + + 06 Jun 2005; Markus Rothe gtk+-2.6.7.ebuild: + Stable on ppc64 + + 13 May 2005; Rene Nussbaumer gtk+-2.6.4-r1.ebuild: + stable on hppa + + 28 Apr 2005; Bryan Østergaard gtk+-2.6.4-r1.ebuild: + Stable on alpha + ia64. + + 20 Apr 2005; Michael Hanselmann gtk+-2.6.4-r1.ebuild: + Stable on ppc. + + 20 Apr 2005; Herbie Hopkins gtk+-2.6.4-r1.ebuild: + Stable on amd64. + + 18 Apr 2005; Herbie Hopkins gtk+-2.6.7.ebuild: + Minor multilib cleanup. + +*gtk+-2.6.7 (16 Apr 2005) + + 16 Apr 2005; foser gtk+-2.6.7.ebuild : + Updated scroll patch (#85663) + + 09 Apr 2005; Markus Rothe gtk+-2.6.4-r1.ebuild: + Stable on ppc64 + + 07 Apr 2005; Simon Stelling gtk+-2.4.14.ebuild: + stable on amd64 + + 02 Apr 2005; Stephen P. Becker gtk+-2.6.4-r1.ebuild: + stable on mips + + 30 Mar 2005; Gustavo Zacarias gtk+-2.6.4-r1.ebuild: + Stable on sparc + +*gtk+-2.6.4-r1 (30 Mar 2005) + + 30 Mar 2005; foser gtk+-2.6.4-r1.ebuild : + Add bmp corruption header fix (#86979) + Change location of epunt_cxx so it has some effect + + 21 Mar 2005; Jeremy Huddleston + gtk+-1.2.10-r11.ebuild: + Use the right toolchain compiler. + + 09 Mar 2005; Mike Gardiner gtk+-2.4.14.ebuild: + Keyworded ppc + + 08 Mar 2005; Gustavo Zacarias gtk+-2.6.2.ebuild: + Stable on sparc + + 07 Mar 2005; Markus Rothe gtk+-2.6.2.ebuild: + Stable on ppc64 + + 03 Mar 2005; Sven Wegener : + Added missing digest entries. + + 13 Feb 2005; Bryan Østergaard gtk+-2.4.14.ebuild: + Stable on alpha. + +*gtk+-2.6.2 (05 Feb 2005) + + 05 Feb 2005; Joe McCann +gtk+-2.6.2.ebuild: + New version. File selector and dialogue patches applied upstream and no + longer needed + +*gtk+-2.6.1-r2 (03 Feb 2005) + + 03 Feb 2005; Joe McCann + +files/gtk+-2.6.1-gtk_dialog.patch, +gtk+-2.6.1-r2.ebuild: + Adding upstream patch from bug 80262 as reported by compnerd. Should fix + gtk+ apps crashing when focus is called on lable widgets. + + 22 Jan 2005; Markus Rothe gtk+-2.6.1-r1.ebuild: + Added append-flags -mminimal-toc for ppc64 to let it compile + +*gtk+-2.6.1-r1 (17 Jan 2005) + + 17 Jan 2005; foser gtk+-2.6.1-r1.ebuild : + Add upstream patch for http://bugzilla.gnome.org/show_bug.cgi?id=164290 + block pixmap engine, partially fixes #77791 + + 13 Jan 2005; Mike Doty gtk+-2.6.1.ebuild: + amd64 patch update by seemant + + 12 Jan 2005; Gustavo Zacarias gtk+-2.4.14.ebuild: + Stable on sparc + +*gtk+-2.6.1 (12 Jan 2005) + + 12 Jan 2005; foser gtk+-2.6.1.ebuild : + New release, closes a whole lot of empty bugs + + 28 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + +*gtk+-2.4.9-r2 (26 Dec 2004) + + 26 Dec 2004; Markus Rothe + +files/gtk+-2.4.9-ppc64.patch, gtk+-2.4.14.ebuild, +gtk+-2.4.9-r2.ebuild: + I've added the patch from bug #64359, which fixes a cursor key problem on + ppc64 to 2.4.9-r2 and 2.4.14. I marked 2.4.9-r2 stable on ppc64 and will + remove this version when 2.4.14 will be marked stable. Credits go to Yuta + SATOH. + + 24 Dec 2004; Bryan Østergaard gtk+-2.4.13-r1.ebuild: + Stable on alpha. + + 23 Dec 2004; Guy Martin gtk+-2.4.13-r1.ebuild: + Stable on hppa. + + 21 Dec 2004; Gustavo Zacarias gtk+-2.4.13-r1.ebuild: + Stable on sparc + + 20 Dec 2004; Dylan Carlson gtk+-2.4.13-r1.ebuild: + Stable on amd64. + + 19 Dec 2004; Mike Gardiner gtk+-2.4.13-r1.ebuild: + Keyworded x86 and ppc for GNOME 2.8.1 + +*gtk+-2.4.14 (11 Dec 2004) + + 11 Dec 2004; Mike Gardiner +gtk+-2.4.14.ebuild: + New version of gtk+ + +*gtk+-2.4.13-r1 (21 Nov 2004) + + 21 Nov 2004; foser gtk+-2.4.13-r1.ebuild : + Add revised smoothscroll patch (#71807), moved patch to mirrors + + 02 Nov 2004; Malcolm Lashley : + Fix missing digest - bug #69859 + +*gtk+-2.4.13 (02 Nov 2004) + + 02 Nov 2004; foser gtk+-2.4.13.ebuild : + Not so fresh release (#64913) + Add correct automake dep (#65796) + + 14 Oct 2004; Mamoru KOMACHI gtk+-1.2.10-r11.ebuild: + Removed ~ppc-macos keyword until bug #57677 is solved. + + 11 Oct 2004; Mamoru KOMACHI gtk+-1.2.10-r11.ebuild: + Added to ~ppc-macos. This closes bug #62069. + + 09 Oct 2004; Tom Gall gtk+-2.4.9-r1.ebuild: + stable on ppc64, bug #64230 + + 01 Oct 2004; Stephen P. Becker gtk+-2.4.4.ebuild, + gtk+-2.4.9-r1.ebuild: + stable on mips + + 20 Sep 2004; Bryan Østergaard,,, gtk+-2.4.9-r1.ebuild: + Stable on alpha, bug 64240. + + 20 Sep 2004; Gustavo Zacarias gtk+-2.4.9-r1.ebuild: + Stable on sparc wrt #64230 + + 20 Sep 2004; gtk+-2.4.9-r1.ebuild: + marked ppc gsla bug: 64230 + +*gtk+-2.4.9-r1 (20 Sep 2004) + + 20 Sep 2004; foser gtk+-2.4.9-r1.ebuild, gtk+-2.4.9-ico_xpm_secure.patch : + Add security fix for the ico & xpm loaders (#64230) + + 30 Aug 2004; Tom Gall gtk+-2.4.4.ebuild: + only stable version of gtk+-2.4.3 for ppc64 was removed, + marking 2.4.4 stable on an emergancy basis + +*gtk+-2.4.9 (29 Aug 2004) + + 29 Aug 2004; foser gtk+-2.4.4.ebuild: + Stable on alpha. + + 22 Aug 2004; Travis Tilley gtk+-2.4.4.ebuild, + gtk+-2.4.7.ebuild: + made arch specific config file patch apply on x86 when CONF_LIBDIR=lib32. this + is just to make building the emul-linux-x86-gtklibs package easier, and has no + effect on x86 users in general. + + 22 Aug 2004; Travis Tilley gtk+-2.4.4.ebuild, + gtk+-2.4.7.ebuild: + added a patch that puts the config files for gtk in an arch specific directory + on amd64 so that the 32bit and 64bit versions dont clash + +*gtk+-2.4.7 (19 Aug 2004) + + 19 Aug 2004; foser gtk+-2.4.7.ebuild : + New release + Add smoothscroll patch from gnome bugzilla for testing + + 07 Aug 2004; Travis Tilley gtk+-2.4.4.ebuild: + stable on amd64 + + 07 Aug 2004; Michael Hanselmann gtk+-1.2.10-r11.ebuild: + Added gnuconfig to replace config.* on Mac OS X and added to ~macos. + + 05 Aug 2004; Gustavo Zacarias gtk+-2.4.4.ebuild: + Stable on sparc + + 05 Aug 2004; Guy Martin gtk+-2.4.4.ebuild: + Stable on hppa. + + 31 Jul 2004; gtk+-2.4.4.ebuild: + stable on x86 for gnome 2.6.2 + + 27 Jul 2004; gtk+-1.2.10-r11.ebuild, + gtk+-2.4.1.ebuild: + stable on alpha (1.2.10-r11) and ia64 (1.2.10-r11, 2.4.1) + + 26 Jul 2004; Tom Gall gtk+-1.2.10-r11.ebuild: + stable on ppc64 + + 20 Jul 2004; Tom Gall gtk+-2.4.3-r1.ebuild: + stable on ppc64, bug #57154 + +*gtk+-2.4.4 (11 Jul 2004) + + 11 Jul 2004; +gtk+-2.4.4.ebuild: + Versionbump. + +*gtk+-2.4.3-r1 (06 Jul 2004) + + 06 Jul 2004; Martin Schlemmer + +files/gtk+-2.4.x-filesel-navbuttons.patch.bz2, +gtk+-2.4.3-r1.ebuild: + Add fileselect dialog patch from Ximian/Suse. + + 02 Jul 2004; Tom Gall gtk+-1.2.10-r11.ebuild: + fix repoman dep (imlib) + + 28 Jun 2004; Tom Gall gtk+-2.4.3.ebuild: + ~ppc64 , bug #54792 + + 23 Jun 2004; Aron Griffis gtk+-1.2.10-r10.ebuild: + QA - fix use invocation + + 19 Jun 2004; Gustavo Zacarias gtk+-2.4.1.ebuild: + sparc stable + + 16 Jun 2004; Bryan Østergaard gtk+-2.4.1.ebuild: + Stable on alpha. + +*gtk+-2.4.3 (15 Jun 2004) + + 15 Jun 2004; foser gtk+-2.4.3.ebuild : + New release (#53700) + + 03 Jun 2004; Stephen P. Becker gtk+-2.4.1.ebuild: + Stable on mips. + + 01 Jun 2004; Travis Tilley gtk+-2.4.1.ebuild: + stable on amd64 + +*gtk+-2.4.1 (04 May 2004) + + 04 May 2004; foser gtk+-2.4.1.ebuild : + New release, add patch & dep to have a default icon theme available to the chooser + + 26 Apr 2004; Stephen P. Becker gtk+-2.2.4-r1.ebuild: + Marked stable on mips. + + 22 Apr 2004; Stephen P. Becker gtk+-2.4.0-r1.ebuild: + Breaks GNOME 2.4, so returned to ~mips. + + 14 Apr 2004; Stephen P. Becker gtk+-1.2.10-r10.ebuild, + gtk+-1.2.10-r11.ebuild, gtk+-2.4.0-r1.ebuild: + Marked stable on mips. + +*gtk+-2.4.0-r1 (09 Apr 2004) + + 09 Apr 2004; Travis Tilley gtk+-2.4.0-r1.ebuild, + files/gtk+-2.4.0-uimanager-zero-becomes-null.patch: + added patch to fix a crash in epiphany that may or may not occur only on + amd64. for more information on this bug, please refer to + http://bugzilla.gnome.org/show_bug.cgi?id=138997 + + 30 Mar 2004; Donnie Berkholz ; gtk+-2.2.4-r1.ebuild, + gtk+-2.4.0.ebuild: + Change x11-base/xfree dependency to virtual/x11. Everyone on xfree should be + on 4.3.0-r3 or greater by now, so #20407 shouldn't be an issue. + +*gtk+-2.4.0 (18 Mar 2004) + + 18 Mar 2004; foser gtk+-2.4.0.ebuild : + New release + Remove incorporated patches + Removed wm patch, it's broken + Correct license + + 06 Mar 2004; Stephen P. Becker gtk+-1.2.10-r10.ebuild, + gtk+-2.2.4-r1.ebuild: + Added ~mips keyword. + +*gtk+-1.2.10-r11 (05 Feb 2004) + + 05 Feb 2004; gtk+-1.2.10-r11.ebuild: + Minor change to DEPEND, adding an RDEPEND to get intltool out of the RDEPEND + set. this deserves a revbump only to make sure that packages get updated. + + 07 Dec 2003; foser gtk+-1.2.10-r10.ebuild : + Fix sysconfdir to /etc to fix gtkrc problems described in #34279 + + 14 Nov 2003; Aron Griffis gtk+-1.2.10-r10.ebuild: + Stable on ia64 + + 08 Nov 2003; Todd Sunderlin gtk+-2.2.4-r1.ebuild: + added sparc keyword + + 20 Oct 2003; Aron Griffis gtk+-2.2.4-r1.ebuild: + Stable on alpha + + 08 Oct 2003; foser gtk+-2.2.4-r1.ebuild : + Added patch to fix notification area, submitted by + + 06 Oct 2003; Mike Gardiner gtk+-2.2.4-r1.ebuild: + Marked stable on x86 + + 23 Sep 2003; Bartosch Pixa gtk+-2.2.4-r1.ebuild: + set ppc in keywords + +*gtk+-2.2.4-r1 (10 Sep 2003) + + 16 Nov 2003; Guy Martin gtk+-2.2.4-r1.ebuild : + Added hppa to KEYWORDS. + + 10 Sep 2003; foser gtk+-2.2.4-r1.ebuild : + Remove USE debug support, the not hardcoded disabling of debugging support + should fix a lot of problems. Rev bump to propagate. + +*gtk+-2.2.4 (07 Sep 2003) + + 07 Sep 2003; foser gtk+-2.2.4.ebuild : + New bugfix release + +*gtk+-2.2.3 (27 Aug 2003) + + 27 Aug 2003; foser gtk+-2.2.3.ebuild : + New version + + 25 Jul 2003; foser gtk+-2.2.2-r1.ebuild : + Fix xinput (#25203) + + 02 Jul 2003; Jason Wever gtk+-2.2.2-r1.ebuild: + Changed sparc keyword back to ~sparc to fix broken dependencies. + +*gtk+-2.2.2-r1 (12 Jun 2003) + + 01 Jul 2003; Guy Martin gtk+-2.2.2-r1.ebuild : + Added ~hppa to KEYWORDS. + + 01 Jul 2003; Todd Sunderlin gtk+-2.2.2-r1.ebuild : + set stable on sparc + + 16 Jun 2003; foser gtk+-2.2.2-r1.ebuild, gtk+-2.2.2-gtkwidget_pixmap_expose.patch : + Replace reverting patch with correct upstream patch for #22576 + + 12 Jun 2003; foser gtk+-2.2.2-r1.ebuild : + Added patch to 'fix' pixbuf corruption issues (#22576) + + 10 Jun 2003; Luca Barbato gtk+-2.2.2.ebuild : + Removed an unnecessary ppc patch. + +*gtk+-2.2.2 (10 Jun 2003) + + 10 Jun 2003; foser gtk+-2.2.2.ebuild : + New version, enabled xinput support (#20407) which needs a recent xfree + Added GDK_USE_XFT as environment var as suggested by utx + + 30 May 2003; Luca Barbato gtk+-2.2.1.ebuild: + Added ppc to keywords. + +*gtk+-2.2.1-r1 (11 Apr 2003) + + 19 Apr 2003; foser gtk+-2.2.1-r1.ebuild : + Make sure we enable wm patch (better late then never) + + 11 Apr 2003; foser gtk+-2.2.1-r1.ebuild : + Added gtktreeview patch for eclipse (#19084) + +*gtk+-1.2.10-r10 (08 Mar 2003) + + 01 Jul 2003; Guy Martin gtk+-1.2.10-r10.ebuild : + Marked stable on hpp. + + 04 Apr 2003; Jason Wever gtk+-1.2.10-r10.ebuild: + Changed ~sparc keyword to sparc. + + 30 Mar 2003; Aron Griffis gtk+-1.2.10-r10.ebuild: + Mark stable on alpha + + 16 Mar 2003; Mark Guertin gtk+-1.2.10-r10.ebuild: + set ppc in keywords + + 16 Mar 2003; Guy Martin gtk+-1.2.10-r10.ebuild : + Added ~hppa to keywords. + + 09 Mar 2003; Martin Schlemmer gtk+-1.2.10-r10.ebuild : + Change to fully use epatch, and also make use of libtool eclass. + + 08 Mar 2003; foser gtk+-1.2.10-r10.ebuild : + New patch to fix locale problems that have been bugging us for a long time + Patch done by Stanislav Brabec + Related gentoo bugs #10529, #16883 + +*gtk+-2.2.1 (04 Feb 2003) + + 01 Jul 2003; Guy Martin gtk+-2.2.1.ebuild : + Added hppa to KEYWORDS. + + 04 Mar 2003; Jason Wever gtk+-2.2.1.ebuild: + Added sparc to keywords. + + 01 Mar 2003; Jason Wever gtk+-2.2.1.ebuild: + Added ~sparc to keywords. + + 21 Feb 2003; Aron Griffis gtk+-2.2.1.ebuild : + Mark stable on alpha + + 13 Feb 2003; Jon Nall gtk+-2.2.1.ebuild : + bumped pango version to 1.1.3 since the gtk+ configure script + barfs if xft-2 is installed, but pango <1.1.3 is installed + + 07 Feb 2003; foser gtk+-2.2.1.ebuild : + Added alpha blended disabled icons patch + + 05 Feb 2003; Jon Nall gtk+--2.2.1.ebuild : + added patch to fix endian problem for 15/24 bit displays + + 04 Feb 2003; Spider gtk+-2.2.1.ebuild : + bumped version + + 16 Jan 2003; foser gtk+-2.2.0.ebuild : + Added some info about rebuilding gtk theme engines after an emerge + + 04 Jan 2003; Rodney Rees gtk+-2.0.6-r3.ebuild : + changed ~sparc to sparc + + 01 Jan 2003; Aron Griffis gtk+-2.0.9.ebuild gtk+-2.2.0.ebuild: + Reverted previous change on gtk+-2.0.9 since it sounds like 2.2.0 works on + Alpha. Added ~alpha to KEYWORDS on 2.2.0 + + 31 Dec 2002; Aron Griffis gtk+-2.0.9.ebuild : + glib-2.0.7 is broken on alpha, so change the dependency here to version + 2.0.6 which works fine with gtk+-2.0.9 + + 24 Dec 2002; Martin Schlemmer gtk+-2.2.0.ebuild : + Fix to depend on glib-2.2.0, else it fails with unresolved symbols .. + +*gtk+-2.2.0 (22 Dec 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + + 22 Dec 2002; foser gtk+-2.2.0.ebuild : + New version + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + + 21 Nov 2002; Martin Schlemmer gtk+-2.1.2.ebuild, + gtk+-2.0.9.ebuild : + + Turn of --export-symbols-regex for now, since it removes + the wrong symbols. Patch from Redhat. + +*gtk+-2.0.9 (20 Nov 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 20 Nov 2002; foser gtk+-2.0.9.ebuild : + New version, mainly fixes a bug which made metacity crash + +*gtk-2.0.8-r1 (15 Nov 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 15 Nov 2002; Seemant Kulleen gtk+-2.0.8-r1.ebuild + files/digest-gtk+-2.0.8-r1 : + + DirectFB patched version of it. + +*gtk+-2.1.2 (12 Nov 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 29 Nov 2002; Jon Nall gtk+-2.1.2.ebuild : + added ~ppc to KEYWORDS + + 12 Nov 2002; foser gtk+-2.1.2.ebuild : + GNOME 2.1.2 release + +*gtk+-2.0.8 (09 Nov 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 12 Nov 2002; L. Boshell : Removed directfb dep + since it wasn't being used. + + 11 Nov 2002; Spider gtk+-2.0.8.ebuild : + stabilized for x86 + + 09 Nov 2002; Spider gtk+-2.0.8.ebuild + files/digest-gtk+-2.0.8 : New version fixes the patch needed for last version + also fixed the dependencies, after 2.0.7-r1. + +*gtk+-2.0.7-r1 (05 Nov 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 09 Nov 2002; foser gtk+-2.0.7-r1 : + Added sgmltools-lite dep, to fix documentation problems + + 05 Nov 2002; foser gtk+-2.0.7-r1 : + Added a patch to fix problems with gdk-pixbuf (bug #10261) + +*gtk+-2.0.7 (04 Nov 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 04 Nov 2002; Spider gtk+-2.0.4.ebuild + files/digest-gtk+-2.0.4: added the latest stable release, bugfixes and nothing + more. Ripped out the directfb (wow, it survived more than 10 days! ) + + +*gtk+-2.1.1 (27 Oct 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 27 Oct 2002; foser gtk+-2.1.1.ebuild : + gnome 2.1 + +*gtk+-2.0.6-r3 (21 Oct 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 21 Oct 2002; Seemant Kulleen gtk+-2.0.6-r3.ebuild + files/digest-gtk+-2.0.6-r3 : + + Added the DirectFB patch (finally!) + +*gtk+-2.0.6-r2 (10 Oct 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 10 Oct 2002; foser gtk+-2.0.6-r2.ebuild : + Bumped revision to get the safety replacement added in r1 spread + +*gtk+-1.2.10-r9 (26 Sep 2002) + + 16 Mar 2003; Guy Martin gtk+-1.2.10-r9.ebuild : + Added hppa to keywords. + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 26 Sep 2002; Spider gtk+-1.2.10-r9.ebuild : + This build enables minimal debugging for all users, this will fix some unexpected crashes in amongst other things xchat. + +*gtk+-2.0.6-r1 (04 Jul 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 08 Oct 2002; foser gtk+-2.0.6-r1.ebuild : + Replace -O3 with -O2 to be on the safe side (bug 8762) + + 04 Jul 2002; Spider gtk+-2.0.6-r1.ebuild : + remove unnecessary debugging + remove bad parts from SRC_URI (broken use) + changed configure some + +*gtk+-2.0.6 (04 Jul 2002) + + 04 Feb 2003; Spider gtk+*.ebuild: + changed all DEBUG to DEBUGBUILD + + 04 Jul 2002; Gabriele Giorgetti gtk+-2.0.6.ebuild: + + New version. + +*gtk+-2.0.5-r2 (15 Jul 2002) + + 15 Jul 2002; Owen Stampflee : + + Added PPC to KEYWORDS. + + 15 Jul 2002; Seemant Kulleen gtk+-2.0.5-r2.ebuild + files/digest-gtk+-2.0.5-r2 : + + directfb enabled GTK is now a patch on our mirrors instead of being a + separate tarball. This makes the behaviour better for portage's server + side caching. + +*gtk+-2.0.5-r1 (03 Jul 2002) + + 03 Jul 2002; Seemant Kulleen gtk+-2.0.5-r1.ebuild + files/digest-gtk+-2.0.5-r1 : + + The DirectFB tarball was replaced on the directfb.org server with one that + has bugfixes in it. No need for paranoia, the directfb folks have + verified it for us. Thanks to: gentoo@tuurlijk.eu.org (Tuurlijk!) in bug + #4451 for spotting it. + +*gtk+-2.0.5 (17 Jun 2002) + + 17 Jun 2002; Seemant Kulleen gtk+-2.0.5.ebuild + files/digest-gtk+-2.0.5 : + + Version bump for both regular GTK+2 and GTK+DirectFB + +*gtk+-2.0.3-r1 (8 Jun 2002) + + 8 Jun 2002; Seemant Kulleen gtk+-2.0.3-r1.ebuild + files/digest-gtk+-2.0.3-r1 : + + Option for directfb-patched gtk libs. This actually gets and compiles a + separate source tarball from directfb.org + +*gtk+-2.0.3 (28 May 2002) + 28 May 2002; Spider gtk+-2.0.3.ebuild: + new stable branch + +*gtk+-1.2.10-r8 (27 May 2002) + + 27 May 2002; Bruce A. Locke gtk+-1.2.10-r8.ebuild: + + Ximian patch set and redhat/mdk patch merged + +*gtk+-2.0.2-r6 (27 May 2002) + 27 May 2002; Spider gtk+-2.0.2-r6.ebuild: + fix for the use png bug, not libtoolized + +*gtk+-2.0.2-r5 (23 May 2002) + 23 May 2002; Spider gtk+-2.0.2-r5.ebuild: + seems people who installed with the libtoolized version of gtk+ fails + when installing gtk+ again. Test this version if it works (read +libtoolize) + + +*gtk+-2.0.2-r4 (22 May 2002) + 22 May 2002; Spider gtk+-2.0.2-r4.ebuild: + + lintool check + debug info back inside + remove libtoolize since it breaks things + singlethread make since this uses cludgy code + + +gtk+-1.2.10-r7 (14 Apr 2002) + 14 Apr 2002; M.Schlemmer ; gtk+-1.2.10-r7.ebuild : + Libtoolize. + +*gtk+-2.0.2-r2 (24 Apr 2002) + 24 Apr 2002; Spider ; gtk+-2.0.2-r2.ebuild: + Libtoolize + +*gtk+-2.0.2-r2 (12 Apr 2002) + 12 Apr 2002; Spider ; gtk+-2.0.2-r2.ebuild: + Update so a user can disable png, jpeg, tiff support for gtk+ + This will so break things if they disable it though ;) + + +gtk+-2.0.2-r1 + 11 Apr 2002; Spider ; gtk+-1.2.10-r4.ebuild gtk+-1.2.10-r5.ebuild gtk+-1.2.10-r6.ebuild gtk+-1.2.10-r7.ebuild gtk+-2.0.2-r1.ebuild : + Update all glib dependencies to use glib-1.2* in preparation of +unmasking the glib-2.0.1 packages + + +*gtk+-2.0.2 (11 Apr 2002) + 11 Apr 2002; Spider ; gtk+-2.0.2-r1.ebuild: + New release with new api + USE="doc" will build api documentation + needs libpng 1.2.1 and is masked because of that. + needs glib 2.0 as well + + +*gtk+-1.2.10-r7 (23 Mar 2002) + + 23 Mar 2002; Seemant Kulleen gtk+-1.2.10-r7.ebuild : + + Man pages are now in LFH compliant /usr/share/man tree. Changes submitted by + Matthew Kennedy. + +*gtk+-1.2.10-r6 (21 Mar 2002) + + 21 Mar 2002; Seemant Kulleen gtk+-1.2.10-r6.ebuild : + + Changed the html documentation step to not be gzipped. This is a small + enough change that it shouldn't matter to have users remerge it. + +*gtk+-1.2.10-r6 (13 Mar 2002) + + 13 Mar 2002; Bruce A. Locke gtk+-1.2.10-r6.ebuild : + + gtk+ 1.2.10-r6 now includes patches from Ximian Gnome that help make + the gtk+ file picker dialog a little more user friendly :) + +*gtk+-1.2.10-r5 (10 Mar 2002) + + 10 Mar 2002; Bruce A. Locke gtk+-1.2.10-r5.ebuild : + + NLS fixes submitted by seemant@rocketmail.com (Seemant Kulleen) + + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch new file mode 100644 index 0000000000..3fe8cffd90 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch @@ -0,0 +1,17 @@ +http://bugzilla.gnome.org/show_bug.cgi?id=536767 + +Makes inkscape and claws-mail buildable again. Basically all packages still using +GtkCList and single included headers. +--- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400 ++++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400 +@@ -29,7 +29,9 @@ + #ifndef __GTK_SIGNAL_H__ + #define __GTK_SIGNAL_H__ + +-#include ++#include ++#include ++#include + #include + + G_BEGIN_DECLS diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch new file mode 100644 index 0000000000..f13ffe65c5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch @@ -0,0 +1,145 @@ +This patch touches both the Makefile.am files as well as the Makefile.in files because +eautoreconf doesn't work properly on gtk+, for some reason. + +--- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.am ++++ gtk+-2.18.5/demos/gtk-demo/Makefile.am +@@ -83,6 +83,10 @@ gtk_demo_DEPENDENCIES = $(DEPS) + gtk_demo_LDADD = $(LDADDS) + gtk_demo_LDFLAGS = -export-dynamic + ++if USE_QUARTZ ++gtk_demo_LDFLAGS += -framework AppKit -framework Carbon ++endif ++ + IMAGEFILES= alphatest.png \ + apple-red.png \ + background.jpg \ +--- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.in ++++ gtk+-2.18.5/demos/gtk-demo/Makefile.in +@@ -40,6 +40,7 @@ host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl + bin_PROGRAMS = gtk-demo$(EXEEXT) ++@USE_QUARTZ_TRUE@am__append_1 = -framework AppKit -framework Carbon + subdir = demos/gtk-demo + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +@@ -460,7 +461,7 @@ gtk_demo_SOURCES = \ + + gtk_demo_DEPENDENCIES = $(DEPS) + gtk_demo_LDADD = $(LDADDS) +-gtk_demo_LDFLAGS = -export-dynamic ++gtk_demo_LDFLAGS = -export-dynamic $(am__append_1) + IMAGEFILES = alphatest.png \ + apple-red.png \ + background.jpg \ +--- gtk+-2.18.5.orig/demos/Makefile.am ++++ gtk+-2.18.5/demos/Makefile.am +@@ -28,6 +28,10 @@ noinst_PROGRAMS = \ + testpixbuf-scale \ + pixbuf-demo + ++if USE_QUARTZ ++AM_LDFLAGS = -framework AppKit -framework Carbon ++endif ++ + # Need to build test-inline-pixbufs.h for testpixbuf + if HAVE_PNG + noinst_PROGRAMS += testpixbuf +--- gtk+-2.18.5.orig/demos/Makefile.in ++++ gtk+-2.18.5/demos/Makefile.in +@@ -433,6 +433,7 @@ LDADDS = \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + ++@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon + @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h + @CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource + @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) +--- gtk+-2.18.5.orig/gtk/Makefile.am ++++ gtk+-2.18.5/gtk/Makefile.am +@@ -888,7 +888,7 @@ libgtk_directfb_2_0_la_SOURCES = $(gtk_c + + libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) + libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid +-libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) ++libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon + libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) + + libgtk_x11_2_0_la_LIBADD = $(libadd) +@@ -901,6 +901,10 @@ libgtk_win32_2_0_la_DEPENDENCIES = $(gtk + libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) + libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) + ++if USE_QUARTZ ++AM_LDFLAGS = -framework AppKit -framework Carbon ++endif ++ + if USE_WIN32 + libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) + endif +--- gtk+-2.18.5.orig/gtk/Makefile.in ++++ gtk+-2.18.5/gtk/Makefile.in +@@ -1294,7 +1294,7 @@ libgtk_quartz_2_0_la_SOURCES = $(gtk_c_s + libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) + libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) + libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid +-libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) ++libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon + libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) + libgtk_x11_2_0_la_LIBADD = $(libadd) + libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 +@@ -1304,6 +1304,7 @@ libgtk_x11_2_0_la_DEPENDENCIES = $(deps) + libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) + libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) + libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) ++@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon + @USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) + EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la + DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) +--- gtk+-2.18.5.orig/perf/Makefile.am ++++ gtk+-2.18.5/perf/Makefile.am +@@ -20,6 +20,10 @@ LDADDS = \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + ++if USE_QUARTZ ++AM_LDFLAGS = -framework AppKit -framework Carbon ++endif ++ + noinst_PROGRAMS = \ + testperf + +--- gtk+-2.18.5.orig/perf/Makefile.in ++++ gtk+-2.18.5/perf/Makefile.in +@@ -373,6 +373,7 @@ LDADDS = \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + ++@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon + testperf_DEPENDENCIES = $(TEST_DEPS) + testperf_LDADD = $(LDADDS) + testperf_SOURCES = \ +--- gtk+-2.18.5.orig/tests/Makefile.am ++++ gtk+-2.18.5/tests/Makefile.am +@@ -20,6 +20,10 @@ LDADDS = \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + ++if USE_QUARTZ ++AM_LDFLAGS = -framework AppKit -framework Carbon ++endif ++ + if USE_X11 + testsocket_programs = testsocket testsocket_child + endif +--- gtk+-2.18.5.orig/tests/Makefile.in ++++ gtk+-2.18.5/tests/Makefile.in +@@ -639,6 +639,7 @@ LDADDS = \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + ++@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon + @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child + @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc + @HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \ diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch new file mode 100644 index 0000000000..e412c40f32 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch @@ -0,0 +1,12 @@ +diff --git a/gtk+-2.18.7/configure b/gtk+-2.18.7/configure +index 53755ea..17e7082 100755 +--- a/gtk+-2.18.7/configure ++++ b/gtk+-2.18.7/configure +@@ -10338,6 +10338,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc new file mode 100644 index 0000000000..8d1783431d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc @@ -0,0 +1,39 @@ +style "default" + +{ + font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*" +} + +style "button" = "default" + +{ + bg[PRELIGHT] = { 0.7, 0.7, 0.9 } +} + +style "treeitem" +{ +bg[ACTIVE] = { 0.7, 0.7, 0.9 } +} + +style "scrollbar" = "button" +{ + bg[ACTIVE] = {0.6, 0.6, 0.6 } +} + +style "status" { + bg[PRELIGHT] = { 0.3, 1.0, 0.3 } +} + +style "gtk-tooltips" { + bg[NORMAL] = "#ffff60" +} + +class "GtkWidget" style "default" +class "GtkButton" style "button" +class "GtkItem" style "button" +class "GtkProgressBar" style "status" +class "GtkScrollbar" style "scrollbar" +class "GtkTreeItem" style "treeitem" +widget "gtk-tooltips" style "gtk-tooltips" + + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild new file mode 100644 index 0000000000..8badde670a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/Attic/gtk+-2.18.7-r1.ebuild,v 1.1 2010/03/11 14:52:23 pacho Exp $ + +EAPI="2" + +inherit gnome.org flag-o-matic eutils libtool virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama" + +# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken +# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) +RDEPEND="!aqua? ( + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXt + x11-libs/libXext + >=x11-libs/libXrandr-1.2 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXcomposite + x11-libs/libXdamage + >=x11-libs/cairo-1.6[X,svg] + ) + aqua? ( + >=x11-libs/cairo-1.6[aqua,svg] + ) + xinerama? ( x11-libs/libXinerama ) + >=dev-libs/glib-2.21.3 + >=x11-libs/pango-1.20 + >=dev-libs/atk-1.13 + media-libs/fontconfig + x11-misc/shared-mime-info + >=media-libs/libpng-1.2.1 + cups? ( net-print/cups ) + jpeg? ( >=media-libs/jpeg-6b-r2:0 ) + jpeg2k? ( media-libs/jasper ) + tiff? ( >=media-libs/tiff-3.5.7 ) + ! "${T}/gtkrc" + insinto ${GTK2_CONFDIR} + doins "${T}"/gtkrc + + # Enable xft in environment as suggested by + echo "GDK_USE_XFT=1" > "${T}"/50gtk2 + doenvd "${T}"/50gtk2 + + dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" + + # This has to be removed, because it's multilib specific; generated in + # postinst + rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules" + + # ChromeOS specific: Remove all gtk im modules except im-ibus.* since + # we don't use them. (crosbus.com/11580) + for immodule in "${D%/}${EPREFIX}/usr/lib/gtk-2.0/2.*/immodules/*" + do + grep ibus $immodule || rm $immodule + done + + # add -framework Carbon to the .pc files + use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do + sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed" + done +} + +pkg_postinst() { + set_gtk2_confdir + + if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then + gtk-query-immodules-2.0 > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules" + gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders" + else + ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;" + ewarn "to complete the installation of GTK+, please create the" + ewarn "directory and then manually run:" + ewarn " cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" + ewarn " gtk-query-immodules-2.0 > gtk.immodules" + ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" + fi + + if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then + elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" + fi + + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your gtkrc." +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml new file mode 100644 index 0000000000..2662444a43 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml @@ -0,0 +1,11 @@ + + + + gnome + + GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, GTK+ is suitable + for projects ranging from small one-off projects to complete + application suites. + + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest new file mode 100644 index 0000000000..54681700df --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest @@ -0,0 +1 @@ +DIST libXfont-1.4.4.tar.bz2 440022 RMD160 0241b2505ed65b0bd66d8bd3c80330a4db6eea6d SHA1 189dd7a3756cb80bcf41b779bf05ec3c366e3041 SHA256 a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild new file mode 100644 index 0000000000..2080e5185d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.4.ebuild,v 1.7 2011/08/15 15:24:56 armin76 Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 + +DESCRIPTION="X.Org Xfont library" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="ipv6" + +RDEPEND="x11-libs/xtrans + x11-libs/libfontenc + >=media-libs/freetype-2 + app-arch/bzip2 + x11-proto/xproto + x11-proto/fontsproto" +DEPEND="${RDEPEND}" + +pkg_setup() { + xorg-2_pkg_setup + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable doc devel-docs) + $(use_with doc xmlto) + --without-bzip2 + --disable-freetype + --without-fop + --with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings" + ) +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest new file mode 100644 index 0000000000..5ef8fa2fab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest @@ -0,0 +1 @@ +DIST libXft-2.2.0.tar.bz2 290451 RMD160 e2955cfd5c8d2e02d4dba5f01b5132634005f971 SHA1 ed29784259f4e26df78141035560ae8a7c62e83f SHA256 c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild new file mode 100644 index 0000000000..6e4ff78986 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.2.0.ebuild,v 1.10 2011/02/14 23:22:40 xarthisius Exp $ + +EAPI=3 +inherit xorg-2 flag-o-matic + +DESCRIPTION="X.Org Xft library" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND=">=x11-libs/libXrender-0.8.2 + x11-libs/libX11 + x11-libs/libXext + media-libs/freetype + media-libs/fontconfig + x11-proto/xproto" +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch new file mode 100644 index 0000000000..0a66652398 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch @@ -0,0 +1,59 @@ +From 8436c920953f288aea2d6d5f370f8eaaaef82d97 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 15 Mar 2012 11:51:41 +1000 +Subject: [PATCH] Fix wrong button label and mask copy on OS X + +Regression introduced in c1a5a70b51f12dedf354102217c7cd4247ed3a4b. + +If double-padding is applied, the length of the mask on the wire may be +smaller than libXi's mask_len. When copying, only the wire length must be +copied, with the remainder set to 0. +When advancing to the button labels, the wire length matters, not libXi's +internal length. + +Signed-off-by: Peter Hutterer +Reviewed-by: Jeremy Huddleston +Tested-by: Jeremy Huddleston +--- + src/XExtInt.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/XExtInt.c b/src/XExtInt.c +index 89c0894..0c64f9a 100644 +--- a/src/XExtInt.c ++++ b/src/XExtInt.c +@@ -1610,12 +1610,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) + int struct_size; + int state_size; + int labels_size; ++ int wire_mask_size; + + cls_wire = (xXIButtonInfo*)any_wire; + sizeXIButtonClassType(cls_wire->num_buttons, + &struct_size, &state_size, + &labels_size); + cls_lib = next_block(&ptr_lib, struct_size); ++ wire_mask_size = ((cls_wire->num_buttons + 7)/8 + 3)/4 * 4; + + cls_lib->type = cls_wire->type; + cls_lib->sourceid = cls_wire->sourceid; +@@ -1623,10 +1625,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) + cls_lib->state.mask_len = state_size; + cls_lib->state.mask = next_block(&ptr_lib, state_size); + memcpy(cls_lib->state.mask, &cls_wire[1], +- cls_lib->state.mask_len); ++ wire_mask_size); ++ if (state_size != wire_mask_size) ++ memset(&cls_lib->state.mask[wire_mask_size], 0, ++ state_size - wire_mask_size); + + cls_lib->labels = next_block(&ptr_lib, labels_size); +- atoms =(uint32_t*)((char*)&cls_wire[1] + cls_lib->state.mask_len); ++ ++ atoms =(uint32_t*)((char*)&cls_wire[1] + wire_mask_size); + for (j = 0; j < cls_lib->num_buttons; j++) + cls_lib->labels[j] = *atoms++; + +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild new file mode 100644 index 0000000000..837b74daf7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.6.0.ebuild,v 1.1 2012/03/09 00:04:22 chithanh Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 + +DESCRIPTION="X.Org Xi library" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND=">=x11-libs/libX11-1.4.99.1 + >=x11-libs/libXext-1.1 + >=x11-proto/inputproto-2.1.99.6 + >=x11-proto/xproto-7.0.13 + >=x11-proto/xextproto-7.0.3" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch" +) + +pkg_setup() { + xorg-2_pkg_setup + XORG_CONFIGURE_OPTIONS=( + $(use_enable doc specs) + $(use_with doc xmlto) + $(use_with doc asciidoc) + --without-fop + ) +} + +pkg_postinst() { + xorg-2_pkg_postinst + + ewarn "Some special keys and keyboard layouts may stop working." + ewarn "To fix them, recompile xorg-server." +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch new file mode 100644 index 0000000000..b5448ccbbd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch @@ -0,0 +1,48 @@ +From f77482f0618f954de1d080599ada058e9a3c24ff Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 28 Jul 2009 09:59:41 +0000 +Subject: Fix compilation of host tools in cross-compilation case + +At 36e9f0d351afbf7fd2595990b2d39e7c551f6420, a fix was added to use +the host gcc instead of the target gcc when cross-compiling +libXt. This fix works, but is not solve the whole problem: the CFLAGS +and LDFLAGS used with the host compilers are the one defined for the +target compiler (and the flags for both compilers might be very +different). + +This new fix let libXt obey to CFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD +environment variables, and use them to compile the host tools in +util/. + +Signed-off-by: Thomas Petazzoni +--- +diff --git a/configure.ac b/configure.ac +index 043ab5f..cb00a41 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -48,6 +48,10 @@ if test x"$CC_FOR_BUILD" = x; then + fi + fi + AC_SUBST([CC_FOR_BUILD]) ++CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} ++AC_SUBST(CFLAGS_FOR_BUILD) ++LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} ++AC_SUBST(LDFLAGS_FOR_BUILD) + + PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) + +diff --git a/util/Makefile.am b/util/Makefile.am +index 0d3ff01..37b78d2 100644 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -5,6 +5,8 @@ noinst_PROGRAMS = makestrs + endif + + CC = @CC_FOR_BUILD@ ++CFLAGS = @CFLAGS_FOR_BUILD@ ++LDFLAGS = @LDFLAGS_FOR_BUILD@ + + EXTRA_DIST = \ + Shell.ht \ +-- +cgit v0.8.2 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild new file mode 100644 index 0000000000..4c136f8450 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.6.ebuild,v 1.6 2009/10/11 11:04:55 nixnut Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular flag-o-matic + +DESCRIPTION="X.Org Xt library" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE + x11-proto/xproto + x11-proto/kbproto" +DEPEND="${RDEPEND}" + +# patch is in git master and macros are only needed if SNAPSHOT is set to "yes" +DEPEND="${DEPEND} >=x11-misc/util-macros-1.2" +PATCHES=("${FILESDIR}/libXt-1.0.6-cross.patch") + +pkg_setup() { + # No such function yet + # x-modular_pkg_setup + + # (#125465) Broken with Bdirect support + filter-flags -Wl,-Bdirect + filter-ldflags -Bdirect + filter-ldflags -Wl,-Bdirect +} + +# msb: Copied from http://gentoo.mindzoo.de/index.cgi/changeset/151 +# Reference: http://gentoo.mindzoo.de/index.cgi/ticket/3 +x-modular_src_compile() { + x-modular_src_configure + + # For some reason, CC gets cleared out after the x-modular_src_make + # call so the recompile below would fail, so we save off the target CC. + TARGET_CC=$(tc-getCC) + + # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for makestr + ( filter-flags -m* ; + cd util && + make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS= clean all ) + x-modular_src_make + + # [Cross-Compile Love] Recompile 'makestr' with the target compiler, + # just in case we want to install it. + ( cd util && make CC="${TARGET_CC}" clean all ) +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild new file mode 120000 index 0000000000..119496a4a7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild @@ -0,0 +1 @@ +libdrm-tests-2.4.39.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild new file mode 100644 index 0000000000..3158c681c4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.34.ebuild,v 1.1 2012/05/11 00:25:45 chithanh Exp $ + +EAPI=4 +inherit xorg-2 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" + +UPSTREAM_PKG="${P/-tests}" + +DESCRIPTION="X.Org libdrm library" +HOMEPAGE="http://dri.freedesktop.org/" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + SRC_URI="http://dri.freedesktop.org/${PN}/${UPSTREAM_PKG}.tar.bz2" +fi + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +VIDEO_CARDS="exynos intel nouveau omap radeon vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} libkms" +RESTRICT="test" # see bug #236845 + +RDEPEND="dev-libs/libpthread-stubs + sys-fs/udev + video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) + ~x11-libs/libdrm-${PV}" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${UPSTREAM_PKG} + +pkg_setup() { + XORG_CONFIGURE_OPTIONS=( + --enable-udev + $(use_enable video_cards_intel intel) + $(use_enable video_cards_nouveau nouveau) + $(use_enable video_cards_radeon radeon) + $(use_enable video_cards_vmware vmwgfx-experimental-api) + $(use_enable video_cards_exynos exynos-experimental-api) + $(use_enable video_cards_omap omap-experimental-api) + $(use_enable libkms) + ) + + xorg-2_pkg_setup +} + +src_compile() { + xorg-2_src_compile + + # Manually build tests since they are not built automatically. + # This should match the logic of tests/Makefile.am. e.g. gem tests for + # intel only. + TESTS=( dr{i,m}stat ) + if use video_cards_intel; then + TESTS+=( gem_{basic,flink,readwrite,mmap} ) + fi + emake -C "${AUTOTOOLS_BUILD_DIR}"/tests "${TESTS[@]}" +} + +src_install() { + into /usr/local/ + dobin "${AUTOTOOLS_BUILD_DIR}"/tests/*/.libs/* + dobin "${TESTS[@]/#/${AUTOTOOLS_BUILD_DIR}/tests/.libs/}" +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild new file mode 120000 index 0000000000..f6ec90f982 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild @@ -0,0 +1 @@ +libdrm-2.4.39.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild new file mode 100644 index 0000000000..e0c9c85953 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.34.ebuild,v 1.1 2012/05/11 00:25:45 chithanh Exp $ + +EAPI=4 +inherit xorg-2 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" + +DESCRIPTION="X.Org libdrm library" +HOMEPAGE="http://dri.freedesktop.org/" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2" +fi + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +VIDEO_CARDS="exynos intel nouveau omap radeon vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} libkms" +RESTRICT="test" # see bug #236845 + +RDEPEND="dev-libs/libpthread-stubs + video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )" +DEPEND="${RDEPEND}" + +src_prepare() { + if [[ ${PV} = 9999* ]]; then + # tests are restricted, no point in building them + sed -ie 's/tests //' "${S}"/Makefile.am + fi + xorg-2_src_prepare +} + +src_configure() { + XORG_CONFIGURE_OPTIONS=( + --enable-udev + $(use_enable video_cards_intel intel) + $(use_enable video_cards_nouveau nouveau) + $(use_enable video_cards_radeon radeon) + $(use_enable video_cards_vmware vmwgfx-experimental-api) + $(use_enable video_cards_exynos exynos-experimental-api) + $(use_enable video_cards_omap omap-experimental-api) + $(use_enable libkms) + ) + + xorg-2_src_configure +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest new file mode 100644 index 0000000000..4c6b60b8aa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest @@ -0,0 +1 @@ +DIST libpciaccess-0.12.1.tar.bz2 326217 RMD160 d74b62e6d6dd502805f7c4d456f4bcf3f2a0780e SHA1 4933bda545df37395e57ff6b4bd61e17a5431770 SHA256 cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch new file mode 100644 index 0000000000..6de2b5f7aa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch @@ -0,0 +1,146 @@ +From f550c1347d3518874fe1c1d417a57322ee6b52db Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 27 Feb 2012 15:43:20 +0000 +Subject: linux: Don't use /dev/port + +Reviewed-by: Jeremy Huddleston +Signed-off-by: Adam Jackson +--- +diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c +index 09e7138..9566d40 100644 +--- a/src/linux_sysfs.c ++++ b/src/linux_sysfs.c +@@ -1,6 +1,7 @@ + /* + * (C) Copyright IBM Corporation 2006 + * All Rights Reserved. ++ * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), +@@ -44,6 +45,18 @@ + #include + #include + ++#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) ++#include ++#else ++#define inb(x) -1 ++#define inw(x) -1 ++#define inl(x) -1 ++#define outb(x) do {} while (0) ++#define outw(x) do {} while (0) ++#define outl(x) do {} while (0) ++#define iopl(x) -1 ++#endif ++ + #include "config.h" + + #ifdef HAVE_MTRR +@@ -769,12 +782,17 @@ pci_device_linux_sysfs_open_legacy_io(struct pci_io_handle *ret, + dev = pci_device_get_parent_bridge(dev); + } + +- /* If not, /dev/port is the best we can do */ +- if (!dev) +- ret->fd = open("/dev/port", O_RDWR); ++ /* ++ * You would think you'd want to use /dev/port here. Don't make that ++ * mistake, /dev/port only does byte-wide i/o cycles which means it ++ * doesn't work. If you think this is stupid, well, you're right. ++ */ + +- if (ret->fd < 0) +- return NULL; ++ /* If we've no other choice, iopl */ ++ if (ret->fd < 0) { ++ if (iopl(3)) ++ return NULL; ++ } + + ret->base = base; + ret->size = size; +@@ -786,7 +804,8 @@ static void + pci_device_linux_sysfs_close_io(struct pci_device *dev, + struct pci_io_handle *handle) + { +- close(handle->fd); ++ if (handle->fd > -1) ++ close(handle->fd); + } + + static uint32_t +@@ -794,8 +813,11 @@ pci_device_linux_sysfs_read32(struct pci_io_handle *handle, uint32_t port) + { + uint32_t ret; + +- pread(handle->fd, &ret, 4, port + handle->base); +- ++ if (handle->fd > -1) ++ pread(handle->fd, &ret, 4, port + handle->base); ++ else ++ ret = inl(port + handle->base); ++ + return ret; + } + +@@ -804,7 +826,10 @@ pci_device_linux_sysfs_read16(struct pci_io_handle *handle, uint32_t port) + { + uint16_t ret; + +- pread(handle->fd, &ret, 2, port + handle->base); ++ if (handle->fd > -1) ++ pread(handle->fd, &ret, 2, port + handle->base); ++ else ++ ret = inw(port + handle->base); + + return ret; + } +@@ -814,7 +839,10 @@ pci_device_linux_sysfs_read8(struct pci_io_handle *handle, uint32_t port) + { + uint8_t ret; + +- pread(handle->fd, &ret, 1, port + handle->base); ++ if (handle->fd > -1) ++ pread(handle->fd, &ret, 1, port + handle->base); ++ else ++ ret = inb(port + handle->base); + + return ret; + } +@@ -823,21 +851,30 @@ static void + pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port, + uint32_t data) + { +- pwrite(handle->fd, &data, 4, port + handle->base); ++ if (handle->fd > -1) ++ pwrite(handle->fd, &data, 4, port + handle->base); ++ else ++ outl(data, port + handle->base); + } + + static void + pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port, + uint16_t data) + { +- pwrite(handle->fd, &data, 2, port + handle->base); ++ if (handle->fd > -1) ++ pwrite(handle->fd, &data, 2, port + handle->base); ++ else ++ outw(data, port + handle->base); + } + + static void + pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port, + uint8_t data) + { +- pwrite(handle->fd, &data, 1, port + handle->base); ++ if (handle->fd > -1) ++ pwrite(handle->fd, &data, 1, port + handle->base); ++ else ++ outb(data, port + handle->base); + } + + static int +-- +cgit v0.9.0.2-2-gbebe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild new file mode 100644 index 0000000000..799789e483 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.12.902.ebuild,v 1.1 2011/12/19 01:39:15 chithanh Exp $ + +EAPI=4 +inherit xorg-2 + +DESCRIPTION="Library providing generic access to the PCI bus and devices" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="minimal zlib" + +DEPEND="!bo) +- drm_intel_bo_wait_rendering(obj_surface->bo); +- ++ /* ++ * No need to sync explicitly, as the driver will properly sync this ++ * surface before the next operation using it as its source begins. ++ */ + return VA_STATUS_SUCCESS; + } + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch new file mode 100644 index 0000000000..b8c8483a4a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch @@ -0,0 +1,24 @@ +diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c +index 3d85248..c888afd 100644 +--- a/src/i965_drv_video.c ++++ b/src/i965_drv_video.c +@@ -2399,9 +2399,6 @@ i965_Terminate(VADriverContextP ctx) + if (i965_post_processing_terminate(ctx) == False) + return VA_STATUS_ERROR_UNKNOWN; + +- if (intel_driver_terminate(ctx) == False) +- return VA_STATUS_ERROR_UNKNOWN; +- + i965_destroy_heap(&i965->buffer_heap, i965_destroy_buffer); + i965_destroy_heap(&i965->image_heap, i965_destroy_image); + i965_destroy_heap(&i965->subpic_heap, i965_destroy_subpic); +@@ -2409,6 +2406,9 @@ i965_Terminate(VADriverContextP ctx) + i965_destroy_heap(&i965->context_heap, i965_destroy_context); + i965_destroy_heap(&i965->config_heap, i965_destroy_config); + ++ if (intel_driver_terminate(ctx) == False) ++ return VA_STATUS_ERROR_UNKNOWN; ++ + free(ctx->pDriverData); + ctx->pDriverData = NULL; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild new file mode 100644 index 0000000000..2e2c3a35fd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.18.ebuild,v 1.1 2012/06/08 15:31:07 aballier Exp $ + +EAPI="3" + +SCM="" +if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild + SCM=git-2 + EGIT_BRANCH=master + EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver" +fi + +inherit autotools ${SCM} multilib + +DESCRIPTION="HW video decode support for Intel integrated graphics" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi" +if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild + SRC_URI="" + S="${WORKDIR}/${PN}" +else + MY_P=${P#libva-} + SRC_URI="http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/${MY_P}.tar.bz2" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="MIT" +SLOT="0" +if [ "${PV%9999}" = "${PV}" ] ; then + KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +else + KEYWORDS="" +fi +IUSE="" + +RDEPEND=">=x11-libs/libva-1.1.0_rc1 + !=x11-libs/libdrm-2.4.23[video_cards_intel]" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/va_terminate.patch + epatch "${FILESDIR}"/no_explicit_sync_in_va_sync_surface.patch + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS NEWS README || die + find "${D}" -name '*.la' -delete +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest new file mode 100644 index 0000000000..7c110a86d1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest @@ -0,0 +1,2 @@ +DIST libxcb-1.4.tar.bz2 306116 RMD160 c8ce1e1670c09ded64c9a1642c8ed26403ef9986 SHA1 fb3bc1a81058e1894663771f87b8a3919f8520ce SHA256 07b6e2d3dde4beb06dc8310daec1c5c82d67022e3c9aec35f3783e63aad3209e +DIST libxcb-1.5.tar.bz2 333760 RMD160 ef50acaf3961ab6b988b97eac3b30ce940b0668a SHA1 87b32a2de342e4c2991c8feed15bdd0602840832 SHA256 3bf062e4ae585610c3e45b6ffe3035edf8b535b0e34f08068f0532a3d4381133 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild new file mode 100644 index 0000000000..5978af728f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.5.ebuild,v 1.2 2009/12/04 21:18:36 remi Exp $ + +EAPI=3 + +inherit xorg-2 libtool + +DESCRIPTION="X C-language Bindings library" +HOMEPAGE="http://xcb.freedesktop.org/" +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb" +[[ ${PV} != 9999* ]] && \ + SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +IUSE="doc selinux" + +RDEPEND="x11-libs/libXau + x11-libs/libXdmcp + dev-libs/libpthread-stubs" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + dev-libs/libxslt + >=x11-proto/xcb-proto-1.7.1 + >=dev-lang/python-2.5[xml]" + +pkg_setup() { + CONFIGURE_OPTIONS="$(use_enable doc build-docs) + $(use_enable selinux) + --enable-xinput" +} + +src_prepare() { + elibtoolize +} + +src_compile() { + xorg-2_src_compile XCBPROTO_XCBINCLUDEDIR="${SYSROOT}/usr/share/xcb" +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild new file mode 100644 index 0000000000..86adbc83af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +EGIT_REPO_URI="http://git.chromium.org/chromiumos/third_party/${PN}.git" +EGIT_COMMIT="f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a" +XORG_EAUTORECONF="yes" + +inherit xorg-2 git-2 + +SRC_URI="" + +DESCRIPTION="X.Org xkbcommon library" +KEYWORDS="amd64 arm x86" +IUSE="" + +RDEPEND="x11-proto/xproto + >=x11-proto/kbproto-1.0.5" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex" + +pkg_setup() { + xorg-2_pkg_setup + XORG_CONFIGURE_OPTIONS=( + --with-xkb-config-root=/usr/share/X11/xkb + ) +} + +src_prepare() { + # http://bugs.gentoo.org/show_bug.cgi?id=386181 + cat <<-\EOF >> makekeys/Makefile.am + CFLAGS = $(BUILD_CFLAGS) + CPPFLAGS = $(BUILD_CPPFLAGS) + LDFLAGS = $(BUILD_LDFLAGS) + EOF + + xorg-2_src_prepare +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest new file mode 100644 index 0000000000..638475f446 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest @@ -0,0 +1 @@ +DIST pango-1.28.4.tar.bz2 1503441 RMD160 e9dc19b62263fdbd5b58c00092220af87ed929df SHA1 e715954a5a3b358889d15b6235e1965303dbb622 SHA256 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch new file mode 100644 index 0000000000..cdbdd5024e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch @@ -0,0 +1,20 @@ +--- pango/Makefile.am ++++ pango/Makefile.am +@@ -16,6 +16,7 @@ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ + -DG_DISABLE_DEPRECATED \ +--- pango/modules.c ++++ pango/modules.c +@@ -353,6 +353,7 @@ + + if (!file_str) + file_str = g_build_filename (pango_get_sysconf_subdirectory (), ++ HOST, + "pango.modules", + NULL); + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules new file mode 100644 index 0000000000..98d1fa82c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules @@ -0,0 +1,35 @@ +# Pango Modules file +# Automatically generated file, do not edit +# +# ModulesPath = /usr/@libdir@/pango/1.6.0/modules +# +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* +/usr/@libdir@/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* +/usr/@libdir@/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* +/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* +/usr/@libdir@/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* +/usr/@libdir@/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* +/usr/@libdir@/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* +/usr/@libdir@/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* +/usr/@libdir@/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* +/usr/@libdir@/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* +/usr/@libdir@/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common: +/usr/@libdir@/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild new file mode 120000 index 0000000000..2856591793 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild @@ -0,0 +1 @@ +pango-1.28.4.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild new file mode 100644 index 0000000000..e1ea215672 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.1 2011/04/04 21:24:23 nirbheek Exp $ + +EAPI="3" +GCONF_DEBUG="yes" + +inherit autotools eutils gnome2 multilib toolchain-funcs + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="http://www.pango.org/" + +LICENSE="LGPL-2 FTL" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="X doc introspection test" + +RDEPEND=">=dev-libs/glib-2.24:2 + >=media-libs/fontconfig-2.5.0:1.0 + media-libs/freetype:2 + >=x11-libs/cairo-1.7.6[X?] + X? ( + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXft )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/gtk-doc-am-1.13 + doc? ( + >=dev-util/gtk-doc-1.13 + ~app-text/docbook-xml-dtd-4.1.2 + x11-libs/libXft ) + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + test? ( + >=dev-util/gtk-doc-1.13 + ~app-text/docbook-xml-dtd-4.1.2 + x11-libs/libXft ) + X? ( x11-proto/xproto )" + +function multilib_enabled() { + has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] ) +} + +pkg_setup() { + tc-export CXX + G2CONF="${G2CONF} + $(use_enable introspection) + $(use_with X x) + $(use X && echo --x-includes=${SYSROOT}${EPREFIX}/usr/include) + $(use X && echo --x-libraries=${SYSROOT}${EPREFIX}/usr/$(get_libdir))" + DOCS="AUTHORS ChangeLog* NEWS README THANKS" +} + +src_prepare() { + gnome2_src_prepare + + # make config file location host specific so that a 32bit and 64bit pango + # wont fight with each other on a multilib system. Fix building for + # emul-linux-x86-gtklibs + if multilib_enabled ; then + epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch" + eautoreconf + fi + + elibtoolize # for Darwin bundles +} + +src_install() { + gnome2_src_install + find "${ED}/usr/$(get_libdir)/pango/1.6.0/modules" -name "*.la" -delete || die + if multilib_enabled; then + insinto "/etc/pango/${CHOST}" + else + insinto /etc/pango + fi + # TODO(msb): Ugly Hack fix for pango-querymodules pango-querymodules + # needs to be run on the target so we ran it on the target and stored + # the result which we copy here + sed "s:@libdir@:$(get_libdir):g" "${FILESDIR}"/pango.modules \ + >pango.modules || die + doins pango.modules || die +} + +pkg_postinst() { + if [ "${ROOT}" = "/" ] ; then + einfo "Generating modules listing..." + + local PANGO_CONFDIR= + + if multilib_enabled ; then + PANGO_CONFDIR="${EPREFIX}/etc/pango/${CHOST}" + else + PANGO_CONFDIR="${EPREFIX}/etc/pango" + fi + + mkdir -p ${PANGO_CONFDIR} + + pango-querymodules > ${PANGO_CONFDIR}/pango.modules + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest new file mode 100644 index 0000000000..906b276480 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest @@ -0,0 +1 @@ +DIST unclutter-8.tar.Z 12344 RMD160 a78b6e148e7eea8f33b6fe0d6db3ad570889770d SHA1 726e829b41e9cb4d6a14cd91ca7efa02125be2be SHA256 b855a78d4465ab2f86287eacac63a73f1504b08522840aa37718776e7ec9192a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch new file mode 100644 index 0000000000..a6ea52ae48 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch @@ -0,0 +1,229 @@ +diff --git a/Makefile b/Makefile +index 3c7b93c..30c1e5e 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,8 +28,8 @@ + MANDIR = $(MANSOURCEPATH)1 + IMAKE = imake + XLIB = $(EXTENSIONLIB) -lX11 +- +- LOCAL_LIBRARIES = $(XLIB) ++ XINPUT = -lXi -lXext ++ LOCAL_LIBRARIES = $(XLIB) $(XINPUT) + + OBJS = unclutter.o + SRCS = unclutter.c +diff --git a/unclutter.c b/unclutter.c +index 98b30af..934d49e 100644 +--- a/unclutter.c ++++ b/unclutter.c +@@ -23,6 +23,8 @@ + #include + #include + #include ++#include ++#include + #include + #include "vroot.h" + +@@ -50,12 +52,144 @@ usage(){ + -dontignoremodifiers don't ignore modifier keys\n\ + (requires -keystroke)\n\ + -not names... dont apply to windows whose wm-name begins.\n\ +- (must be last argument)"); ++ (must be last argument)\ ++ -notap "); ++ + } + + #define ALMOSTEQUAL(a,b) (abs(a-b)<=jitter) + #define ANYBUTTON (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask) + ++static const char* property_name = "Tap Paused"; ++ ++/* ++ * Method to determine version of the xinput extension ++ */ ++int xinput_version(display) ++Display *display; ++{ ++ XExtensionVersion *version; ++ static int vers = -1; ++ ++ if (vers != -1) ++ return vers; ++ ++ version = XGetExtensionVersion(display, INAME); ++ ++ if (version && (version != (XExtensionVersion*) NoSuchExtension)) { ++ vers = version->major_version; ++ XFree(version); ++ } ++ ++ return vers; ++} ++ ++/* ++ * Method to find device info for a given name (name can be device name or ++ * device id) ++ */ ++XIDeviceInfo* xi2_find_device_info(display, name) ++Display *display; ++char *name; ++{ ++ XIDeviceInfo *info; ++ int ndevices; ++ Bool is_id = True; ++ int i, id = -1; ++ ++ for (i = 0; i < strlen(name); i++) { ++ if (!isdigit(name[i])) { ++ is_id = False; ++ break; ++ } ++ } ++ ++ if (is_id) { ++ id = atoi(name); ++ } ++ ++ info = XIQueryDevice(display, XIAllDevices, &ndevices); ++ for (i = 0; i < ndevices; i++) { ++ if ((is_id && info[i].deviceid == id) ++ || (!is_id && strcmp(info[i].name, name) == 0)) { ++ return &info[i]; ++ } ++ } ++ ++ XIFreeDeviceInfo(info); ++ return NULL; ++} ++ ++/* ++ * Method to set the tap property ++ */ ++void set_tap_property(display, info, value) ++Display *display; ++XIDeviceInfo* info; ++unsigned char value; ++{ ++ // Atom for property name ++ Atom prop = XInternAtom(display, property_name, False); ++ ++ // Storage for existing property information ++ Atom type; ++ int format; ++ long unsigned int nitems, bytes; ++ unsigned char* data; ++ ++ // Get existing property to check format ++ int result = XIGetProperty(display, info->deviceid, prop, 0, 0, False, ++ AnyPropertyType, &type, &format, &nitems, &bytes, &data); ++ if (result != Success) { ++ fprintf(stderr, "Device %d property '%s' does not exist\n", ++ info->deviceid, property_name); ++ return; ++ } ++ XFree(data); ++ ++ // Check if property format is as expected ++ if (type != XA_INTEGER && format != 8 && nitems != 1) { ++ fprintf(stderr, "Device %d property '%s' is in wrong format\n", ++ info->deviceid, property_name); ++ return; ++ } ++ ++ // Change property to new value ++ XIChangeProperty(display, info->deviceid, prop, XA_INTEGER, 8, ++ PropModeReplace, &value, 1); ++} ++ ++/* ++ * Check xinput version and return touchpad device info ++ */ ++XIDeviceInfo* setup_xinput(display, touchpad_device_name) ++Display *display; ++char* touchpad_device_name; ++{ ++ int event, error, xi_opcode; ++ ++ if (!XQueryExtension(display, "XInputExtension", &xi_opcode, &event, ++ &error)) { ++ printf("X Input extension not available.\n"); ++ return 0; ++ } ++ ++ if (xinput_version(display) != XI_2_Major) { ++ fprintf(stderr, "%s extension version 2 not available\n", INAME); ++ return 0; ++ } ++ ++ XIDeviceInfo* info = xi2_find_device_info(display, touchpad_device_name); ++ if (info == NULL) { ++ fprintf(stderr, "Cannot find device named %s\n", touchpad_device_name); ++ return 0; ++ } ++ ++ set_tap_property(display, info, 0); ++ ++ return info; ++} ++ + /* Since the small window we create is a child of the window the pointer is + * in, it can be destroyed by its adoptive parent. Hence our destroywindow() + * can return an error, saying it no longer exists. Similarly, the parent +@@ -218,6 +352,7 @@ Window root; + + main(argc,argv)char **argv;{ + Display *display; ++ XIDeviceInfo *touchpad_device = 0; + int screen,oldx = -99,oldy = -99,numscreens; + int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0, + dovisible = 1, doevents = 1, onescreen = 0, dontignoremodifiers = 0; +@@ -225,6 +360,7 @@ main(argc,argv)char **argv;{ + Window *realroot; + Window root; + char *displayname = 0; ++ char *notap_device_name = 0; + struct KeyRecord* ignorekeyoverflow = NULL; + static unsigned char + ignorekeytable[SLOTCOUNT / (sizeof(unsigned char) * 8)]; +@@ -276,10 +412,18 @@ main(argc,argv)char **argv;{ + argc--,argv++; + if(argc<0)usage(); + displayname = *argv; +- }else usage(); ++ }else if(strcmp(*argv,"-notap")==0){ ++ argc--,argv++; ++ if(argc<0)usage(); ++ notap_device_name = *argv; ++ } ++ else usage(); + } + display = XOpenDisplay(displayname); + if(display==0)pexit("could not open display"); ++ if(notap_device_name != 0) { ++ touchpad_device = setup_xinput(display, notap_device_name); ++ } + numscreens = ScreenCount(display); + cursor = (Cursor*) malloc(numscreens*sizeof(Cursor)); + realroot = (Window*) malloc(numscreens*sizeof(Window)); +@@ -387,6 +531,8 @@ main(argc,argv)char **argv;{ + PointerMotionMask|ButtonPressMask|ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, cursor[screen], + CurrentTime)==GrabSuccess){ ++ if(touchpad_device) set_tap_property(display, touchpad_device, 1); ++ + /* wait for a button event or large cursor motion */ + XEvent event; + do{ +@@ -402,7 +548,9 @@ main(argc,argv)char **argv;{ + ALMOSTEQUAL(rooty,event.xmotion.y)) || + (event.type!=KeyPress && event.type!=MotionNotify)); + XUngrabPointer(display, CurrentTime); ++ if(touchpad_device) set_tap_property(display, touchpad_device, 0); + } ++ + }else{ + XSetWindowAttributes attributes; + XEvent event; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch new file mode 100644 index 0000000000..5dec9a0e53 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch @@ -0,0 +1,181 @@ +From 058c02041246755a0817f7611b275dee397b6f57 Mon Sep 17 00:00:00 2001 +From: Andrew de los Reyes +Date: Wed, 22 Feb 2012 19:23:50 -0800 +Subject: [PATCH] Allow some keys to be ignored when using -keystroke. + +Generally, we want most, but not all, keystrokes to hide the +cursor. Alt-Tab is an example of a keystroke that deals with window +placement, which may happen while the user is using the mouse, so it's +nice to not hide the cursor when it is hit. Similarly, modifier keys +shouldn't hide the cursor, since a user may be trying to Alt-click or +Alt-drag. + +To address these, we create two new options: + +-ignore: allows a given modifier set and keycode to be specified. It + will be ignored. This option can be called many times with many + ignore values. + + A simple lookup table is created. There are too many possible + keycodes to create a full lookup table (Afaik), so this table is + enough to hold all the common cases (keycodes 0-127 w/ Shift, Ctrl, + Alt modifiers). For overflow, a linked list of keycodes is used. + +-dontignoremodifiers: Modifier keys are ignored by default now, but + with this option they can still cause the cursor to hide. +--- + unclutter.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 103 insertions(+), 3 deletions(-) + +diff --git a/unclutter.c b/unclutter.c +index 009bad5..98b30af 100644 +--- a/unclutter.c ++++ b/unclutter.c +@@ -44,6 +44,11 @@ usage(){ + -onescreen apply only to given screen of display\n\ + -visible ignore visibility events\n\ + -noevents dont send pseudo events\n\ ++ -ignore neither show nor hide when this key typed\n\ ++ (may be used multiple times;\n\ ++ requires -keystroke)\n\ ++ -dontignoremodifiers don't ignore modifier keys\n\ ++ (requires -keystroke)\n\ + -not names... dont apply to windows whose wm-name begins.\n\ + (must be last argument)"); + } +@@ -66,6 +71,80 @@ XErrorEvent *error; + (*defaulthandler)(display,error); + } + ++struct KeyRecord { ++ unsigned int state; ++ unsigned int keycode; ++ struct KeyRecord *next; ++}; ++ ++/* Returns -1 if doesn't fit in table, and should use overflow */ ++ssize_t keystoreslot(state, keycode) ++unsigned int state; ++unsigned int keycode; ++{ ++ /* 7 bits for keycode then 3 bits for state: shift, ctrl, mod1 (alt). */ ++ if (keycode > 0x7f) ++ return -1; ++ if (state & ~(ShiftMask | ControlMask | Mod1Mask)) ++ return -1; /* Doesn't fit w/ modifiers */ ++ ssize_t ret = keycode; ++ ret |= ((state & ShiftMask) ? 1 : 0) << 7; ++ ret |= ((state & ControlMask) ? 1 : 0) << 8; ++ ret |= ((state & Mod1Mask) ? 1 : 0) << 9; ++ return ret; ++} ++ ++/* 10 bits per modifier + keycode entry */ ++#define SLOTCOUNT (1 << 10) ++ ++void keystoreset(table, overflow, state, keycode) ++unsigned char *table; ++struct KeyRecord **overflow; ++unsigned int state; ++unsigned int keycode; ++{ ++ ssize_t slot = keystoreslot(state, keycode); ++ if (slot < 0) { ++ struct KeyRecord* elt = malloc(sizeof(struct KeyRecord)); ++ if (elt == NULL) { ++ fprintf(stderr, ++ "malloc failed. Some ignore key requests will not be honored.\n"); ++ return; ++ } ++ elt->state = state; ++ elt->keycode = keycode; ++ elt->next = *overflow; ++ *overflow = elt; ++ return; ++ } ++ size_t byteindex = slot / (sizeof(*table) * 8); ++ size_t bitindex = slot % (sizeof(*table) * 8); ++ table[byteindex] |= 1 << bitindex; ++} ++ ++int keystoreget(table, overflow, state, keycode) ++unsigned char *table; ++struct KeyRecord *overflow; ++unsigned int state; ++unsigned int keycode; ++{ ++ ssize_t slot = keystoreslot(state, keycode); ++ if (slot < 0) { ++ while (overflow && ++ (state != overflow->state || keycode != overflow->keycode)) ++ overflow = overflow->next; ++ return overflow != NULL; ++ } ++ size_t byteindex = slot / (sizeof(*table) * 8); ++ size_t bitindex = slot % (sizeof(*table) * 8); ++ return (table[byteindex] & (1 << bitindex)) != 0; ++} ++ ++int ismodifier(Display *display, unsigned int keycode) { ++ KeySym ks = XKeycodeToKeysym(display, keycode, 0); ++ return ks >= XK_Shift_L && ks <= XK_Hyper_R; ++} ++ + void XSelectAll(display, window, type) + Display *display; + Window window; +@@ -141,12 +220,18 @@ main(argc,argv)char **argv;{ + Display *display; + int screen,oldx = -99,oldy = -99,numscreens; + int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0, +- dovisible = 1, doevents = 1, onescreen = 0; ++ dovisible = 1, doevents = 1, onescreen = 0, dontignoremodifiers = 0; + Cursor *cursor; + Window *realroot; + Window root; + char *displayname = 0; +- ++ struct KeyRecord* ignorekeyoverflow = NULL; ++ static unsigned char ++ ignorekeytable[SLOTCOUNT / (sizeof(unsigned char) * 8)]; ++ unsigned int modifier; ++ unsigned int keycode; ++ ++ memset(ignorekeytable, 0, sizeof(ignorekeytable)); + progname = *argv; + argc--; + while(argv++,argc-->0){ +@@ -156,6 +241,16 @@ main(argc,argv)char **argv;{ + idletime = atoi(*argv); + }else if(strcmp(*argv,"-keystroke")==0){ + idletime = -1; ++ }else if(strcmp(*argv,"-ignore")==0){ ++ argc--,argv++; ++ if(argc<0)usage(); ++ modifier = atoi(*argv); ++ argc--,argv++; ++ if(argc<0)usage(); ++ keycode = atoi(*argv); ++ keystoreset(ignorekeytable, &ignorekeyoverflow, modifier, keycode); ++ }else if(strcmp(*argv,"-dontignoremodifiers")==0){ ++ dontignoremodifiers = 1; + }else if(strcmp(*argv,"-jitter")==0){ + argc--,argv++; + if(argc<0)usage(); +@@ -236,7 +331,12 @@ main(argc,argv)char **argv;{ + continue; + } + }while(event.type != KeyPress || +- (event.xkey.state & ANYBUTTON)); ++ (event.xkey.state & ANYBUTTON) || ++ keystoreget(ignorekeytable, ignorekeyoverflow, ++ event.xkey.state & ~ANYBUTTON, ++ event.xkey.keycode) || ++ (!dontignoremodifiers && ++ ismodifier(display, event.xkey.keycode))); + oldx = event.xkey.x_root; + oldy = event.xkey.y_root; + } +-- +1.7.3.4 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch new file mode 100644 index 0000000000..b4e34587a9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch @@ -0,0 +1,45 @@ +From 1e9863e2ae8466ba3abe9f44787d1ac5770edf19 Mon Sep 17 00:00:00 2001 +From: Andrew de los Reyes +Date: Mon, 20 Feb 2012 17:22:13 -0800 +Subject: [PATCH 1/3] Take action on KeyPress, not KeyRelease + +When using KeyRelease, it feels like there is a delay between using +the keyboard and cursor disappearing, which makes it feel unpolished. +--- + unclutter.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/unclutter.c b/unclutter.c +index 23bb99b..ab4e039 100644 +--- a/unclutter.c ++++ b/unclutter.c +@@ -180,7 +180,7 @@ main(argc,argv)char **argv;{ + realroot[screen] = XRootWindow(display,screen); + cursor[screen] = createnullcursor(display,realroot[screen]); + if(idletime<0) +- XSelectInput(display,realroot[screen],KeyReleaseMask); ++ XSelectInput(display,realroot[screen],KeyPressMask); + } + screen = DefaultScreen(display); + root = VirtualRootWindow(display,screen); +@@ -209,7 +209,7 @@ main(argc,argv)char **argv;{ + XEvent event; + do{ + XNextEvent(display,&event); +- }while(event.type != KeyRelease || ++ }while(event.type != KeyPress || + (event.xkey.state & ANYBUTTON)); + oldx = event.xkey.x_root; + oldy = event.xkey.y_root; +@@ -265,7 +265,7 @@ main(argc,argv)char **argv;{ + XEvent event; + do{ + XNextEvent(display,&event); +- }while(event.type==KeyRelease || ++ }while(event.type==KeyPress || + (event.type==MotionNotify && + ALMOSTEQUAL(rootx,event.xmotion.x) && + ALMOSTEQUAL(rooty,event.xmotion.y))); +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch new file mode 100644 index 0000000000..de3bd5cc0d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch @@ -0,0 +1,99 @@ +From f5e6e228207e82f1ff69f1d4d04f9ad53d3dfc02 Mon Sep 17 00:00:00 2001 +From: Andrew de los Reyes +Date: Mon, 20 Feb 2012 17:29:57 -0800 +Subject: [PATCH 2/3] Select keystrokes from all windows, not just root. + +To do this, we create a new function XSelectAll, that calls +XSelectInput on a tree of windows. Also, watch for CreateNotify +events, which indicate a new window is created, and when that happens, +call XSelectAll on it to get key events. +--- + unclutter.c | 41 +++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 39 insertions(+), 2 deletions(-) + +diff --git a/unclutter.c b/unclutter.c +index ab4e039..009bad5 100644 +--- a/unclutter.c ++++ b/unclutter.c +@@ -66,6 +66,26 @@ XErrorEvent *error; + (*defaulthandler)(display,error); + } + ++void XSelectAll(display, window, type) ++Display *display; ++Window window; ++unsigned long type; ++{ ++ Window parent; ++ Window *children; ++ unsigned int nchildren; ++ int status, i; ++ XSelectInput(display, window, type); ++ ++ status = XQueryTree(display, window, &window, ++ &parent, &children, &nchildren); ++ if (status == 0 || nchildren == 0) ++ return; ++ for (i = 0; i < nchildren; i++) ++ XSelectAll(display, children[i], type); ++ XFree((char *)children); ++} ++ + char **names; /* -> argv list of names to avoid */ + + /* +@@ -180,7 +200,8 @@ main(argc,argv)char **argv;{ + realroot[screen] = XRootWindow(display,screen); + cursor[screen] = createnullcursor(display,realroot[screen]); + if(idletime<0) +- XSelectInput(display,realroot[screen],KeyPressMask); ++ XSelectAll(display, realroot[screen], ++ KeyPressMask|SubstructureNotifyMask); + } + screen = DefaultScreen(display); + root = VirtualRootWindow(display,screen); +@@ -209,6 +230,11 @@ main(argc,argv)char **argv;{ + XEvent event; + do{ + XNextEvent(display,&event); ++ if (event.type == CreateNotify) { ++ XSelectAll(display, event.xcreatewindow.parent, ++ KeyPressMask|SubstructureNotifyMask); ++ continue; ++ } + }while(event.type != KeyPress || + (event.xkey.state & ANYBUTTON)); + oldx = event.xkey.x_root; +@@ -265,10 +291,16 @@ main(argc,argv)char **argv;{ + XEvent event; + do{ + XNextEvent(display,&event); ++ if (event.type == CreateNotify) { ++ XSelectAll(display, event.xcreatewindow.parent, ++ KeyPressMask|SubstructureNotifyMask); ++ continue; ++ } + }while(event.type==KeyPress || + (event.type==MotionNotify && + ALMOSTEQUAL(rootx,event.xmotion.x) && +- ALMOSTEQUAL(rooty,event.xmotion.y))); ++ ALMOSTEQUAL(rooty,event.xmotion.y)) || ++ (event.type!=KeyPress && event.type!=MotionNotify)); + XUngrabPointer(display, CurrentTime); + } + }else{ +@@ -333,6 +365,11 @@ main(argc,argv)char **argv;{ + /* wait till pointer leaves window */ + do{ + XNextEvent(display,&event); ++ if (event.type == CreateNotify) { ++ XSelectAll(display, event.xcreatewindow.parent, ++ KeyPressMask|SubstructureNotifyMask); ++ continue; ++ } + }while(event.type!=LeaveNotify && + event.type!=FocusOut && + event.type!=UnmapNotify && +-- +1.7.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf new file mode 100644 index 0000000000..3c515abed9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf @@ -0,0 +1,35 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description "Unclutter (hides cursor while typing)" +author "chromium-os-dev@chromium.org" + +# This daemon maintains a connection to the X server, thus it uses +# non-standard start/stop conditions: +start on login-prompt-visible +stop on stopping ui + +respawn + +env XAUTHORITY=/home/chronos/.Xauthority +env DISPLAY=:0.0 + +script +IGNORE=" -ignore 8 23" # Alt-Tab +IGNORE="$IGNORE -ignore 4 23" # Ctrl-Tab +IGNORE="$IGNORE -ignore 0 71" # F5 (Switch Windows) +IGNORE="$IGNORE -ignore 4 71" # Ctrl-F5 (Screenshot) +IGNORE="$IGNORE -ignore 5 71" # Ctrl-Shift-F5 (Partial Screenshot) +IGNORE="$IGNORE -ignore 8 36" # Alt-Enter +IGNORE="$IGNORE -ignore 4 57" # Ctrl-N +IGNORE="$IGNORE -ignore 4 58" # Ctrl-M +IGNORE="$IGNORE -ignore 4 25" # Ctrl-W +IGNORE="$IGNORE -ignore 1 9" # Shift-Esc +for i in $(seq 10 18); do + IGNORE="$IGNORE -ignore 4 $i" # Ctrl-{1-9} + IGNORE="$IGNORE -ignore 8 $i" # Alt-{1-9} +done +TPID=`/opt/google/touchpad/tpcontrol_xinput listdev` +exec sudo -u chronos unclutter -keystroke -notap $TPID -grab $IGNORE +end script diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild new file mode 100644 index 0000000000..e4fc140927 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/unclutter/unclutter-8-r1.ebuild,v 1.9 2007/07/22 03:41:55 dberkholz Exp $ + +inherit eutils toolchain-funcs + +S="${WORKDIR}/${PN}" +DESCRIPTION="Hides mouse pointer while not in use." +HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README" +SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z" +SLOT="0" +LICENSE="public-domain" +KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86" +IUSE="" +RDEPEND="x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi" +DEPEND="${RDEPEND} + x11-proto/xproto" + +src_compile() { + # src_prepare fails in this ebuild, so patch here + epatch "${FILESDIR}/${P}-keypress.patch" + epatch "${FILESDIR}/${P}-listen-to-all-windows.patch" + epatch "${FILESDIR}/${P}-ignore-some-keys.patch" + epatch "${FILESDIR}/${P}-disable-tap.patch" + # This xmkmf appears unnecessary + # xmkmf -a || die "Couldn't run xmkmf" + emake -j1 CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die +} + +src_install () { + dobin unclutter + newman unclutter.man unclutter.1x + dodoc README + insinto /etc/init + doins "${FILESDIR}/unclutter.conf" +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest new file mode 100644 index 0000000000..259c3b1ff7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest @@ -0,0 +1 @@ +DIST xkeyboard-config-1.7.tar.bz2 633314 RMD160 aac2a886db8b60261b4b0d3b6fbfb813cc2d1b30 SHA1 d6df43bfc0596be04865f2be7c4e794e198358c8 SHA256 2597bd5ad1a4b9f1f1a763fbde1fc86629a77476860eb21bd80d36973867e440 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch new file mode 100644 index 0000000000..98a46a7567 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch @@ -0,0 +1,16 @@ +diff -ur xkb.orig/symbols/inet xkb/symbols/inet +--- xkb.orig/symbols/inet 2012-10-22 10:33:09.099377948 -0700 ++++ xkb/symbols/inet 2012-10-22 10:46:28.635298140 -0700 +@@ -225,6 +225,12 @@ + key { [ XF86Launch7 ] }; + key { [ XF86Launch8 ] }; + key { [ XF86Launch9 ] }; ++ key { [ F19 ] }; ++ key { [ F20 ] }; ++ key { [ F21 ] }; ++ key { [ F22 ] }; ++ key { [ F23 ] }; ++ key { [ F24 ] }; + }; + + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch new file mode 100644 index 0000000000..b2dc261bad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch @@ -0,0 +1,22 @@ +diff -ur xkeyboard-config-2.4.1.orig/symbols/de xkeyboard-config-2.4.1/symbols/de +--- xkeyboard-config-2.4.1.orig/symbols/de 2011-10-05 07:19:54.000000000 +0900 ++++ xkeyboard-config-2.4.1/symbols/de 2012-02-14 19:28:04.752942409 +0900 +@@ -383,6 +383,7 @@ + + include "shift(both_capslock)" + include "level3(caps_switch)" ++ include "level3(lwin_switch)" + include "level3(bksl_switch)" + include "level5(lsgt_switch)" + include "level5(ralt_switch)" +diff -ur xkeyboard-config-2.4.1.orig/symbols/us xkeyboard-config-2.4.1/symbols/us +--- xkeyboard-config-2.4.1.orig/symbols/us 2011-10-05 07:19:54.000000000 +0900 ++++ xkeyboard-config-2.4.1/symbols/us 2012-02-14 19:28:54.812726287 +0900 +@@ -789,6 +789,7 @@ + key { [ slash, question, questiondown, asciitilde ] }; + + key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; ++ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; + key { [ minus, underscore, endash, emdash ] }; + key { [ space, space, space, nobreakspace ] }; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch new file mode 100644 index 0000000000..07ce1dcc1a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch @@ -0,0 +1,216 @@ +From 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d Mon Sep 17 00:00:00 2001 +From: Sergey V. Udaltsov +Date: Wed, 05 Oct 2011 21:26:26 +0000 +Subject: Levels 2-4 for CTRL+ALT are propagated from level 1 + +--- +diff --git a/symbols/keypad b/symbols/keypad +index e85aaac..1bab391 100644 +--- a/symbols/keypad ++++ b/symbols/keypad +@@ -84,19 +84,19 @@ xkb_symbols "x11" { + // Ungrab cancels server/keyboard/pointer grabs + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] ++ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] + }; + + // ClsGrb kills whichever client has a grab in effect + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] ++ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] + }; + + // -VMode switches to the previous video mode + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] ++ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] + }; + + key { [ KP_Home, KP_7 ] }; +@@ -106,7 +106,7 @@ xkb_symbols "x11" { + // +VMode switches to the next video mode + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] ++ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] + }; + + key { [ KP_Left, KP_4 ] }; +@@ -242,11 +242,11 @@ xkb_symbols "legacymath" { + + key.type[Group1]="CTRL+ALT" ; + +- key { [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / +- key { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * +- key { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - ++ key { [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / ++ key { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * ++ key { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - + +- key { [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + ++ key { [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + + + }; + +@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" { + // ClsGrb kills whichever client has a grab in effect + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] ++ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] + }; + + key { [ KP_4 ] }; +@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" { + // -VMode switches to the previous video mode + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] ++ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] + }; + + key { [ KP_1 ] }; +@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" { + // +VMode switches to the next video mode + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] ++ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] + }; + + key { [ KP_0 ] }; +@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" { + // Ungrab cancels server/keyboard/pointer grabs + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] ++ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] + }; + }; +diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl +index 7d47d66..73b5af2 100644 +--- a/symbols/srvr_ctrl ++++ b/symbols/srvr_ctrl +@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" { + // Ungrab cancels server/keyboard/pointer grabs + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] ++ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] + }; + + // ClsGrb kills whichever client has a grab in effect + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] ++ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] + }; + + // -VMode switches to the previous video mode + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] ++ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] + }; + + // +VMode switches to the next video mode + key { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode] ++ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode] + }; + + }; +@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" { + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ] ++ symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ] ++ symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ] ++ symbols[Group1]= [ F3, F3, F3, F3, F3 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ] ++ symbols[Group1]= [ F4, F4, F4, F4, F4 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ] ++ symbols[Group1]= [ F5, F5, F5, F5, F5 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ] ++ symbols[Group1]= [ F6, F6, F6, F6, F6 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ] ++ symbols[Group1]= [ F7, F7, F7, F7, F7 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ] ++ symbols[Group1]= [ F8, F8, F8, F8, F8 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ] ++ symbols[Group1]= [ F9, F9, F9, F9, F9 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ] ++ symbols[Group1]= [ F10, F10, F10, F10, F10 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ] ++ symbols[Group1]= [ F11, F11, F11, F11, F11 ] + }; + + key { + type="CTRL+ALT", +- symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ] ++ symbols[Group1]= [ F12, F12, F12, F12, F12 ] + }; + + }; +diff --git a/symbols/terminate b/symbols/terminate +index 96dd6e8..c74220b 100644 +--- a/symbols/terminate ++++ b/symbols/terminate +@@ -2,6 +2,6 @@ partial default modifier_keys + xkb_symbols "ctrl_alt_bksp" { + key { + type="CTRL+ALT", +- symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ] ++ symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ] + }; + }; +-- +cgit v0.9.0.2-2-gbebe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch new file mode 100644 index 0000000000..ca6405cc01 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch @@ -0,0 +1,24 @@ +With UK layouts, the grave key should operate as a dead key, +and the bar should be broken. +Additionally, vowels should be given an acute accent when AltGr is pressed. + +diff -uNr xkeyboard-config-1.7.orig/symbols/gb xkeyboard-config-1.7/symbols/gb +--- xkeyboard-config-1.7.orig/symbols/gb 2009-08-15 23:31:43.000000000 +0900 ++++ xkeyboard-config-1.7/symbols/gb 2011-05-19 12:56:47.000000000 +0900 +@@ -151,7 +151,15 @@ xkb_symbols "dvorak" { + key { [ 3, sterling, threesuperior, NoSymbol ] }; + key { [ numbersign, asciitilde ] }; + key { [ backslash, bar ] }; +- key { [ grave, notsign, bar, bar ] }; ++ key { [ deadgrave, notsign, brokenbar, brokenbar ] }; ++ key { [ a, A, aacute, Aacute ] }; ++ key { [ o, O, oacute, Oacute ] }; ++ key { [ e, E, eacute, Eacute ] }; ++ key { [ u, U, uacute, Uacute ] }; ++ key { [ i, I, iacute, Iacute ] }; ++ key { [ y, Y, yacute, Yacute ] }; ++ key { [ c, C, ccedilla, Ccedilla ] }; ++ key { [ w, W, wacute, Wacute ] }; + }; + + // Dvorak letter positions, but punctuation all in the normal UK positions. diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch new file mode 100644 index 0000000000..a0a627c9f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch @@ -0,0 +1,12 @@ +diff -urN xkeyboard-config-2.4.1.orig/symbols/gb xkeyboard-config-2.4.1/symbols/gb +--- xkeyboard-config-2.4.1.orig/symbols/gb 2012-11-22 14:40:25.858449142 +0900 ++++ xkeyboard-config-2.4.1/symbols/gb 2012-11-26 13:55:13.877729860 +0900 +@@ -75,7 +75,7 @@ + name[Group1]="English (UK, extended WinKeys)"; + + // Alphanumeric section +- key { [ dead_grave, notsign, brokenbar, NoSymbol ] }; ++ key { [ grave, notsign, brokenbar, NoSymbol ] }; + + key { [ 2, quotedbl, dead_diaeresis, onehalf ] }; + key { [ 3, sterling, threesuperior, onethird ] }; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch new file mode 100644 index 0000000000..6034bb75c7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch @@ -0,0 +1,13 @@ +diff -ur xkeyboard-config-2.4.1.orig/rules/base.xml.in xkeyboard-config-2.4.1/rules/base.xml.in +--- xkeyboard-config-2.4.1.orig/rules/base.xml.in 2011-10-05 07:19:54.000000000 +0900 ++++ xkeyboard-config-2.4.1/rules/base.xml.in 2012-02-14 19:20:13.944976247 +0900 +@@ -3708,7 +3708,8 @@ + <_shortDescription>no + <_description>Norwegian + +- nor ++ nob ++ nno + + + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch new file mode 100644 index 0000000000..b26420bb82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch @@ -0,0 +1,10 @@ +diff -urN xkeyboard-config-2.4.1.orig/rules/compat/layoutsMapping.lst xkeyboard-config-2.4.1/rules/compat/layoutsMapping.lst +--- xkeyboard-config-2.4.1.orig/rules/compat/layoutsMapping.lst 2012-11-14 14:08:33.999093026 +0900 ++++ xkeyboard-config-2.4.1/rules/compat/layoutsMapping.lst 2012-11-14 17:03:26.637971159 +0900 +@@ -25,3 +25,6 @@ + yu srp + fr-latin9 fr(latin9) + us_intl us(alt-intl) ++# To be us(euro) as the default us keyboard layout on parrot, overwrite us ++# layout mapping to us(euro). ++us us(euro) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch new file mode 100644 index 0000000000..9f94cbd4a0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch @@ -0,0 +1,25 @@ +diff -urN xkeyboard-config-2.4.1.org/symbols/pc xkeyboard-config-2.4.1/symbols/pc +--- xkeyboard-config-2.4.1.org/symbols/pc 2013-01-17 15:09:37.104779731 +0900 ++++ xkeyboard-config-2.4.1/symbols/pc 2013-01-17 15:11:40.836636784 +0900 +@@ -19,7 +19,10 @@ + key { [ Tab, ISO_Left_Tab ] }; + key { [ Return ] }; + +- key { [ Caps_Lock ] }; ++ // Generate a non Caps_Lock symbol (F16) for to allow the user to ++ // remap the key. Chrome remaps the F16 key symbol back to VKEY_CAPITAL when ++ // needed. crbug.com/146204. ++ key { [ XF86Launch7 ] }; + + key { [ Num_Lock ] }; + +@@ -40,6 +43,9 @@ + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod2 { Num_Lock }; ++ // Use as Mod3. The Mod3Mask mask will be remapped to ControlMask, ++ // Mod1Mask (Alt), etc. in Chrome. crbug.com/146204 ++ modifier_map Mod3 { }; + modifier_map Mod4 { Super_L, Super_R }; + + // Fake keys for virtual<->real modifiers mapping diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch new file mode 100644 index 0000000000..350edae348 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch @@ -0,0 +1,14 @@ +diff -urN xkeyboard-config-2.4.1.org/symbols/pc xkeyboard-config-2.4.1/symbols/pc +--- xkeyboard-config-2.4.1.org/symbols/pc 2013-01-17 13:51:15.974219536 +0900 ++++ xkeyboard-config-2.4.1/symbols/pc 2013-01-17 14:31:45.361168332 +0900 +@@ -42,7 +42,9 @@ + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L, Control_R }; +- modifier_map Mod2 { Num_Lock }; ++ // Keep Num_Lock as Mod2 modifier. Mod2 is used as both NumLock modifier ++ // and diamond key modifier. ++ modifier_map Mod2 { Num_Lock, XF86Launch6 }; + // Use as Mod3. The Mod3Mask mask will be remapped to ControlMask, + // Mod1Mask (Alt), etc. in Chrome. crbug.com/146204 + modifier_map Mod3 { }; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch new file mode 100644 index 0000000000..9c526af13a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch @@ -0,0 +1,75 @@ +From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Thu, 19 Jan 2012 16:36:16 +1100 +Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option + +Similar to how we put the Terminate mapping behind an option rather than +enabling it by default, put the ClearGrab/CloseGrab action handlers +behind an option too, so we don't ship 'break my screensaver'. Oops. + +Signed-off-by: Daniel Stone +--- + compat/xfree86 | 15 +++++++++------ + rules/base.o_c.part | 1 + + rules/base.xml.in | 6 ++++++ + 3 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/compat/xfree86 b/compat/xfree86 +index cf4a8b2..52e661d 100644 +--- a/compat/xfree86 ++++ b/compat/xfree86 +@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic" { + action = SwitchScreen(Screen=12, !SameServer); + }; + +- interpret XF86_Ungrab { +- action = Private(type=0x86, data="Ungrab"); +- }; +- interpret XF86_ClearGrab { +- action = Private(type=0x86, data="ClsGrb"); +- }; + interpret XF86LogGrabInfo { + action = Private(type=0x86, data="PrGrbs"); + }; +@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic" { + action = Private(type=0x86, data="-VMode"); + }; + }; ++ ++partial xkb_compatibility "grab_break" { ++ interpret XF86_Ungrab { ++ action = Private(type=0x86, data="Ungrab"); ++ }; ++ interpret XF86_ClearGrab { ++ action = Private(type=0x86, data="ClsGrb"); ++ }; ++}; +diff --git a/rules/base.o_c.part b/rules/base.o_c.part +index 352f8b3..b80ab6d 100644 +--- a/rules/base.o_c.part ++++ b/rules/base.o_c.part +@@ -3,4 +3,5 @@ + grp_led:scroll = +ledscroll(group_lock) + japan:kana_lock = +japan(kana_lock) + caps:shiftlock = +ledcaps(shift_lock) ++ grab:break_actions = +xfree86(grab_break) + +diff --git a/rules/base.xml.in b/rules/base.xml.in +index 22b720f..6c17faa 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -6278,6 +6278,12 @@ + <_description>Toggle PointerKeys with Shift + NumLock. + + ++ + + + +-- +1.7.8.3 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild new file mode 100644 index 0000000000..44165037ec --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild,v 1.5 2012/01/24 12:52:59 jer Exp $ + +EAPI=4 + +XORG_STATIC=no +inherit xorg-2 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config" + +DESCRIPTION="X keyboard configuration database" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" +[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="parrot" + +LICENSE="MIT" +SLOT="0" + +RDEPEND=">=x11-apps/xkbcomp-1.2.1 + >=x11-libs/libX11-1.4.2" +DEPEND="${RDEPEND} + x11-proto/xproto + >=dev-util/intltool-0.30 + dev-perl/XML-Parser" + +XORG_CONFIGURE_OPTIONS=( + --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" + --enable-compat-rules + # do not check for runtime deps + --disable-runtime-deps + --with-xkb-rules-symlink=xorg +) + +PATCHES=( + "${FILESDIR}"/${P}-extended-function-keys.patch + "${FILESDIR}"/xorg-cve-2012-0064.patch + "${FILESDIR}"/${P}-gb-dvorak-deadkey.patch + "${FILESDIR}"/${P}-no-keyboard.patch + "${FILESDIR}"/${P}-colemack-neo-capslock-remap.patch + "${FILESDIR}"/${P}-remap-capslock.patch + "${FILESDIR}"/${P}-add-f19-24.patch + "${FILESDIR}"/${P}-gb-extd-deadkey.patch + "${FILESDIR}"/${P}-remap-f15-as-mod2mask.patch +) + +use parrot && PATCHES+=( "${FILESDIR}"/${P}-parrot-euro-sign.patch ) + +src_prepare() { + xorg-2_src_prepare + if [[ ${XORG_EAUTORECONF} != no ]]; then + intltoolize --copy --automake || die + fi +} + +src_compile() { + # cleanup to make sure .dir files are regenerated + # bug #328455 c#26 + xorg-2_src_compile clean + xorg-2_src_compile +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest new file mode 100644 index 0000000000..48404e3b66 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest @@ -0,0 +1 @@ +DIST xcb-proto-1.6.tar.bz2 92829 RMD160 61ffea8c3ab4b745f04eccc10c64f7f1c356692c SHA1 e82418557c7f59f29da9ec18e0906d6d78e3a164 SHA256 f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild new file mode 100644 index 0000000000..642a7c3768 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.6-r2.ebuild,v 1.5 2011/12/27 21:13:20 maekke Exp $ + +EAPI=3 +PYTHON_DEPEND="2:2.5" + +inherit python xorg-2 + +DESCRIPTION="X C-language Bindings protocol headers" +HOMEPAGE="http://xcb.freedesktop.org/" +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto" +[[ ${PV} != 9999* ]] && \ + SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2" + +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-libs/libxml2" + +pkg_setup() { + python_set_active_version 2 +} + +src_prepare() { + xorg-2_src_prepare +} + +src_install() { + xorg-2_src_install + python_clean_installation_image +} + +pkg_postinst() { + python_mod_optimize xcbgen + ewarn "Please rebuild both libxcb and xcb-util if you are upgrading from version 1.6" +} + +pkg_postrm() { + python_mod_cleanup xcbgen +} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest new file mode 100644 index 0000000000..9b8df2a0c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest @@ -0,0 +1 @@ +DIST xextproto-7.2.0.tar.bz2 207724 RMD160 f7ea5722a70d64c62f8cf0bea0b53fbf2688166a SHA1 a117fb9d7fdebee7af3f9e79efe9812e39e650a5 SHA256 d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild new file mode 100644 index 0000000000..6e4f504e27 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/xextproto-7.2.0.ebuild,v 1.3 2011/03/16 16:14:15 scarabeus Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 + +DESCRIPTION="X.Org XExt protocol headers" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND="! 0) g.width = (g.width + wcw - 1) / wcw; ++ if (wcw > 1) g.xOff = g.xOff / wcw; ++ if (width < g.xOff) width = g.xOff; + +- if (width < g.width ) width = g.width; + if (height < g.height ) height = g.height; + if (glheight < g.height - g.y) glheight = g.height - g.y; + } diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff new file mode 100644 index 0000000000..81a3646d48 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff @@ -0,0 +1,16 @@ +diff -NrU5 rxvt-unicode-9.06.original/src/screen.C rxvt-unicode-9.06/src/screen.C +--- rxvt-unicode-9.06.original/src/screen.C 2009-10-25 18:16:16.000000000 -0600 ++++ rxvt-unicode-9.06/src/screen.C 2009-10-25 18:17:53.000000000 -0600 +@@ -1927,11 +1927,11 @@ + # endif + XMapWindow (dpy, parent[0]); + # endif + + # if ENABLE_FRILLS +- if (option (Opt_urgentOnBell)) ++ if (option (Opt_urgentOnBell) && !focus) + set_urgency (1); + # endif + + if (option (Opt_visualBell)) + { diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch new file mode 100644 index 0000000000..b09ad99340 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch @@ -0,0 +1,18 @@ +Index: src/rxvtperl.xs +=================================================================== +RCS file: /schmorpforge/rxvt-unicode/src/rxvtperl.xs,v +retrieving revision 1.127 +diff -u -r1.127 rxvtperl.xs +--- src/rxvtperl.xs 30 May 2009 08:51:23 -0000 1.127 ++++ src/rxvtperl.xs 30 Jul 2009 22:19:33 -0000 +@@ -929,7 +929,9 @@ + rxvt_term::grab (Time eventtime, int sync = 0) + CODE: + { +- int mode = sync ? GrabModeSync : GrabModeAsync; ++ // TA: 20090730: Always assume Async mode here -- recent Xorg ++ // Servers don't appreciate being put in Sync mode. ++ int mode = GrabModeAsync; + + THIS->perl.grabtime = 0; + diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild new file mode 100644 index 0000000000..414f81c9b7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild,v 1.1 2010/02/03 05:07:45 jer Exp $ + +EAPI="2" + +inherit autotools flag-o-matic + +DESCRIPTION="rxvt clone with xft and unicode support" +HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" +SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +IUSE="minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla" + +# see bug #115992 for modular x deps +RDEPEND="x11-libs/libX11 + x11-libs/libXft + afterimage? ( media-libs/libafterimage ) + x11-libs/libXrender + perl? ( dev-lang/perl ) + >=sys-libs/ncurses-5.7-r3" +DEPEND="${RDEPEND} + dev-util/pkgconfig + x11-proto/xproto" + +src_prepare() { + if { use xterm-color || use wcwidth; }; then + ewarn "You enabled xterm-color or wcwidth or both." + ewarn "Please note that neither of them are supported by upstream." + ewarn "You are at your own if you run into problems." + ebeep 5 + fi + + local tdir=/usr/share/terminfo + if use xterm-color; then + epatch doc/urxvt-8.2-256color.patch + sed -e \ + 's/^\(rxvt-unicode\)/\1256/;s/colors#88/colors#256/;s/pairs#256/pairs#32767/' \ + doc/etc/rxvt-unicode.terminfo > doc/etc/rxvt-unicode256.terminfo + sed -i -e \ + "s~^\(\s\+@TIC@.*\)~\1\n\t@TIC@ -o "${D}"/${tdir} \$(srcdir)/etc/rxvt-unicode256.terminfo~" \ + doc/Makefile.in + fi + + # kill the rxvt-unicode terminfo file - #192083 + sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || + die "sed failed" + + use wcwidth && epatch doc/wcwidth.patch + + # bug #240165 + epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff + + # ncurses will provide rxvt-unicode terminfo, so we don't install them again + # see bug #192083 + # + # According to my tests this is not (yet?) true, so keep it prepared and + # disabled until it's needed again. + #if has_version ' + fperms 0755 /usr/bin/xterm + + # restore the navy blue + sed -i -e "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/XTerm-color +}